@retaw106/mmc-pi 2.3.0 → 2.4.0

package/dist/index.js

@@ -50,11 +50,15 @@ import {
   stripTagPrefix,
   peelLeadingMcTagNotation,
   prependTag,
+  rememberCurrentToolOutputCount,
   isRecord,
   TEXT_TAG_IDENTITY_MARKER,
   PI_FALLBACK_PREFIXES_JSON,
   contentTagOwnerMessageId,
+  TailHygieneJsonMemo,
+  piJsonHash,
   estimateImageTokensFromDataUrl,
+  providerVisibleMessage,
   TODO_STATUSES,
   TODO_PRIORITIES,
   TITLE_DONE_STATUSES,
@@ -105,6 +109,7 @@ import {
   backfillTagTokenCounts,
   insertTag,
   updateTagStatus,
+  markTagDropped,
   getInertWhitespaceAssistantTagsByNumbers,
   updateTagDropMode,
   updateCavemanDepth,
@@ -139,7 +144,6 @@ import {
   withReadOnlySessionDb,
   expandToolPart,
   retreatPastHostUnservedRows,
-  providerVisibleMessage,
   completedToolArcCrossesBoundary,
   estimateTrueRawMessageTokens,
   buildToolArcs,
@@ -156,6 +160,7 @@ import {
   applyEditMarkerToInput,
   setDatabase,
   loadToolDefinitionMeasurements,
+  estimatePartImageTokens,
   modelAcceptsEmptyContent,
   isAnthropicFamilyRoute,
   variantChangeBustsProviderCache,
@@ -179,8 +184,9 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-f7z4jc1f.js";
+} from "./index-zmx631ey.js";
 import {
+  inRootAsyncContext,
   registerSlowWriteReporter,
   registerSqliteDiagnosticSink,
   detectSqliteRuntime,
@@ -195,7 +201,7 @@ import {
   withPrivilegedWriter,
   indexCoordinationInput,
   withIndexChunk
-} from "./index-3qawqvws.js";
+} from "./index-cr4hzd76.js";
 import {
   pushNotification2
 } from "./index-b3eqj1g6.js";
@@ -6750,6 +6756,15 @@ var HistorianModelEntryObjectSchema = object({
   thinking_level: PiThinkingLevelSchema.describe("Pi thinking level for this entry.")
 }).strict();
 var HistorianModelEntrySchema = union([string2(), HistorianModelEntryObjectSchema]);
+var MaintenanceModelEntrySchema = HistorianModelEntrySchema.superRefine((entry, ctx) => {
+  const model = typeof entry === "string" ? entry : entry.model;
+  if (typeof model !== "string" || model.trim().length === 0) {
+    ctx.addIssue({
+      code: "custom",
+      message: "maintenance model entries must be non-empty: a bare provider/model string or { model, variant?, thinking_level? }"
+    });
+  }
+});
 var ProfileHistorianSchema = object({
   model: HistorianModelEntrySchema.optional().describe("Primary historian model entry."),
   fallback_models: array(HistorianModelEntrySchema).optional().describe("Ordered fallback historian model entries."),
@@ -6876,6 +6891,8 @@ var MagicContextConfigSchema = object({
   }).describe("Cross-session memory configuration"),
   maintenance: object({
     enabled: boolean2().default(true).describe("Enable the automatic memory-maintenance task (default: true). USER-LEVEL ONLY — the whole maintenance group is stripped from project-tier config."),
+    model: MaintenanceModelEntrySchema.optional().describe("Primary maintenance model entry: a bare provider/model string or { model, variant? (OpenCode), thinking_level? (Pi) }. USER-LEVEL ONLY. When absent, inherit historian model configuration. If neither has a primary, automatic passes skip and manual runs refuse. The main-session model is never inherited."),
+    fallback_models: array(MaintenanceModelEntrySchema).optional().describe("Ordered fallback maintenance model entries, tried after CALL failures only. When absent and the primary is inherited, inherit historian fallbacks; explicit [] disables fallbacks. Illegal manifests, permission refusals, and exhausted budgets never switch models."),
     budgets: object({
       inputTokens: number2().int().min(1).default(400000).describe("Per-run input-token budget (input + cacheRead + cacheWrite pricing dimensions). Default 400000."),
       outputTokens: number2().int().min(1).default(32000).describe("Per-run output-token budget. Default 32000."),
@@ -6917,7 +6934,7 @@ var MagicContextConfigSchema = object({
       maxRetries: 3
     },
     anomalyThreshold: { absoluteRows: 10, poolFraction: 0.25 }
-  }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: the whole group is stripped from project-tier config so a cloned repository cannot raise budgets, relax cooldowns, or loosen the anomaly guard.")
+  }).describe("Automatic memory-maintenance run controls (dreamer replacement). USER-LEVEL ONLY: project-tier config cannot pick maintenance models or change run controls. An absent model inherits historian model configuration, never the session model.")
 });
 var LIVE_RELOAD_CONFIG_PATHS = [
   "cache_ttl",
@@ -8654,6 +8671,130 @@ function storedPathBelongsToIdentity(storedProjectPath, projectIdentity) {
   return storedProjectPath === projectIdentity || normalizeStoredProjectPath(storedProjectPath) === projectIdentity;
 }
 
+// ../plugin/src/shared/model-resolution.ts
+function asRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : undefined;
+}
+function readString(value) {
+  if (typeof value !== "string")
+    return;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+function normalizeModelEntry(entry, harness) {
+  if (typeof entry === "string") {
+    const model = readString(entry);
+    return model ? { model } : undefined;
+  }
+  const objectEntry = asRecord(entry);
+  if (!objectEntry)
+    return;
+  const model = readString(objectEntry.model);
+  if (!model)
+    return;
+  const qualifier = readString(objectEntry[harness === "opencode" ? "variant" : "thinking_level"]);
+  return qualifier ? { model, qualifier } : { model };
+}
+function isValidModelReference(entry) {
+  const slash = entry.model.indexOf("/");
+  return slash > 0 && slash < entry.model.length - 1;
+}
+function sameAttempt(a, b) {
+  return a.model === b.model && a.qualifier === b.qualifier;
+}
+function resolveFallbackEntries(value, harness) {
+  const values = Array.isArray(value) ? value : value === undefined ? [] : [value];
+  const resolved = [];
+  for (const value of values) {
+    const entry = normalizeModelEntry(value, harness);
+    if (!entry || !isValidModelReference(entry))
+      continue;
+    if (resolved.some((candidate) => sameAttempt(candidate, entry)))
+      continue;
+    resolved.push(entry);
+  }
+  return resolved;
+}
+function resolvePrimaryEntry(args) {
+  const entry = normalizeModelEntry(args.entry, args.harness);
+  if (!entry)
+    return;
+  const qualifier = entry.qualifier ?? readString(args.defaultQualifier);
+  return qualifier ? { ...entry, qualifier } : entry;
+}
+function resolveHistorianModel(config, harness) {
+  const historian = asRecord(asRecord(config)?.historian);
+  if (!historian)
+    return { fallbacks: [] };
+  return {
+    primary: resolvePrimaryEntry({
+      entry: historian.model,
+      defaultQualifier: historian[harness === "opencode" ? "variant" : "thinking_level"],
+      harness
+    }),
+    fallbacks: resolveFallbackEntries(historian.fallback_models, harness)
+  };
+}
+
+// ../plugin/src/shared/resolve-fallbacks.ts
+function parseProviderModel(spec) {
+  const slash = spec.indexOf("/");
+  if (slash < 1 || slash >= spec.length - 1)
+    return null;
+  return {
+    providerID: spec.slice(0, slash).trim(),
+    modelID: spec.slice(slash + 1).trim()
+  };
+}
+function modelBodyField(spec) {
+  const entry = toModelEntry(spec);
+  if (!entry)
+    return {};
+  const parsed = parseProviderModel(entry.model);
+  return parsed ? { model: parsed, ...entry.qualifier ? { variant: entry.qualifier } : {} } : {};
+}
+function toModelEntry(spec) {
+  if (typeof spec === "string") {
+    const model = spec.trim();
+    return model ? { model } : undefined;
+  }
+  return spec;
+}
+
+// ../plugin/src/features/magic-context/memory-maintainer/model-chain.ts
+var MAINTENANCE_MODEL_UNCONFIGURED_MESSAGE = "memory maintenance has no primary model configured — set maintenance.model or historian.model in the user-level mmc config (fallback_models alone does not enable maintenance; the session model is never inherited)";
+function inheritMaintenanceModelConfig(config) {
+  const { maintenance, historian } = config;
+  if (maintenance.model !== undefined || historian?.model === undefined)
+    return maintenance;
+  const entry = typeof historian.model === "string" ? { model: historian.model } : historian.model;
+  return {
+    ...maintenance,
+    model: {
+      ...entry,
+      variant: entry.variant ?? historian.variant,
+      thinking_level: entry.thinking_level ?? historian.thinking_level
+    },
+    fallback_models: maintenance.fallback_models ?? historian.fallback_models
+  };
+}
+function resolveMaintenanceModelChain(config, harness) {
+  const primary = normalizeModelEntry(config.model, harness);
+  if (!primary)
+    return;
+  const fallbacks = [];
+  for (const entry of config.fallback_models ?? []) {
+    const resolved = normalizeModelEntry(entry, harness);
+    if (resolved)
+      fallbacks.push(resolved);
+  }
+  return { primary, fallbacks };
+}
+function hasMaintenancePrimary(config) {
+  const primary = toModelEntry(config.model);
+  return primary !== undefined && primary.model.trim().length > 0;
+}
+
 // ../plugin/src/shared/model-cache-ttl.ts
 var MODEL_CACHE_LIFETIMES = [
   {
@@ -14735,6 +14876,9 @@ function requestPendingMaterialization(sessions, sessionId, origin) {
 function pendingMaterializationOrigin(sessions, sessionId) {
   return sessions.has(sessionId) ? origins.get(sessions)?.get(sessionId) ?? "pending_materialization" : "pending_materialization";
 }
+function hasPendingMaterializationOrigin(sessions, sessionId, origin) {
+  return sessions.has(sessionId) && causes.get(sessions)?.get(sessionId)?.has(origin) === true;
+}
 function clearPendingMaterialization(sessions, sessionId) {
   sessions.delete(sessionId);
   origins.get(sessions)?.delete(sessionId);
@@ -16746,7 +16890,7 @@ function scheduleAfterBootQuiet(task, additionalDelayMs = 0) {
 function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
-function readString(value) {
+function readString2(value) {
   if (typeof value === "string" && value.length > 0)
     return value;
   if (typeof value === "number")
@@ -16769,19 +16913,19 @@ function describeError(error) {
     };
   }
   const obj = error;
-  const nameFromField = readString(obj.name);
+  const nameFromField = readString2(obj.name);
   const nameFromCtor = error?.constructor?.name;
   const name = nameFromField ?? nameFromCtor ?? "Error";
-  const message = readString(obj.message) ?? "";
-  const status = readString(obj.status) ?? readString(obj.statusCode);
-  const code = readString(obj.code);
+  const message = readString2(obj.message) ?? "";
+  const status = readString2(obj.status) ?? readString2(obj.statusCode);
+  const code = readString2(obj.code);
   let causeName;
   const cause = obj.cause;
   if (cause && typeof cause === "object") {
     const causeRecord = cause;
-    causeName = readString(causeRecord.name) ?? cause.constructor?.name;
+    causeName = readString2(causeRecord.name) ?? cause.constructor?.name;
   }
-  const stack = readString(obj.stack);
+  const stack = readString2(obj.stack);
   const stackHead = stack ? stack.split(`
 `).slice(0, 4).map((l) => l.trim()).filter((l) => l.length > 0).join(" | ") : undefined;
   const briefParts = [];
@@ -17503,8 +17647,8 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
       startMessageFtsRowidMapBackfill(db).then(async () => {
         if (!readsOpenCodeStore)
           return;
-        const { readRawSessionMessagePage, readRawSessionMessages } = await import("./read-session-chunk-vhejzv1k.js");
-        const { startMessageTimeBackfill } = await import("./message-time-backfill-mpks152d.js");
+        const { readRawSessionMessagePage, readRawSessionMessages } = await import("./read-session-chunk-g164kwxz.js");
+        const { startMessageTimeBackfill } = await import("./message-time-backfill-fvkrfyp4.js");
         await startMessageTimeBackfill(db, Object.assign(readRawSessionMessages, {
           readPage: readRawSessionMessagePage
         }));
@@ -20593,71 +20737,6 @@ function shouldKeepSubagents() {
   return keepSubagents;
 }
 
-// ../plugin/src/shared/model-resolution.ts
-function asRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : undefined;
-}
-function readString2(value) {
-  if (typeof value !== "string")
-    return;
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : undefined;
-}
-function normalizeModelEntry(entry, harness) {
-  if (typeof entry === "string") {
-    const model = readString2(entry);
-    return model ? { model } : undefined;
-  }
-  const objectEntry = asRecord(entry);
-  if (!objectEntry)
-    return;
-  const model = readString2(objectEntry.model);
-  if (!model)
-    return;
-  const qualifier = readString2(objectEntry[harness === "opencode" ? "variant" : "thinking_level"]);
-  return qualifier ? { model, qualifier } : { model };
-}
-function isValidModelReference(entry) {
-  const slash = entry.model.indexOf("/");
-  return slash > 0 && slash < entry.model.length - 1;
-}
-function sameAttempt(a, b) {
-  return a.model === b.model && a.qualifier === b.qualifier;
-}
-function resolveFallbackEntries(value, harness) {
-  const values = Array.isArray(value) ? value : value === undefined ? [] : [value];
-  const resolved = [];
-  for (const value of values) {
-    const entry = normalizeModelEntry(value, harness);
-    if (!entry || !isValidModelReference(entry))
-      continue;
-    if (resolved.some((candidate) => sameAttempt(candidate, entry)))
-      continue;
-    resolved.push(entry);
-  }
-  return resolved;
-}
-function resolvePrimaryEntry(args) {
-  const entry = normalizeModelEntry(args.entry, args.harness);
-  if (!entry)
-    return;
-  const qualifier = entry.qualifier ?? readString2(args.defaultQualifier);
-  return qualifier ? { ...entry, qualifier } : entry;
-}
-function resolveHistorianModel(config, harness) {
-  const historian = asRecord(asRecord(config)?.historian);
-  if (!historian)
-    return { fallbacks: [] };
-  return {
-    primary: resolvePrimaryEntry({
-      entry: historian.model,
-      defaultQualifier: historian[harness === "opencode" ? "variant" : "thinking_level"],
-      harness
-    }),
-    fallbacks: resolveFallbackEntries(historian.fallback_models, harness)
-  };
-}
-
 // ../plugin/src/shared/prompt-surface-runtime.ts
 import { readFileSync as readFileSync12, statSync as statSync5 } from "node:fs";
 import { dirname as dirname5, isAbsolute as isAbsolute2, resolve as resolve5 } from "node:path";
@@ -20812,7 +20891,7 @@ function registerStandalonePluginMarker(version) {
 // package.json
 var package_default = {
   name: "@retaw106/mmc-pi",
-  version: "2.3.0",
+  version: "2.4.0",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -22035,10 +22114,16 @@ class MaintenanceLauncher {
   constructor(deps) {
     this.deps = deps;
   }
+  modelConfigured() {
+    return hasMaintenancePrimary(this.deps.getConfig().maintenance);
+  }
   maybeLaunch(signals) {
     if (!this.deps.getConfig().maintenance.enabled) {
       return { launched: false, reason: "maintenance-disabled" };
     }
+    if (!this.modelConfigured()) {
+      return { launched: false, reason: "maintenance-model-unconfigured" };
+    }
     if (this.runInFlight) {
       return { launched: false, reason: "run-in-flight-local" };
     }
@@ -22068,6 +22153,9 @@ class MaintenanceLauncher {
     if (!this.deps.getConfig().maintenance.enabled) {
       return { launched: false, reason: "maintenance-disabled" };
     }
+    if (!this.modelConfigured()) {
+      return { launched: false, reason: "maintenance-model-unconfigured" };
+    }
     if (this.runInFlight) {
       return { launched: false, reason: "run-in-flight-local" };
     }
@@ -22961,6 +23049,11 @@ var pendingDecisionBySession = new Map;
 var pendingPiDecisionBySession = new Map;
 var lastBoundMessageIdBySession = new Map;
 var scheduledWriteTokensBySession = new Map;
+var systemHashChangedSessions = new Set;
+var piSystemHashChangedSessions = new Set;
+var unbustedPassBySession = new Map;
+var newestInputAssistantBySession = new Map;
+var stagedV2DecisionBySession = new Map;
 var writerOverrideForTests = null;
 var retentionOverrideForTests = null;
 function normalizeMaterializeReason(harness, reason, rematerialized) {
@@ -22975,12 +23068,28 @@ function normalizeMaterializeReason(harness, reason, rematerialized) {
   }
   return rematerialized ? "pressure_refold" : null;
 }
+function notePiSystemPromptHashChange(sessionId) {
+  piSystemHashChangedSessions.add(sessionId);
+}
+function hasPendingPiSystemPromptHashChange(sessionId) {
+  return piSystemHashChangedSessions.has(sessionId);
+}
+var IDLE_EXPIRY_REASONS = new Set([
+  "ttl_idle",
+  "ttl_expiry"
+]);
+function withSystemHashReason(decision) {
+  if (IDLE_EXPIRY_REASONS.has(decision.materializeReason))
+    return decision;
+  return { ...decision, materializeReason: "system_hash" };
+}
 function recordPendingPiTransformDecision(sessionId, decision, snapshotNewestAssistantEntryId, publicationGuard) {
   publicationGuard?.();
-  if (!decision.bustedThisPass)
+  const systemHashChanged = piSystemHashChangedSessions.delete(sessionId);
+  if (!decision.bustedThisPass && !systemHashChanged)
     return;
   pendingPiDecisionBySession.set(sessionId, {
-    ...decision,
+    ...systemHashChanged ? withSystemHashReason(decision) : decision,
     snapshotNewestAssistantEntryId,
     publicationGuard
   });
@@ -23023,7 +23132,7 @@ function schedulePiTransformDecisionResolve(args) {
     return false;
   pendingPiDecisionBySession.delete(args.sessionId);
   const token = addScheduledWriteToken(args.sessionId);
-  setTimeout(() => {
+  inRootAsyncContext(() => setTimeout(() => {
     try {
       if (!hasScheduledWriteToken(args.sessionId, token))
         return;
@@ -23043,7 +23152,7 @@ function schedulePiTransformDecisionResolve(args) {
     } finally {
       deleteScheduledWriteToken(args.sessionId, token);
     }
-  }, 0);
+  }, 0));
   return true;
 }
 function addScheduledWriteToken(sessionId) {
@@ -23192,6 +23301,31 @@ function computePiWorkMetrics(sessionEntries) {
   return { newWorkTokens, totalInputTokens };
 }
 
+// ../plugin/src/hooks/magic-context/pending-drop-eligibility.ts
+function pendingDropVeto(tagNumber, target, protectedTagIds) {
+  if (protectedTagIds.has(tagNumber))
+    return "protected";
+  if (target?.thinkingDropProtected)
+    return "active_thinking";
+  return null;
+}
+function capturePendingDropEligibility(targets, protectedTagIds) {
+  const eligible = new Set;
+  for (const [number, target] of targets) {
+    if (pendingDropVeto(number, target, protectedTagIds))
+      continue;
+    if (target.drop) {
+      if (target.canDrop?.() === true)
+        eligible.add(number);
+    } else {
+      const content = target.getContent?.();
+      if (typeof content === "string" && content.length > `[dropped §${number}§]`.length)
+        eligible.add(number);
+    }
+  }
+  return eligible;
+}
+
 // ../plugin/src/hooks/magic-context/apply-operations.ts
 var RECENT_TOOL_SKELETON_WINDOW = 20;
 function buildReplacementContent(tagId) {
@@ -23295,7 +23429,7 @@ function prepareLegacyToolSkeletonConversions(db, sessionId, targets, options =
     }
   };
 }
-function applyPendingOperations(sessionId, db, targets, protectedTagIds, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set, onTagReduced, onBatchComplete) {
+function applyPendingOperations(sessionId, db, targets, protectedTagIds, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set, onTagReduced, onBatchComplete, onEligibilitySnapshot) {
   let didMutateMessage = false;
   let diagnostics;
   const reject = (reason) => {
@@ -23310,6 +23444,7 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
     }).immediate();
     {
       const pendingOps = preloadedPendingOps ?? getPendingOps(db, sessionId);
+      onEligibilitySnapshot?.(capturePendingDropEligibility(targets, protectedTagIds));
       const neededTagNumbers = new Set(pendingOps.map((op) => op.tagId));
       for (const op of syntheticPendingOps)
         neededTagNumbers.add(op.tagId);
@@ -23346,13 +23481,10 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
             removePendingOp(db, sessionId, pendingOp.tagId);
           continue;
         }
-        if (protectedTagIds.has(pendingOp.tagId)) {
-          reject("protected");
-          continue;
-        }
         const target = targets.get(pendingOp.tagId);
-        if (target?.thinkingDropProtected) {
-          reject("active_thinking");
+        const veto = pendingDropVeto(pendingOp.tagId, target, protectedTagIds);
+        if (veto) {
+          reject(veto);
           continue;
         }
         const isToolTag = tagTypeById.get(pendingOp.tagId) === "tool";
@@ -23372,9 +23504,7 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
           try {
             db.transaction(() => {
               startedAt = performance.now();
-              if (mode)
-                updateTagDropMode(db, sessionId, pendingOp.tagId, mode);
-              updateTagStatus(db, sessionId, pendingOp.tagId, "dropped");
+              markTagDropped(db, sessionId, pendingOp.tagId, mode);
               if (!synthetic)
                 removePendingOp(db, sessionId, pendingOp.tagId);
             }).immediate();
@@ -23883,6 +24013,7 @@ var AGENT_STEP_CAPS = {
   [MEMORY_MAINTAINER_A_AGENT]: MEMORY_MAINTAINER_A_STEP_CAP,
   [HIDDEN_HISTORIAN_AGENT]: HISTORIAN_STEP_CAP
 };
+var DISPOSED_CHILDREN_KEY = Symbol.for("magic-context.v2.disposed-hidden-children");
 class HiddenAgentStepLimit extends Error {
   agent;
   cap;
@@ -23965,31 +24096,6 @@ function hasLengthCappedOutput(value) {
 import { AsyncLocalStorage } from "node:async_hooks";
 var primaryQuotas = new AsyncLocalStorage;
 
-// ../plugin/src/shared/resolve-fallbacks.ts
-function parseProviderModel(spec) {
-  const slash = spec.indexOf("/");
-  if (slash < 1 || slash >= spec.length - 1)
-    return null;
-  return {
-    providerID: spec.slice(0, slash).trim(),
-    modelID: spec.slice(slash + 1).trim()
-  };
-}
-function modelBodyField(spec) {
-  const entry = toModelEntry(spec);
-  if (!entry)
-    return {};
-  const parsed = parseProviderModel(entry.model);
-  return parsed ? { model: parsed, ...entry.qualifier ? { variant: entry.qualifier } : {} } : {};
-}
-function toModelEntry(spec) {
-  if (typeof spec === "string") {
-    const model = spec.trim();
-    return model ? { model } : undefined;
-  }
-  return spec;
-}
-
 // ../plugin/src/shared/model-suggestion-retry.ts
 var ABORT_CALL_TIMEOUT_MS = 3000;
 function copyPromptArgs(args, body) {
@@ -25372,12 +25478,12 @@ function estimateUntaggedInMemoryTailUpperBound(db, sessionId, inMemoryTail, tag
 function getProactiveCompartmentTriggerPercentage(executeThresholdPercentage) {
   return Math.max(0, executeThresholdPercentage - PROACTIVE_TRIGGER_OFFSET_PERCENTAGE);
 }
-function estimateProjectedPostDropPercentage(db, sessionId, usage, activeTags, keepReasoningTokens, clearedReasoningThroughTag, canClearReasoning, liveBudgetCutoff) {
+function estimateProjectedPostDropPercentage(db, sessionId, usage, activeTags, keepReasoningTokens, clearedReasoningThroughTag, canClearReasoning, liveBudgetCutoff, eligiblePendingDropTagIds) {
   const totalActiveBytes = activeTags.reduce((sum, tag) => sum + tag.byteSize + tag.reasoningByteSize, 0);
   if (totalActiveBytes === 0)
     return null;
   let droppableBytes = 0;
-  const pendingDrops = getPendingOps(db, sessionId).filter((op) => op.operation === "drop");
+  const pendingDrops = getPendingOps(db, sessionId).filter((op) => op.operation === "drop" && eligiblePendingDropTagIds?.has(op.tagId) === true);
   const pendingDropTagIds = new Set(pendingDrops.map((op) => op.tagId));
   if (pendingDrops.length > 0) {
     droppableBytes += activeTags.filter((tag) => pendingDropTagIds.has(tag.tagNumber)).reduce((sum, tag) => sum + tag.byteSize + tag.reasoningByteSize, 0);
@@ -25505,7 +25611,7 @@ function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThr
 function formatProjectedPostDropPercentage(value) {
   return value === null ? "none" : `${value.toFixed(1)}%`;
 }
-function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, keepReasoningTokens, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection, reclaimRide, storedTotalsExcludeToolTags) {
+function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, keepReasoningTokens, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection, reclaimRide, eligiblePendingDropTagIds, storedTotalsExcludeToolTags) {
   if (sessionMeta.compartmentInProgress) {
     sessionLog(sessionId, `compartment trigger: skipped — historian already in progress (usage=${usage.percentage.toFixed(1)}%)`);
     return { shouldFire: false };
@@ -25569,7 +25675,7 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
     return { shouldFire: false };
   }
   const canClearReasoning = reasoningProjection?.canClearReasoning ?? modelAcceptsEmptyContent(reasoningProjection?.providerID);
-  const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession(db, sessionId), keepReasoningTokens, sessionMeta.clearedReasoningThroughTag, canClearReasoning, reasoningProjection?.budgetCutoff);
+  const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession(db, sessionId), keepReasoningTokens, sessionMeta.clearedReasoningThroughTag, canClearReasoning, reasoningProjection?.budgetCutoff, eligiblePendingDropTagIds);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
   const rideLabel = reclaimRide ? reclaimRideLabel(reclaimRide) : "ride=none";
   const dropsCanLand = reclaimRide !== undefined && hasReclaimRide(reclaimRide);
@@ -25672,8 +25778,8 @@ var USER_FACING_FAILURES = {
   },
   history_boundary_unresolved: {
     code: "MC-H04",
-    sentence: "This request was not sent: the message that marks where this session's history summary ends is missing from the OpenCode store, and without it the request is larger than the model's context window.",
-    action: "Run /mmc-recomp to rebuild the history summary."
+    sentence: "This request was not sent: Magic Context could not safely place the history summary boundary in the loaded conversation, and the untrimmed request is larger than the model's context window.",
+    action: "Reopen this session in its current project directory, then run /mmc-recomp to rebuild the history summary. A model with a larger context window can also help."
   },
   history_over_window_unmanaged: {
     code: "MC-H06",
@@ -25791,6 +25897,20 @@ function userFacingFailureCode(key) {
 }
 
 // ../plugin/src/hooks/magic-context/degraded-pass-refusal.ts
+function describeDegradedPassFailure(site, cause) {
+  const details = [site];
+  const seen = new Set;
+  while (cause !== undefined && cause !== null && !seen.has(cause)) {
+    seen.add(cause);
+    const current = cause;
+    const detail = typeof current.site === "string" ? current.site : typeof current.message === "string" ? current.message : String(cause);
+    if (!details.includes(detail))
+      details.push(detail);
+    cause = current.cause;
+  }
+  return `Magic Context could not safely prepare this turn [${userFacingFailureCode("transform_pass_degraded")}] (${details.join(": ")}). This request was not sent.`;
+}
+
 class DegradedPassRefusalError extends Error {
   site;
   code = "DEGRADED_PASS_REFUSAL";
@@ -25798,7 +25918,7 @@ class DegradedPassRefusalError extends Error {
   estimatedTokens;
   contextLimitTokens;
   constructor(site, options) {
-    super(renderUserFacingFailure("transform_pass_degraded", "plain"), {
+    super(describeDegradedPassFailure(site, options?.cause), {
       cause: options?.cause
     });
     this.site = site;
@@ -27899,7 +28019,7 @@ function buildEditSupersessionReclaim(input) {
       seenFile.add(filePath);
       continue;
     }
-    if (input.recentMessageIds && (tag.toolOwnerMessageId === null || input.recentMessageIds.has(tag.toolOwnerMessageId))) {
+    if (tag.tagNumber > input.watermark || input.recentMessageIds && (tag.toolOwnerMessageId === null || input.recentMessageIds.has(tag.toolOwnerMessageId))) {
       continue;
     }
     if (realPendingTagIds.has(tag.tagNumber))
@@ -27932,6 +28052,51 @@ function readFilePath(target) {
   return null;
 }
 
+// ../plugin/src/shared/reclaim-distance.ts
+var RECLAIM_DISTANCE_USER_TURNS = 3;
+var RECLAIM_DISTANCE_WINDOW_FRACTION = 0.25;
+function isReclaimUserTurn(args) {
+  return args.role === "user" && !args.syntheticHead && !args.synthetic && !args.ignored && args.parts.some((part) => {
+    if (part.synthetic || part.ignored)
+      return false;
+    if (part.kind !== "text" && part.kind !== "image" && part.kind !== "file")
+      return false;
+    if (part.kind !== "text")
+      return true;
+    return stripReclaimMcText(part.text ?? "").trim().length > 0;
+  });
+}
+function stripReclaimMcText(text) {
+  return text.replace(/^§\d+§\s*/, "").replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, (reminder) => /^(?:Your next step: call ctx_reduce on the outputs you've already used|Still unstamped:|Housekeeping: .* are reclaimable\. Stamp each output with ctx_reduce|.* are reclaimable\. Make a ctx_reduce pass now|.* are still unstamped\. Call ctx_reduce now)/.test(reminder.slice("<system-reminder>".length).trimStart()) ? "" : reminder).replace(/<instruction name="deferred_notes">[\s\S]*?<\/instruction>/g, "");
+}
+function farBehindToolBookmark(entries, usableWindow) {
+  let newerTurns = 0;
+  let newerTokens = 0;
+  const farTags = [];
+  let firstYoungTag = Infinity;
+  const seenOutputs = new Set;
+  const tokenDistance = usableWindow > 0 && Number.isFinite(usableWindow) ? usableWindow * RECLAIM_DISTANCE_WINDOW_FRACTION : Infinity;
+  for (let index = entries.length - 1;index >= 0; index--) {
+    const entry = entries[index];
+    if (!entry)
+      continue;
+    const tag = entry.toolOutputTag;
+    if (tag !== undefined && !seenOutputs.has(tag)) {
+      seenOutputs.add(tag);
+      if (newerTurns >= RECLAIM_DISTANCE_USER_TURNS || newerTokens >= tokenDistance) {
+        farTags.push(tag);
+      } else {
+        firstYoungTag = Math.min(firstYoungTag, tag);
+      }
+    }
+    if (entry.userTurn)
+      newerTurns++;
+    if (Number.isFinite(entry.tokens) && entry.tokens > 0)
+      newerTokens += entry.tokens;
+  }
+  return farTags.reduce((bookmark, tag) => tag < firstYoungTag ? Math.max(bookmark, tag) : bookmark, 0);
+}
+
 // ../plugin/src/hooks/magic-context/tool-reclaim.ts
 function buildSyntheticToolReclaimOps(input) {
   const watermark = Math.max(0, input.watermark);
@@ -27963,10 +28128,74 @@ function buildSyntheticToolReclaimOps(input) {
   }
   return synthetic;
 }
-function advanceToolReclaimWatermarkToCurrentMax(db, sessionId) {
-  const maxTagNumber = getMaxTagNumberBySession(db, sessionId);
-  advanceToolReclaimWatermark(db, sessionId, maxTagNumber);
-  return maxTagNumber;
+function advanceToolReclaimWatermarkByDistance(db, sessionId, entries, usableWindow) {
+  const bookmark = farBehindToolBookmark(entries, usableWindow);
+  advanceToolReclaimWatermark(db, sessionId, bookmark);
+  return bookmark;
+}
+function toolReclaimDistanceEntries(messages, targets) {
+  const outputTags = new Map;
+  for (const [tag, target] of targets) {
+    for (const location of target.mutationParts ?? []) {
+      const part = distancePart(location.part);
+      if (part.kind === "tool_result" || part.kind === "tool")
+        outputTags.set(location.part, tag);
+    }
+  }
+  const entries = [];
+  for (const message of messages) {
+    const parts = message.parts.map(distancePart);
+    let userTurn = isReclaimUserTurn({ ...message.info, parts });
+    for (const [index, part] of parts.entries()) {
+      const authored = isReclaimUserTurn({ role: "user", parts: [part] });
+      entries.push({
+        tokens: message.info.syntheticHead ? 0 : estimateTokens(stripReclaimMcText(part.text ?? "")) + part.imageTokens,
+        userTurn: userTurn && authored,
+        toolOutputTag: outputTags.get(message.parts[index])
+      });
+      if (authored)
+        userTurn = false;
+    }
+  }
+  return entries;
+}
+function distancePart(raw) {
+  if (!raw || typeof raw !== "object")
+    return { kind: "structural", imageTokens: 0 };
+  const part = raw;
+  const provenance = { synthetic: part.synthetic === true, ignored: part.ignored === true };
+  if (typeof part.getText === "function") {
+    const text = part.getText();
+    return {
+      ...provenance,
+      kind: String(part.kind),
+      text: typeof text === "string" ? text : undefined,
+      imageTokens: typeof part.imageTokens === "function" ? Number(part.imageTokens()) : 0
+    };
+  }
+  const metadata = { ...provenance, imageTokens: estimatePartImageTokens(raw) };
+  if (part.type === "tool") {
+    const state = part.state;
+    return {
+      ...metadata,
+      kind: "tool",
+      text: `${JSON.stringify(state?.input ?? {})}
+${typeof state?.output === "string" ? state.output : JSON.stringify(state?.output ?? "")}`
+    };
+  }
+  if (part.type === "tool_use")
+    return { ...metadata, kind: "tool_use", text: JSON.stringify(part.input ?? {}) };
+  if (part.type === "tool_result")
+    return {
+      ...metadata,
+      kind: "tool_result",
+      text: typeof part.content === "string" ? part.content : JSON.stringify(part.content ?? "")
+    };
+  return {
+    ...metadata,
+    kind: String(part.type),
+    text: typeof part.text === "string" ? part.text : typeof part.thinking === "string" ? part.thinking : undefined
+  };
 }
 
 // ../plugin/src/shared/recovery-reasoning-prefix.ts
@@ -36048,6 +36277,59 @@ function recordPiTransformTiming(sample) {
 // src/ctx-reduce-nudge-pi.ts
 import { randomUUID as randomUUID6 } from "node:crypto";
 
+// src/provider-visible-parts-pi.ts
+function isRecord4(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+var PART_FIELDS = {
+  text: ["type", "text", "textSignature"],
+  thinking: ["type", "thinking", "thinkingSignature", "redacted"],
+  image: ["type", "data", "mimeType"],
+  toolCall: [
+    "type",
+    "id",
+    "name",
+    "arguments",
+    "thoughtSignature",
+    "namespace"
+  ]
+};
+var MESSAGE_FIELDS = [
+  "role",
+  "provider",
+  "api",
+  "model",
+  "stopReason",
+  "toolCallId",
+  "toolName",
+  "isError"
+];
+function pick2(value, fields) {
+  const view = {};
+  for (const field of fields) {
+    if (Object.hasOwn(value, field))
+      view[field] = value[field];
+  }
+  return view;
+}
+function providerVisiblePiPart(value, providerApi) {
+  if (providerApi === "pi-messages")
+    return value;
+  if (Array.isArray(value))
+    return value.map((part) => providerVisiblePiPart(part, providerApi));
+  if (!isRecord4(value))
+    return value;
+  if (typeof value.role === "string") {
+    const view = pick2(value, MESSAGE_FIELDS);
+    if (Object.hasOwn(value, "content")) {
+      view.content = Array.isArray(value.content) ? value.content.map((part) => providerVisiblePiPart(part, providerApi)) : typeof value.content === "string" ? value.content : undefined;
+    }
+    return view;
+  }
+  const type = typeof value.type === "string" ? value.type : "";
+  return pick2(value, Object.hasOwn(PART_FIELDS, type) ? PART_FIELDS[type] : ["type"]);
+}
+
 // src/tail-hygiene-walk-pi.ts
 var TAG_PREFIX = /^§(\d+)§\s*/;
 var SYNTHETIC_TODO_PREFIX = "mc_synthetic_todo_";
@@ -36061,7 +36343,7 @@ function clearPiTailHygieneContentMemo() {
 }
 var FNV1A_32_OFFSET2 = 2166136261;
 var FNV1A_32_PRIME2 = 16777619;
-function isRecord4(value) {
+function isRecord5(value) {
   return value !== null && typeof value === "object";
 }
 function fnv1a32(value) {
@@ -36076,7 +36358,7 @@ function safeStableStringify(value) {
   const seen = new Set;
   try {
     return JSON.stringify(value, (_key, current) => {
-      if (!isRecord4(current) || Array.isArray(current))
+      if (!isRecord5(current) || Array.isArray(current))
         return current;
       if (seen.has(current))
         return "[Circular]";
@@ -36135,7 +36417,7 @@ function messageIdentity(message, index, stableId) {
   const resolved = stableId?.(message, index);
   if (resolved)
     return resolved;
-  if (isRecord4(message)) {
+  if (isRecord5(message)) {
     if (typeof message.responseId === "string" && message.responseId.length > 0) {
       return `response:${message.responseId}`;
     }
@@ -36195,13 +36477,13 @@ function collectToolArcs(input) {
   const messageIds = input.messages.map((message, index) => messageIdentity(message, index, input.stableId));
   for (let messageIndex = 0;messageIndex < input.messages.length; messageIndex += 1) {
     const raw = input.messages[messageIndex];
-    if (!isRecord4(raw))
+    if (!isRecord5(raw))
       continue;
     const role = raw.role;
     if (role === "assistant" && Array.isArray(raw.content)) {
       for (let partIndex = 0;partIndex < raw.content.length; partIndex += 1) {
         const part = raw.content[partIndex];
-        if (!isRecord4(part) || part.type !== "toolCall")
+        if (!isRecord5(part) || part.type !== "toolCall")
           continue;
         if (typeof part.id !== "string" || part.id.length === 0)
           continue;
@@ -36212,7 +36494,7 @@ function collectToolArcs(input) {
           ownerId,
           ownerIndex: messageIndex,
           toolName: typeof part.name === "string" ? part.name : null,
-          sentinel: isRecord4(part.arguments) && typeof part.arguments.__magic_context_dropped__ === "string",
+          sentinel: isRecord5(part.arguments) && typeof part.arguments.__magic_context_dropped__ === "string",
           parts: [part]
         };
         arcs.push(arc);
@@ -36244,7 +36526,7 @@ function collectToolArcs(input) {
     if (!Array.isArray(raw.content))
       continue;
     for (const part of raw.content) {
-      if (!isRecord4(part))
+      if (!isRecord5(part))
         continue;
       arc.parts.push(part);
       arcByPart.set(part, arc);
@@ -36445,11 +36727,20 @@ function attributeTags(input, arcs, messageIds) {
   }
   return { messageTags, tagsByNumber };
 }
-function excludedDraft(key, value) {
+var partJsonMemo = new TailHygieneJsonMemo;
+var excludedViews = new WeakMap;
+function excludedDraftForApi(key, value, providerApi) {
+  let view = value !== null && typeof value === "object" ? excludedViews.get(value) : undefined;
+  if (view === undefined) {
+    view = providerVisiblePiPart(value, providerApi);
+    if (value !== null && typeof value === "object")
+      excludedViews.set(value, view);
+  }
   return {
     key,
     kind: "excluded",
-    content: typeof value === "string" ? value : safeStableStringify(value),
+    content: "",
+    contentHash: partJsonMemo.get(key, view, () => typeof view === "string" ? partHash("excluded", view) : piJsonHash(view, () => safeStableStringify(view)), true),
     tokens: 0
   };
 }
@@ -36474,7 +36765,7 @@ function finalizeParts(drafts, pendingDropTagNumbers, protectedTagNumbers, newes
     u += uTokens;
     return {
       key: draft.key,
-      contentHash: partHash(draft.kind, draft.content),
+      contentHash: draft.contentHash ?? partHash(draft.kind, draft.content),
       kind: draft.kind,
       tokens,
       uTokens,
@@ -36494,6 +36785,19 @@ function finalizeParts(drafts, pendingDropTagNumbers, protectedTagNumbers, newes
   };
 }
 function measurePiTailHygiene(input) {
+  partJsonMemo.beginPass();
+  excludedViews = new WeakMap;
+  let providerApi = input.providerApi;
+  if (providerApi === undefined) {
+    for (let index = input.messages.length - 1;index >= 0; index--) {
+      const message = input.messages[index];
+      if (isRecord5(message) && message.role === "assistant" && typeof message.api === "string") {
+        providerApi = message.api;
+        break;
+      }
+    }
+  }
+  const excludedDraft = (key, value) => excludedDraftForApi(key, value, providerApi);
   const { arcs, arcByPart, messageIds } = collectToolArcs(input);
   const { messageTags, tagsByNumber } = attributeTags(input, arcs, messageIds);
   const drafts = [];
@@ -36504,7 +36808,7 @@ function measurePiTailHygiene(input) {
     if (messageIndex === input.messages.length - 1)
       newestMessagePartStart = drafts.length;
     const messageKey = messageIds[messageIndex] ?? `pi-message:${messageIndex}`;
-    if (!isRecord4(raw)) {
+    if (!isRecord5(raw)) {
       drafts.push(excludedDraft(`${messageKey}\x00excluded`, raw));
       continue;
     }
@@ -36543,7 +36847,7 @@ function measurePiTailHygiene(input) {
     for (let partIndex = 0;partIndex < raw.content.length; partIndex += 1) {
       const part = raw.content[partIndex];
       const key = `${messageKey}\x00${partIndex}`;
-      if (!isRecord4(part)) {
+      if (!isRecord5(part)) {
         drafts.push(excludedDraft(`${key}\x00excluded`, part));
         continue;
       }
@@ -36613,7 +36917,7 @@ function measurePiTailHygiene(input) {
           drafts.push(excludedDraft(`${key}\x00toolInput`, part));
           continue;
         }
-        const content = safeStableStringify(part.arguments);
+        const content = partJsonMemo.get(`${key}\x00input`, part.arguments, () => safeStableStringify(part.arguments));
         if (!content) {
           drafts.push(excludedDraft(`${key}\x00toolInput`, part));
         } else {
@@ -36663,7 +36967,7 @@ function refreshPiTailHygieneBaseline(input) {
     })
   };
   const now = input.now ?? Date.now();
-  const refrozen = (mismatch) => ({
+  const refrozen = (mismatch) => rememberCurrentToolOutputCount({
     ...freezeTailHygieneMeasurement(measured),
     protectedToolsPolicy,
     hygieneUnitsVersion: frozenCalibration.hygieneUnitsVersion,
@@ -36677,7 +36981,7 @@ function refreshPiTailHygieneBaseline(input) {
     channel1PostReduceGrace: input.previous?.channel1PostReduceGrace,
     lastPrefixMismatch: mismatch,
     realUserTurnCount: rawMeasured.realUserTurnCount
-  });
+  }, measured);
   if (input.cacheBusting || !input.previous)
     return refrozen();
   const prefix = compareMeasuredTailPrefix(input.previous.baselineParts, measured.parts);
@@ -36691,7 +36995,7 @@ function refreshPiTailHygieneBaseline(input) {
     if (part.kind !== "toolOutput" || !part.protected)
       turnDeltaU += part.uTokens;
   }
-  return {
+  return rememberCurrentToolOutputCount({
     ...input.previous,
     protectedToolsPolicy,
     turnDeltaU,
@@ -36701,7 +37005,7 @@ function refreshPiTailHygieneBaseline(input) {
     contentSignature: measured.contentSignature,
     lastPrefixMismatch: undefined,
     realUserTurnCount: rawMeasured.realUserTurnCount
-  };
+  }, measured);
 }
 function effectivePiTailHygiene(baseline) {
   const t = Math.ceil(Math.max(0, baseline.baselineT + baseline.turnDeltaT));
@@ -36711,7 +37015,7 @@ function effectivePiTailHygiene(baseline) {
 function measurePiToolResultDelta(content) {
   let tokens = 0;
   for (const part of content) {
-    if (!isRecord4(part))
+    if (!isRecord5(part))
       continue;
     if (part.type === "text" && typeof part.text === "string") {
       const text = stripChannel1ReminderSpans(part.text);
@@ -39160,7 +39464,6 @@ ${renderUserFacingFailure("recomp_unavailable")}`;
     }
   }
 }
-
 // ../plugin/src/hooks/magic-context/compartment-runner.ts
 var activeRuns = new Map;
 function getActiveCompartmentRun(sessionId) {
@@ -39181,7 +39484,7 @@ function withPublishedCallback(deps) {
   };
 }
 function startLeaseRenewal(deps, holderId) {
-  return setInterval(() => {
+  return inRootAsyncContext(() => setInterval(() => {
     try {
       if (!renewCompartmentLease(deps.db, deps.sessionId, holderId)) {
         sessionLog(deps.sessionId, "compartment lease renewal failed; publish will be skipped if holder is stale");
@@ -39189,7 +39492,7 @@ function startLeaseRenewal(deps, holderId) {
     } catch (err) {
       sessionLog(deps.sessionId, `compartment lease renewal threw; publish will be skipped if holder is stale (${err instanceof Error ? err.message : String(err)})`);
     }
-  }, COMPARTMENT_LEASE_RENEWAL_MS);
+  }, COMPARTMENT_LEASE_RENEWAL_MS));
 }
 async function executeContextRecompWithResult(deps, options = {}) {
   const { sessionId } = deps;
@@ -41126,9 +41429,9 @@ class PiContextBudget {
   elapsed() {
     return this.now() - this.startedAt;
   }
-  remainingWork() {
+  remainingWork = () => {
     return Math.max(0, PI_CONTEXT_BUDGET.workMs - this.elapsed());
-  }
+  };
   remainingOutcome = () => Math.max(0, PI_CONTEXT_BUDGET.outcomeMs - this.elapsed());
   writerAllowance() {
     return Math.max(0, Math.min(PI_CONTEXT_BUDGET.writerMs, this.remainingWork() - PI_CONTEXT_BUDGET.completionReserveMs));
@@ -42513,6 +42816,7 @@ async function executeGuardedRun(opts, holderId, leaseKey, acquisition) {
       pending,
       fullPool: roundState.snapshot,
       shouldContinue: () => meter.shouldContinue(),
+      remainingWallMs: () => Math.max(0, config.budgets.wallMs - meter.getState().spent.wallMs),
       recordUsage: (delta) => meter.recordUsage(delta),
       recordToolStep: () => meter.recordToolStep(),
       refuseToolStep: () => meter.refuseToolStep()
@@ -43012,6 +43316,14 @@ function createPiMaintenanceSeams(deps) {
 function runPiMaintenanceFactory(deps) {
   const nowMs = deps.nowMs ?? Date.now;
   const startedAtMs = nowMs();
+  if (!deps.options.model || deps.options.model.trim().length === 0) {
+    return Promise.resolve({
+      startedAtMs,
+      finishedAtMs: nowMs(),
+      ok: false,
+      error: MAINTENANCE_MODEL_UNCONFIGURED_MESSAGE
+    });
+  }
   return new Promise((resolve, reject) => {
     queueMicrotask(() => {
       (async () => {
@@ -44624,11 +44936,22 @@ class PiDegradedPassError extends Error {
   code = "PI_DEGRADED_PASS";
   recoverable = true;
   constructor(site, options) {
-    super("Magic Context could not finish preparing this turn; send your message again", options);
+    super(describeDegradedPassFailure(site, options?.cause), options);
     this.site = site;
     this.name = "PiDegradedPassError";
   }
 }
+function piFallbackRefusal(site, cause) {
+  const seen = new Set;
+  let current = cause;
+  while (current && typeof current === "object" && !seen.has(current)) {
+    seen.add(current);
+    if (current instanceof PiStorageBusyError || isTransientSqliteError(current) || isTransientPiStorageError(current))
+      return new PiStorageBusyError({ cause });
+    current = current.cause;
+  }
+  return cause instanceof PiDegradedPassError ? cause : new PiDegradedPassError(site, { cause });
+}
 function estimatePiOutgoingInputTokens(messages, observed, measuredPrefix, contextLimit) {
   if (!observed || !Number.isFinite(observed.systemTokens) || observed.systemTokens <= 0 || !Number.isFinite(observed.toolDefinitionTokens) || observed.toolDefinitionTokens < 0 || !hasTokenizerForFit())
     return { tokens: 0, trusted: false };
@@ -44761,7 +45084,7 @@ function estimatePiOutgoingInputTokens(messages, observed, measuredPrefix, conte
 function assertPiRawFallbackFits(messages, contextLimit, log, cause, observed, measuredPrefix) {
   if (!contextLimit || !Number.isFinite(contextLimit) || !observed || !Number.isFinite(observed.systemTokens) || observed.systemTokens <= 0 || !Number.isFinite(observed.toolDefinitionTokens) || observed.toolDefinitionTokens < 0 || observed.envelopeBytes !== undefined && (!Number.isFinite(observed.envelopeBytes) || observed.envelopeBytes < 0)) {
     log("raw_fallback_refused completeness=partial");
-    throw new PiStorageBusyError({ cause });
+    throw piFallbackRefusal("fallback-metadata-incomplete", cause);
   }
   const measured = measuredPrefix && measuredPrefix.modelKey === observed.modelKey && observed.envelopeSignature && measuredPrefix.envelopeSignature === observed.envelopeSignature && Number.isSafeInteger(measuredPrefix.inputTokens) && measuredPrefix.inputTokens > 0 ? measuredPrefix : undefined;
   const baseInputTokens = measured?.inputTokens ?? 0;
@@ -44781,7 +45104,7 @@ function assertPiRawFallbackFits(messages, contextLimit, log, cause, observed, m
   const proxyTokens = baseInputTokens + Math.ceil(bytes / 4);
   if (serializationFailed || proxyTokens > contextLimit) {
     log(`raw_fallback_over_context_limit proxy_bytes=${bytes} proxy_tokens=${proxyTokens} limit=${contextLimit} early_abort=true serialization_failed=${serializationFailed}`);
-    throw new PiStorageBusyError({ cause });
+    throw piFallbackRefusal(serializationFailed ? "fallback-serialization-failed" : "fallback-over-context-limit", cause);
   }
   const complete = pricedMessages.every((message) => {
     if (!message || typeof message !== "object")
@@ -44792,7 +45115,7 @@ function assertPiRawFallbackFits(messages, contextLimit, log, cause, observed, m
   const raw = tokenizePiMessages([...pricedMessages]);
   if (!hasTokenizerForFit()) {
     log("raw_fallback_refused completeness=partial tokenizer=unavailable");
-    throw new PiStorageBusyError({ cause });
+    throw piFallbackRefusal("fallback-tokenizer-unavailable", cause);
   }
   const tokens = baseInputTokens + providerMass({
     system: measured ? 0 : observed.systemTokens,
@@ -44801,7 +45124,7 @@ function assertPiRawFallbackFits(messages, contextLimit, log, cause, observed, m
   }, observed.calibration ?? calibrationForModelKey(observed.modelKey), true);
   if (!complete || !Number.isFinite(tokens) || tokens <= 0 || tokens > contextLimit || serializationFailed || proxyTokens > contextLimit) {
     log(`raw_fallback_over_context_limit proxy_bytes=${bytes} proxy_tokens=${proxyTokens} limit=${contextLimit} early_abort=true serialization_failed=${serializationFailed}`);
-    throw new PiStorageBusyError({ cause });
+    throw piFallbackRefusal(complete ? "fallback-over-context-limit" : "fallback-messages-incomplete", cause);
   }
 }
 function classifyPiOutgoingFit(estimate, limit) {
@@ -44840,9 +45163,12 @@ function parseNumbers(value) {
   }
   return value;
 }
-function readPiCommittedServedNumbers(db, sessionId) {
+function readPiCommittedServedNumbers(db, sessionId, requireEnvelope = false) {
   try {
-    return parseNumbers(readReplayEnvelope(db, sessionId).piServedTagNumbers);
+    const numbers = readReplayEnvelope(db, sessionId).piServedTagNumbers;
+    if (requireEnvelope && numbers === undefined)
+      throw new PiServedEnvelopeUnavailable("No committed Pi served-number envelope for torn legacy tail");
+    return parseNumbers(numbers);
   } catch (error) {
     if (error instanceof ReplayDocumentError) {
       throw new PiServedEnvelopeUnavailable("Pi served-number envelope is unreadable", { cause: error });
@@ -45735,23 +46061,33 @@ function stripThinkingParts(message) {
   assistant.content = strippedContent;
   return before - strippedContent.length;
 }
+
+class PiThinkingBindingRecoveryRefusal extends EmergencyFailClosedError {
+  constructor() {
+    super("Pi thinking-binding recovery has no valid new strip shape; this turn was not sent. Send a new message or start a new session.", { code: "pi_thinking_binding_no_valid_shape" });
+    this.name = "PiThinkingBindingRecoveryRefusal";
+  }
+}
 function applyPiThinkingBindingRecovery(args) {
   const protectedMessages = latestAssistantTurnMessages(args.messages);
   const frozenEntryIds = frozenBindingEntryIds(args.db, args.sessionId);
-  const flagTargetCandidate = isPrefixBoundThinkingModel(args.provider, args.model) ? getThinkingBindingRecoveryTarget(args.db, args.sessionId) : null;
+  const flagTargetCandidate = !args.replayOnly && 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]))
+      if (!hasThinkingPart(args.messages[index]))
         continue;
       const entryId = args.entryIds[index];
-      if (entryId && hasThinkingPart(args.messages[index]))
-        entryIds.add(entryId);
+      if (!entryId)
+        throw new PiThinkingBindingRecoveryRefusal;
+      entryIds.add(entryId);
     }
     const newEntryIds = [...entryIds].filter((id) => !frozenEntryIds.has(id));
-    if (newEntryIds.length === 0 || addMergedReasoningStrippedIds(args.db, args.sessionId, [
+    if (newEntryIds.length === 0)
+      throw new PiThinkingBindingRecoveryRefusal;
+    if (addMergedReasoningStrippedIds(args.db, args.sessionId, [
       ...newEntryIds.map(thinkingBindingRecoveryFrozenId),
       ...args.endOfPassOrder ? [THINKING_BINDING_STRIP_ORDER_END_MARKER] : []
     ])) {
@@ -45759,7 +46095,8 @@ function applyPiThinkingBindingRecovery(args) {
         frozenEntryIds.add(id);
       applied = { flagTarget, entryIds: [...entryIds] };
       reportBindingRecovery(args.sessionId, args.report, `thinking-binding recovery consumed on context pass target=${flagTarget} entries=${applied.entryIds.length} [${applied.entryIds.join(",")}]`);
-    }
+    } else
+      throw new PiThinkingBindingRecoveryRefusal;
   }
   const restoringActiveTurn = latestThinkingRecoveryCoversActiveTurn({
     db: args.db,
@@ -45776,6 +46113,12 @@ function applyPiThinkingBindingRecovery(args) {
   }
   return applied;
 }
+function hasUnfrozenPiThinking(args) {
+  return isPrefixBoundThinkingModel(args.provider, args.model) && args.messages.some((message, index) => {
+    const entryId = args.entryIds[index];
+    return hasThinkingPart(message) && (!entryId || !args.frozen.has(entryId));
+  });
+}
 function applyPiProactiveThinkingStrip(args) {
   if (!args.cacheBustingPass)
     return null;
@@ -47764,6 +48107,15 @@ var afterFallbackAdoptionForTests;
 var pendingDecisionLogObserverForTests;
 var mutationGateObserverForTests;
 var lkgRecoveryLogObserverForTests;
+var pipelineResultObserverForTests;
+function observePipelineResultForTests(sessionId, result) {
+  pipelineResultObserverForTests?.(sessionId, {
+    prefixBustPermitted: result.prefixBustPermitted,
+    bustedThisPass: result.bustedThisPass,
+    identityRebuilt: result.identityRebuilt,
+    signedPrefixRewritten: result.signedPrefixRewritten
+  });
+}
 var variantChangeLogObserverForTests;
 var beforePipelineForTests;
 function logPiLkgRecovery(sessionId, message) {
@@ -47784,6 +48136,7 @@ function signalPiSystemHashChange(sessionId, hash) {
   signalPiSystemPromptRefresh(sessionId);
   if (!pendingMaterializationSessions.has(sessionId))
     signalPiPendingMaterialization(sessionId, "system_hash");
+  notePiSystemPromptHashChange(sessionId);
 }
 function deferPiDeliveredSystemRefresh(sessionId, ownsHistory) {
   deferDeliveredSystemRefresh({
@@ -47794,6 +48147,7 @@ function deferPiDeliveredSystemRefresh(sessionId, ownsHistory) {
   }, sessionId, ownsHistory);
 }
 var sessionsByProject = new Map;
+var lastServedSystemHashBySession = new Map;
 var lastSeenProjectIdentityBySession = new Map;
 var persistedProjectIdentityBySession = new Map;
 var sessionProjectBindingFailureLogAtBySession = new Map;
@@ -49430,7 +49784,7 @@ function registerPiContextHandler(pi, baseOptions) {
     const passGuard = { assert: assertCurrentPass, wait: guardAwait };
     guardSqliteTransformPass({
       assert: assertCurrentPass,
-      remainingMs: () => budget.remainingWork()
+      remainingMs: budget.remainingWork
     });
     budget.stage = "schema";
     const toolWireSchema = await guardAwait(loadPiToolWireSchema());
@@ -49438,6 +49792,15 @@ function registerPiContextHandler(pi, baseOptions) {
     let rawMessageCount = 0;
     let rawFallbackLimit;
     let sessionIdForError;
+    let systemHashForPass;
+    const recordServedSystemHash = () => {
+      if (budget.sideTurn || !sessionIdForError)
+        return;
+      if (systemHashForPass === undefined)
+        lastServedSystemHashBySession.delete(sessionIdForError);
+      else
+        lastServedSystemHashBySession.set(sessionIdForError, systemHashForPass);
+    };
     let lkgPassSnapshot;
     let lkgCompactionOff = baseOptions.compactionOff === true;
     let lkgOptions = baseOptions;
@@ -49459,6 +49822,11 @@ function registerPiContextHandler(pi, baseOptions) {
         return;
       }
       sessionIdForError = sessionId;
+      try {
+        const effectiveSystem = readHostSystemPrompt(ctx);
+        if (effectiveSystem !== undefined)
+          systemHashForPass = crypto3.createHash("sha256").update(effectiveSystem).digest("hex");
+      } catch {}
       let piUsage;
       try {
         piUsage = ctx.getContextUsage?.();
@@ -49964,6 +50332,9 @@ function registerPiContextHandler(pi, baseOptions) {
         messages: event.messages,
         lkgEntryIds: event.messages.map((message) => lkgInputIdByRef.get(message)),
         smartDrops: options.smartDrops === true,
+        effectiveSystemHash: systemHashForPass,
+        userFlushOrigin: hasPendingMaterializationOrigin(pendingMaterializationSessions, sessionId, "user_flush"),
+        reclaimUsableWindow: usageContextLimit ?? 0,
         protectedTools: options.protectedTools,
         protectedTags: options.protectedTags ?? 20,
         protectedTokens: options.protectedTokens,
@@ -50040,6 +50411,7 @@ function registerPiContextHandler(pi, baseOptions) {
         }
       };
       let result = await budget.waitMandatory(runPipeline(pipelineArgs));
+      observePipelineResultForTests(sessionId, result);
       logTransformTiming(sessionId, "runPipeline", tRunPipeline);
       if (result.identityRebuilt || result.lkgFrozenReleaseReason)
         schedulerDecision = "execute";
@@ -50049,7 +50421,7 @@ function registerPiContextHandler(pi, baseOptions) {
         assertCurrentPass();
         recordSuccessfulTaggedMessageIds(sessionId, taggedInputEntryIds ?? strictEntryIds, branchEntries);
       }
-      const piDecisionSnapshotNewestAssistant = result.bustedThisPass ? findNewestPiAssistantEntryId(branchEntries) : undefined;
+      const piDecisionSnapshotNewestAssistant = result.bustedThisPass || hasPendingPiSystemPromptHashChange(sessionId) ? findNewestPiAssistantEntryId(branchEntries) : undefined;
       const publishTransformDecision = !budget.sideTurn && piDecisionSnapshotNewestAssistant !== undefined ? () => {
         recordPendingPiTransformDecision(sessionId, {
           tsMs: Date.now(),
@@ -50075,7 +50447,7 @@ function registerPiContextHandler(pi, baseOptions) {
       if (historian && !options.compactionOff && budget.remainingWork() > 0) {
         guardSqliteTransformPass({
           assert: budget.assert,
-          remainingMs: () => budget.remainingWork()
+          remainingMs: budget.remainingWork
         });
         try {
           budget.assert();
@@ -50093,6 +50465,7 @@ function registerPiContextHandler(pi, baseOptions) {
             historian,
             isFirstContextPassForSession,
             activeTags: result.activeTags,
+            eligiblePendingDropTagIds: result.eligiblePendingDropTagIds,
             rawMessageProvider,
             taggerFloor,
             sessionMeta,
@@ -50150,7 +50523,7 @@ function registerPiContextHandler(pi, baseOptions) {
       if (options.autoSearch?.enabled && !options.compactionOff && result.prefixMutationAllowed && budget.remainingWork() > PI_CONTEXT_BUDGET.searchMs) {
         guardSqliteTransformPass({
           assert: budget.assert,
-          remainingMs: () => budget.remainingWork()
+          remainingMs: budget.remainingWork
         });
         try {
           outputMessages = await guardAwait(runAutoSearchHintForPi({
@@ -50209,14 +50582,15 @@ function registerPiContextHandler(pi, baseOptions) {
         hostEditBeforeNewestThinking = stickyBefore === null || [...stickyAfter].some((key) => !stickyBefore.has(key)) || JSON.stringify(getPersistedTodoSyntheticAnchor(options.db, sessionId)) !== todoAnchorBefore;
       } catch {}
       const outputEntryIds = resolvePiLkgOutputEntryIds(outputMessages, result.syntheticLeadingCount, (message) => result.lkgEntryIdByRef.get(message) ?? result.postCommitEntryIdByRef.get(message) ?? bindingEntryIdByRef.get(message)).map((entryId) => entryId ?? undefined);
-      const thinkingBindingRecoveryApplied = bindingStripOrder === "end" && !result.signedPrefixRewritten ? applyPiThinkingBindingRecovery({
+      const thinkingBindingRecoveryApplied = bindingStripOrder === "end" ? applyPiThinkingBindingRecovery({
         db: options.db,
         sessionId,
         messages: outputMessages,
         entryIds: outputEntryIds,
         provider: lkgProviderKey ?? undefined,
         model: ctx.model?.id,
-        endOfPassOrder: true
+        endOfPassOrder: true,
+        replayOnly: result.signedPrefixRewritten && result.prefixBustPermitted
       }) : startOfPassBindingRecovery;
       if (shouldRunPiProactiveThinkingStrip({
         compactionOff: options.compactionOff === true,
@@ -50231,7 +50605,7 @@ function registerPiContextHandler(pi, baseOptions) {
             entryIds: outputEntryIds,
             provider: lkgProviderKey ?? undefined,
             model: ctx.model?.id,
-            cacheBustingPass: !!recovery.rebuildReason || result.signedPrefixRewritten || result.prefixBustPermitted && !result.strictThinkingKept && (isCacheBusting || result.prefixRebuildAlreadyPriced || result.executedWorkThisPass && (result.prefixEditBesidesReasoningTrim || hostEditBeforeNewestThinking)),
+            cacheBustingPass: result.prefixBustPermitted && !result.strictThinkingKept && (result.signedPrefixRewritten || isCacheBusting || result.prefixRebuildAlreadyPriced || result.executedWorkThisPass && (result.prefixEditBesidesReasoningTrim || hostEditBeforeNewestThinking)),
             stripActiveTurn: result.signedPrefixRewritten,
             requirePersistence: !!recovery.rebuildReason,
             report: (line) => sessionLog(sessionId, line)
@@ -50280,6 +50654,7 @@ function registerPiContextHandler(pi, baseOptions) {
             protectedTools: options.protectedTools,
             pendingDropTagNumbers,
             stableId,
+            providerApi: ctx.model?.api,
             protectedToolTags: protectedToolTagNumbers(result.channelBaselineSnapshot.activeTags, options.protectedTools),
             syntheticLeadingCount: result.syntheticLeadingCount,
             cacheBusting: result.bustedThisPass,
@@ -50439,7 +50814,7 @@ function registerPiContextHandler(pi, baseOptions) {
             entryIds: retryIds.map((id) => id ?? undefined),
             provider: ctx.model?.provider,
             model: ctx.model?.id,
-            cacheBustingPass: true,
+            cacheBustingPass: result.prefixBustPermitted,
             stripActiveTurn: true
           });
           estimate = estimatePiOutgoingInputTokens(outputMessages, envelope, undefined, rawFallbackLimit);
@@ -50497,6 +50872,7 @@ function registerPiContextHandler(pi, baseOptions) {
                     startGuard: budget.assert,
                     isFirstContextPassForSession: false,
                     activeTags: result.activeTags,
+                    eligiblePendingDropTagIds: result.eligiblePendingDropTagIds,
                     rawMessageProvider,
                     ordinalAlignment: ordinalAlignment(),
                     taggerFloor,
@@ -50551,7 +50927,7 @@ function registerPiContextHandler(pi, baseOptions) {
                   entryIds: resolvePiLkgOutputEntryIds(outputMessages, result.syntheticLeadingCount, (message) => result.lkgEntryIdByRef.get(message) ?? result.postCommitEntryIdByRef.get(message)).map((id) => id ?? undefined),
                   provider: ctx.model?.provider,
                   model: ctx.model?.id,
-                  cacheBustingPass: result.bustedThisPass,
+                  cacheBustingPass: result.prefixBustPermitted,
                   stripActiveTurn: result.signedPrefixRewritten
                 });
                 estimate = estimatePiOutgoingInputTokens(outputMessages, envelope, undefined, outgoingFitLimit);
@@ -50574,7 +50950,7 @@ function registerPiContextHandler(pi, baseOptions) {
       budget.assertOutcome();
       guardSqliteTransformPass({
         assert: budget.assertOutcome,
-        remainingMs: () => Math.max(0, PI_CONTEXT_BUDGET.outcomeMs - budget.elapsed())
+        remainingMs: budget.remainingOutcome
       });
       if (!budget.sideTurn && !lkgCompactionOff && lkgPassSnapshot && (rawMessageCount > 0 || result.servedTagNumbers?.size)) {
         let hostEnvelopeSignature;
@@ -50586,7 +50962,7 @@ function registerPiContextHandler(pi, baseOptions) {
           readPiCommittedServedNumbers(options.db, sessionId);
           serializedOutput = lkgCoordinator.captureAppliedPass({
             publishServedNumbers: () => publishPiServedNumbers(options.db, sessionId, [
-              ...getPiServedTagNumbers(sessionId),
+              ...getPiServedTagNumbers(sessionId, undefined, options.db),
               ...result.servedTagNumbers ?? []
             ]),
             assertCurrentPass: budget.assertOutcome,
@@ -50614,7 +50990,7 @@ function registerPiContextHandler(pi, baseOptions) {
               options.db.transaction(() => {
                 budget.assertOutcome();
                 publishPiServedNumbers(options.db, sessionId, [
-                  ...getPiServedTagNumbers(sessionId),
+                  ...getPiServedTagNumbers(sessionId, undefined, options.db),
                   ...result.servedTagNumbers ?? []
                 ]);
               }).immediate();
@@ -50654,6 +51030,7 @@ function registerPiContextHandler(pi, baseOptions) {
       publishTransformDecision?.();
       if (!budget.sideTurn && result.strictThinkingKept && !result.signedPrefixRewritten && !result.materialized)
         recordPiHeldSystemHead(sessionId, (ownsHistory) => deferPiDeliveredSystemRefresh(sessionId, ownsHistory));
+      recordServedSystemHash();
       return { messages: outputMessages };
     } catch (err) {
       if (budget.isCancelled(err))
@@ -50663,7 +51040,7 @@ function registerPiContextHandler(pi, baseOptions) {
       if (err instanceof PiServedIdentityError) {
         if (sessionIdForError)
           clearPiLkgSessionState(sessionIdForError);
-        throw new PiStorageBusyError({ cause: err });
+        throw piFallbackRefusal("served-identity-unavailable", err);
       }
       if (err instanceof PiLkgAdmissionReplay && sessionIdForError) {
         budget.assertOutcome();
@@ -50676,6 +51053,7 @@ function registerPiContextHandler(pi, baseOptions) {
           });
         budget.assertOutcome();
         budget.recovery = err.recovery;
+        recordServedSystemHash();
         return { messages: err.messages };
       }
       if ((isFailClosedBlockingError(err) || err instanceof EmergencyFailClosedError) && !baseOptions.compactionOff)
@@ -50742,6 +51120,7 @@ function registerPiContextHandler(pi, baseOptions) {
               });
             budget.assertOutcome();
             budget.recovery = "fitting LKG replay";
+            recordServedSystemHash();
             return { messages: replay.messages };
           }
           logPiLkgRecovery(sessionIdForError, `${failureLabel} ${piStorageErrorReason(err)}: LKG unavailable (${replay.reason}); refusing unreduced ${rawMessageCount}-message input`);
@@ -50762,11 +51141,7 @@ function registerPiContextHandler(pi, baseOptions) {
       if (err instanceof PiDegradedPassError && err.site === "outgoing-over-window")
         throw contextRefusalError("The request exceeds the model's context window after reclaim, and no fitting saved request is available; this turn was not sent.");
       if (!lkgCompactionOff && sessionIdForError) {
-        throw new PiStorageBusyError({
-          cause: err instanceof PiDegradedPassError ? err : new PiDegradedPassError("context-handler-failed", {
-            cause: err
-          })
-        });
+        throw piFallbackRefusal("context-handler-failed", err);
       }
       log(`[magic-context][pi] context handler failed (continuing without mutation): ${message}`, stack);
       return;
@@ -50843,7 +51218,7 @@ function resolveHistoryBudgetTokensForPi(args) {
   }) / 100) * historyBudgetPercentage);
 }
 function startPiCompartmentLeaseRenewal(db, sessionId, holderId) {
-  return setInterval(() => {
+  return inRootAsyncContext(() => setInterval(() => {
     try {
       if (!renewCompartmentLease(db, sessionId, holderId)) {
         sessionLog(sessionId, "compartment lease renewal failed; publish will be skipped if holder is stale");
@@ -50851,7 +51226,7 @@ function startPiCompartmentLeaseRenewal(db, sessionId, holderId) {
     } catch (err) {
       sessionLog(sessionId, `compartment lease renewal threw; publish will be skipped if holder is stale (${err instanceof Error ? err.message : String(err)})`);
     }
-  }, COMPARTMENT_LEASE_RENEWAL_MS);
+  }, COMPARTMENT_LEASE_RENEWAL_MS));
 }
 function ensureRunnablePiBoundaryForTests(snapshot) {
   if (true) {
@@ -50940,15 +51315,21 @@ function maybeLaunchPiMaintenance(args) {
 }
 function resolvePiMaintenanceLauncher(db, projectIdentity, commandRuntime) {
   return getMaintenanceLauncher(db, projectIdentity, {
-    getConfig: () => ({
-      maintenance: {
-        enabled: maintenanceRuntime.current?.maintenance.enabled ?? commandRuntime?.()?.options?.enabled ?? false
-      }
-    }),
+    getConfig: () => {
+      const command = commandRuntime?.();
+      const slot = maintenanceRuntime.current;
+      const slotIsOurs = slot?.projectIdentity === projectIdentity;
+      const enabled = command?.options?.enabled ?? (slotIsOurs ? slot?.maintenance.enabled : undefined) ?? command?.maintenanceConfig?.enabled ?? false;
+      const model = command?.options?.model ?? (slotIsOurs ? slot?.maintenance.model : undefined) ?? command?.maintenanceConfig?.model;
+      return { maintenance: { enabled, model } };
+    },
     nowMs: Date.now,
     runFactory: (signals) => {
-      const options = maintenanceRuntime.current?.maintenance ?? commandRuntime?.()?.options;
-      const projectPath = maintenanceRuntime.current?.projectIdentity ?? commandRuntime?.()?.projectPath ?? projectIdentity;
+      const command = commandRuntime?.();
+      const slot = maintenanceRuntime.current;
+      const slotIsOurs = slot?.projectIdentity === projectIdentity;
+      const options = (slotIsOurs ? slot?.maintenance : undefined) ?? command?.options;
+      const projectPath = (slotIsOurs ? slot?.projectIdentity : undefined) ?? command?.projectPath ?? projectIdentity;
       if (!options) {
         return Promise.resolve({
           startedAtMs: Date.now(),
@@ -50957,6 +51338,14 @@ function resolvePiMaintenanceLauncher(db, projectIdentity, commandRuntime) {
           error: "maintenance runtime slot cleared"
         });
       }
+      if (!options.model || options.model.trim().length === 0) {
+        return Promise.resolve({
+          startedAtMs: Date.now(),
+          finishedAtMs: Date.now(),
+          ok: false,
+          error: MAINTENANCE_MODEL_UNCONFIGURED_MESSAGE
+        });
+      }
       return runPiMaintenanceFactory({
         db,
         projectPath,
@@ -50985,7 +51374,7 @@ function spawnPiHistorianRun(args) {
   const holderId = crypto3.randomUUID();
   const controller = new AbortController;
   historianAbortControllers.set(sessionId, controller);
-  const runPromise = withoutSqliteTransformPass(() => (async () => {
+  const runPromise = inRootAsyncContext(() => (async () => {
     await new Promise((resolve) => setTimeout(resolve, 0));
     if (controller.signal.aborted)
       return;
@@ -51323,7 +51712,7 @@ Historian previously failed ${failureCount} time(s), so Magic Context is retryin
       force: usage.percentage >= historianForceMaterializationPercentage && (usage.percentage >= 95 || getEmergencyInputSample(db, sessionId) === 0),
       explicitFlush: hasPendingMaterialization(sessionId),
       publishedHistory: args.publishedHistoryRide
-    }, true);
+    }, args.eligiblePendingDropTagIds, true);
     if (!trigger.shouldFire) {
       sessionLog(sessionId, `historian trigger eval: shouldFire=false (no trigger condition met)`);
       try {
@@ -51485,29 +51874,37 @@ async function runPipeline(args) {
   let activeThinkingTurn = hasActiveAnthropicThinkingTurn(args.messages, args.resolvedProviderID, args.resolvedModelID);
   let protectedSignedPrefix = activeThinkingTurn && args.reasoningClearing?.prefixBound === true;
   let rewritingSignedPrefix = false;
+  let isCacheBustingPass = args.recoveryRebuildReason === "lkg_recovery_input_rebuild" || (!!args.recoveryRebuildReason || args.forceSignedRebuildForFit === true) && hasUnfrozenPiThinking({
+    messages: args.messages,
+    entryIds: args.messages.map((message, index) => args.lkgEntryIds?.[index] ?? resolvePiRealStableId(message, index, args.entryIds, args.entryIdByRef ?? undefined)),
+    frozen: frozenBindingEntryIds(args.db, args.sessionId),
+    provider: args.resolvedProviderID,
+    model: args.resolvedModelID
+  });
   let workingForRewrite;
-  const stripForPrefixRewrite = () => {
+  const stripForPrefixRewrite = (permitRewrite = true) => {
+    isCacheBustingPass ||= permitRewrite;
     const messages = workingForRewrite ?? args.messages;
     const result = applyPiProactiveThinkingStrip({
       db: args.db,
       sessionId: args.sessionId,
       messages,
-      entryIds: messages.map((message, index) => resolvePiStableId(message, index, args.entryIds, args.entryIdByRef ?? undefined)),
+      entryIds: messages.map((message, index) => args.lkgEntryIds?.[index] ?? resolvePiRealStableId(message, index, args.entryIds, args.entryIdByRef ?? undefined)),
       provider: args.resolvedProviderID,
       model: args.resolvedModelID,
-      cacheBustingPass: true,
+      cacheBustingPass: isCacheBustingPass,
       stripActiveTurn: true,
       persistOnly: true,
       requirePersistence: !!args.recoveryRebuildReason
     });
-    if (activeThinkingTurn && !result)
+    if (activeThinkingTurn && isCacheBustingPass && !result)
       throw new Error("Cannot persist signed thinking omission before prefix rewrite");
     rewritingSignedPrefix = true;
     activeThinkingTurn = false;
     protectedSignedPrefix = false;
   };
   if (args.recoveryRebuildReason || args.forceSignedRebuildForFit && protectedSignedPrefix)
-    stripForPrefixRewrite();
+    stripForPrefixRewrite(isCacheBustingPass);
   const realStableId = (msg, index) => resolvePiRealStableId(msg, index, args.entryIds, args.entryIdByRef ?? undefined);
   const passFallbackIds = settlePiFallbackOccurrences(args.db, args.sessionId, piContentFallbackIds(args.messages, realStableId));
   const stableIdResolver = (msg, index) => realStableId(msg, index) ?? passFallbackIds[index] ?? resolvePiStableId(msg, index);
@@ -51521,6 +51918,7 @@ async function runPipeline(args) {
   let materializationSatisfiedThisPass = false;
   let pendingOpsAppliedThisPass = false;
   let pendingOpsDidMutate = false;
+  let eligiblePendingDropTagIds;
   let heuristicOrReasoningDidMutate = false;
   let prefixEditBesidesReasoningTrim = false;
   const recordFirstApplicationWireEdit = (beforeNewerThinking) => {
@@ -51658,8 +52056,9 @@ async function runPipeline(args) {
     allowFreshContentionFallback: args.forceMaterialization === true || emergencyDropEligible
   } : undefined;
   const foldDueDecision = piM0State ? mustMaterializePi(piM0State, args.db, injectionPassSnapshot?.compartments, injectionPassSnapshot) : { value: false, reason: null };
-  const firstRenderBust = piM0State !== undefined && !(injectionPassSnapshot?.cachedRow?.cached_m0_bytes && injectionPassSnapshot.cachedRow.cached_m1_bytes);
+  const firstRenderBust = piM0State !== undefined ? !(injectionPassSnapshot?.cachedRow?.cached_m0_bytes && injectionPassSnapshot.cachedRow.cached_m1_bytes) : args.stableIdSchemeCutover === true && args.readLastServedMessages?.() === null;
   let foldExecutedThisPass = false;
+  const effectiveSystemChangedThisPass = args.effectiveSystemHash !== undefined && lastServedSystemHashBySession.has(args.sessionId) && lastServedSystemHashBySession.get(args.sessionId) !== args.effectiveSystemHash;
   let foldBustsServedPrefixThisPass = false;
   let publishedM1RefreshedThisPass = false;
   let prefixPreflightContended = false;
@@ -51689,7 +52088,7 @@ async function runPipeline(args) {
       foldExecutedThisPass = foldExecutesThisPass(foldDueDecision.value || softRefreshOpportunity, preFoldInjectionResult.m0Materialized === true);
       if (foldExecutedThisPass) {
         const afterFold = getOrCreateSessionMeta(args.db, args.sessionId);
-        foldBustsServedPrefixThisPass = !protectedSignedPrefix && foldBustsServedPrefix(foldDueDecision.reason, {
+        foldBustsServedPrefixThisPass = !protectedSignedPrefix && foldBustsServedPrefix(foldDueDecision.reason === "system_hash" && !effectiveSystemChangedThisPass ? undefined : foldDueDecision.reason, {
           m0Bytes: persistedM0BeforeFold.cachedM0Bytes ?? null,
           m1Bytes: persistedM0BeforeFold.cachedM1Bytes ?? null
         }, {
@@ -51735,15 +52134,16 @@ async function runPipeline(args) {
   const routinePressureAlreadyApplied = !args.sessionMeta.isSubagent && executePressureEligible && routinePressureAppliedBySession.get(args.sessionId) === true;
   let hasPendingMaterializeSignal = !protectedSignedPrefix && hasPendingMaterialization(args.sessionId);
   const heldIdleExpiryRebuild = protectedSignedPrefix && piHardSignals?.cacheExpired === true;
+  const systemPrefixChangedThisPass = !prefixPreflightContended && effectiveSystemChangedThisPass;
   const rideSignals = {
     subagentExecute: args.sessionMeta.isSubagent && args.schedulerDecision === "execute",
-    hardFold: foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild,
+    hardFold: foldBustsServedPrefixThisPass || systemPrefixChangedThisPass || firstRenderBust || heldIdleExpiryRebuild || isCacheBustingPass,
     force: (args.forceMaterialization === true || emergencyDropEligible) && (args.contextUsage.percentage >= 95 || getEmergencyInputSample(args.db, args.sessionId) === 0),
-    explicitFlush: hasPendingMaterializeSignal || deferredMaterializeEligible && !prefixPreflightContended,
-    publishedHistory: !prefixPreflightContended && (args.isCacheBusting || publishedM1RefreshedThisPass || canConsumeDeferredLate && deferredHistoryWasPendingAtPassStart)
+    explicitFlush: !protectedSignedPrefix && (args.userFlushOrigin === true || hasPendingMaterializationOrigin(pendingMaterializationSessions, args.sessionId, "user_flush")),
+    publishedHistory: !prefixPreflightContended && publishedM1RefreshedThisPass
   };
   let prefixMutationAllowed = !protectedSignedPrefix || firstRenderBust || heldIdleExpiryRebuild || emergencyDropEligible;
-  let isCacheBustingPass = prefixMutationAllowed && hasReclaimRide(rideSignals);
+  isCacheBustingPass = prefixMutationAllowed && hasReclaimRide(rideSignals);
   let publishedWorkDrainAllowed = isCacheBustingPass;
   let unavoidableCarriedIdentityRebuild = false;
   if (protectedSignedPrefix && readPiIdentityRebuilds(args.db, args.sessionId).length > 0) {
@@ -51763,7 +52163,7 @@ async function runPipeline(args) {
     onRejectedProjectOverride: (warning) => sessionLog(args.sessionId, warning)
   });
   let protectionFloorResolution = resolveProtectionFloor();
-  let shouldRunHeuristics = args.heuristics !== undefined && isCacheBustingPass && (rideSignals.publishedHistory || args.forceMaterialization === true || hasPendingMaterializeSignal || deferredMaterializeEligible || foldBustsServedPrefixThisPass || firstRenderBust || rideSignals.subagentExecute || args.schedulerDecision === "execute" && !alreadyRanHeuristicsThisTurn);
+  let shouldRunHeuristics = args.heuristics !== undefined && isCacheBustingPass && (rideSignals.publishedHistory || systemPrefixChangedThisPass || rideSignals.explicitFlush || args.forceMaterialization === true || hasPendingMaterializeSignal || deferredMaterializeEligible || foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild || args.recoveryRebuildReason !== undefined && isCacheBustingPass || rideSignals.subagentExecute || args.schedulerDecision === "execute" && !alreadyRanHeuristicsThisTurn);
   const tTagSnapshotSync = performance.now();
   readPiFallbackTagRows(args.db, args.sessionId);
   logTransformTiming(args.sessionId, "tagSnapshotSync", tTagSnapshotSync);
@@ -51857,7 +52257,7 @@ async function runPipeline(args) {
     ...message,
     parts: message.parts
   }));
-  const recoveryNormalized = !!args.recoveryPrefix && (foldBustsServedPrefixThisPass || firstRenderBust || identityRebuild);
+  const recoveryNormalized = !!args.recoveryPrefix && (isCacheBustingPass || identityRebuild);
   const taggingView = args.recoveryPrefix && !recoveryNormalized ? mutationView.filter((message) => !args.recoveryPrefix?.untaggedInputIds.has(message.info.id ?? "")) : mutationView;
   let tagTextTokenCache = piTagTextTokenCacheBySession.get(args.sessionId);
   if (!tagTextTokenCache) {
@@ -51974,6 +52374,7 @@ async function runPipeline(args) {
   const deferredHistoryRefreshWasPending = deferredHistoryWasPendingAtPassStart;
   const shouldReadPendingOps = !args.compactionOff && (publishedWorkDrainAllowed || args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || foldExecutedThisPass || firstRenderBust);
   const pendingOps = shouldReadPendingOps ? getPendingOps(args.db, args.sessionId) : [];
+  const reclaimDistance = isCacheBustingPass ? toolReclaimDistanceEntries(mutationView, targets) : [];
   const protectionWindowForPass = getProtectionWindowForSession(args.db, args.sessionId, protectionFloorResolution.floor);
   const protectedTagNumbersForPass = usesTokenProtection ? protectionWindowForPass.protectedTagNumbers : newestActiveTagNumbersByCount(getActiveTagsBySession(args.db, args.sessionId), args.protectedTags);
   const protectedToolTags = protectedToolTagNumbers(getActiveTagsBySession(args.db, args.sessionId), args.protectedTools);
@@ -52003,7 +52404,9 @@ async function runPipeline(args) {
         ...args.contextUsage.percentage >= 95 ? [] : protectedTagNumbersForPass,
         ...protectedToolTags,
         ...identityAdoption.protectedTagNumbers
-      ]), pendingOperationTags, pendingOps, [], new Set, (reduction) => droppedTokenReductions.push(reduction));
+      ]), pendingOperationTags, pendingOps, [], new Set, (reduction) => droppedTokenReductions.push(reduction), undefined, (eligible) => {
+        eligiblePendingDropTagIds = eligible;
+      });
       if (pendingOpsDidMutate) {
         droppedCount += pendingOps.length;
       }
@@ -52097,11 +52500,11 @@ async function runPipeline(args) {
   if (shouldRunHeuristics && args.heuristics) {
     try {
       const tHeuristic = performance.now();
-      const independentMutationBeforeHeuristics = pendingOpsDidMutate || foldBustsServedPrefixThisPass || identityRebuild || firstRenderBust || heldIdleExpiryRebuild;
+      const independentMutationBeforeHeuristics = pendingOpsDidMutate || systemPrefixChangedThisPass || foldBustsServedPrefixThisPass || identityRebuild || firstRenderBust || heldIdleExpiryRebuild;
       if (args.forceMaterialization === true && independentMutationBeforeHeuristics && getEmergencyInputSample(args.db, args.sessionId) > 0) {
         clearEmergencyDropSample(args.db, args.sessionId);
       }
-      routineCleanupApplied = (emergencyDropEligible ? args.contextUsage.percentage >= 95 || getEmergencyInputSample(args.db, args.sessionId) === 0 : args.sessionMeta.isSubagent || !routinePressureAlreadyApplied) || hasPendingMaterializeSignal || deferredMaterialize || independentMutationBeforeHeuristics;
+      routineCleanupApplied = (emergencyDropEligible ? args.contextUsage.percentage >= 95 || getEmergencyInputSample(args.db, args.sessionId) === 0 : args.sessionMeta.isSubagent || !routinePressureAlreadyApplied) || hasPendingMaterializeSignal || rideSignals.explicitFlush || deferredMaterialize || independentMutationBeforeHeuristics;
       heuristicsResult = applyPiHeuristicCleanup(args.sessionId, args.db, newTargets, args.messages, {
         protectedTools: args.protectedTools,
         prepareToolRemovalMeasurements: transcript.prepareToolRemovalMeasurements,
@@ -52286,6 +52689,7 @@ async function runPipeline(args) {
         }
       }
       const editReclaim = buildEditSupersessionReclaim({
+        watermark: reclaimMeta.toolReclaimWatermark ?? 0,
         db: args.db,
         sessionId: args.sessionId,
         targets: newTargets,
@@ -52413,7 +52817,7 @@ async function runPipeline(args) {
     setEmergencyDropSample(args.db, args.sessionId, args.contextUsage.inputTokens);
   }
   if (toolReclaimApplicationOpportunity) {
-    advanceToolReclaimWatermarkToCurrentMax(args.db, args.sessionId);
+    advanceToolReclaimWatermarkByDistance(args.db, args.sessionId, reclaimDistance, args.reclaimUsableWindow ?? 0);
   }
   if (autoReclaimTargetCount > 0) {
     sessionLog(args.sessionId, `tool reclaim auto-drop: targets=${autoReclaimTargetCount} mutated=${autoReclaimDidMutate}`);
@@ -52489,9 +52893,9 @@ async function runPipeline(args) {
     db: args.db,
     sessionId: args.sessionId,
     messages: args.messages,
-    isCacheBusting: args.isCacheBusting && prefixMutationAllowed,
+    isCacheBusting: args.isCacheBusting && isCacheBustingPass,
     stableIdByRef: postCommitStableIdByRef,
-    forceDiscovery: args.stableIdSchemeCutover === true && prefixMutationAllowed,
+    forceDiscovery: args.stableIdSchemeCutover === true && isCacheBustingPass,
     canFirstApply: isCacheBustingPass,
     onLegacyReplay: (previous, next) => {
       const id = postCommitStableIdByRef.get(previous);
@@ -52507,8 +52911,14 @@ async function runPipeline(args) {
     onFirstApplication: (message, index) => recordFirstApplicationAt(message, index, 0, (item) => item && typeof item === "object" ? postCommitStableIdByRef.get(item) : undefined)
   });
   logTransformTiming(args.sessionId, "stripDroppedPlaceholders", tDroppedPlaceholders);
-  const deferredHistoryDrainEligible = historyWasConsumedThisPass && materializationSatisfiedThisPass && (deferredHistoryWasPendingAtPassStart || hasPendingMaterializeSignal) && !suppressDeferredHistoryDrain && !casLost;
-  let preserveDeferredMaterializationForMarkerDrain = false;
+  const deferredHistoryDrainEligible = (canConsumeDeferredLate && !firstRenderBust || historyWasConsumedThisPass && materializationSatisfiedThisPass && (deferredHistoryWasPendingAtPassStart || hasPendingMaterializeSignal)) && prefixMutationAllowed && injectionResult !== null && injectionResult.contentionExhausted !== true && !prefixPreflightContended && !suppressDeferredHistoryDrain && !casLost;
+  const consumePublicationRender = () => {
+    if (!deferredHistoryWasPendingAtPassStart || !historyWasConsumedThisPass)
+      return;
+    consumeDeferredHistoryRefresh(args.sessionId);
+    if (!publishedWorkDrainAllowed || pendingOpsAppliedThisPass && (!shouldRunHeuristics || heuristicsExecuted))
+      deferredMaterializationConsumedThisPass = consumeDeferredMaterialization(args.sessionId) || deferredMaterializationConsumedThisPass;
+  };
   let pendingForDrain = null;
   if (!deferredHistoryDrainEligible && (deferredHistoryWasPendingAtPassStart || hasPendingMaterializeSignal)) {
     try {
@@ -52530,14 +52940,12 @@ async function runPipeline(args) {
       if (!pending) {
         if (injectionResult?.contentionExhausted === true) {
           suppressDeferredHistoryDrain = true;
-          preserveDeferredMaterializationForMarkerDrain = true;
           sessionLog(args.sessionId, "Pi deferred-history drain skipped: m[0]/m[1] used a contention fallback; preserving deferred signals");
         } else {
-          consumeDeferredHistoryRefresh(args.sessionId);
+          consumePublicationRender();
         }
       } else if (!pendingPiMarkerCoveredByRenderedBoundary(pending, injectionResult)) {
         suppressDeferredHistoryDrain = true;
-        preserveDeferredMaterializationForMarkerDrain = true;
         const boundary = injectionResult?.renderedBoundary;
         const m1Coverage = injectionResult?.m1RenderedCoverage;
         logPiCompactionMarkerDrainGateOnce(args.sessionId, pending, "rendered-history-not-covering-marker", {
@@ -52547,8 +52955,8 @@ async function runPipeline(args) {
           m1CoverageEndMessageId: m1Coverage?.endMessageId
         });
       } else if (!args.appendCompaction || !args.readBranchEntries || !foldingSystemState) {
+        consumePublicationRender();
         suppressDeferredHistoryDrain = true;
-        preserveDeferredMaterializationForMarkerDrain = true;
         if (!args.appendCompaction)
           logPiCompactionMarkerDrainGateOnce(args.sessionId, pending, "append-compaction-unavailable");
         if (!args.readBranchEntries)
@@ -52556,6 +52964,7 @@ async function runPipeline(args) {
         if (!foldingSystemState)
           logPiCompactionMarkerDrainGateOnce(args.sessionId, pending, "folding-system-state-unavailable");
       } else {
+        consumePublicationRender();
         args.assertCurrentPass?.();
         const outcome = applyDeferredPiCompactionMarker({
           db: args.db,
@@ -52577,7 +52986,6 @@ async function runPipeline(args) {
             }
           } else {
             suppressDeferredHistoryDrain = true;
-            preserveDeferredMaterializationForMarkerDrain = true;
             if (adoption.kind === "divergent") {
               logPiCompactionMarkerDrainGateOnce(args.sessionId, pending, "equivalence-refused", {
                 firstKeptEntryId: outcome.firstKeptEntryId,
@@ -52595,7 +53003,6 @@ async function runPipeline(args) {
         }
         if (outcome.kind === "waiting-for-entry") {
           suppressDeferredHistoryDrain = true;
-          preserveDeferredMaterializationForMarkerDrain = true;
         } else if (outcome.kind === "retryable-failure") {} else if (markerEquivalent && clearPendingPiCompactionMarkerStateIf(args.db, args.sessionId, pending, outcome.kind === "stale-skip" ? outcome.reason : outcome.kind)) {
           consumeDeferredHistoryRefresh(args.sessionId);
         } else if (markerEquivalent) {
@@ -52609,9 +53016,8 @@ async function runPipeline(args) {
         logPiCompactionMarkerDrainGateOnce(args.sessionId, pendingForDrain, "drain-threw", getPiCompactionMarkerDrainErrorFields(err));
     }
   }
-  if (preserveDeferredMaterializationForMarkerDrain && deferredMaterializationConsumedThisPass) {
+  if ((prefixPreflightContended || injectionResult?.contentionExhausted === true) && deferredMaterializationConsumedThisPass)
     signalPiDeferredMaterialization(args.sessionId);
-  }
   logTransformTiming(args.sessionId, "batchFinalize:heuristics", performance.now());
   const outputMessages = transcript.getOutputMessages();
   try {
@@ -52717,7 +53123,7 @@ async function runPipeline(args) {
     prefixMutationAllowed,
     strictThinkingKept: protectedSignedPrefix,
     signedPrefixRewritten: rewritingSignedPrefix,
-    prefixRebuildAlreadyPriced: firstRenderBust || heldIdleExpiryRebuild,
+    prefixRebuildAlreadyPriced: firstRenderBust || heldIdleExpiryRebuild || !!args.recoveryRebuildReason && isCacheBustingPass,
     identityRebuilt: identityRebuild,
     servedTagNumbers,
     heuristicsExecuted,
@@ -52733,6 +53139,7 @@ async function runPipeline(args) {
     emergency,
     bustedThisPass,
     agentDropsAppliedThisPass: pendingOpsDidMutate,
+    eligiblePendingDropTagIds,
     prefixEditBesidesReasoningTrim: !!args.recoveryRebuildReason || prefixEditBesidesReasoningTrim || firstRenderBust || args.isCacheBusting || hasPendingMaterializeSignal || deferredMaterializationConsumedThisPass || foldBustsServedPrefixThisPass || publishedM1RefreshedThisPass || materialized || historyWasConsumedThisPass || pendingOpsDidMutate || autoReclaimDidMutateThisPass || emergency,
     targetCount: targets.size,
     reasoningWatermark: args.sessionMeta.clearedReasoningThroughTag ?? 0,
@@ -52916,6 +53323,7 @@ function clearPiCompactionOffInMemoryState(sessionId) {
   clearPiChannel1State(sessionId);
 }
 function clearContextHandlerSession(sessionId) {
+  lastServedSystemHashBySession.delete(sessionId);
   clearPiHistoryBoundaryRepairSession(sessionId);
   clearPiUpperReclaimSession(sessionId);
   invalidateTrueRawTokenCache({ sessionId, reason: "pi.branch.changed" });
@@ -53228,6 +53636,7 @@ function runManualMaintenanceCommand(args) {
   }
   const explanations = {
     "maintenance-disabled": "memory maintenance is disabled (maintenance.enabled: false)",
+    "maintenance-model-unconfigured": "memory maintenance has no primary model configured — set maintenance.model in the user-level mmc config (fallback_models alone does not enable maintenance; the chain never inherits the historian or session model)",
     "run-in-flight-local": "a maintenance run is already in flight; next_due_at is due now, so the launcher retries on the next pass",
     "empty-pool": "memory pool is empty (no active/permanent rows) — nothing to maintain"
   };
@@ -54097,7 +54506,7 @@ function formatThresholdPercent(value) {
 }
 
 // ../plugin/src/shared/status-view-check.ts
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isNumber(value) {
@@ -54173,25 +54582,25 @@ class OptionalFields {
   }
 }
 function isWindowGeometry(value) {
-  if (!isRecord5(value) || !isNumber(value.usableSoft) || !isRecord5(value.derivation))
+  if (!isRecord6(value) || !isNumber(value.usableSoft) || !isRecord6(value.derivation))
     return false;
   const derivation = value.derivation;
   return isNumber(derivation.window) && isNumber(derivation.reserve) && isString(derivation.reserveSource);
 }
 function isTailHygiene(value) {
-  return isRecord5(value) && isNumber(value.u) && isNumber(value.t) && isNumber(value.severity) && isBoolean(value.evaluable);
+  return isRecord6(value) && isNumber(value.u) && isNumber(value.t) && isNumber(value.severity) && isBoolean(value.evaluable);
 }
 function isCompactionMarker(value) {
-  return isRecord5(value) && (value.code === null || value.code === "MC-C11") && isNumber(value.attempts) && (value.lastError === null || isString(value.lastError));
+  return isRecord6(value) && (value.code === null || value.code === "MC-C11") && isNumber(value.attempts) && (value.lastError === null || isString(value.lastError));
 }
 function isConfigParseFailure(value) {
-  return isRecord5(value);
+  return isRecord6(value);
 }
 function isConfigReloadFailure(value) {
-  return isRecord5(value) && isString(value.path) && isString(value.message);
+  return isRecord6(value) && isString(value.path) && isString(value.message);
 }
 function isUnconfirmedMigrationHolders(value) {
-  return isRecord5(value) && Array.isArray(value.pids) && value.pids.every(isNumber) && isNumber(value.fromVersion) && isNumber(value.toVersion);
+  return isRecord6(value) && Array.isArray(value.pids) && value.pids.every(isNumber) && isNumber(value.fromVersion) && isNumber(value.toVersion);
 }
 function isNullableNumber2(value) {
   return value === null || isNumber(value);
@@ -54203,7 +54612,7 @@ function isCacheTtlSource(value) {
   return isString(value);
 }
 function checkStatusViewSource(candidate) {
-  if (!isRecord5(candidate))
+  if (!isRecord6(candidate))
     return { ok: false, fields: ["(the payload is not an object)"] };
   const missing = [];
   const numbers = {};
@@ -54823,14 +55232,14 @@ class StatusDialogComponent {
     this.detailRefresh = new PiStatusDetailRefresh(props.pi, props.ctx, props.deps, props.sessionId);
     this.detail = this.detailRefresh.refresh();
     openStatusDialogs.add(this);
-    this.refreshTimer = setInterval(() => {
+    this.refreshTimer = inRootAsyncContext(() => setInterval(() => {
       if (this.closed)
         return;
       try {
         this.detail = this.detailRefresh.refresh();
         this.props.tui.requestRender();
       } catch {}
-    }, REFRESH_INTERVAL_MS);
+    }, REFRESH_INTERVAL_MS));
   }
   handleInput(data) {
     if (this.closed)
@@ -55687,7 +56096,7 @@ No runnable wrapup boundary is available yet; wrapped up 0 messages into 0 compa
       }
       return true;
     };
-    const renewal = setInterval(() => {
+    const renewal = inRootAsyncContext(() => setInterval(() => {
       try {
         renewWrapupMarker({
           lastCompartmentEnd: getLastCompartmentEndMessage(deps.db, sessionId)
@@ -55695,7 +56104,7 @@ No runnable wrapup boundary is available yet; wrapped up 0 messages into 0 compa
       } catch (err) {
         console.warn(`[magic-context][pi] /mmc-wrapup marker renewal failed for ${sessionId}: ${err instanceof Error ? err.message : String(err)}`);
       }
-    }, 60000);
+    }, 60000));
     const stopRenewal = () => clearInterval(renewal);
     deps.shutdownSignal?.addEventListener("abort", stopRenewal, { once: true });
     try {
@@ -55770,13 +56179,13 @@ Chunk ${chunkIndex}: wrapping messages ${plan.snapshot.offset}-${plan.snapshot.e
           break;
         }
         const leaseHolder = leaseResult.holderId;
-        const leaseRenewal = setInterval(() => {
+        const leaseRenewal = inRootAsyncContext(() => setInterval(() => {
           try {
             renewCompartmentLease(deps.db, sessionId, leaseHolder);
           } catch (err) {
             console.warn(`[magic-context][pi] /mmc-wrapup compartment lease renewal failed for ${sessionId}: ${err instanceof Error ? err.message : String(err)}`);
           }
-        }, COMPARTMENT_LEASE_RENEWAL_MS);
+        }, COMPARTMENT_LEASE_RENEWAL_MS));
         const stopLeaseRenewal = () => clearInterval(leaseRenewal);
         deps.shutdownSignal?.addEventListener("abort", stopLeaseRenewal, {
           once: true
@@ -58299,8 +58708,8 @@ function resolveCtxExpandMode(args, domain) {
 }
 
 // ../plugin/src/tools/ctx-expand/render.ts
-import { createHash as createHash24 } from "node:crypto";
-function isRecord6(value) {
+import { createHash as createHash25 } from "node:crypto";
+function isRecord7(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function roleLabel(role) {
@@ -58312,7 +58721,7 @@ function roleLabel(role) {
 }
 function verboseRoleLabel(msg) {
   if (msg.role === "user" && msg.parts.length > 0 && msg.parts.every((part) => {
-    if (!isRecord6(part))
+    if (!isRecord7(part))
       return false;
     if (part.type === "tool_result")
       return true;
@@ -58340,15 +58749,15 @@ function keyArg(input) {
 function asToolPart(part) {
   const type = typeof part.type === "string" ? part.type : "";
   if (type === "tool") {
-    const state = isRecord6(part.state) ? part.state : null;
+    const state = isRecord7(part.state) ? part.state : null;
     const output = state && typeof state.output === "string" ? state.output : state && state.output != null ? JSON.stringify(state.output) : null;
-    const metadata = state && isRecord6(state.metadata) ? state.metadata : null;
+    const metadata = state && isRecord7(state.metadata) ? state.metadata : null;
     const title = state && typeof state.title === "string" && state.title || metadata && typeof metadata.title === "string" && metadata.title || null;
     return {
       name: typeof part.tool === "string" ? part.tool : "tool",
       callId: typeof part.callID === "string" ? part.callID : "",
       title,
-      input: state && isRecord6(state.input) ? state.input : null,
+      input: state && isRecord7(state.input) ? state.input : null,
       output
     };
   }
@@ -58357,7 +58766,7 @@ function asToolPart(part) {
       name: typeof part.name === "string" ? part.name : "tool",
       callId: typeof part.id === "string" ? part.id : "",
       title: null,
-      input: isRecord6(part.input) ? part.input : null,
+      input: isRecord7(part.input) ? part.input : null,
       output: null
     };
   }
@@ -58386,7 +58795,7 @@ function reasoningOf(part) {
   return null;
 }
 function renderPartPreview(part, expandTools) {
-  if (!isRecord6(part))
+  if (!isRecord7(part))
     return null;
   const expansion = expandToolPart(part, expandTools, true);
   if (expansion !== null)
@@ -58413,7 +58822,7 @@ function renderPartPreview(part, expandTools) {
   return `    • [${type}]`;
 }
 function renderPartFull(part) {
-  if (!isRecord6(part))
+  if (!isRecord7(part))
     return null;
   const text = textOf(part);
   if (text !== null) {
@@ -58500,11 +58909,11 @@ function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
     const message = readRawSessionMessageById2(sessionId, owner);
     if (!message)
       return `Tag ${number}'s original tool owner is no longer in stored history.`;
-    const parts = message?.parts.filter((part) => isRecord6(part) && asToolPart(part)?.callId === tag.messageId) ?? [];
-    if (!parts.some((part) => isRecord6(part) && asToolPart(part)?.output !== null)) {
+    const parts = message?.parts.filter((part) => isRecord7(part) && asToolPart(part)?.callId === tag.messageId) ?? [];
+    if (!parts.some((part) => isRecord7(part) && asToolPart(part)?.output !== null)) {
       visitRawSessionMessages2(sessionId, message.ordinal + 1, Number.MAX_SAFE_INTEGER, (candidate) => {
-        const matching = candidate.parts.filter((part) => isRecord6(part) && asToolPart(part)?.callId === tag.messageId);
-        if (matching.some((part) => isRecord6(part) && part.type === "tool_use"))
+        const matching = candidate.parts.filter((part) => isRecord7(part) && asToolPart(part)?.callId === tag.messageId);
+        if (matching.some((part) => isRecord7(part) && part.type === "tool_use"))
           return false;
         parts.push(...matching);
         return matching.length === 0;
@@ -58521,9 +58930,9 @@ function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
   if (!message)
     return `Tag ${number}'s original text is no longer in stored history.`;
   const index = scoped ? Number(scoped[2]) : 0;
-  const piText = message.parts.filter((part) => isRecord6(part) && part.type === "text");
+  const piText = message.parts.filter((part) => isRecord7(part) && part.type === "text");
   const part = message.parts[index];
-  const matching = derived ? piText.filter((part) => isRecord6(part) && typeof part.text === "string" && createHash24("sha256").update(part.text).digest("hex") === derived[3]) : [];
+  const matching = derived ? piText.filter((part) => isRecord7(part) && typeof part.text === "string" && createHash25("sha256").update(part.text).digest("hex") === derived[3]) : [];
   const selected = derived ? matching[Number(derived[4])] : textIndexDomain === "text" ? piText[index] : part;
   if (!selected)
     return `Tag ${number}'s original text part is no longer in stored history.`;
@@ -60932,7 +61341,11 @@ var __test = {
   },
   clearPiInProcessSubagentInitContext,
   claimPiStartupMaintenance,
-  clearPiStartupMaintenanceClaim
+  clearPiStartupMaintenanceClaim,
+  buildPiMaintenanceOptions,
+  resetLoggedPiMaintenanceModelMissing() {
+    loggedPiMaintenanceModelMissing = false;
+  }
 };
 function registerConfiguredTodoLifecycle(pi, options) {
   if (!options.configured)
@@ -61167,22 +61580,32 @@ function resolveAutoSearchFromConfig(config) {
     minPromptChars: auto?.min_prompt_chars ?? 20
   };
 }
+var loggedPiMaintenanceModelMissing = false;
 function buildPiMaintenanceOptions(config, historian) {
-  const maintenance = config.maintenance;
+  const maintenance = inheritMaintenanceModelConfig(config);
   if (!maintenance?.enabled)
     return;
-  if (!historian)
+  const chain = resolveMaintenanceModelChain(maintenance, "pi");
+  if (!chain) {
+    if (!loggedPiMaintenanceModelMissing) {
+      loggedPiMaintenanceModelMissing = true;
+      log(`${PREFIX4} memory maintenance off: neither maintenance.model nor historian.model is configured (set either in the user-level mmc config; the session model is never inherited)`);
+    }
+    return;
+  }
+  const primary = toModelEntry(chain.primary);
+  if (!primary)
     return;
   return {
     enabled: true,
-    runner: historian.runner,
-    model: historian.model,
-    fallbackModels: historian.fallbackModels,
-    thinkingLevel: historian.thinkingLevel,
-    timeoutMs: historian.timeoutMs,
-    temperature: historian.temperature,
-    maxOutputTokens: historian.maxOutputTokens,
-    language: historian.language,
+    runner: historian?.runner ?? new PiSubagentRunner,
+    model: primary.model,
+    fallbackModels: chain.fallbacks,
+    thinkingLevel: primary.qualifier,
+    timeoutMs: config.historian_timeout_ms,
+    temperature: config.historian?.temperature,
+    maxOutputTokens: config.historian?.maxTokens,
+    language: config.language,
     runConfig: {
       budgets: maintenance.budgets,
       cooldowns: maintenance.cooldowns,
@@ -61626,7 +62049,11 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
       return {
         projectPath: project.projectIdentity,
         directory: project.projectDir,
-        options: buildPiMaintenanceOptions(sampled, historian)
+        options: buildPiMaintenanceOptions(sampled, historian),
+        maintenanceConfig: {
+          enabled: sampled.maintenance?.enabled ?? false,
+          model: sampled.maintenance?.model
+        }
       };
     }
   });