@retaw106/mmc-pi 2.1.2 → 2.2.1

package/dist/index.js

@@ -22,6 +22,7 @@ import {
   normalizeProtectedToolName,
   mergeProtectedTools,
   detectThinkingBindingMismatch,
+  detectLatestTurnThinkingMismatch,
   isPrefixBoundThinkingModel,
   detectOverflow,
   stableStringify,
@@ -32,7 +33,7 @@ import {
   localBudget,
   calibrationForModelKey,
   historyLocalBudget,
-  CTX_REDUCE_KEEP,
+  adoptedProtectedToolsPolicy,
   protectedToolTagNumbers,
   protectedToolTokenCount,
   removeSystemReminders,
@@ -51,6 +52,7 @@ import {
   prependTag,
   isRecord,
   TEXT_TAG_IDENTITY_MARKER,
+  contentTagOwnerMessageId,
   estimateImageTokensFromDataUrl,
   TODO_STATUSES,
   TODO_PRIORITIES,
@@ -135,6 +137,7 @@ import {
   buildTrueRawTokenIndex,
   computeRawRangeFingerprint,
   invalidateTrueRawTokenCache,
+  stripSystemInjection,
   hasUserAnswerMetadata,
   droppedInputMarker,
   createDroppedInputGuard,
@@ -165,7 +168,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-bz61mcxg.js";
+} from "./index-j0jjtcwm.js";
 import {
   registerSlowWriteReporter,
   registerSqliteDiagnosticSink,
@@ -6964,7 +6967,6 @@ var HistorianConfigSchema = AgentMetadataSchema.extend({
 var MagicContextConfigSchema = object({
   enabled: boolean2().default(true).describe("Enable magic context (default: true)"),
   allow_home_project: boolean2().default(false).describe("Allow Magic Context sessions launched from the exact canonical home directory. A non-git home uses its deterministic dir: identity; a home repository uses its git: identity. USER-LEVEL ONLY: project config is ignored. The home identity is excluded from registry seed exports, never resolves descendants by containment, and cannot join a workspace."),
-  auto_update: boolean2().optional().describe("DEPRECATED no-op: the automatic update check was removed (the package is private-registry-only, so public npm checks always 404). The key is still accepted so existing configs keep parsing; upgrade via the host's own plugin update channel."),
   language: string2().trim().toLowerCase().refine((s) => isValidLanguageCode(s), 'language must be a 2-letter ISO 639-1 code (e.g. "tr", "es", "de")').optional().describe("Output language for Magic Context's generated content and guidance, as a " + '2-letter ISO 639-1 code (e.g. "tr", "es", "de", "ja", "pt"). When set, the ' + "historian and the agent-guidance block instruct the model to " + "write its PROSE in this language while keeping all structural tokens (XML tags, " + "the five memory category names, code identifiers, file paths) in English. " + "USER-LEVEL ONLY (ignored in project config for security). Unset = today's " + "behavior (model mirrors the conversation; English scaffolding). Changing it " + "triggers one cache re-materialization; existing compartments/memories keep their " + "original language until naturally rewritten."),
   profile: string2().trim().min(1).optional().describe("Select a named user-owned model profile. A valid project name overrides this user default; an empty string, null, or other non-string project value is ignored with a warning so the user selection still applies. Unknown names warn and use the base configuration."),
   profiles: ConfigProfilesSchema.optional().describe("User-level named model profiles. A profile may contain only the flat historian model-resolution fields (model, fallback_models, OpenCode variant, Pi thinking_level). Project configs may select a name but cannot define profiles."),
@@ -7436,10 +7438,6 @@ function stripUnsafeProjectConfigFields(projectRaw) {
     delete projectRaw.profiles;
     warnings.push("Ignoring profiles from project config (security: profile definitions are user-level only; a repository may select a named user profile with profile).");
   }
-  if ("auto_update" in projectRaw) {
-    delete projectRaw.auto_update;
-    warnings.push("Ignoring auto_update from project config (security: this setting only honors user-level config).");
-  }
   if ("fail_closed_blocking" in projectRaw) {
     delete projectRaw.fail_closed_blocking;
     warnings.push("Ignoring fail_closed_blocking from project config (security: only user-level config may disable or force the loud inoperability gate).");
@@ -11973,8 +11971,8 @@ function ensureBackfillStateTable(db) {
   }
 }
 function withImmediateTransaction(db, fn) {
+  withoutSqliteTransformPass(() => withSqliteBackgroundWriter(() => db.exec("BEGIN IMMEDIATE")));
   const transactionStartedAt = performance.now();
-  db.exec("BEGIN IMMEDIATE");
   try {
     const result = fn();
     db.exec("COMMIT");
@@ -12081,6 +12079,9 @@ function createPageReader(source) {
   };
 }
 async function runSessionProjectBackfill(db, source, options = {}) {
+  return withoutSqliteTransformPass(() => withSqliteBackgroundWriter(() => runSessionProjectBackfillPass(db, source, options)));
+}
+async function runSessionProjectBackfillPass(db, source, options = {}) {
   const startedAt = performance.now();
   const harness = getHarness();
   const now = options.now ?? Date.now;
@@ -12215,12 +12216,12 @@ import { execFile, execFileSync as execFileSync2 } from "node:child_process";
 import { readFileSync as readFileSync8 } from "node:fs";
 
 // ../plugin/src/shared/pi-executable.ts
-var PI_IMAGE_NAMES = new Set(["pi", "pi.cmd"]);
+var PI_IMAGE_NAMES = new Set(["pi", "pi.cmd", "omp", "oh-my-pi"]);
 function piHarnessKindFromExecutable(value) {
   const executable = (value ?? "").trim().replace(/^['"]|['"]$/g, "").replaceAll("\\", "/").split("/").at(-1)?.toLowerCase().replace(/\.(?:exe|cmd)$/, "");
   if (!executable || !PI_IMAGE_NAMES.has(executable))
     return;
-  return "pi";
+  return executable === "pi" ? "pi" : "omp";
 }
 
 // ../plugin/src/shared/rpc-utils.ts
@@ -14119,6 +14120,13 @@ function getCurrentVersion(db) {
 function isMigrationApplied(db, version) {
   return db.prepare("SELECT 1 FROM schema_migrations WHERE version = ?").get(version) != null;
 }
+function hasPendingMigrations(db) {
+  const bookkeeping = db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'schema_migrations'").get();
+  if (bookkeeping == null)
+    return true;
+  const currentVersion = getCurrentVersion(db);
+  return MIGRATIONS.some((candidate) => candidate.version > currentVersion && !isMigrationApplied(db, candidate.version));
+}
 function isSiblingMigrationConflict(db, error, version) {
   if (!(error instanceof Error))
     return false;
@@ -14391,6 +14399,8 @@ function lkgContentDigestFromFields(fields) {
   }
   return hash.digest("base64url");
 }
+var digestMemo = new Map;
+var DIGEST_MEMO_MAX_BYTES = 16 * 1024 * 1024;
 function equalContentFields(left, right) {
   if (left === right)
     return true;
@@ -15066,7 +15076,8 @@ function clampWatermark(value, maxCopiedTag) {
 }
 function copySessionStateForClone(db, sourceSessionId, destinationSessionId, filter) {
   return runImmediate(db, () => {
-    if (countRows(db, "compartments", destinationSessionId) > 0 || countRows(db, "tags", destinationSessionId) > 0 || filter.copySessionNotesAndFacts === true && (tableExists2(db, "notes") && countRows(db, "notes", destinationSessionId) > 0 || tableExists2(db, "session_facts") && countRows(db, "session_facts", destinationSessionId) > 0)) {
+    const hasTemporalDecisions = tableExists2(db, "temporal_decisions");
+    if (countRows(db, "compartments", destinationSessionId) > 0 || countRows(db, "tags", destinationSessionId) > 0 || hasTemporalDecisions && countRows(db, "temporal_decisions", destinationSessionId) > 0 || filter.copySessionNotesAndFacts === true && (tableExists2(db, "notes") && countRows(db, "notes", destinationSessionId) > 0 || tableExists2(db, "session_facts") && countRows(db, "session_facts", destinationSessionId) > 0)) {
       return {
         kind: "destination-not-empty",
         compartmentsCopied: 0,
@@ -15155,6 +15166,14 @@ function copySessionStateForClone(db, sourceSessionId, destinationSessionId, fil
         insertPendingOp.run(destinationSessionId, row.tag_id, row.operation, row.queued_at, row.harness);
       }
     }
+    if (hasTemporalDecisions) {
+      const temporalRows = db.prepare("SELECT message_id,marker FROM temporal_decisions WHERE session_id=?").all(sourceSessionId);
+      const insertTemporal = db.prepare("INSERT INTO temporal_decisions(session_id,message_id,marker) VALUES (?,?,?)");
+      for (const row of temporalRows) {
+        if (filter.includeMessageId(row.message_id))
+          insertTemporal.run(destinationSessionId, mapMessageId(filter, row.message_id), row.marker);
+      }
+    }
     const inherited = filter.copySessionNotesAndFacts === true ? copyPiSessionNotesAndFacts(db, sourceSessionId, destinationSessionId, filter) : { notesCopied: 0, factsCopied: 0 };
     const meta = db.prepare(`SELECT cleared_reasoning_through_tag, tool_reclaim_watermark,
                         pi_stable_id_scheme, stripped_placeholder_ids,
@@ -15991,7 +16010,7 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
       startMessageFtsRowidMapBackfill(db).then(async () => {
         if (!readsOpenCodeStore)
           return;
-        const { readRawSessionMessagePage, readRawSessionMessages } = await import("./read-session-chunk-pz4pxry4.js");
+        const { readRawSessionMessagePage, readRawSessionMessages } = await import("./read-session-chunk-ktp56z65.js");
         const { startMessageTimeBackfill } = await import("./message-time-backfill-a3p9r5rh.js");
         await startMessageTimeBackfill(db, Object.assign(readRawSessionMessages, {
           readPage: readRawSessionMessagePage
@@ -17511,12 +17530,23 @@ function openDatabase(dbPathOrOptions) {
       closeQuietly(db);
       return null;
     }
+    if (options?.allowMigrations === false && hasPendingMigrations(db)) {
+      log(`[magic-context] storage not ready: pending migrations at ${dbPath}; host callers must await the async opener`);
+      closeQuietly(db);
+      return null;
+    }
     if (!enforceMigrationOnOpenGuard(db, dbPath, dbDir, latestSupportedVersion)) {
       closeQuietly(db);
       return null;
     }
     initializeDatabase(db, busyTimeoutMs);
-    runMigrations(db);
+    if (options?.allowMigrations === false) {
+      if (hasPendingMigrations(db)) {
+        closeQuietly(db);
+        return null;
+      }
+    } else
+      runMigrations(db);
     ensureContextStoreUuid(db);
     return finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion);
   } catch (error) {
@@ -19140,7 +19170,7 @@ var CTX_REDUCE_LIGHT_DESCRIPTION = `Stamp an item as no longer needed for the wo
 var CTX_EXPAND_LIGHT_DESCRIPTION = "Recover one item with tag=N (a §N§ or dropped placeholder number), not a message ordinal; text or one tool call with full input/output. message=N and start/end are whole-message ordinals from history/search, never tag numbers. Recover raw conversation behind a <session-history> heading or around a mmc_search hit: mmc_expand(start, end) returns [N] U:/A: lines (~15K-token cap; oversized ranges return the head and where to continue). verbose=true lists messages with per-part previews to pick one; message=N returns that message in full, including a tool output released with mmc_reduce. Ranges after the last compartment are your live tail, not expandable.";
 var CTX_NOTE_LIGHT_DESCRIPTION = 'Session notes are pending intentions: work you intend to return to, with findings attached ("take a note" always qualifies). Not active steps, an executing plan, or restart insurance; a record of how things stand (world-state, a design at a point in time) with nothing you intend to do about it — that goes stale silently; a fact worth keeping is memory, the rest is nothing. First line = title (<80 chars). write saves; read lists rows (note_ids for bodies); update changes one; dismiss retires 1–50. Dismiss a note when its work lands or is abandoned; a queue you never dismiss from stops being read.';
 var CTX_MEMORY_LIGHT_DESCRIPTION = "Durable facts about this project, shared with every agent on it and kept for the months this work lasts; active ones are already in <project-memory> as `#id: fact`. Write one standalone fact when it must not have to be found again — a rule, an architecture fact, a constraint, a config value, a naming convention — especially what cost you turns. A pending intention with evidence is mmc_note, not memory. write (content + category); update one id (content; category optional); archive one or more ids (reason optional); merge two or more ids (content); get 1–20 ids in any status.";
-var CTX_SEARCH_LIGHT_DESCRIPTION = 'Search the archive — everything that ever happened here that is not on your desk: memories not in <project-memory>, compacted conversation, notes. Phrase query as a natural-language question carrying the exact terms you expect ("where is the opencode source code path?", "why did we choose SQLite over postgres?", "how does the historian lease work?") — a keyword stack finds less. Sources (omit for all): memory (rules, conventions), message (compacted conversation; hits carry ordinals for mmc_expand), note (parked follow-ups). Memory ids alone (`#7234`) resolve directly. from/to restrict every source to an inclusive UTC date range.';
+var CTX_SEARCH_LIGHT_DESCRIPTION = 'Search past context not on your desk: memories not in <project-memory>, compacted conversation, notes. Phrase query as a natural-language question carrying the exact terms you expect ("where is the opencode source code path?", "why did we choose SQLite over postgres?", "how does the historian lease work?") — a keyword stack finds less. Sources (omit for all): memory (rules, conventions), message (compacted conversation; hits carry ordinals for mmc_expand), primer (stored project Q&A), note (parked follow-ups). Memory ids alone (`#7234`) resolve directly. from/to restrict every source to an inclusive UTC date range.';
 
 // ../plugin/src/shared/prompt-surface-runtime.ts
 var GUIDANCE_MARKER = "## Magic Context";
@@ -21676,9 +21706,15 @@ function applyFlushedStatuses(sessionId, db, targets, preloadedTags) {
 
 // ../plugin/src/hooks/magic-context/cache-busting-signals.ts
 function hasReclaimRide(signals) {
-  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory;
-}
-var RECLAIM_RIDE_NAMES = ["hardFold", "force", "explicitFlush", "publishedHistory"];
+  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory || signals.subagentExecute === true;
+}
+var RECLAIM_RIDE_NAMES = [
+  "hardFold",
+  "force",
+  "explicitFlush",
+  "publishedHistory",
+  "subagentExecute"
+];
 function reclaimRideLabel(signals) {
   const active = RECLAIM_RIDE_NAMES.filter((name) => signals[name]);
   return `ride=${active.length > 0 ? active.join("+") : "none"}`;
@@ -21748,6 +21784,9 @@ var MEMORY_MAINTAINER_B_AGENT = "magic-context-maintainer-b";
 var MEMORY_MAINTAINER_A_ALLOWED_TOOLS = [];
 var MEMORY_MAINTAINER_B_ALLOWED_TOOLS = ["read", "grep", "glob"];
 var MEMORY_MAINTAINER_A_STEP_CAP = 4;
+function resolveMaintenanceStepCap(baseSteps, consumedSteps) {
+  return Math.max(1, baseSteps - consumedSteps);
+}
 var MEMORY_MAINTAINER_A_SYSTEM_PROMPT = [
   "You are the memory-maintenance stage A screener: a hidden background agent that",
   "value-screens a coding project's long-term memory pool before a separate",
@@ -22018,6 +22057,9 @@ ${stageAManifest}
 `);
 }
 
+// ../plugin/src/shared/subagent-runner.ts
+var HISTORIAN_STEP_CAP = 4;
+
 // ../plugin/src/v2/hooks/hidden-child.ts
 var HIDDEN_HISTORIAN_AGENT = "historian";
 var AGENT_TOOL_ALLOWLIST = {
@@ -22026,7 +22068,8 @@ var AGENT_TOOL_ALLOWLIST = {
   [MEMORY_MAINTAINER_B_AGENT]: MEMORY_MAINTAINER_B_ALLOWED_TOOLS
 };
 var AGENT_STEP_CAPS = {
-  [MEMORY_MAINTAINER_A_AGENT]: MEMORY_MAINTAINER_A_STEP_CAP
+  [MEMORY_MAINTAINER_A_AGENT]: MEMORY_MAINTAINER_A_STEP_CAP,
+  [HIDDEN_HISTORIAN_AGENT]: HISTORIAN_STEP_CAP
 };
 class HiddenAgentStepLimit extends Error {
   agent;
@@ -23478,11 +23521,10 @@ var MIN_PROACTIVE_TAIL_MESSAGE_COUNT = 12;
 var DEFAULT_MIN_COMMIT_CLUSTERS_FOR_TRIGGER = 3;
 var TAIL_SIZE_TRIGGER_MULTIPLIER = 3;
 var BLOCK_UNTIL_DONE_PERCENTAGE = 95;
-var CONTENT_TAG_OWNER_SUFFIX = /:(?:p|file)\d+$/;
 function tagOwnerMessageId(row) {
   if (row.type === "tool")
     return row.tool_owner_message_id ?? row.message_id;
-  return row.message_id.replace(CONTENT_TAG_OWNER_SUFFIX, "");
+  return contentTagOwnerMessageId(row.message_id);
 }
 function getActiveOrDroppedTagOwnerMessageIds(db, sessionId, floor = 0) {
   const rows = floor > 0 ? db.prepare(`SELECT type, message_id, tool_owner_message_id
@@ -25591,6 +25633,164 @@ function hasActiveAnthropicThinkingTurn(messages, provider, model) {
   }
   return false;
 }
+function protectNewTagMutations(messages, targets, protectedParts, prefixBound) {
+  if (protectedParts.size === 0)
+    return targets;
+  const positions = new Map;
+  let ordinal = 0;
+  for (const message of messages)
+    for (const part of message.parts)
+      positions.set(part, ordinal++);
+  let lastProtected = -1;
+  for (const part of protectedParts)
+    lastProtected = Math.max(lastProtected, positions.get(part) ?? -1);
+  const result = new Map;
+  for (const [tag, target] of targets) {
+    const message = target.message;
+    const coordinates = target.mutationParts ?? (message ? message.parts.map((part) => ({ message, part })) : []);
+    const prefixEdit = prefixBound && coordinates.some(({ part }) => (positions.get(part) ?? Infinity) < lastProtected);
+    const dropsThinking = target.dropReasoningParts?.some((part) => protectedParts.has(part)) === true;
+    if (!prefixEdit && !dropsThinking) {
+      result.set(tag, target);
+      continue;
+    }
+    result.set(tag, {
+      ...target,
+      thinkingDropProtected: true,
+      thinkingRewriteProtected: prefixEdit,
+      canDrop: () => false,
+      drop: () => "incomplete",
+      truncate: () => "incomplete",
+      skeletonReal: () => "incomplete",
+      skeletonStripped: () => "incomplete",
+      editMarker: () => "incomplete",
+      editMarkerStripped: () => "incomplete",
+      setContent: (content, options) => prefixEdit || options?.keepReasoning !== true ? false : target.setContent(content, options)
+    });
+  }
+  return result;
+}
+
+// ../plugin/src/hooks/magic-context/latest-thinking-recovery.ts
+var LATEST_THINKING_RESTORE = "latest_thinking_original";
+var knownRejectedSessions = new Set;
+var lastPassTurnAnchor = new Map;
+var ACTIVE = `${LATEST_THINKING_RESTORE}:`;
+var ARMED = `${LATEST_THINKING_RESTORE}_armed:`;
+var UNRECOVERABLE = `${LATEST_THINKING_RESTORE}_unavailable`;
+var LATEST_THINKING_UNSAFE = "ANTHROPIC_LATEST_TURN_EDIT_UNSAFE: The provider rejected edits to this thinking turn and its original context cannot be safely replayed. Send a new user message or /clear to continue.";
+function armLatestThinkingRecovery(db, sessionId) {
+  knownRejectedSessions.add(sessionId);
+  ensureSessionMetaRow(db, sessionId);
+  const current = getThinkingBindingRecoveryTarget(db, sessionId);
+  const anchor = lastPassTurnAnchor.get(sessionId);
+  const next = current?.startsWith(ACTIVE) ? UNRECOVERABLE + ":" + current.slice(ACTIVE.length) : current?.startsWith(UNRECOVERABLE) || current?.startsWith(ARMED) ? current : anchor !== undefined ? ARMED + anchor : LATEST_THINKING_RESTORE;
+  db.prepare("UPDATE session_meta SET thinking_binding_recovery_target = ? WHERE session_id = ?").run(next, sessionId);
+}
+function clone2(value) {
+  if (Array.isArray(value))
+    return value.map(clone2);
+  if (!isRecord(value))
+    return value;
+  const proto = Object.getPrototypeOf(value);
+  if (proto !== Object.prototype && proto !== null)
+    return value;
+  return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, clone2(item)]));
+}
+function isThinkingPart(part) {
+  return isRecord(part) && ["thinking", "reasoning", "redacted_thinking"].includes(String(part.type));
+}
+function replayableOriginal(part) {
+  if (!isThinkingPart(part) || !isRecord(part))
+    return false;
+  const metadata = isRecord(part.metadata) && isRecord(part.metadata.anthropic) ? part.metadata.anthropic : {};
+  const signature = part.signature ?? part.thinkingSignature ?? metadata.signature ?? part.data ?? metadata.redactedData;
+  return typeof signature === "string" && signature.length > 0 && part.text !== "[cleared]" && part.thinking !== "[cleared]";
+}
+function prepareLatestThinkingRecovery(args) {
+  const start = latestAssistantTurnStart(args.messages);
+  const anchor = start > 0 ? args.id(args.messages[start - 1], start - 1) : undefined;
+  if (anchor === undefined)
+    lastPassTurnAnchor.delete(args.sessionId);
+  else
+    lastPassTurnAnchor.set(args.sessionId, anchor);
+  let target;
+  try {
+    target = getThinkingBindingRecoveryTarget(args.db, args.sessionId);
+  } catch (error) {
+    if (knownRejectedSessions.has(args.sessionId))
+      throw contextRefusalError(LATEST_THINKING_UNSAFE);
+    return { restore: false, ended: false };
+  }
+  if (!target || !target.startsWith(LATEST_THINKING_RESTORE)) {
+    knownRejectedSessions.delete(args.sessionId);
+    return { restore: false, ended: false };
+  }
+  const armedAnchor = target.startsWith(ARMED) ? target.slice(ARMED.length) : undefined;
+  if (target === LATEST_THINKING_RESTORE || armedAnchor !== undefined && armedAnchor !== anchor) {
+    args.db.prepare("UPDATE session_meta SET thinking_binding_recovery_target = '' WHERE session_id = ? AND thinking_binding_recovery_target = ?").run(args.sessionId, target);
+    knownRejectedSessions.delete(args.sessionId);
+    return { restore: false, ended: false };
+  }
+  knownRejectedSessions.add(args.sessionId);
+  const savedAnchor = target.startsWith(ACTIVE) ? target.slice(ACTIVE.length) : target.startsWith(UNRECOVERABLE + ":") ? target.slice(UNRECOVERABLE.length + 1) : undefined;
+  if (savedAnchor !== undefined && savedAnchor !== anchor) {
+    args.db.prepare("UPDATE session_meta SET thinking_binding_recovery_target = '' WHERE session_id = ? AND thinking_binding_recovery_target = ?").run(args.sessionId, target);
+    knownRejectedSessions.delete(args.sessionId);
+    return { restore: false, ended: true };
+  }
+  if (target.startsWith(UNRECOVERABLE) || !anchor)
+    throw contextRefusalError(LATEST_THINKING_UNSAFE);
+  if (armedAnchor !== undefined) {
+    args.db.prepare("UPDATE session_meta SET thinking_binding_recovery_target = ? WHERE session_id = ? AND thinking_binding_recovery_target = ?").run(ACTIVE + anchor, args.sessionId, target);
+  }
+  const active = args.messages.slice(start);
+  if (!active.some((message) => args.parts(message).some(replayableOriginal)))
+    throw contextRefusalError(LATEST_THINKING_UNSAFE + " [missing-thinking-original]");
+  const ids = new Map(args.messages.map((message, index) => [args.id(message, index), index]));
+  for (const decision of getMergedReasoningStrippedIds(args.db, args.sessionId)) {
+    if (decision === "binding_mismatch_order:end" || decision === TOOL_SWEEP_SCOPED_MARKER)
+      continue;
+    const id = decodeMergedReasoningParts(decision)?.[0] ?? (decision.startsWith("binding_mismatch:") ? decision.slice("binding_mismatch:".length) : decision);
+    const index = ids.get(id);
+    if (index === undefined || index >= start && !args.parts(args.messages[index]).some(replayableOriginal))
+      throw contextRefusalError(LATEST_THINKING_UNSAFE + ` [missing-original:${id}]`);
+  }
+  return { restore: true, ended: false };
+}
+function latestThinkingRecoveryCoversActiveTurn(args) {
+  let target;
+  try {
+    target = getThinkingBindingRecoveryTarget(args.db, args.sessionId);
+  } catch {
+    return false;
+  }
+  const bound = target?.startsWith(ARMED) ? target.slice(ARMED.length) : target?.startsWith(ACTIVE) ? target.slice(ACTIVE.length) : undefined;
+  if (bound === undefined)
+    return false;
+  const start = latestAssistantTurnStart(args.messages);
+  return start > 0 && args.id(args.messages[start - 1], start - 1) === bound;
+}
+function captureOriginalTurn(messages, parts, setParts) {
+  const start = Math.max(0, latestAssistantTurnStart(messages) - 1);
+  const originals = messages.slice(start).map((message) => ({ message, parts: clone2(parts(message)) }));
+  const before = messages.slice(0, start);
+  return (target = messages) => {
+    const first = target.findIndex((message) => originals.some((original) => original.message === message || isRecord(message) && isRecord(original.message) && (isRecord(message.info) && isRecord(original.message.info) && message.info.id === original.message.info.id || message.role === original.message.role && message.timestamp !== undefined && message.timestamp === original.message.timestamp)));
+    const prefix = first >= 0 ? target.slice(0, first) : target === messages ? before : target.slice();
+    for (const original of originals) {
+      setParts(original.message, clone2(original.parts));
+    }
+    target.length = 0;
+    target.push(...prefix, ...originals.map((original) => original.message));
+  };
+}
+function armBindingRecoverySafely(db, sessionId) {
+  if (getThinkingBindingRecoveryTarget(db, sessionId)?.startsWith(LATEST_THINKING_RESTORE))
+    armLatestThinkingRecovery(db, sessionId);
+  else
+    armThinkingBindingRecovery(db, sessionId);
+}
 
 // ../plugin/src/hooks/magic-context/reasoning-budget-status.ts
 var sources = new Map;
@@ -25740,51 +25940,6 @@ function readFilePath(target) {
   return null;
 }
 
-// ../plugin/src/hooks/magic-context/system-injection-stripper.ts
-var SYSTEM_INJECTION_MARKERS = [
-  "<!-- OMO_INTERNAL_INITIATOR -->",
-  "[SYSTEM DIRECTIVE: MAGIC-CONTEXT",
-  "[SYSTEM DIRECTIVE: OH-MY-OPENCODE",
-  "[Category+Skill Reminder]",
-  "[EDIT ERROR - IMMEDIATE ACTION REQUIRED]",
-  "[task CALL FAILED - IMMEDIATE RETRY REQUIRED]",
-  "[EMERGENCY CONTEXT WINDOW WARNING]",
-  "Unstable background agent appears idle",
-  "**THE SUBAGENT JUST CLAIMED THIS TASK IS DONE."
-];
-var SYSTEM_REMINDER_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
-var OMO_MARKER_REGEX = /<!-- OMO_INTERNAL_INITIATOR -->/g;
-function stripSystemInjection(text) {
-  let hasInjection = false;
-  for (const marker of SYSTEM_INJECTION_MARKERS) {
-    if (text.includes(marker)) {
-      hasInjection = true;
-      break;
-    }
-  }
-  if (SYSTEM_REMINDER_REGEX.test(text))
-    hasInjection = true;
-  SYSTEM_REMINDER_REGEX.lastIndex = 0;
-  if (!hasInjection)
-    return null;
-  let cleaned = text;
-  cleaned = cleaned.replace(SYSTEM_REMINDER_REGEX, "");
-  cleaned = cleaned.replace(OMO_MARKER_REGEX, "");
-  cleaned = cleaned.replace(/\[SYSTEM DIRECTIVE: OH-MY-(?:OPENCODE|CLAUDE)[^\]]*\][\s\S]*?(?=\n\n(?!\s*[-*])|$)/g, "");
-  for (const marker of SYSTEM_INJECTION_MARKERS) {
-    if (marker.startsWith("<!-- ") || marker.startsWith("[SYSTEM DIRECTIVE"))
-      continue;
-    const idx = cleaned.indexOf(marker);
-    if (idx === -1)
-      continue;
-    const blockEnd = cleaned.indexOf(`
-
-`, idx + marker.length);
-    cleaned = blockEnd !== -1 ? cleaned.slice(0, idx) + cleaned.slice(blockEnd) : cleaned.slice(0, idx);
-  }
-  return cleaned.trim();
-}
-
 // ../plugin/src/hooks/magic-context/tool-reclaim.ts
 function buildSyntheticToolReclaimOps(input) {
   const watermark = Math.max(0, input.watermark);
@@ -26417,6 +26572,10 @@ function buildAggregateTarget(tagId, occurrences, requiresToolArcSkeleton, conve
     return !occurrences.every((occ, index) => occ.part.remove && authorization[index] !== false);
   };
   return {
+    mutationParts: occurrences.map((occ) => ({
+      message: { info: occ.message.info, parts: [] },
+      part: occ.part
+    })),
     measureReclaim(skeleton) {
       let beforeTools = 0;
       let afterTools = 0;
@@ -26530,6 +26689,7 @@ function buildAggregateTarget(tagId, occurrences, requiresToolArcSkeleton, conve
 }
 function buildTextTarget(part, message, textPrefix) {
   return {
+    mutationParts: [{ message: { info: message.info, parts: [] }, part }],
     textPrefix,
     setContent(content) {
       return part.setText(content);
@@ -26545,6 +26705,7 @@ function buildTextTarget(part, message, textPrefix) {
 }
 function buildToolTarget(part, message, tagId) {
   return {
+    mutationParts: [{ message: { info: message.info, parts: [] }, part }],
     setContent(content) {
       return setToolContentOrText(part, content);
     },
@@ -33509,391 +33670,6 @@ function recordPiTransformTiming(sample) {
 // src/ctx-reduce-nudge-pi.ts
 import { randomUUID as randomUUID4 } from "node:crypto";
 
-// src/heuristic-cleanup-pi.ts
-var PI_CTX_REDUCE_KEEP = CTX_REDUCE_KEEP;
-var DEDUP_SAFE_TOOLS = new Set([
-  "grep",
-  "read",
-  "glob",
-  "ast_grep_search",
-  "lsp_diagnostics",
-  "lsp_symbols",
-  "lsp_find_references",
-  "lsp_goto_definition",
-  "lsp_prepare_rename",
-  "mcp_grep",
-  "mcp_read",
-  "mcp_glob",
-  "mcp_ast_grep_search",
-  "mcp_lsp_diagnostics",
-  "mcp_lsp_symbols",
-  "mcp_lsp_find_references",
-  "mcp_lsp_goto_definition",
-  "mcp_lsp_prepare_rename"
-]);
-function buildPiToolFingerprints(messages, resolveStableId) {
-  const fingerprints = new Map;
-  for (let i = 0;i < messages.length; i++) {
-    const message = messages[i];
-    if (!message || typeof message !== "object")
-      continue;
-    const msg = message;
-    if (msg.role !== "assistant")
-      continue;
-    if (!Array.isArray(msg.content))
-      continue;
-    const ownerMsgId = resolveStableId(message, i);
-    if (!ownerMsgId)
-      continue;
-    for (const part of msg.content) {
-      if (!part || typeof part !== "object")
-        continue;
-      const p = part;
-      if (p.type !== "toolCall")
-        continue;
-      if (typeof p.name !== "string")
-        continue;
-      if (!DEDUP_SAFE_TOOLS.has(p.name))
-        continue;
-      if (typeof p.id !== "string" || p.id.length === 0)
-        continue;
-      const args = p.arguments;
-      if (args && typeof args === "object" && "__magic_context_dropped__" in args) {
-        continue;
-      }
-      let serialized;
-      try {
-        serialized = JSON.stringify(args ?? {});
-      } catch {
-        continue;
-      }
-      const fingerprint = `${ownerMsgId}:${p.name}:${serialized}`;
-      const compositeKey = `${ownerMsgId}\x00${p.id}`;
-      fingerprints.set(compositeKey, fingerprint);
-    }
-  }
-  return fingerprints;
-}
-function collectStaleReduceCallIds(messages, messageIdToMaxTag, ctxReduceTagNumbers, toolAgeCutoff, resolveStableId) {
-  const reduceCalls = new Map;
-  for (let i = 0;i < messages.length; i++) {
-    const raw = messages[i];
-    if (!raw || typeof raw !== "object")
-      continue;
-    const msg = raw;
-    if (msg.role !== "assistant" || !Array.isArray(msg.content))
-      continue;
-    const stableId = resolveStableId(raw, i);
-    if (!stableId)
-      continue;
-    const ownerMaxTag = messageIdToMaxTag.get(stableId) ?? 0;
-    for (const part of msg.content) {
-      if (!part || typeof part !== "object")
-        continue;
-      const p = part;
-      if (p.type !== "toolCall")
-        continue;
-      if (p.name !== "mmc_reduce")
-        continue;
-      if (typeof p.id !== "string" || p.id.length === 0)
-        continue;
-      const composite = `${stableId}\x00${p.id}`;
-      const maxTag = ctxReduceTagNumbers.get(composite) ?? ownerMaxTag;
-      if (maxTag === 0)
-        continue;
-      reduceCalls.set(composite, {
-        composite,
-        callId: p.id,
-        maxTag,
-        messageIndex: i
-      });
-    }
-  }
-  const newestFirst = [...reduceCalls.values()].sort((left, right) => {
-    const byPosition = right.maxTag - left.maxTag || right.messageIndex - left.messageIndex;
-    if (byPosition !== 0)
-      return byPosition;
-    if (left.composite === right.composite)
-      return 0;
-    return left.composite < right.composite ? 1 : -1;
-  });
-  const composite = new Set;
-  const bareCallIds = new Set;
-  for (const call of newestFirst) {
-    if (call.maxTag > toolAgeCutoff)
-      continue;
-    composite.add(call.composite);
-    bareCallIds.add(call.callId);
-  }
-  return { composite, bareCallIds };
-}
-function applyPiHeuristicCleanup(sessionId, db, targets, piMessages, config, preloadedTags, resolveId) {
-  const resolveStableId = (msg, index) => {
-    if (resolveId)
-      return resolveId(msg, index);
-    if (!msg || typeof msg !== "object")
-      return;
-    const m = msg;
-    const role = typeof m.role === "string" ? m.role : "unknown";
-    return typeof m.timestamp === "number" ? `pi-msg-${index}-${m.timestamp}-${role}` : `pi-msg-${index}-${role}`;
-  };
-  const tags = preloadedTags ?? getActiveTagsBySession(db, sessionId);
-  const protectedTools = config.protectedToolTags ?? protectedToolTagNumbers(tags, config.protectedTools);
-  const maxTag = getMaxTagNumberBySession(db, sessionId);
-  const protectedCutoff = config.protectedCutoff === null ? maxTag + 1 : config.protectedCutoff ?? maxTag - config.protectedTags;
-  const routine = config.routine !== false;
-  const toolAgeCutoff = protectedCutoff;
-  let droppedTools = 0;
-  let emergencyDroppedTools = 0;
-  let deduplicatedTools = 0;
-  let droppedInjections = 0;
-  let droppedStaleReduceCalls = 0;
-  const droppedTokenReductions = [];
-  if (config.emergency) {
-    const emergency = config.emergency;
-    const priorInputSample = getEmergencyInputSample(db, sessionId);
-    const candidateTags = tags.filter((t) => t.status === "active" && t.type === "tool" && targets.get(t.tagNumber)?.canDrop?.());
-    const recentTags = new Set(candidateTags.slice().sort((a, b) => b.tagNumber - a.tagNumber).slice(0, 20).map((tag) => tag.tagNumber));
-    const calibration = sessionDecisionCalibration(db, sessionId);
-    const activeTags = tags.filter((t) => t.status === "active").map((tag) => measureEmergencyTag(tag, targets.get(tag.tagNumber), calibration, targets.get(tag.tagNumber)?.requiresToolArcSkeleton === true || (emergency.usagePercentage ?? 0) < 95 && recentTags.has(tag.tagNumber) && hasSmallToolInput(targets.get(tag.tagNumber))));
-    const byTag = new Map(activeTags.map((tag) => [tag.tagNumber, tag]));
-    const droppableTags = candidateTags.flatMap((tag) => {
-      const measured = byTag.get(tag.tagNumber);
-      return measured ? [measured] : [];
-    }).filter((tag) => (tag.reclaimableTokens ?? 0) > 0);
-    sessionLog(sessionId, `emergency candidates: loaded=${tags.length} active=${activeTags.length} activeTools=${activeTags.filter((tag) => tag.type === "tool").length} visibleCompleteTools=${droppableTags.length} windowYields=${(emergency.usagePercentage ?? 0) >= 95} cutoff=${protectedCutoff}`);
-    const plan = planEmergencyDrop({
-      tags: droppableTags,
-      floorTags: activeTags,
-      maxTag,
-      protectedCutoff,
-      currentTotalInputTokens: emergency.currentTotalInputTokens,
-      ceilingTokens: emergency.ceilingTokens,
-      usagePercentage: emergency.usagePercentage,
-      priorInputSample,
-      hasPriorDrop: priorInputSample > 0,
-      passAlreadyPriced: emergency.passAlreadyPriced === true,
-      protectedToolTags: protectedTools
-    });
-    if (plan.shouldDrop) {
-      const toDrop = new Set(plan.tagNumbers);
-      const newestEmergencyTags = recentTags;
-      db.transaction(() => {
-        for (const tag of tags) {
-          if (!toDrop.has(tag.tagNumber))
-            continue;
-          if (tag.status !== "active" || tag.type !== "tool")
-            continue;
-          const target = targets.get(tag.tagNumber);
-          const recent = (emergency.usagePercentage ?? 0) < 95 && newestEmergencyTags.has(tag.tagNumber);
-          const { result, mode } = applyNewToolDrop(target, {
-            inWindow: recent,
-            keepSkeleton: target?.requiresToolArcSkeleton === true
-          });
-          if (result === "removed" || result === "truncated") {
-            updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
-            updateTagDropMode(db, sessionId, tag.tagNumber, mode);
-            droppedTools++;
-            emergencyDroppedTools++;
-            droppedTokenReductions.push({
-              tagNumber: tag.tagNumber,
-              mode: mode === "full" ? "full" : "truncated"
-            });
-          }
-        }
-      }).immediate();
-      sessionLog(sessionId, `emergency tiered drop: ${plan.reason}`);
-    } else {
-      sessionLog(sessionId, `emergency tiered drop skipped: ${plan.reason}`);
-    }
-  }
-  const staleReduce = routine && config.staleReduceStripEnabled ? collectStaleReduceCallIds(piMessages, buildMessageIdToMaxTagFromTargets(targets), buildCtxReduceTagNumbers(tags), toolAgeCutoff, resolveStableId) : { composite: new Set, bareCallIds: new Set };
-  if (routine && config.staleReduceStripEnabled && (staleReduce.composite.size > 0 || staleReduce.bareCallIds.size > 0)) {
-    db.transaction(() => {
-      for (const tag of tags) {
-        if (tag.status !== "active")
-          continue;
-        if (tag.type !== "tool")
-          continue;
-        if (protectedTools.has(tag.tagNumber))
-          continue;
-        if (!tag.messageId)
-          continue;
-        const matched = tag.toolOwnerMessageId ? staleReduce.composite.has(`${tag.toolOwnerMessageId}\x00${tag.messageId}`) : staleReduce.bareCallIds.has(tag.messageId);
-        if (!matched)
-          continue;
-        const target = targets.get(tag.tagNumber);
-        if (target?.canDrop?.() === false)
-          continue;
-        const { result, mode } = applyNewToolDrop(target, { inWindow: false });
-        if (result === "incomplete")
-          continue;
-        updateTagDropMode(db, sessionId, tag.tagNumber, mode);
-        updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
-        if (result === "removed" || result === "truncated") {
-          droppedStaleReduceCalls++;
-          config.onStaleReduceEdit?.(tag);
-        }
-      }
-    }).immediate();
-  }
-  if (routine) {
-    db.transaction(() => {
-      for (const tag of tags) {
-        if (tag.status !== "active")
-          continue;
-        if (tag.tagNumber > protectedCutoff)
-          continue;
-        if (tag.type !== "message")
-          continue;
-        const target = targets.get(tag.tagNumber);
-        if (!target)
-          continue;
-        const content = target.getContent?.();
-        if (!content)
-          continue;
-        const stripped = stripSystemInjection(content);
-        if (stripped === null)
-          continue;
-        const strippedSource = stripTagPrefix(stripped);
-        if (strippedSource.trim().length === 0) {
-          if (target.thinkingDropProtected)
-            continue;
-          const dropResult = target.drop?.() ?? "absent";
-          const didReplace = dropResult === "absent" ? target.setContent(`[dropped §${tag.tagNumber}§]`) : false;
-          if (dropResult === "removed" || dropResult === "absent") {
-            updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
-            if (dropResult === "removed" || didReplace) {
-              droppedInjections++;
-              droppedTokenReductions.push({
-                tagNumber: tag.tagNumber,
-                mode: "full"
-              });
-            }
-          }
-        } else {
-          if (freezePiContentDecision(db, sessionId, "reminder-strip", tag.messageId)) {
-            if (target.setContent(stripped)) {
-              droppedInjections++;
-              droppedTokenReductions.push({
-                tagNumber: tag.tagNumber,
-                mode: "partial",
-                removedCharacters: Math.max(0, content.length - stripped.length)
-              });
-            }
-          }
-        }
-      }
-    }).immediate();
-  }
-  const toolFingerprints = routine ? buildPiToolFingerprints(piMessages, resolveStableId) : new Map;
-  if (toolFingerprints.size > 0) {
-    const tagsByCompositeKey = new Map;
-    for (const tag of tags) {
-      if (tag.type === "tool" && tag.status === "active" && tag.messageId) {
-        const key = tag.toolOwnerMessageId ? `${tag.toolOwnerMessageId}\x00${tag.messageId}` : tag.messageId;
-        tagsByCompositeKey.set(key, tag);
-      }
-    }
-    const fingerprintGroups = new Map;
-    for (const [compositeKey, fingerprint] of toolFingerprints) {
-      const tag = tagsByCompositeKey.get(compositeKey);
-      if (!tag)
-        continue;
-      const group = fingerprintGroups.get(fingerprint) ?? [];
-      group.push(tag);
-      fingerprintGroups.set(fingerprint, group);
-    }
-    db.transaction(() => {
-      for (const [, group] of fingerprintGroups) {
-        if (group.length <= 1)
-          continue;
-        group.sort((a, b) => a.tagNumber - b.tagNumber);
-        for (let i = 0;i < group.length - 1; i++) {
-          const tag = group[i];
-          if (tag.tagNumber > protectedCutoff)
-            continue;
-          const target = targets.get(tag.tagNumber);
-          if (protectedTools.has(tag.tagNumber))
-            continue;
-          if (target?.canDrop?.() === false)
-            continue;
-          const { result, mode } = applyNewToolDrop(target, {
-            inWindow: false
-          });
-          if (result === "incomplete")
-            continue;
-          updateTagDropMode(db, sessionId, tag.tagNumber, mode);
-          updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
-          if (result === "removed" || result === "truncated") {
-            deduplicatedTools++;
-            droppedTokenReductions.push({
-              tagNumber: tag.tagNumber,
-              mode: mode === "full" ? "full" : "truncated"
-            });
-          }
-        }
-      }
-    }).immediate();
-  }
-  if (droppedTools > 0 || deduplicatedTools > 0 || droppedInjections > 0 || droppedStaleReduceCalls > 0) {
-    sessionLog(sessionId, `heuristic cleanup: dropped ${droppedTools} tool tags, stale mmc_reduce=${droppedStaleReduceCalls}, deduplicated ${deduplicatedTools} tool calls, dropped ${droppedInjections} system injections`);
-  }
-  let compressedTextTags = 0;
-  let mutatedTextTags = 0;
-  if (routine && config.caveman?.enabled) {
-    const cavemanTags = getActiveTagsBySession(db, sessionId);
-    const cavemanResult = applyCavemanCleanup(sessionId, db, targets, cavemanTags, {
-      enabled: true,
-      minChars: config.caveman.minChars,
-      wordRules: config.caveman.wordRules,
-      protectedCutoff
-    });
-    compressedTextTags = cavemanResult.compressedToLite + cavemanResult.compressedToFull + cavemanResult.compressedToUltra;
-    mutatedTextTags = cavemanResult.mutatedTextTags;
-    if (cavemanResult.textReductions) {
-      for (const r of cavemanResult.textReductions) {
-        droppedTokenReductions.push({
-          tagNumber: r.tagNumber,
-          mode: "partial",
-          removedCharacters: r.removedCharacters
-        });
-      }
-    }
-  }
-  return {
-    droppedTools,
-    deduplicatedTools,
-    droppedInjections,
-    droppedStaleReduceCalls,
-    emergencyDroppedTools,
-    compressedTextTags,
-    mutatedTextTags,
-    droppedTokenReductions
-  };
-}
-function buildCtxReduceTagNumbers(tags) {
-  const byComposite = new Map;
-  for (const tag of tags) {
-    if (tag.status !== "active" || tag.type !== "tool" || tag.toolName !== "mmc_reduce" || !tag.toolOwnerMessageId) {
-      continue;
-    }
-    byComposite.set(`${tag.toolOwnerMessageId}\x00${tag.messageId}`, tag.tagNumber);
-  }
-  return byComposite;
-}
-function buildMessageIdToMaxTagFromTargets(targets) {
-  const byMessage = new Map;
-  for (const [tagNumber, target] of targets) {
-    const id = target.message?.info?.id;
-    if (typeof id !== "string" || id.length === 0)
-      continue;
-    if (tagNumber > (byMessage.get(id) ?? 0))
-      byMessage.set(id, tagNumber);
-  }
-  return byMessage;
-}
-
 // src/tail-hygiene-walk-pi.ts
 var TAG_PREFIX = /^§(\d+)§\s*/;
 var SYNTHETIC_TODO_PREFIX = "mc_synthetic_todo_";
@@ -34205,14 +33981,14 @@ function excludedDraft(key, value) {
     tokens: 0
   };
 }
-function finalizeParts(drafts, pendingDropTagNumbers, protectedTagNumbers, newestMessagePartStart) {
+function finalizeParts(drafts, pendingDropTagNumbers, protectedTagNumbers, newestMessagePartStart, protectedToolTags) {
   const visibleTags = new Map;
   for (const part of drafts) {
     if (part.kind !== "excluded" && part.tag)
       visibleTags.set(part.tag.tagNumber, part.tag);
   }
   const protectedNumbers = new Set(protectedTagNumbers);
-  const exemplarNumbers = [...visibleTags.values()].filter((tag) => tag.type === "tool" && tag.toolName === "mmc_reduce").sort((left, right) => right.tagNumber - left.tagNumber).slice(0, PI_CTX_REDUCE_KEEP).map((tag) => tag.tagNumber);
+  const exemplarNumbers = protectedToolTags ?? protectedToolTagNumbers([...visibleTags.values()]);
   for (const tagNumber of exemplarNumbers)
     protectedNumbers.add(tagNumber);
   let u = 0;
@@ -34379,9 +34155,14 @@ function measurePiTailHygiene(input) {
       drafts.push(excludedDraft(`${key}\x00excluded`, part));
     }
   }
-  return finalizeParts(drafts, input.pendingDropTagNumbers ?? new Set, input.protectedTagNumbers, newestMessagePartStart);
+  return finalizeParts(drafts, input.pendingDropTagNumbers ?? new Set, input.protectedTagNumbers, newestMessagePartStart, input.protectedToolTags);
 }
 function refreshPiTailHygieneBaseline(input) {
+  const protectedToolsPolicy = adoptedProtectedToolsPolicy(input.protectedTools, input.previous?.protectedToolsPolicy, input.cacheBusting, !!input.previous);
+  input = {
+    ...input,
+    protectedToolTags: protectedToolTagNumbers(input.tags, protectedToolsPolicy)
+  };
   const rawMeasured = measurePiTailHygiene(input);
   const frozenCalibration = !input.cacheBusting && input.previous ? {
     toolsRatio: input.previous.toolsRatio,
@@ -34406,6 +34187,7 @@ function refreshPiTailHygieneBaseline(input) {
   const now = input.now ?? Date.now();
   const refrozen = (mismatch) => ({
     ...freezeTailHygieneMeasurement(measured),
+    protectedToolsPolicy,
     hygieneUnitsVersion: frozenCalibration.hygieneUnitsVersion,
     toolsRatio: frozenCalibration.toolsRatio,
     proseRatio: frozenCalibration.proseRatio,
@@ -34432,6 +34214,7 @@ function refreshPiTailHygieneBaseline(input) {
   }
   return {
     ...input.previous,
+    protectedToolsPolicy,
     turnDeltaU,
     turnDeltaT,
     evaluable: true,
@@ -34789,6 +34572,390 @@ function hasPiFallbackMessageTags2(db, sessionId) {
   return probe(db, sessionId, "message");
 }
 
+// src/heuristic-cleanup-pi.ts
+var DEDUP_SAFE_TOOLS = new Set([
+  "grep",
+  "read",
+  "glob",
+  "ast_grep_search",
+  "lsp_diagnostics",
+  "lsp_symbols",
+  "lsp_find_references",
+  "lsp_goto_definition",
+  "lsp_prepare_rename",
+  "mcp_grep",
+  "mcp_read",
+  "mcp_glob",
+  "mcp_ast_grep_search",
+  "mcp_lsp_diagnostics",
+  "mcp_lsp_symbols",
+  "mcp_lsp_find_references",
+  "mcp_lsp_goto_definition",
+  "mcp_lsp_prepare_rename"
+]);
+function buildPiToolFingerprints(messages, resolveStableId) {
+  const fingerprints = new Map;
+  for (let i = 0;i < messages.length; i++) {
+    const message = messages[i];
+    if (!message || typeof message !== "object")
+      continue;
+    const msg = message;
+    if (msg.role !== "assistant")
+      continue;
+    if (!Array.isArray(msg.content))
+      continue;
+    const ownerMsgId = resolveStableId(message, i);
+    if (!ownerMsgId)
+      continue;
+    for (const part of msg.content) {
+      if (!part || typeof part !== "object")
+        continue;
+      const p = part;
+      if (p.type !== "toolCall")
+        continue;
+      if (typeof p.name !== "string")
+        continue;
+      if (!DEDUP_SAFE_TOOLS.has(p.name))
+        continue;
+      if (typeof p.id !== "string" || p.id.length === 0)
+        continue;
+      const args = p.arguments;
+      if (args && typeof args === "object" && "__magic_context_dropped__" in args) {
+        continue;
+      }
+      let serialized;
+      try {
+        serialized = JSON.stringify(args ?? {});
+      } catch {
+        continue;
+      }
+      const fingerprint = `${ownerMsgId}:${p.name}:${serialized}`;
+      const compositeKey = `${ownerMsgId}\x00${p.id}`;
+      fingerprints.set(compositeKey, fingerprint);
+    }
+  }
+  return fingerprints;
+}
+function collectStaleReduceCallIds(messages, messageIdToMaxTag, ctxReduceTagNumbers, toolAgeCutoff, resolveStableId) {
+  const reduceCalls = new Map;
+  for (let i = 0;i < messages.length; i++) {
+    const raw = messages[i];
+    if (!raw || typeof raw !== "object")
+      continue;
+    const msg = raw;
+    if (msg.role !== "assistant" || !Array.isArray(msg.content))
+      continue;
+    const stableId = resolveStableId(raw, i);
+    if (!stableId)
+      continue;
+    const ownerMaxTag = messageIdToMaxTag.get(stableId) ?? 0;
+    for (const part of msg.content) {
+      if (!part || typeof part !== "object")
+        continue;
+      const p = part;
+      if (p.type !== "toolCall")
+        continue;
+      if (p.name !== "mmc_reduce")
+        continue;
+      if (typeof p.id !== "string" || p.id.length === 0)
+        continue;
+      const composite = `${stableId}\x00${p.id}`;
+      const maxTag = ctxReduceTagNumbers.get(composite) ?? ownerMaxTag;
+      if (maxTag === 0)
+        continue;
+      reduceCalls.set(composite, {
+        composite,
+        callId: p.id,
+        maxTag,
+        messageIndex: i
+      });
+    }
+  }
+  const newestFirst = [...reduceCalls.values()].sort((left, right) => {
+    const byPosition = right.maxTag - left.maxTag || right.messageIndex - left.messageIndex;
+    if (byPosition !== 0)
+      return byPosition;
+    if (left.composite === right.composite)
+      return 0;
+    return left.composite < right.composite ? 1 : -1;
+  });
+  const composite = new Set;
+  const bareCallIds = new Set;
+  for (const call of newestFirst) {
+    if (call.maxTag > toolAgeCutoff)
+      continue;
+    composite.add(call.composite);
+    bareCallIds.add(call.callId);
+  }
+  return { composite, bareCallIds };
+}
+function applyPiHeuristicCleanup(sessionId, db, targets, piMessages, config, preloadedTags, resolveId) {
+  const resolveStableId = (msg, index) => {
+    if (resolveId)
+      return resolveId(msg, index);
+    if (!msg || typeof msg !== "object")
+      return;
+    const m = msg;
+    const role = typeof m.role === "string" ? m.role : "unknown";
+    return typeof m.timestamp === "number" ? `pi-msg-${index}-${m.timestamp}-${role}` : `pi-msg-${index}-${role}`;
+  };
+  const tags = preloadedTags ?? getActiveTagsBySession(db, sessionId);
+  const protectedTools = config.protectedToolTags ?? protectedToolTagNumbers(tags, config.protectedTools);
+  const maxTag = getMaxTagNumberBySession(db, sessionId);
+  const protectedCutoff = config.protectedCutoff === null ? maxTag + 1 : config.protectedCutoff ?? maxTag - config.protectedTags;
+  const routine = config.routine !== false;
+  const toolAgeCutoff = protectedCutoff;
+  let droppedTools = 0;
+  let emergencyDroppedTools = 0;
+  let deduplicatedTools = 0;
+  let droppedInjections = 0;
+  let droppedStaleReduceCalls = 0;
+  const droppedTokenReductions = [];
+  if (config.emergency) {
+    const emergency = config.emergency;
+    const priorInputSample = getEmergencyInputSample(db, sessionId);
+    const candidateTags = tags.filter((t) => t.status === "active" && t.type === "tool" && targets.get(t.tagNumber)?.canDrop?.());
+    const recentTags = new Set(candidateTags.slice().sort((a, b) => b.tagNumber - a.tagNumber).slice(0, 20).map((tag) => tag.tagNumber));
+    const calibration = sessionDecisionCalibration(db, sessionId);
+    const activeTags = tags.filter((t) => t.status === "active").map((tag) => measureEmergencyTag(tag, targets.get(tag.tagNumber), calibration, targets.get(tag.tagNumber)?.requiresToolArcSkeleton === true || (emergency.usagePercentage ?? 0) < 95 && recentTags.has(tag.tagNumber) && hasSmallToolInput(targets.get(tag.tagNumber))));
+    const byTag = new Map(activeTags.map((tag) => [tag.tagNumber, tag]));
+    const droppableTags = candidateTags.flatMap((tag) => {
+      const measured = byTag.get(tag.tagNumber);
+      return measured ? [measured] : [];
+    }).filter((tag) => (tag.reclaimableTokens ?? 0) > 0);
+    sessionLog(sessionId, `emergency candidates: loaded=${tags.length} active=${activeTags.length} activeTools=${activeTags.filter((tag) => tag.type === "tool").length} visibleCompleteTools=${droppableTags.length} windowYields=${(emergency.usagePercentage ?? 0) >= 95} cutoff=${protectedCutoff}`);
+    const plan = planEmergencyDrop({
+      tags: droppableTags,
+      floorTags: activeTags,
+      maxTag,
+      protectedCutoff,
+      currentTotalInputTokens: emergency.currentTotalInputTokens,
+      ceilingTokens: emergency.ceilingTokens,
+      usagePercentage: emergency.usagePercentage,
+      priorInputSample,
+      hasPriorDrop: priorInputSample > 0,
+      passAlreadyPriced: emergency.passAlreadyPriced === true,
+      protectedToolTags: protectedTools
+    });
+    if (plan.shouldDrop) {
+      const toDrop = new Set(plan.tagNumbers);
+      const newestEmergencyTags = recentTags;
+      db.transaction(() => {
+        for (const tag of tags) {
+          if (!toDrop.has(tag.tagNumber))
+            continue;
+          if (tag.status !== "active" || tag.type !== "tool")
+            continue;
+          const target = targets.get(tag.tagNumber);
+          const recent = (emergency.usagePercentage ?? 0) < 95 && newestEmergencyTags.has(tag.tagNumber);
+          const { result, mode } = applyNewToolDrop(target, {
+            inWindow: recent,
+            keepSkeleton: target?.requiresToolArcSkeleton === true
+          });
+          if (result === "removed" || result === "truncated") {
+            updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
+            updateTagDropMode(db, sessionId, tag.tagNumber, mode);
+            droppedTools++;
+            emergencyDroppedTools++;
+            droppedTokenReductions.push({
+              tagNumber: tag.tagNumber,
+              mode: mode === "full" ? "full" : "truncated"
+            });
+          }
+        }
+      }).immediate();
+      sessionLog(sessionId, `emergency tiered drop: ${plan.reason}`);
+    } else {
+      sessionLog(sessionId, `emergency tiered drop skipped: ${plan.reason}`);
+    }
+  }
+  const staleReduce = routine && config.staleReduceStripEnabled ? collectStaleReduceCallIds(piMessages, buildMessageIdToMaxTagFromTargets(targets), buildCtxReduceTagNumbers(tags), toolAgeCutoff, resolveStableId) : { composite: new Set, bareCallIds: new Set };
+  if (routine && config.staleReduceStripEnabled && (staleReduce.composite.size > 0 || staleReduce.bareCallIds.size > 0)) {
+    db.transaction(() => {
+      for (const tag of tags) {
+        if (tag.status !== "active")
+          continue;
+        if (tag.type !== "tool")
+          continue;
+        if (protectedTools.has(tag.tagNumber))
+          continue;
+        if (!tag.messageId)
+          continue;
+        const matched = tag.toolOwnerMessageId ? staleReduce.composite.has(`${tag.toolOwnerMessageId}\x00${tag.messageId}`) : staleReduce.bareCallIds.has(tag.messageId);
+        if (!matched)
+          continue;
+        const target = targets.get(tag.tagNumber);
+        if (target?.canDrop?.() === false)
+          continue;
+        const { result, mode } = applyNewToolDrop(target, { inWindow: false });
+        if (result === "incomplete")
+          continue;
+        updateTagDropMode(db, sessionId, tag.tagNumber, mode);
+        updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
+        if (result === "removed" || result === "truncated") {
+          droppedStaleReduceCalls++;
+          config.onStaleReduceEdit?.(tag);
+        }
+      }
+    }).immediate();
+  }
+  if (routine) {
+    db.transaction(() => {
+      for (const tag of tags) {
+        if (tag.status !== "active")
+          continue;
+        if (tag.tagNumber > protectedCutoff)
+          continue;
+        if (tag.type !== "message")
+          continue;
+        const target = targets.get(tag.tagNumber);
+        if (!target)
+          continue;
+        const content = target.getContent?.();
+        if (!content)
+          continue;
+        const stripped = stripSystemInjection(content);
+        if (stripped === null)
+          continue;
+        const strippedSource = stripTagPrefix(stripped);
+        if (strippedSource.trim().length === 0) {
+          if (target.thinkingDropProtected)
+            continue;
+          const dropResult = target.drop?.() ?? "absent";
+          const didReplace = dropResult === "absent" ? target.setContent(`[dropped §${tag.tagNumber}§]`) : false;
+          if (dropResult === "removed" || dropResult === "absent") {
+            updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
+            if (dropResult === "removed" || didReplace) {
+              droppedInjections++;
+              droppedTokenReductions.push({
+                tagNumber: tag.tagNumber,
+                mode: "full"
+              });
+            }
+          }
+        } else {
+          if (freezePiContentDecision(db, sessionId, "reminder-strip", tag.messageId)) {
+            if (target.setContent(stripped)) {
+              droppedInjections++;
+              droppedTokenReductions.push({
+                tagNumber: tag.tagNumber,
+                mode: "partial",
+                removedCharacters: Math.max(0, content.length - stripped.length)
+              });
+            }
+          }
+        }
+      }
+    }).immediate();
+  }
+  const toolFingerprints = routine ? buildPiToolFingerprints(piMessages, resolveStableId) : new Map;
+  if (toolFingerprints.size > 0) {
+    const tagsByCompositeKey = new Map;
+    for (const tag of tags) {
+      if (tag.type === "tool" && tag.status === "active" && tag.messageId) {
+        const key = tag.toolOwnerMessageId ? `${tag.toolOwnerMessageId}\x00${tag.messageId}` : tag.messageId;
+        tagsByCompositeKey.set(key, tag);
+      }
+    }
+    const fingerprintGroups = new Map;
+    for (const [compositeKey, fingerprint] of toolFingerprints) {
+      const tag = tagsByCompositeKey.get(compositeKey);
+      if (!tag)
+        continue;
+      const group = fingerprintGroups.get(fingerprint) ?? [];
+      group.push(tag);
+      fingerprintGroups.set(fingerprint, group);
+    }
+    db.transaction(() => {
+      for (const [, group] of fingerprintGroups) {
+        if (group.length <= 1)
+          continue;
+        group.sort((a, b) => a.tagNumber - b.tagNumber);
+        for (let i = 0;i < group.length - 1; i++) {
+          const tag = group[i];
+          if (tag.tagNumber > protectedCutoff)
+            continue;
+          const target = targets.get(tag.tagNumber);
+          if (protectedTools.has(tag.tagNumber))
+            continue;
+          if (target?.canDrop?.() === false)
+            continue;
+          const { result, mode } = applyNewToolDrop(target, {
+            inWindow: false
+          });
+          if (result === "incomplete")
+            continue;
+          updateTagDropMode(db, sessionId, tag.tagNumber, mode);
+          updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
+          if (result === "removed" || result === "truncated") {
+            deduplicatedTools++;
+            droppedTokenReductions.push({
+              tagNumber: tag.tagNumber,
+              mode: mode === "full" ? "full" : "truncated"
+            });
+          }
+        }
+      }
+    }).immediate();
+  }
+  if (droppedTools > 0 || deduplicatedTools > 0 || droppedInjections > 0 || droppedStaleReduceCalls > 0) {
+    sessionLog(sessionId, `heuristic cleanup: dropped ${droppedTools} tool tags, stale mmc_reduce=${droppedStaleReduceCalls}, deduplicated ${deduplicatedTools} tool calls, dropped ${droppedInjections} system injections`);
+  }
+  let compressedTextTags = 0;
+  let mutatedTextTags = 0;
+  if (routine && config.caveman?.enabled) {
+    const cavemanTags = getActiveTagsBySession(db, sessionId);
+    const cavemanResult = applyCavemanCleanup(sessionId, db, targets, cavemanTags, {
+      enabled: true,
+      minChars: config.caveman.minChars,
+      wordRules: config.caveman.wordRules,
+      protectedCutoff
+    });
+    compressedTextTags = cavemanResult.compressedToLite + cavemanResult.compressedToFull + cavemanResult.compressedToUltra;
+    mutatedTextTags = cavemanResult.mutatedTextTags;
+    if (cavemanResult.textReductions) {
+      for (const r of cavemanResult.textReductions) {
+        droppedTokenReductions.push({
+          tagNumber: r.tagNumber,
+          mode: "partial",
+          removedCharacters: r.removedCharacters
+        });
+      }
+    }
+  }
+  return {
+    droppedTools,
+    deduplicatedTools,
+    droppedInjections,
+    droppedStaleReduceCalls,
+    emergencyDroppedTools,
+    compressedTextTags,
+    mutatedTextTags,
+    droppedTokenReductions
+  };
+}
+function buildCtxReduceTagNumbers(tags) {
+  const byComposite = new Map;
+  for (const tag of tags) {
+    if (tag.status !== "active" || tag.type !== "tool" || tag.toolName !== "mmc_reduce" || !tag.toolOwnerMessageId) {
+      continue;
+    }
+    byComposite.set(`${tag.toolOwnerMessageId}\x00${tag.messageId}`, tag.tagNumber);
+  }
+  return byComposite;
+}
+function buildMessageIdToMaxTagFromTargets(targets) {
+  const byMessage = new Map;
+  for (const [tagNumber, target] of targets) {
+    const id = target.message?.info?.id;
+    if (typeof id !== "string" || id.length === 0)
+      continue;
+    if (tagNumber > (byMessage.get(id) ?? 0))
+      byMessage.set(id, tagNumber);
+  }
+  return byMessage;
+}
+
 // src/historian-tail-pi.ts
 function readPiHistorianTail(db, sessionId, provider) {
   const end = getLastCompartmentEndMessage(db, sessionId);
@@ -35367,7 +35534,11 @@ function materializeM0Pi(state, db, passSnapshot) {
       modelKey: snapshotMarkers.modelKey,
       projectIdentity: snapshotMarkers.projectIdentity
     });
-    db.prepare("UPDATE session_meta SET memory_block_count = ?, memory_block_ids = ? WHERE session_id = ?").run(renderedMemoryIds.length, JSON.stringify(renderedMemoryIds), state.sessionId);
+    const visibleMemoryIds = [
+      ...new Set([...renderedMemoryIds, ...m1Render.renderedMemoryIds])
+    ];
+    const visibleIdsJson = JSON.stringify(visibleMemoryIds);
+    db.prepare("UPDATE session_meta SET memory_block_count = ?, memory_block_ids = ? WHERE session_id = ?").run(visibleMemoryIds.length, visibleIdsJson, state.sessionId);
     setCachedBoundary(db, state.sessionId, snapshotMarkers.lastBaselineEndMessageId);
     db.exec("COMMIT");
     logSlowWriteTransaction("pi_materialize_cache", transactionStartedAt);
@@ -35505,7 +35676,8 @@ ${body}
   if (sections.length === 0) {
     return {
       text: PI_M1_PLACEHOLDER,
-      memoryUpdateCount: memoryUpdates.count
+      memoryUpdateCount: memoryUpdates.count,
+      renderedMemoryIds: []
     };
   }
   return {
@@ -35516,7 +35688,8 @@ ${sections.join(`
 ${sections.join(`
 `)}
 </session-history-since>`,
-    memoryUpdateCount: memoryUpdates.count
+    memoryUpdateCount: memoryUpdates.count,
+    renderedMemoryIds: newMemoriesBlock ? deltaMemories.map((memory) => memory.id) : []
   };
 }
 function toCachedBuffer(value) {
@@ -35684,9 +35857,13 @@ function softRefreshCachedM1Pi(args) {
     const renderedM0Ids = readCachedM0MemoryIds(row.cached_m0_upgrade_state, parseMemoryBlockIds(row.memory_block_ids), markers.maxMemoryId);
     const rendered = renderM1PiWithMetadata(args.state, args.db, markers, renderedM0Ids, args.compartmentsForNormalization);
     const m1Bytes = Buffer.from(rendered.text, "utf8");
+    const visibleMemoryIds = [
+      ...new Set([...renderedM0Ids, ...rendered.renderedMemoryIds])
+    ];
+    const visibleIdsJson = JSON.stringify(visibleMemoryIds);
     const latestCompartment = args.compartmentsForNormalization.at(-1);
     const advancedBoundary = latestCompartment?.endMessageId && latestCompartment.endMessageId.length > 0 ? latestCompartment.endMessageId : markers.lastBaselineEndMessageId;
-    args.db.prepare("UPDATE session_meta SET cached_m1_bytes = ?, cached_m0_last_baseline_end_message_id = ?, cached_m0_upgrade_state = ? WHERE session_id = ?").run(m1Bytes, advancedBoundary, withCachedM0MemoryIds(row.cached_m0_upgrade_state, renderedM0Ids), args.state.sessionId);
+    args.db.prepare("UPDATE session_meta SET cached_m1_bytes = ?, cached_m0_last_baseline_end_message_id = ?, memory_block_count = ?, memory_block_ids = ?, cached_m0_upgrade_state = ? WHERE session_id = ?").run(m1Bytes, advancedBoundary, visibleMemoryIds.length, visibleIdsJson, withCachedM0MemoryIds(row.cached_m0_upgrade_state, renderedM0Ids), args.state.sessionId);
     args.db.exec("COMMIT");
     logSlowWriteTransaction("pi_soft_refresh_cache", transactionStartedAt);
     return {
@@ -37955,6 +38132,7 @@ async function runPhase(deps, ctx, phase, stageAManifest) {
     messages: []
   };
   let refusalNotes = [];
+  let consumedSteps = 0;
   for (let round = 1;round <= maxRounds; round += 1) {
     const decision = ctx.shouldContinue();
     if (decision === "stop")
@@ -37974,10 +38152,12 @@ async function runPhase(deps, ctx, phase, stageAManifest) {
       sessionLog(deps.parentSessionId ?? "pi-maintenance", `maintenance phase ${phase} round ${round}: producer admission refused`);
       break;
     }
+    const stepCap = phase === "a" ? MEMORY_MAINTAINER_A_STEP_CAP : resolveMaintenanceStepCap(deps.options.runConfig.budgets.toolSteps, consumedSteps);
     const result = await session({
       agent: phase === "a" ? MAINTAINER_AGENT_A : MAINTAINER_AGENT_B,
       systemPrompt: maintainerSystemPrompt(deps, phase),
-      userMessage: prompt
+      userMessage: prompt,
+      stepCap
     });
     ctx.recordUsage(result.usage);
     acc.usage.inputTokens += result.usage.inputTokens;
@@ -37986,6 +38166,7 @@ async function runPhase(deps, ctx, phase, stageAManifest) {
     for (let step = 0;step < result.toolSteps; step += 1) {
       if (ctx.shouldContinue() === "continue") {
         ctx.recordToolStep();
+        consumedSteps += 1;
       } else {
         const refusal = ctx.refuseToolStep();
         refusalNotes.push(refusal.message);
@@ -38058,6 +38239,7 @@ async function defaultSessionFace(deps, args) {
       agent: args.agent,
       systemPrompt: args.systemPrompt,
       userMessage: args.userMessage,
+      stepCap: args.stepCap,
       model: deps.options.model,
       fallbackModels: deps.options.fallbackModels,
       timeoutMs: deps.options.timeoutMs ?? DEFAULT_MAINTAINER_TIMEOUT_MS,
@@ -40460,10 +40642,16 @@ function handlePiProviderFailure(args) {
   const provider = typeof message.provider === "string" ? message.provider : undefined;
   const model = typeof message.model === "string" ? message.model : undefined;
   const binding = detectThinkingBindingMismatch(message.errorMessage);
+  if (detectLatestTurnThinkingMismatch(message.errorMessage) && !args.compactionOff && isAnthropicFamilyRoute(provider, model)) {
+    armLatestThinkingRecovery(args.db, args.sessionId);
+    clearPiLkgSessionState(args.sessionId);
+    dropSlot(args.sessionId, "latest-thinking-recovery-arm");
+    return { kind: "thinking_binding", armed: true };
+  }
   if (binding.isBindingMismatch) {
     const enabled = args.thinkingBindingRecoveryEnabled !== false && !args.compactionOff && isPrefixBoundThinkingModel(provider, model);
     if (enabled) {
-      armThinkingBindingRecovery(args.db, args.sessionId);
+      armBindingRecoverySafely(args.db, args.sessionId);
       clearPiLkgSessionState(args.sessionId);
       dropSlot(args.sessionId, "thinking-binding-recovery-arm");
       reportBindingRecovery(args.sessionId, args.report, `thinking-binding recovery armed from message_end (provider paths: failing=${binding.failingBlockPath ?? "?"} firstChanged=${binding.firstChangedPath ?? "?"})`);
@@ -40513,12 +40701,16 @@ function stripThinkingParts(message) {
   return before - strippedContent.length;
 }
 function applyPiThinkingBindingRecovery(args) {
+  const protectedMessages = latestAssistantTurnMessages(args.messages);
   const frozenEntryIds = frozenBindingEntryIds(args.db, args.sessionId);
-  const flagTarget = isPrefixBoundThinkingModel(args.provider, args.model) ? getThinkingBindingRecoveryTarget(args.db, args.sessionId) : null;
+  const flagTargetCandidate = isPrefixBoundThinkingModel(args.provider, args.model) ? getThinkingBindingRecoveryTarget(args.db, args.sessionId) : null;
+  const flagTarget = flagTargetCandidate?.startsWith(LATEST_THINKING_RESTORE) ? null : flagTargetCandidate;
   let applied = null;
   if (flagTarget) {
     const entryIds = new Set;
     for (let index = 0;index < args.messages.length; index += 1) {
+      if (protectedMessages.has(args.messages[index]))
+        continue;
       const entryId = args.entryIds[index];
       if (entryId && hasThinkingPart(args.messages[index]))
         entryIds.add(entryId);
@@ -40534,7 +40726,15 @@ function applyPiThinkingBindingRecovery(args) {
       reportBindingRecovery(args.sessionId, args.report, `thinking-binding recovery consumed on context pass target=${flagTarget} entries=${applied.entryIds.length} [${applied.entryIds.join(",")}]`);
     }
   }
+  const restoringActiveTurn = latestThinkingRecoveryCoversActiveTurn({
+    db: args.db,
+    sessionId: args.sessionId,
+    messages: args.messages,
+    id: (message, index) => resolvePiStableId(message, index, args.entryIds)
+  });
   for (let index = 0;index < args.messages.length; index += 1) {
+    if (restoringActiveTurn && protectedMessages.has(args.messages[index]))
+      continue;
     const entryId = args.entryIds[index];
     if (entryId && frozenEntryIds.has(entryId))
       stripThinkingParts(args.messages[index]);
@@ -40546,9 +40746,12 @@ function applyPiProactiveThinkingStrip(args) {
     return null;
   if (!isPrefixBoundThinkingModel(args.provider, args.model))
     return null;
+  const protectedMessages = latestAssistantTurnMessages(args.messages);
   const entryIds = [];
   const indices = [];
   for (let index = 0;index < args.messages.length; index += 1) {
+    if (protectedMessages.has(args.messages[index]))
+      continue;
     const entryId = args.entryIds[index];
     if (!entryId || !hasThinkingPart(args.messages[index]))
       continue;
@@ -44274,8 +44477,10 @@ function registerPiContextHandler(pi, baseOptions) {
             messages: outputMessages,
             tags,
             protectedTagNumbers,
+            protectedTools: options.protectedTools,
             pendingDropTagNumbers,
             stableId,
+            protectedToolTags: protectedToolTagNumbers(tags, options.protectedTools),
             syntheticLeadingCount: result.syntheticLeadingCount,
             cacheBusting: result.bustedThisPass,
             previous: previousBaseline,
@@ -45187,6 +45392,16 @@ async function runPipeline(args) {
   args.assertCurrentPass?.();
   if (args.compactionOff)
     return runCompactionOffPipeline(args);
+  const thinkingRecovery = prepareLatestThinkingRecovery({
+    db: args.db,
+    sessionId: args.sessionId,
+    messages: args.messages,
+    id: (message, index) => resolvePiStableId(message, index, args.entryIds, args.entryIdByRef ?? undefined),
+    parts: (message) => Array.isArray(message?.content) ? message.content : []
+  });
+  if (thinkingRecovery.ended)
+    signalPiPendingMaterialization(args.sessionId);
+  let restoreOriginals;
   const activeThinkingTurn = hasActiveAnthropicThinkingTurn(args.messages, args.resolvedProviderID, args.resolvedModelID);
   const protectedSignedPrefix = activeThinkingTurn && args.reasoningClearing?.prefixBound === true;
   let foldingSystemState = null;
@@ -45445,6 +45660,10 @@ async function runPipeline(args) {
   afterFallbackAdoptionForTests?.(args.stableIdSchemeCutover === true);
   const textIdentityPlan = buildPiTextIdentityPlan(args.db, args.sessionId, args.tagger, transcript, args.reusableMessageIds);
   const tTag = performance.now();
+  const mutationView = transcript.messages.map((message) => ({
+    ...message,
+    parts: message.parts
+  }));
   let tagTextTokenCache = piTagTextTokenCacheBySession.get(args.sessionId);
   if (!tagTextTokenCache) {
     tagTextTokenCache = new Map;
@@ -45457,7 +45676,7 @@ async function runPipeline(args) {
   }
   const { targets } = runPersistedReplayStage("tagging-persistence-failure", () => args.tagger.cleanup(args.sessionId), () => {
     args.assertCurrentPass?.();
-    return tagTranscript(args.sessionId, transcript, args.tagger, args.db, {
+    return tagTranscript(args.sessionId, { ...transcript, messages: mutationView }, args.tagger, args.db, {
       skipPrefixInjection: !ctxReduceCallable,
       entryFingerprintByMessageId,
       reuseMessageIds: textIdentityPlan.reusableMessageIds,
@@ -45475,6 +45694,35 @@ async function runPipeline(args) {
     });
   });
   logTransformTiming(args.sessionId, "tagMessages", tTag);
+  const reasoningTagsForProtection = buildMessageIdToMaxTag(targets);
+  const frozenThinkingForProtection = activeThinkingTurn ? frozenBindingEntryIds(args.db, args.sessionId) : new Set;
+  const protectedThinkingProxies = new Set;
+  if (activeThinkingTurn) {
+    for (let i = latestAssistantTurnStart(workingMessages);i < mutationView.length; i++) {
+      const id = stableIdResolver(workingMessages[i], i);
+      if (!thinkingRecovery.restore && id && frozenThinkingForProtection.has(id))
+        continue;
+      for (let p = 0;p < mutationView[i].parts.length; p++) {
+        const part = mutationView[i].parts[p];
+        if (part.kind !== "thinking")
+          continue;
+        const local = workingMessages[i].content?.[p];
+        if (!thinkingRecovery.restore && !local?.redacted && id && (reasoningTagsForProtection.get(id) ?? Infinity) <= (args.sessionMeta.clearedReasoningThroughTag ?? 0))
+          continue;
+        protectedThinkingProxies.add(part);
+      }
+    }
+  }
+  const newTargets = protectNewTagMutations(mutationView.map((message) => ({
+    info: message.info,
+    parts: message.parts
+  })), targets, protectedThinkingProxies, args.reasoningClearing?.prefixBound === true);
+  if (thinkingRecovery.restore) {
+    transcript.commit();
+    restoreOriginals = captureOriginalTurn(args.messages, (message) => message.content, (message, content) => {
+      message.content = content;
+    });
+  }
   if (foldBustsServedPrefixThisPass) {
     try {
       let converted = 0;
@@ -45517,7 +45765,7 @@ async function runPipeline(args) {
     pendingDecisionLogObserverForTests?.(pendingDecisionLog);
     try {
       const tApplyPending = performance.now();
-      pendingOpsDidMutate = applyPendingOperations(args.sessionId, args.db, targets, new Set([
+      pendingOpsDidMutate = applyPendingOperations(args.sessionId, args.db, newTargets, new Set([
         ...args.contextUsage.percentage >= 95 ? [] : protectedTagNumbersForPass,
         ...protectedToolTagNumbers(getActiveTagsBySession(args.db, args.sessionId), args.protectedTools)
       ]), pendingOperationTags, pendingOps, [], new Set, (reduction) => droppedTokenReductions.push(reduction));
@@ -45530,7 +45778,8 @@ async function runPipeline(args) {
       pendingOpsAppliedThisPass = true;
       if (hasPendingMaterializeSignal) {
         if (args.heuristics === undefined) {
-          consumePendingMaterialization(args.sessionId);
+          if (!pendingOps.some((op) => newTargets.get(op.tagId)?.thinkingDropProtected))
+            consumePendingMaterialization(args.sessionId);
         }
       }
     } catch (err) {
@@ -45618,7 +45867,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 || deferredMaterialize || independentMutationBeforeHeuristics;
-      heuristicsResult = applyPiHeuristicCleanup(args.sessionId, args.db, targets, args.messages, {
+      heuristicsResult = applyPiHeuristicCleanup(args.sessionId, args.db, newTargets, args.messages, {
         protectedTools: args.protectedTools,
         protectedToolTags,
         protectedTags: args.protectedTags,
@@ -45635,7 +45884,7 @@ async function runPipeline(args) {
         caveman: args.isSubagent ? undefined : args.heuristics.caveman
       }, activeTags, stableIdResolver);
       if (!routineCleanupApplied && heuristicsResult.emergencyDroppedTools > 0) {
-        const ridingCleanup = applyPiHeuristicCleanup(args.sessionId, args.db, targets, args.messages, {
+        const ridingCleanup = applyPiHeuristicCleanup(args.sessionId, args.db, newTargets, args.messages, {
           protectedTools: args.protectedTools,
           protectedToolTags,
           protectedTags: args.protectedTags,
@@ -45675,7 +45924,8 @@ async function runPipeline(args) {
       heuristicsExecuted = true;
       executedWorkThisPass = true;
       if (hasPendingMaterializeSignal) {
-        consumePendingMaterialization(args.sessionId);
+        if (!pendingOps.some((op) => newTargets.get(op.tagId)?.thinkingDropProtected))
+          consumePendingMaterialization(args.sessionId);
       }
       if (currentTurnId !== null) {
         lastHeuristicsTurnIdBySession.set(args.sessionId, currentTurnId);
@@ -45776,7 +46026,7 @@ async function runPipeline(args) {
     const syntheticPendingOps = buildSyntheticToolReclaimOps({
       db: args.db,
       sessionId: args.sessionId,
-      targets,
+      targets: newTargets,
       watermark: reclaimMeta.toolReclaimWatermark ?? 0,
       pendingOps
     });
@@ -45787,7 +46037,7 @@ async function runPipeline(args) {
       const supersessionOps = buildSupersessionReclaimOps({
         db: args.db,
         sessionId: args.sessionId,
-        targets,
+        targets: newTargets,
         pendingOps,
         recentMessageIds,
         protectedToolTags
@@ -45801,7 +46051,7 @@ async function runPipeline(args) {
       const editReclaim = buildEditSupersessionReclaim({
         db: args.db,
         sessionId: args.sessionId,
-        targets,
+        targets: newTargets,
         pendingOps,
         recentMessageIds,
         protectedToolTags
@@ -45816,7 +46066,7 @@ async function runPipeline(args) {
     }
     autoReclaimTargetCount = syntheticPendingOps.length;
     if (syntheticPendingOps.length > 0) {
-      autoReclaimDidMutate = applyPendingOperations(args.sessionId, args.db, targets, protectedTagNumbersForPass, undefined, [], syntheticPendingOps, editMarkerTagIds, (reduction) => droppedTokenReductions.push(reduction));
+      autoReclaimDidMutate = applyPendingOperations(args.sessionId, args.db, newTargets, protectedTagNumbersForPass, undefined, [], syntheticPendingOps, editMarkerTagIds, (reduction) => droppedTokenReductions.push(reduction));
       if (autoReclaimDidMutate) {
         droppedCount += syntheticPendingOps.length;
         autoReclaimDidMutateThisPass = true;
@@ -46078,6 +46328,7 @@ async function runPipeline(args) {
   } catch (err) {
     sessionLog(args.sessionId, `token accounting failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
   }
+  restoreOriginals?.(workingMessages);
   const materialized = injectionResult?.m0Materialized === true;
   if (args.reasoningClearing?.prefixBound && firstEditSourceOrder && firstEditParts.size > 0 && !prefixEditBesidesReasoningTrim) {
     const frozenThinking = frozenBindingEntryIds(args.db, args.sessionId);
@@ -46704,17 +46955,8 @@ ${result.message}`,
 var rebasesInFlight = new WeakMap;
 var repairCheckedSessions = new WeakMap;
 
-// ../plugin/src/hooks/magic-context/historian-state-file.ts
-import { mkdirSync as mkdirSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "node:fs";
-function cleanupHistorianStateFile(path) {
-  if (!path)
-    return;
-  try {
-    unlinkSync2(path);
-  } catch {}
-}
 // ../plugin/src/hooks/magic-context/compartment-runner-historian.ts
-import { mkdirSync as mkdirSync3, unlinkSync as unlinkSync3, writeFileSync as writeFileSync3 } from "node:fs";
+import { mkdirSync as mkdirSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "node:fs";
 import { join as join11 } from "node:path";
 
 // ../plugin/src/agents/historian.ts
@@ -47467,7 +47709,7 @@ function cleanupHistorianDump(sessionId, dumpPath) {
   if (!dumpPath)
     return;
   try {
-    unlinkSync3(dumpPath);
+    unlinkSync2(dumpPath);
   } catch (error) {
     sessionLog(sessionId, "compartment agent: failed to remove historian response dump", {
       dumpPath,
@@ -47478,12 +47720,12 @@ function cleanupHistorianDump(sessionId, dumpPath) {
 function dumpHistorianResponse(sessionId, directory, label, text) {
   try {
     const dumpDir = historianResponseDumpDir(directory);
-    mkdirSync3(dumpDir, { recursive: true });
+    mkdirSync2(dumpDir, { recursive: true });
     ensureMmcArtifactGitignore(directory);
     const safeSessionId = sanitizeDumpName(sessionId);
     const safeLabel = sanitizeDumpName(label);
     const dumpPath = join11(dumpDir, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
-    writeFileSync3(dumpPath, text, "utf8");
+    writeFileSync2(dumpPath, text, "utf8");
     sessionLog(sessionId, "compartment agent: historian response dumped", {
       label,
       dumpPath
@@ -47634,7 +47876,6 @@ Could not acquire the compartment-state lease for this session.`;
       logPostPublishFailure(step, error);
     }
   };
-  let currentStateFilePath;
   updateSessionMeta(db, sessionId, { compartmentInProgress: true });
   try {
     const rawMessageCount = getRawSessionMessageCount2(sessionId);
@@ -47971,7 +48212,6 @@ Another process acquired the compartment-state lease before recomp could publish
 ${renderUserFacingFailure("recomp_unavailable")}`;
   } finally {
     updateSessionMeta(db, sessionId, { compartmentInProgress: false });
-    cleanupHistorianStateFile(currentStateFilePath);
   }
 }
 
@@ -49876,7 +50116,7 @@ function buildStatusViewFor(check, options) {
 // package.json
 var package_default = {
   name: "@retaw106/mmc-pi",
-  version: "2.1.2",
+  version: "2.2.1",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -49907,7 +50147,7 @@ var package_default = {
     "dist",
     "README.md"
   ],
-  "//": "The build intentionally bundles typebox (no --external typebox) and keeps it a regular dependency. OMP's extension loader rewrites every bare `typebox` import to its own omptype-based shim, whose schemas are callable objects rather than JSON Schema; they fail structuredClone during tool registration, so an external typebox import stops Magic Context loading on OMP. src/typebox-bundling.test.ts guards this.",
+  "//": 'The build intentionally bundles typebox (no --external typebox): OMP\'s extension loader rewrites every bare `typebox` import to its own omptype-based shim, whose schemas are callable objects rather than JSON Schema; they fail structuredClone during tool registration, so an external typebox import stops Magic Context loading on OMP. The package nonetheless declares typebox as an optional peer "*": Pi treats it as a host-provided extension package and warns on startup when it appears in dependencies (upstream issue #571). The bundled copy is the only one loaded at runtime. src/typebox-bundling.test.ts guards both facts.',
   scripts: {
     build: "bun ../../scripts/check-bun.mjs && bun ../../scripts/clean-dist-chunks.mjs dist index.js historian-calibration-extension.js config-init.js cli.js && rm -rf dist/web && bun build src/index.ts src/historian-calibration-extension.ts --outdir dist --target node --format esm --splitting --external @earendil-works/pi-coding-agent --external @earendil-works/pi-tui --external node:sqlite && bun run build:web && bun run build:config-init && bun run build:cli",
     "build:web": "bun build src/web/main.ts --outfile dist/web/main.js --target node --format esm --external @earendil-works/pi-coding-agent --external @earendil-works/pi-tui --external node:sqlite && mkdir -p dist/web/ui && cp ../plugin/src/web/ui/* dist/web/ui/",
@@ -49927,7 +50167,6 @@ var package_default = {
   dependencies: {
     "ai-tokenizer": "^1.0.6",
     "comment-json": "^5.0.0",
-    typebox: "^1.3.1",
     zod: "^4.1.8"
   },
   devDependencies: {
@@ -49941,11 +50180,13 @@ var package_default = {
     "pi-ai-086": "npm:@earendil-works/pi-ai@0.86.0",
     "pi-coding-agent-086": "npm:@earendil-works/pi-coding-agent@0.86.0",
     "pi-coding-agent-087": "npm:@earendil-works/pi-coding-agent@0.87.1",
+    typebox: "^1.3.1",
     typescript: "^5.8.0"
   },
   peerDependencies: {
     "@earendil-works/pi-coding-agent": ">=0.80.2",
-    "@earendil-works/pi-tui": ">=0.80.2"
+    "@earendil-works/pi-tui": ">=0.80.2",
+    typebox: "*"
   },
   peerDependenciesMeta: {
     "@earendil-works/pi-coding-agent": {
@@ -49953,6 +50194,9 @@ var package_default = {
     },
     "@earendil-works/pi-tui": {
       optional: true
+    },
+    typebox: {
+      optional: true
     }
   },
   exports: {
@@ -49969,6 +50213,7 @@ var package_default = {
 
 // src/dialogs/status-dialog.ts
 var REFRESH_INTERVAL_MS = 1000;
+var DETAIL_REFRESH_INTERVAL_MS = 1e4;
 var BORDER_ROWS = 2;
 var BORDER_COLUMNS = 2;
 var PADDING_COLUMNS = 2;
@@ -49998,6 +50243,7 @@ function stopStatusDialogRefresh() {
 class StatusDialogComponent {
   props;
   detail;
+  detailRefresh;
   refreshTimer = null;
   closed = false;
   scrollOffset = 0;
@@ -50005,13 +50251,14 @@ class StatusDialogComponent {
   maxScrollOffset = 0;
   constructor(props) {
     this.props = props;
-    this.detail = buildPiStatusDetail(props.pi, props.ctx, props.deps, props.sessionId);
+    this.detailRefresh = new PiStatusDetailRefresh(props.pi, props.ctx, props.deps, props.sessionId);
+    this.detail = this.detailRefresh.refresh();
     openStatusDialogs.add(this);
     this.refreshTimer = setInterval(() => {
       if (this.closed)
         return;
       try {
-        this.detail = buildPiStatusDetail(this.props.pi, this.props.ctx, this.props.deps, this.props.sessionId);
+        this.detail = this.detailRefresh.refresh();
         this.props.tui.requestRender();
       } catch {}
     }, REFRESH_INTERVAL_MS);
@@ -50248,7 +50495,152 @@ function deriveDefaultProtectedTokensFloor(usableSoft) {
   const val = Math.round(0.05 * soft);
   return Math.max(low, Math.min(64000, val));
 }
+function readStatusHostBytes(pi, ctx) {
+  return {
+    modelKey: ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined,
+    modelBytes: safeStringify(ctx.model),
+    system: safeRead(() => readHostSystemPrompt(ctx), undefined),
+    tools: safeRead(() => (pi.getAllTools?.() ?? []).map((tool) => `${tool.name ?? ""}
+${tool.description ?? ""}
+${safeStringify(tool.parameters)}`), [])
+  };
+}
+
+class PiStatusTokenCache {
+  estimate;
+  systemKey;
+  systemTokens = 0;
+  toolsKey;
+  toolTokens = 0;
+  constructor(estimate = estimateTokens) {
+    this.estimate = estimate;
+  }
+  estimates(host, fallbackSystemTokens) {
+    if (host.system !== undefined) {
+      const key = JSON.stringify([host.modelKey, host.system]);
+      if (this.systemKey !== key) {
+        this.systemTokens = this.estimate(host.system);
+        this.systemKey = key;
+      }
+    }
+    const key = JSON.stringify([host.modelKey, host.tools]);
+    if (this.toolsKey !== key) {
+      this.toolTokens = host.tools.reduce((sum, bytes) => sum + this.estimate(bytes), 0);
+      this.toolsKey = key;
+    }
+    return {
+      systemPromptTokens: host.system === undefined ? fallbackSystemTokens : this.systemTokens,
+      toolDefinitionTokens: this.toolTokens
+    };
+  }
+}
+
+class PiStatusDetailRefresh {
+  pi;
+  ctx;
+  deps;
+  initialSessionId;
+  detail;
+  state;
+  lastBuildAt = 0;
+  detailKey = "";
+  storeRevision;
+  revisionDb;
+  revisionStatement;
+  constructor(pi, ctx, deps, initialSessionId, tokens = new PiStatusTokenCache) {
+    this.pi = pi;
+    this.ctx = ctx;
+    this.deps = deps;
+    this.initialSessionId = initialSessionId;
+    this.state = { tokens };
+  }
+  readStoreRevision() {
+    if (!isKnownAutocommit(this.deps.db))
+      return;
+    try {
+      if (this.revisionDb !== this.deps.db) {
+        this.revisionStatement = this.deps.db.prepare("SELECT total_changes() AS changes, data_version AS version FROM pragma_data_version");
+        this.revisionDb = this.deps.db;
+      }
+      const row = this.revisionStatement?.get();
+      return row ? `${row.changes}/${row.version}` : undefined;
+    } catch {
+      return;
+    }
+  }
+  refresh(now = Date.now()) {
+    const sessionId = resolveSessionId(this.ctx) ?? this.initialSessionId;
+    const host = readStatusHostBytes(this.pi, this.ctx);
+    const usage = this.ctx.getContextUsage?.();
+    const { db: _db, ...config } = this.deps;
+    const key = JSON.stringify([sessionId, host, usage?.contextWindow, config]);
+    const databaseChanged = this.revisionDb !== this.deps.db;
+    const revision = this.readStoreRevision();
+    if (!this.detail || key !== this.detailKey || revision === undefined || revision !== this.storeRevision || databaseChanged || now - this.lastBuildAt >= DETAIL_REFRESH_INTERVAL_MS) {
+      this.detail = buildStatusDetail(this.pi, this.ctx, this.deps, sessionId, this.state, host);
+      this.detailKey = key;
+      this.lastBuildAt = now;
+      this.storeRevision = this.readStoreRevision();
+    }
+    this.detail = refreshLiveStatus(this.detail, this.state, this.ctx, usage, now);
+    return this.detail;
+  }
+}
+function conversationTokensFor(detail) {
+  return Math.max(0, detail.inputTokens - detail.systemPromptTokens - detail.compartmentTokens - detail.factTokens - detail.memoryTokens - detail.profileTokens - detail.toolCallTokens - detail.toolDefinitionTokens);
+}
+function refreshLiveStatus(detail, state, ctx, usage, now) {
+  const live = state.live;
+  if (!live)
+    return detail;
+  const windowGeometry = resolvePiWindowGeometry({
+    rawContextWindow: usage?.contextWindow ?? ctx.model?.contextWindow,
+    rawContextWindowSource: "catalog",
+    model: ctx.model,
+    detectedContextLimit: live.detectedContextLimit,
+    provenInputTokens: live.provenInputTokens,
+    persistedInputTokens: live.persistedInputTokens,
+    persistedPercentage: live.persistedPercentage
+  });
+  const pressure = resolvePiStatusPressureSnapshot({
+    providerInputLimit: live.providerInputLimit,
+    sessionId: detail.sessionId,
+    persistedPercentage: live.persistedPercentage,
+    persistedInputTokens: live.persistedInputTokens,
+    liveInputTokens: usage?.tokens,
+    usableContextLimit: windowGeometry?.usableSoft
+  });
+  const cacheRemainingMs = cacheRemaining(detail.cacheTtl, detail.lastResponseTime, now);
+  const current = {
+    ...detail,
+    inputTokens: pressure.inputTokens,
+    usagePercentage: pressure.percentage,
+    contextLimit: pressure.contextLimit ?? 0,
+    windowGeometry,
+    cacheRemainingMs,
+    cacheExpired: detail.lastResponseTime > 0 && cacheRemainingMs === 0,
+    tailHygiene: resolveTailHygieneStatus(getPiChannel1Baseline(detail.sessionId)),
+    recompInFlight: isPiRecompInFlight(detail.sessionId)
+  };
+  return { ...current, conversationTokens: conversationTokensFor(current) };
+}
+function cacheRemaining(cacheTtl, lastResponseTime, now) {
+  let ttlMs;
+  try {
+    ttlMs = parseCacheTtl(cacheTtl);
+  } catch {
+    ttlMs = 5 * 60 * 1000;
+  }
+  if (ttlMs === Number.POSITIVE_INFINITY)
+    return ttlMs;
+  return lastResponseTime > 0 ? Math.max(0, ttlMs - (now - lastResponseTime)) : ttlMs;
+}
 function buildPiStatusDetail(pi, ctx, deps, sessionId) {
+  return buildStatusDetail(pi, ctx, deps, sessionId, {
+    tokens: new PiStatusTokenCache
+  });
+}
+function buildStatusDetail(pi, ctx, deps, sessionId, state, host = readStatusHostBytes(pi, ctx)) {
   const usage = ctx.getContextUsage?.();
   const meta = getOrCreateSessionMeta(deps.db, sessionId);
   let detectedContextLimit;
@@ -50270,6 +50662,13 @@ function buildPiStatusDetail(pi, ctx, deps, sessionId) {
     readBranch: () => ctx.sessionManager.getBranch(),
     providerInputLimit
   });
+  state.live = {
+    persistedInputTokens: meta.lastInputTokens,
+    persistedPercentage: meta.lastContextPercentage,
+    detectedContextLimit,
+    provenInputTokens: provenInputTokens || undefined,
+    providerInputLimit
+  };
   const windowGeometry = resolvePiWindowGeometry({
     rawContextWindow: usage?.contextWindow ?? ctx.model?.contextWindow,
     rawContextWindowSource: "catalog",
@@ -50305,29 +50704,23 @@ function buildPiStatusDetail(pi, ctx, deps, sessionId) {
   const factTokens = m0Blocks.factTokens;
   const memoryTokens = m0Blocks.memoryTokens;
   const profileTokens = m0Blocks.profileTokens;
-  let systemPromptTokens = meta.systemPromptTokens;
-  try {
-    const sysPrompt = readHostSystemPrompt(ctx);
-    if (sysPrompt !== undefined && sysPrompt.length > 0) {
-      systemPromptTokens = estimateTokens(sysPrompt);
-    }
-  } catch {}
+  const { systemPromptTokens, toolDefinitionTokens } = state.tokens.estimates(host, meta.systemPromptTokens);
   const tags = getTagsBySession(deps.db, sessionId);
   const activeTags = tags.filter((tag) => tag.status === "active");
   const droppedTags = tags.filter((tag) => tag.status === "dropped");
   const activeBytes = activeTags.reduce((sum, tag) => sum + tag.byteSize, 0);
   const pendingOps = readPendingOpsCount(deps.db, sessionId);
   const toolCallTokens = meta.toolCallTokens;
-  let toolDefinitionTokens = 0;
-  try {
-    const tools = pi.getAllTools?.() ?? [];
-    for (const tool of tools) {
-      toolDefinitionTokens += estimateTokens(`${tool.name ?? ""}
-${tool.description ?? ""}
-${safeStringify(tool.parameters)}`);
-    }
-  } catch {}
-  const conversationTokens = Math.max(0, inputTokens - systemPromptTokens - compartmentTokens - factTokens - memoryTokens - profileTokens - toolCallTokens - toolDefinitionTokens);
+  const conversationTokens = conversationTokensFor({
+    inputTokens,
+    systemPromptTokens,
+    compartmentTokens,
+    factTokens,
+    memoryTokens,
+    profileTokens,
+    toolCallTokens,
+    toolDefinitionTokens
+  });
   const workMetrics = getSessionWorkMetrics(deps.db, sessionId);
   const tailHygiene = resolveTailHygieneStatus(getPiChannel1Baseline(sessionId));
   const modelKey = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined;
@@ -51935,7 +52328,7 @@ import {
   realpathSync as realpathSync4,
   rmSync as rmSync2,
   statSync as statSync8,
-  writeFileSync as writeFileSync4
+  writeFileSync as writeFileSync3
 } from "node:fs";
 import { createRequire } from "node:module";
 import { homedir as homedir5, tmpdir } from "node:os";
@@ -52456,7 +52849,7 @@ class PiSubagentRunner {
       try {
         systemPromptTempDir = mkdtempSync(join13(tmpdir(), "mc-pi-prompt-"));
         systemPromptPath = join13(systemPromptTempDir, "system-prompt.txt");
-        writeFileSync4(systemPromptPath, options.systemPrompt, "utf8");
+        writeFileSync3(systemPromptPath, options.systemPrompt, "utf8");
       } catch (error) {
         cleanupSystemPromptFile();
         return failBeforeSpawn("spawn_failed", `failed to prepare pi system prompt file: ${error instanceof Error ? error.message : String(error)}`);
@@ -52585,6 +52978,11 @@ class PiSubagentRunner {
       let lastEventTimestamp = 0;
       const accumulatedMessages = [];
       accountingMessages = accumulatedMessages;
+      const stepCap = options.stepCap ?? (options.agent === "magic-context-historian" ? HISTORIAN_STEP_CAP : undefined);
+      let assistantSteps = 0;
+      let streamedAssistantSteps = 0;
+      let terminalSeen = false;
+      const isAssistant = (message) => message !== null && typeof message === "object" && message.role === "assistant";
       rl.on("line", (line) => {
         if (settled || line.length === 0)
           return;
@@ -52618,6 +53016,37 @@ class PiSubagentRunner {
           event,
           ms: elapsedMs
         });
+        if (stepCap !== undefined) {
+          if (e.type === "message_end" && isAssistant(e.message)) {
+            streamedAssistantSteps += 1;
+            assistantSteps += 1;
+          }
+          if (e.type === "agent_end" && Array.isArray(e.messages) && !terminalSeen) {
+            terminalSeen = true;
+            const assistants = e.messages.filter(isAssistant);
+            for (let i = streamedAssistantSteps;i < assistants.length; i += 1)
+              assistantSteps += 1;
+          }
+          if (assistantSteps > stepCap) {
+            if (e.type === "message_end")
+              accumulatedMessages.push(e.message);
+            if (e.type === "agent_end" && Array.isArray(e.messages))
+              accountingMessages = e.messages;
+            if (timeoutHandle)
+              clearTimeout(timeoutHandle);
+            if (drainTimerHandle)
+              clearTimeout(drainTimerHandle);
+            terminateChild(child);
+            settle({
+              ok: false,
+              reason: "step_limit",
+              error: `pi subagent ${options.agent} exceeded its ${stepCap}-step limit`,
+              durationMs: Date.now() - startTime,
+              meta: { cap: stepCap, steps: assistantSteps }
+            });
+            return;
+          }
+        }
         if (e.type === "auto_retry_start" || e.type === "agent_end" && event.willRetry === true) {
           sawAgentEnd = false;
           agentEndMessages = null;
@@ -53079,7 +53508,6 @@ var FULL_PARAMETER_DESCRIPTIONS = {
     content: "The memory text — one standalone fact (write, update, merge).",
     category: "Kind of fact (required for write; on update/merge optional, omitted keeps the current category).",
     ids: "Memory ids from <project-memory>: one for update, one or more for archive, two or more for merge, 1–20 for get.",
-    limit: "Max results for list (default 10).",
     reason: "Why it is being archived (optional)."
   },
   mmc_search: {
@@ -53114,13 +53542,12 @@ var LIGHT_PARAMETER_DESCRIPTIONS = {
     content: "One standalone fact (write, update, merge).",
     category: "Kind of fact (required for write; optional on update/merge).",
     ids: "Ids from <project-memory>: one for update, 1+ for archive, 2+ for merge, 1–20 for get.",
-    limit: "Max results for list (default 10).",
     reason: "Why it is archived (optional)."
   },
   mmc_search: {
     query: "A natural-language question carrying the exact terms you expect in the answer.",
     limit: "Maximum results (default 10).",
-    sources: "Restrict to these sources; omit for all.",
+    sources: "Sources; omit or [] for all.",
     from: "Earliest date, YYYY-MM-DD (inclusive).",
     to: "Latest date, YYYY-MM-DD (inclusive; default open)."
   }
@@ -54832,7 +55259,8 @@ function createCtxReduceTool(deps) {
         parts.push(`drop ${formatIds(immediateDropIds)}`);
       if (deferredDropIds.length > 0)
         parts.push(`deferred drop ${formatIds(deferredDropIds)}`);
-      return ok4(`Queued: ${parts.join(", ")}.${skippedNote ? ` ${skippedNote}` : ""}${inertNote ? ` ${inertNote}` : ""}${ctxReduceSelfStampNote ? ` ${ctxReduceSelfStampNote}` : ""}`);
+      const held = deferredDropIds.length === 1 ? `Held: §${deferredDropIds[0]} is inside the protected working set; it applies once newer work displaces it.` : deferredDropIds.length > 1 ? `Held: ${deferredDropIds.map((id) => `§${id}`).join(", ")} are inside the protected working set; they apply once newer work displaces them.` : "";
+      return ok4(`Queued: ${parts.join(", ")}.${held ? ` ${held}` : ""}${skippedNote ? ` ${skippedNote}` : ""}${inertNote ? ` ${inertNote}` : ""}${ctxReduceSelfStampNote ? ` ${ctxReduceSelfStampNote}` : ""}`);
     }
   };
 }