@cortexkit/pi-magic-context 0.36.1 → 0.38.0

package/dist/index.js

@@ -1,9 +1,12 @@
 import {
   AGE_RECLAIM_MIN_TOKENS,
   BoundedSessionMap,
+  CHANNEL1_FLOOR_TOKENS,
+  CHANNEL1_SENTINEL,
   COMPACTION_ENABLED_PATH,
   COMPARTMENT_LEASE_RENEWAL_MS,
   COMPARTMENT_RENDER_EPOCH,
+  CTX_REDUCE_KEEP,
   DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE,
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DEFAULT_HISTORY_BUDGET_TOKENS,
@@ -37,6 +40,8 @@ import {
   backfillTagTokenCounts,
   beginBootQuietPeriod,
   buildCanonicalChunkTextFromFts,
+  buildChannel1Reminder,
+  buildChannel2Reminder,
   buildCompartmentSummaryFallbackText,
   buildPrimaryLanguageDirective,
   buildSyntheticTodoPart,
@@ -46,9 +51,11 @@ import {
   bumpProjectUserProfileVersion,
   byteSize,
   canonicalizeInMemoryChunkTextForEmbedding,
+  casChannel2NudgeClaim,
   casChannel2NudgeState,
   chunkCanonicalText,
   chunkEmbeddingWindowsAreCurrent,
+  claimChannel2NudgeState,
   cleanUserText,
   clearCachedM0M1,
   clearCompressionDepth,
@@ -82,14 +89,17 @@ import {
   createPrimer,
   createPromptSurfaceGuidanceEpochCache,
   createPromptSurfaceRuntime,
+  decideChannel1,
   decodeCachedM0UpgradeIdentity,
   deleteMemory,
   deleteUserMemoryCandidates,
   deliverNoteNudgeAtomic,
   deriveTagLoadFloor,
+  deriveWindowGeometry,
   describeError,
   dismissUserMemory,
   drainCommitBacklogForProject,
+  effectiveTailHygiene,
   embedBatchForProject,
   embedItemsForProject,
   embedPromotedFacts,
@@ -103,8 +113,10 @@ import {
   escalationBands,
   escapeXmlAttr,
   escapeXmlContent,
+  estimateImageTokensFromDataUrl,
   estimateTokens,
   estimateTrueRawMessageTokens,
+  evaluateChannel2,
   expandWorkspaceIdentitySetWithAliases,
   extractM0Block,
   extractTexts,
@@ -113,8 +125,8 @@ import {
   findAdoptableFallbackTags,
   findLastModelKeyFromBranch,
   findPiFallbackToolOwnerTags,
+  formatWindowDerivationLine,
   getActivePrimers,
-  getActiveTagTokenAggregate,
   getActiveTagsBySession,
   getActiveToolTagsForAgeReclaim,
   getActiveUserMemories,
@@ -122,6 +134,7 @@ import {
   getAllStatusTagTokenTotalsFlat,
   getAutoSearchHintDecisions,
   getCachedAbsoluteMessageCount,
+  getChannel2NudgeClaim,
   getChannel2NudgeState,
   getCompactionModeRecord,
   getCompartments,
@@ -205,6 +218,7 @@ import {
   getUnmappedMemoryIds,
   getUserMemoryCandidates,
   getVisibleMemoryIds,
+  getWindowOverlay,
   getWrapupInProgressState,
   hasMeaningfulUserText,
   hasMemoryClassifiedAtColumn,
@@ -242,6 +256,7 @@ import {
   markProtectedTailPolicyV3Seeded,
   memoryNeedsCue,
   migrateMagicContextConfigLocations,
+  modelRefLookupOrder,
   nextDueAtMs,
   nextOccurrence,
   normalizeText,
@@ -258,6 +273,7 @@ import {
   peelLeadingMcTagNotation,
   persistCachedM0,
   piModelRefToCanonical,
+  planEmergencyDrop,
   preloadTokenizer,
   prependTag,
   primeInMemoryTailRawMessageCache,
@@ -275,7 +291,6 @@ import {
   readGitChangedFilesSince,
   readGitFileChangeTimesSince,
   readGitHead,
-  readNewMemoriesForM1Union,
   readPiSessionMessages,
   readProjectDocsCanonical,
   readRawSessionMessages,
@@ -310,15 +325,16 @@ import {
   resetLastNudgeCycleIfTailShrank,
   resolveCompactionModeRecord,
   resolveGitTopLevel,
-  resolveLimit,
   resolveModelConfigOrDefault,
   resolveModelRefForOmp,
   resolveModelRefForPi,
   resolveMuralWire,
+  resolveOutputReserve,
   resolvePiStableId,
   resolveProjectIdentity,
   resolveProjectIdentityForSession,
   resolveProjectIdentityStrict,
+  resolveWindowOverlayFacts,
   resolveWorkspaceIdentitySet,
   resolveWorkspaceShareCategories,
   retryPendingSessionCleanups,
@@ -346,6 +362,7 @@ import {
   setStoragePrivatePermissionEnforcement,
   setTodoSnapshot,
   sourceNameForMemory,
+  stripChannel1ReminderSpans,
   stripMemoryMuralBlock,
   stripPersistedAssistantText,
   stripTagPrefix,
@@ -373,11 +390,12 @@ import {
   updateUserMemoryContent,
   updateWrapupInProgress,
   verificationFileExists,
+  wakePlaneStatus,
   withContentLanguageDirective,
   withMigrationLanguageDirective,
   withRawMessageProvider,
   withRawSessionMessageCache
-} from "./index-zxgbtsnj.js";
+} from "./index-6hs6yh6r.js";
 import {
   pushNotification
 } from "./index-hw34xmzk.js";
@@ -389,7 +407,7 @@ import {
   log,
   sessionLog,
   setHarness
-} from "./index-npnqc564.js";
+} from "./index-hk6sj7dn.js";
 import {
   __require,
   __toESM
@@ -573,24 +591,44 @@ function isMagicContextHiddenAgentName(agent) {
   return false;
 }
 var MAX_FORMATTED_BLOCKING_PROCESSES = 8;
+function normalizeFailClosedProcessKind(process2) {
+  switch (process2.kind) {
+    case "OpenCode server":
+    case "OpenCode instance (TUI/CLI)":
+    case "Pi":
+    case "process":
+      return process2.kind;
+  }
+  switch (process2.harness?.trim().toLowerCase()) {
+    case "opencode server":
+      return "OpenCode server";
+    case "opencode instance (tui/cli)":
+    case "opencode instance":
+      return "OpenCode instance (TUI/CLI)";
+    case "pi":
+    case "pi harness":
+    case "omp":
+      return "Pi";
+    default:
+      return "process";
+  }
+}
 function formatFailClosedBlockingProcesses(processes) {
   const uniqueProcesses = new Map;
   for (const process2 of processes) {
-    if (!process2.harness.trim() || !Number.isInteger(process2.pid) || process2.pid <= 0)
+    if (!Number.isInteger(process2.pid) || process2.pid <= 0)
       continue;
-    uniqueProcesses.set(`${process2.harness}\x00${process2.pid}`, {
-      harness: process2.harness.trim(),
-      pid: process2.pid
-    });
+    const kind = normalizeFailClosedProcessKind(process2);
+    uniqueProcesses.set(`${kind}\x00${process2.pid}`, { kind, pid: process2.pid });
   }
   const entries = [...uniqueProcesses.values()];
   const visible = entries.slice(0, MAX_FORMATTED_BLOCKING_PROCESSES);
-  const rendered = visible.map(({ harness, pid }) => `${harness} (PID ${pid})`);
+  const rendered = visible.map(({ kind, pid }) => `${kind} (PID ${pid})`);
   const omitted = entries.length - visible.length;
   if (omitted > 0)
     rendered.push(`${omitted} more blocking process(es)`);
   if (rendered.length === 0)
-    return "a live harness process";
+    return "a live process";
   if (rendered.length === 1)
     return rendered[0];
   const last = rendered.pop();
@@ -600,9 +638,9 @@ function formatFailClosedBlockingMessage(reason) {
   if (reason.kind === "migration_guard") {
     if (reason.unreadableFile) {
       const arm = reason.unreadableArm ?? "io";
-      const recovery = arm === "io" ? `If no OpenCode server is running, it is safe to delete ${reason.unreadableFile} and retry.` : `The file may be a recent incomplete write; retry after the file is older than the ten-minute grace window, or stop OpenCode before deleting it.`;
+      const recovery = arm === "io" ? `If none of these processes are running, it is safe to delete ${reason.unreadableFile} and retry.` : `The file may be a recent incomplete write; retry after the file is older than the ten-minute grace window, or stop the relevant process before deleting it.`;
       return [
-        `Magic Context cannot migrate the shared database because RPC discovery file ${reason.unreadableFile} is uncertain (${arm} arm), so the absence of a live OpenCode server cannot be proven.`,
+        `Magic Context cannot migrate the shared database because RPC discovery file ${reason.unreadableFile} is uncertain (${arm} arm), so the absence of a live process cannot be proven.`,
         recovery,
         `Recovery: ${FAIL_CLOSED_DOCTOR_COMMAND}`
       ].join(" ");
@@ -887,7 +925,7 @@ var LIMIT_EXTRACTION_PATTERNS = [
     pattern: /too large for model with (\d+) maximum context length/i,
     provenance: "combined"
   },
-  { pattern: /context size.*(\d+) tokens?/i, provenance: "combined" },
+  { pattern: /context size[^0-9]{0,40}(\d{4,})\s*tokens?/i, provenance: "combined" },
   { pattern: /exceeds? the context length of (\d+)/i, provenance: "combined" },
   {
     pattern: />\s*(\d+)\s*(?:tokens?\s*)?(?:maximum|max|limit)\b/i,
@@ -1510,11 +1548,13 @@ function isFinitePositive(v) {
 }
 function* modelKeyLookupOrder(modelKey) {
   const slash = modelKey.indexOf("/");
-  const provider = slash >= 0 ? modelKey.slice(0, slash) : "";
+  const providerRefs = slash >= 0 ? modelRefLookupOrder(modelKey) : [];
   let modelId = slash >= 0 ? modelKey.slice(slash + 1) : modelKey;
   while (modelId.length > 0) {
-    if (provider)
-      yield `${provider}/${modelId}`;
+    for (const providerRef of providerRefs) {
+      const providerSlash = providerRef.indexOf("/");
+      yield `${providerRef.slice(0, providerSlash)}/${modelId}`;
+    }
     yield modelId;
     const lastDash = modelId.lastIndexOf("-");
     if (lastDash <= 0)
@@ -3761,7 +3801,7 @@ async function sendIgnoredMessageNow(client, sessionId, text, params, forcePersi
     queueIgnoredNotification({ client, sessionId, text, params, forcePersist });
     return "queued";
   }
-  const { waitForSafeNotificationTarget } = await import("./safe-notification-target-0s6j4m9f.js");
+  const { waitForSafeNotificationTarget } = await import("./safe-notification-target-7n7s6xv7.js");
   if (await waitForSafeNotificationTarget(client, sessionId) === "skip") {
     sessionLog(sessionId, "notification skipped (session not titled yet)");
     return "skipped";
@@ -4521,6 +4561,34 @@ function assertManifestCoversExactly(ids, expectedIds, rootName) {
       throw new Error(`${rootName} manifest missing id ${id}`);
   }
 }
+var OPEN_TAG_RE = /<([A-Za-z][\w:-]*)\b/;
+function describeUnrecognizedManifestShape(text, expectedRoot, expectedEntry) {
+  const expected = `expected <${expectedRoot}> with <${expectedEntry}> entries`;
+  const trimmed = text.trim();
+  if (trimmed.startsWith("[") || trimmed.startsWith("{")) {
+    return `JSON ${trimmed.startsWith("[") ? "array" : "object"} unrecognized; ${expected}`;
+  }
+  const firstTag = OPEN_TAG_RE.exec(trimmed)?.[1];
+  if (firstTag && firstTag.toLowerCase() !== expectedRoot.toLowerCase()) {
+    return `root <${firstTag}> unrecognized; ${expected}`;
+  }
+  const escapedRoot = expectedRoot.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const bodyMatch = new RegExp(`<${escapedRoot}\\b[^>]*>([\\s\\S]*?)<\\/${escapedRoot}>`, "i").exec(text);
+  const body = (bodyMatch?.[1] ?? "").trim();
+  if (body.startsWith("[") || body.startsWith("{")) {
+    return `JSON ${body.startsWith("[") ? "array" : "object"} unrecognized; ${expected}`;
+  }
+  const innerTag = OPEN_TAG_RE.exec(body)?.[1];
+  if (innerTag && innerTag.toLowerCase() !== expectedEntry.toLowerCase()) {
+    return `root <${innerTag}> unrecognized; ${expected}`;
+  }
+  return `parsed zero entries; ${expected}`;
+}
+function assertParsedManifestNonEmpty(parsedCount, expectedCount, text, expectedRoot, expectedEntry) {
+  if (expectedCount > 0 && parsedCount === 0) {
+    throw new Error(describeUnrecognizedManifestShape(text, expectedRoot, expectedEntry));
+  }
+}
 
 // ../plugin/src/features/magic-context/dreamer/module-apply.ts
 class DreamerModuleBusyError extends Error {
@@ -5839,9 +5907,19 @@ ${renderAnchors(args.anchors ?? [])}### Memory pool to classify
 ${renderPool2(args.memories)}`;
 }
 var SCOPES = new Set(["project", "ecosystem", "universe"]);
+function classifyBody(text) {
+  try {
+    return extractCompleteManifestBody(text, "classify");
+  } catch (error) {
+    const described = describeUnrecognizedManifestShape(text, "classify", "memory");
+    if (!described.startsWith("parsed zero entries"))
+      throw new Error(described);
+    throw error;
+  }
+}
 function parseClassifyManifest(text) {
   const out = [];
-  const body = extractCompleteManifestBody(text, "classify");
+  const body = classifyBody(text);
   for (const m of body.matchAll(/<memory\b([^>]*)\/?>/g)) {
     const attrs = m[1];
     const idMatch = attrs.match(/\bid\s*=\s*"(\d+)"/);
@@ -5874,9 +5952,18 @@ function parseClassifyManifest(text) {
     }
     out.push(entry);
   }
+  if (out.length === 0 && body.trim().length > 0) {
+    throw new Error(describeUnrecognizedManifestShape(text, "classify", "memory"));
+  }
   assertNoDuplicateManifestIds(out.map((entry) => entry.id), "classify");
   return out;
 }
+function validateClassifyManifest(text, expectedIds) {
+  const parsed = parseClassifyManifest(text);
+  assertParsedManifestNonEmpty(parsed.length, expectedIds.size, text, "classify", "memory");
+  assertManifestCoversExactly(parsed.map((entry) => entry.id), expectedIds, "classify");
+  return parsed;
+}
 
 // ../plugin/src/features/magic-context/dreamer/classify.ts
 var MIN_POOL_TO_CLASSIFY = 10;
@@ -6075,7 +6162,7 @@ async function classifyOneChunk(args, chunk, anchors, sliceMs, signal) {
         if (!text)
           throw new Error("classify returned no output");
         try {
-          parseClassifyManifest(text);
+          validateClassifyManifest(text, new Set(chunk.map((candidate) => candidate.id)));
         } catch (error) {
           const providerFailure = providerOutputFailureFromInvalidManifest(messages, text);
           if (providerFailure)
@@ -6143,8 +6230,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal) {
   if (result.truncated === true) {
     throw new Error("classify returned length-capped output");
   }
-  const parsed = parseClassifyManifest(manifestText);
-  assertManifestCoversExactly(parsed.map((entry) => entry.id), new Set(chunk.map((candidate) => candidate.id)), "classify");
+  const parsed = validateClassifyManifest(manifestText, new Set(chunk.map((candidate) => candidate.id)));
   const rows = parsed.map((entry) => {
     const candidate = chunk.find((item) => item.id === entry.id);
     if (!candidate)
@@ -7272,6 +7358,9 @@ var DEFAULT_MAX_CHECKS = 10;
 var DEFAULT_SWEEP_BUDGET_MS = 15000;
 var MAX_FAILURES_BEFORE_REAUTHOR = 3;
 async function runDueCompiledSmartNoteChecks(args) {
+  if (await wakePlaneStatus() === "present") {
+    return { ran: 0, surfaced: 0, failed: 0, networkFailed: 0 };
+  }
   const startedAt = Date.now();
   const now = args.now ?? startedAt;
   const due = getDueCompiledSmartNoteChecks(args.db, args.projectIdentity, now, args.maxChecks ?? DEFAULT_MAX_CHECKS, args.retinaHandoff);
@@ -7401,6 +7490,11 @@ function createPromptAbortSignal(parent, timeoutMs, timeoutMessage) {
   };
 }
 async function evaluateSmartNotes(args) {
+  if (await wakePlaneStatus() === "present") {
+    const pending = getPendingSmartNotes(args.db, args.projectIdentity).length;
+    log("[dreamer] evaluate-smart-notes: skipped (wake plane active)");
+    return { surfaced: 0, pending, ran: false };
+  }
   const projectRoot = args.sessionDirectory ?? args.projectIdentity;
   const moduleBridge = getModuleNoteEvaluationBridge(args.projectIdentity);
   await moduleBridge?.sync();
@@ -7933,11 +8027,33 @@ For each memory below, find the repo file(s) it makes a claim about, or mark it
 ${list}
 </memories>`;
 }
+var MEMORY_ELEMENT_PATTERN = "<memory\\b([^>]*)(?:\\/>|>([\\s\\S]*?)<\\/memory>)";
+var NESTED_FILE_PATTERN = "<file\\b([^>]*)\\/?>";
+function extractNestedFilePaths(inner) {
+  const files = [];
+  for (const match of inner.matchAll(new RegExp(NESTED_FILE_PATTERN, "gi"))) {
+    const pathMatch = match[1].match(/\bpath\s*=\s*"([^"]+)"/);
+    if (pathMatch)
+      files.push(pathMatch[1].trim());
+  }
+  return files.filter(Boolean);
+}
+function mappingsBody(text) {
+  try {
+    return extractCompleteManifestBody(text, "mappings");
+  } catch (error) {
+    const described = describeUnrecognizedManifestShape(text, "mappings", "memory");
+    if (!described.startsWith("parsed zero entries"))
+      throw new Error(described);
+    throw error;
+  }
+}
 function parseMapMemoriesManifest(text) {
   const out = [];
-  const body = extractCompleteManifestBody(text, "mappings");
-  for (const m of body.matchAll(/<memory\b([^>]*)\/?>/g)) {
+  const body = mappingsBody(text);
+  for (const m of body.matchAll(new RegExp(MEMORY_ELEMENT_PATTERN, "gi"))) {
     const attrs = m[1];
+    const inner = m[2];
     const idMatch = attrs.match(/\bid\s*=\s*"(\d+)"/);
     if (!idMatch)
       throw new Error("mappings manifest entry missing numeric id");
@@ -7946,24 +8062,67 @@ function parseMapMemoriesManifest(text) {
       throw new Error("mappings manifest entry missing numeric id");
     const independent = /\bindependent\s*=\s*"(?:true|1)"/i.test(attrs);
     const filesMatch = attrs.match(/\bfiles\s*=\s*"([^"]*)"/);
-    const files = filesMatch ? filesMatch[1].split(",").map((f) => f.trim()).filter(Boolean) : [];
-    out.push({ id, files, independent: independent || files.length === 0 });
+    const attrFiles = filesMatch ? filesMatch[1].split(",").map((f) => f.trim()).filter(Boolean) : [];
+    const nestedFiles = inner ? extractNestedFilePaths(inner) : [];
+    const files = attrFiles.length > 0 ? attrFiles : nestedFiles;
+    if (!independent && files.length === 0) {
+      throw new Error(`mappings manifest entry ${id} has neither files nor independent="true"`);
+    }
+    out.push({
+      id,
+      files: independent && files.length === 0 ? [] : files,
+      independent: independent && files.length === 0
+    });
+  }
+  if (out.length === 0 && body.trim().length > 0) {
+    throw new Error(describeUnrecognizedManifestShape(text, "mappings", "memory"));
   }
   assertNoDuplicateManifestIds(out.map((entry) => entry.id), "mappings");
   return out;
 }
+function validateMapMemoriesManifest(text, expectedIds) {
+  const parsed = parseMapMemoriesManifest(text);
+  assertParsedManifestNonEmpty(parsed.length, expectedIds.size, text, "mappings", "memory");
+  assertManifestCoversExactly(parsed.map((entry) => entry.id), expectedIds, "mappings");
+  return parsed;
+}
 
 // ../plugin/src/features/magic-context/dreamer/map-memories.ts
 var MAP_BATCH_SIZE = 80;
-function loadUnmappedInputs(db, projectIdentity, repoDir) {
+var MAX_INDEPENDENT_REQUEUE_PER_RUN = MAP_BATCH_SIZE;
+function shouldRequeueIndependentMapping(state2, content, repoDir) {
+  if (!state2.hasSentinel || state2.files.length > 0)
+    return false;
+  return extractMemoryCandidatePaths(content, repoDir).length > 0;
+}
+function toMapInput(memory, repoDir) {
+  return {
+    id: memory.id,
+    category: memory.category,
+    content: memory.content,
+    candidates: extractMemoryCandidatePaths(memory.content, repoDir)
+  };
+}
+function selectMapMemoryInputs(db, projectIdentity, repoDir) {
   const active = getMemoriesByProject(db, projectIdentity);
-  const unmapped = new Set(getUnmappedMemoryIds(db, active.map((m) => m.id)));
-  return active.filter((m) => unmapped.has(m.id)).map((m) => ({
-    id: m.id,
-    category: m.category,
-    content: m.content,
-    candidates: extractMemoryCandidatePaths(m.content, repoDir)
-  }));
+  const activeIds = active.map((m) => m.id);
+  const unmapped = new Set(getUnmappedMemoryIds(db, activeIds));
+  const verifications = getMemoryVerifications(db, activeIds);
+  const unmappedInputs = active.filter((m) => unmapped.has(m.id)).map((m) => toMapInput(m, repoDir));
+  const requeue = [];
+  for (const memory of active) {
+    if (unmapped.has(memory.id))
+      continue;
+    const state2 = verifications.get(memory.id);
+    if (!state2)
+      continue;
+    if (!shouldRequeueIndependentMapping(state2, memory.content, repoDir))
+      continue;
+    requeue.push(toMapInput(memory, repoDir));
+    if (requeue.length >= MAX_INDEPENDENT_REQUEUE_PER_RUN)
+      break;
+  }
+  return [...unmappedInputs, ...requeue];
 }
 async function mapMemories(args) {
   const result = {
@@ -7973,7 +8132,7 @@ async function mapMemories(args) {
     remaining: 0,
     complete: true
   };
-  const inputs = loadUnmappedInputs(args.db, args.projectIdentity, args.sessionDirectory);
+  const inputs = selectMapMemoryInputs(args.db, args.projectIdentity, args.sessionDirectory);
   if (inputs.length === 0)
     return result;
   const batches = [];
@@ -8052,7 +8211,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
         const text = extractLatestAssistantText(messages);
         if (!text)
           throw new Error("map-memories returned no output");
-        parseMapMemoriesManifest(text);
+        validateMapMemoriesManifest(text, new Set(batch.map((memory) => memory.id)));
         return text;
       }
     });
@@ -8086,10 +8245,13 @@ async function applyBatchMappings(args, batch, manifestText) {
     return { mapped: 0, independent: 0 };
   const planned = [];
   for (const p of parsed) {
-    if (p.independent || p.files.length === 0) {
+    if (p.independent) {
       planned.push({ id: p.id, files: [], independent: true });
       continue;
     }
+    if (p.files.length === 0) {
+      throw new Error(`mapping entry ${p.id} has no files and no independent sentinel`);
+    }
     const normalized = await normalizeVerificationFiles({
       cwd: args.sessionDirectory,
       files: p.files
@@ -9350,9 +9512,22 @@ function attrOf(s, name) {
 function filesOf(s) {
   return (attrOf(s, "files") ?? "").split(",").map((f) => f.trim()).filter(Boolean);
 }
+function verifyIds(parsed) {
+  return [...parsed.verified, ...parsed.updated, ...parsed.archived].map((entry) => entry.id);
+}
+function verifyBody(text) {
+  try {
+    return extractCompleteManifestBody(text, "verify");
+  } catch (error) {
+    const described = describeUnrecognizedManifestShape(text, "verify", "verified");
+    if (!described.startsWith("parsed zero entries"))
+      throw new Error(described);
+    throw error;
+  }
+}
 function parseVerifyManifest(text) {
   const out = { verified: [], updated: [], archived: [] };
-  const body = extractCompleteManifestBody(text, "verify");
+  const body = verifyBody(text);
   for (const m of body.matchAll(/<verified\b([^>]*)\/?>/g)) {
     const id = Number.parseInt(attrOf(m[1], "id") ?? "", 10);
     if (!Number.isInteger(id))
@@ -9371,9 +9546,19 @@ function parseVerifyManifest(text) {
       throw new Error("verify manifest entry missing numeric id");
     out.archived.push({ id, reason: attrOf(m[1], "reason") ?? "" });
   }
-  assertNoDuplicateManifestIds([...out.verified, ...out.updated, ...out.archived].map((entry) => entry.id), "verify");
+  if (verifyIds(out).length === 0 && body.trim().length > 0) {
+    throw new Error(describeUnrecognizedManifestShape(text, "verify", "verified"));
+  }
+  assertNoDuplicateManifestIds(verifyIds(out), "verify");
   return out;
 }
+function validateVerifyManifest(text, expectedIds) {
+  const parsed = parseVerifyManifest(text);
+  const ids = verifyIds(parsed);
+  assertParsedManifestNonEmpty(ids.length, expectedIds.size, text, "verify", "verified");
+  assertManifestCoversExactly(ids, expectedIds, "verify");
+  return parsed;
+}
 
 // ../plugin/src/features/magic-context/dreamer/verify.ts
 var VERIFY_BATCH_SIZE = 50;
@@ -9525,7 +9710,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         if (!text)
           throw new Error("verify returned no output");
         try {
-          parseVerifyManifest(text);
+          validateVerifyManifest(text, new Set(batch.map((memory) => memory.id)));
         } catch (error) {
           const providerFailure = providerOutputFailureFromInvalidManifest(messages, text);
           if (providerFailure)
@@ -9745,6 +9930,18 @@ function loadActiveMemoryPromptMemories(db, projectIdentity) {
   const verificationById = getMemoryVerifications(db, memories.map((memory) => memory.id));
   return memories.map((memory) => toCuratePromptMemory(memory, verificationById));
 }
+var TEXTUAL_CURATE_TOOL_CALL_PATTERNS = [
+  /\[\s*historical tool call\s*\][\s\S]*?(?:^|\n)\s*name\s*:\s*ctx_memory\b[\s\S]*?(?:^|\n)\s*arguments\s*:/im,
+  /(?:^|\n)\s*name\s*:\s*ctx_memory\b[\s\S]*?(?:^|\n)\s*arguments\s*:/im,
+  /(?:^|\n)\s*(?:```[^\n]*\n\s*)?ctx_memory\s*\(\s*action\s*=/im,
+  /["']name["']\s*:\s*["']ctx_memory["'][\s\S]*?["']arguments["']\s*:/i
+];
+function validateCurateAssistantText(text) {
+  if (TEXTUAL_CURATE_TOOL_CALL_PATTERNS.some((pattern) => pattern.test(text))) {
+    throw new Error("Curate returned an unresolved textual ctx_memory tool call.");
+  }
+  return text;
+}
 function createDreamTaskExecutor(deps) {
   let parentSessionIdPromise;
   const resolveParentSessionId = () => {
@@ -9815,7 +10012,8 @@ function createDreamTaskExecutor(deps) {
               name: config.task,
               durationMs: Date.now() - startedAt,
               resultChars: 0,
-              ...error ? { error } : {},
+              ...status === "failed" && error ? { error } : {},
+              ...extra?.progress ? { progress: extra.progress } : {},
               backlog: (() => {
                 const end = extra?.backlogAfter ?? getDreamTaskBacklog(db, projectIdentity, config.task);
                 const processed = processedDreamTaskItems(backlogAtStart.pending, end.pending);
@@ -9958,11 +10156,12 @@ function createDreamTaskExecutor(deps) {
         const backlogAfter = config.task === "verify-broad" ? { pending: result.remaining, total: backlogAtStart.total } : undefined;
         if (!result.complete) {
           if (broadProgress && processed > 0) {
-            recordRun("completed", broadProgress, {
+            recordRun("completed", null, {
+              progress: broadProgress,
               memoryChanges: computeMemoryDelta(memoryBefore),
               backlogAfter
             });
-            return { status: "completed", error: broadProgress };
+            return { status: "completed" };
           }
           const error = incompleteMessage(result.remaining);
           recordRun("failed", error, {
@@ -9971,11 +10170,12 @@ function createDreamTaskExecutor(deps) {
           });
           return { status: "failed", transient: true, error };
         }
-        recordRun("completed", broadProgress, {
+        recordRun("completed", null, {
+          progress: broadProgress,
           memoryChanges: computeMemoryDelta(memoryBefore),
           backlogAfter
         });
-        return broadProgress ? { status: "completed", error: broadProgress } : { status: "completed" };
+        return { status: "completed" };
       }
       if (config.task === "classify-memories") {
         let moduleArgs;
@@ -10442,7 +10642,7 @@ async function runAgenticTask(config, ctx, helpers) {
         const text = extractLatestAssistantText(messages);
         if (!text)
           throw new Error("Dreamer returned no assistant output.");
-        return text;
+        return task === "curate" ? validateCurateAssistantText(text) : text;
       }
     });
     if (leaseLost)
@@ -13261,6 +13461,21 @@ function replayCavemanCompression(sessionId, db, targets, tags) {
   return replayed;
 }
 
+// ../plugin/src/hooks/magic-context/channel2-cycle.ts
+function rearmChannel2AfterCoverageAdvancingHardFold(input) {
+  if (input.compactionOff || !input.foldExecuted || input.previousCoverage === null || input.currentCoverage === null || input.currentCoverage <= input.previousCoverage) {
+    return false;
+  }
+  return casChannel2NudgeState(input.db, input.sessionId, "delivered", "");
+}
+function rearmChannel2AfterMeasuredCollapse(input) {
+  if (!input.baseline.evaluable || input.baseline.generationInvalidated)
+    return false;
+  if (effectiveTailHygiene(input.baseline).u >= CHANNEL1_FLOOR_TOKENS)
+    return false;
+  return casChannel2NudgeState(input.db, input.sessionId, "delivered", "");
+}
+
 // ../plugin/src/hooks/magic-context/protected-tail-boundary.ts
 var ALPHA = 0.3;
 var FLOOR_RATIO = 0.08;
@@ -14146,132 +14361,13 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
   };
 }
 
-// ../plugin/src/hooks/magic-context/ctx-reduce-nudge.ts
-var CHANNEL1_SENTINEL = "<system-reminder>";
-var TOKENS_PER_BYTE = 0.25;
-var CHANNEL1_FLOOR_TOKENS = 1e4;
-var CHANNEL1_REFIRE_FLOOR_TOKENS = 1e4;
-function channel1RefireTokens(workingWindowTokens) {
-  const scaled = Math.round(0.05 * Math.max(0, workingWindowTokens));
-  return Math.max(CHANNEL1_REFIRE_FLOOR_TOKENS, scaled);
-}
-var S_GENTLE = 0.2;
-var S_FIRM = 0.4;
-var S_URGENT = 0.65;
-var CHANNEL1_PRESSURE_FLOOR = 0.8;
-var LEVEL_RANK = { gentle: 1, firm: 2, urgent: 3 };
-var DROP_SENTINELS = ["[dropped", "[truncated"];
-function isDroppedToolOutput(output) {
-  const head = output.slice(0, 16);
-  return DROP_SENTINELS.some((s) => head.startsWith(s));
-}
-function toolOutputTokens(output) {
-  return Math.round(byteSize(output) * TOKENS_PER_BYTE);
-}
-function decideChannel1(input) {
-  const { undroppedTokens, workingWindowTokens, hasRecentReduce } = input;
-  const pressure = Math.min(1, Math.max(0, input.pressure));
-  const resetCycle = hasRecentReduce || undroppedTokens < input.lastNudgeUndropped;
-  const lastNudge = resetCycle ? 0 : input.lastNudgeUndropped;
-  const lastLevel = resetCycle ? "" : input.lastNudgeLevel;
-  const quiet = () => ({
-    fire: false,
-    level: "gentle",
-    undroppedTokens,
-    nextLastNudge: lastNudge,
-    nextLastNudgeLevel: lastLevel
-  });
-  if (hasRecentReduce)
-    return quiet();
-  if (undroppedTokens < CHANNEL1_FLOOR_TOKENS)
-    return quiet();
-  if (pressure < CHANNEL1_PRESSURE_FLOOR)
-    return quiet();
-  const denom = Math.max(input.estimatedInputTokens, 1);
-  const severity = Math.min(1, undroppedTokens / denom);
-  if (severity < S_GENTLE)
-    return quiet();
-  let level;
-  if (severity >= S_URGENT)
-    level = "urgent";
-  else if (severity >= S_FIRM)
-    level = "firm";
-  else
-    level = "gentle";
-  if (lastLevel === "") {
-    if (undroppedTokens < lastNudge + channel1RefireTokens(workingWindowTokens)) {
-      return quiet();
-    }
-  } else if (LEVEL_RANK[level] <= LEVEL_RANK[lastLevel]) {
-    return quiet();
-  }
-  return {
-    fire: true,
-    level,
-    undroppedTokens,
-    nextLastNudge: undroppedTokens,
-    nextLastNudgeLevel: level
-  };
-}
-function computePressure(input) {
-  const { lastInputTokens, turnToolTokens, contextLimit, executeThresholdPercentage } = input;
-  if (contextLimit <= 0 || executeThresholdPercentage <= 0)
-    return 0;
-  const estimatedInput = lastInputTokens + turnToolTokens;
-  const usagePercentage = estimatedInput / contextLimit * 100;
-  return usagePercentage / executeThresholdPercentage;
-}
-function approxThousands(tokens) {
-  return `${Math.round(tokens / 1000)}k`;
-}
-function formatOldestReclaimableHint(hint) {
-  if (!hint || hint.length === 0)
-    return "";
-  const rendered = hint.slice(0, 4).map((tag) => `§${tag.tagNumber}§ ${tag.toolName ?? "tool"}`).join(" · ");
-  return rendered.length > 0 ? `
-oldest reclaimable: ${rendered}.` : "";
-}
-var CHANNEL2_USABLE_FRACTION = 1 / 3;
-var CHANNEL2_MIN_RECLAIMABLE = 1e4;
-function shouldTriggerChannel2(input) {
-  if (input.reclaimableTokens < CHANNEL2_MIN_RECLAIMABLE)
-    return false;
-  if (input.usableTokens <= 0)
-    return true;
-  return input.reclaimableTokens >= input.usableTokens * CHANNEL2_USABLE_FRACTION;
-}
-function buildChannel2Reminder(undroppedTokens, hint) {
-  const amount = approxThousands(undroppedTokens);
-  const hintText = formatOldestReclaimableHint(hint);
-  return `<system-reminder>
-` + `Routine context housekeeping is near: a large span of this session will be comparted soon, ` + `and ~${amount} tokens of tool output remain unreduced. Drop spent outputs with ctx_reduce ` + `first so the archived span is the part that matters.${hintText}
-` + `</system-reminder>`;
-}
-function buildChannel1Reminder(level, undroppedTokens, hint) {
-  const amount = approxThousands(undroppedTokens);
-  const hintText = formatOldestReclaimableHint(hint);
-  let body;
-  switch (level) {
-    case "gentle":
-      body = `You have ~${amount} tokens of tool output you have not reduced. ` + `When you are done with earlier outputs, dropping them with ctx_reduce keeps context lean.`;
-      break;
-    case "firm":
-      body = `~${amount} tokens of unreduced tool output has built up. ` + `At your next natural stopping point, consider dropping what you have already processed with ctx_reduce.`;
-      break;
-    case "urgent":
-      body = `~${amount} tokens of unreduced tool output remain, and a large span of this session will be comparted before long. ` + `Consider dropping spent outputs with ctx_reduce so the archived span is the part that matters.`;
-      break;
-  }
-  return `
-
-<system-reminder>
-${body}${hintText}
-</system-reminder>`;
+// ../plugin/src/hooks/magic-context/fold-execution-gate.ts
+function foldExecutesThisPass(foldDue, materialized) {
+  return foldDue && materialized;
 }
 
 // ../plugin/src/hooks/magic-context/supersession-reclaim.ts
 var TODOWRITE_KEEP = 1;
-var CTX_REDUCE_KEEP = 5;
 var ZERO_VALUE_META_TOOLS = new Set(["bash_status", "bash_kill"]);
 var CTX_NOTE_ZERO_VALUE_ACTIONS = new Set(["read", "dismiss"]);
 function buildSupersessionReclaimOps(input) {
@@ -14399,158 +14495,6 @@ function advanceToolReclaimWatermarkToCurrentMax(db, sessionId) {
 
 // ../plugin/src/shared/tag-transcript.ts
 import { createHash as createHash9 } from "node:crypto";
-
-// ../plugin/src/hooks/magic-context/image-token-estimate.ts
-var IMAGE_TOKEN_DIVISOR = 750;
-var IMAGE_FALLBACK_TOKENS = 1200;
-var IMAGE_TOKEN_CAP = 4500;
-function estimateImageTokensFromDataUrl(url) {
-  const comma = url.indexOf(",");
-  if (comma < 0)
-    return IMAGE_FALLBACK_TOKENS;
-  const header = url.slice(0, comma);
-  const payload = url.slice(comma + 1);
-  const sliceLen = Math.min(512, payload.length);
-  const preview = payload.slice(0, sliceLen);
-  let bytes;
-  try {
-    bytes = base64Decode(preview);
-  } catch {
-    return IMAGE_FALLBACK_TOKENS;
-  }
-  if (header.includes("image/png")) {
-    const dims = parsePngDimensions(bytes);
-    if (dims)
-      return clampImageTokens(Math.ceil(dims.w * dims.h / IMAGE_TOKEN_DIVISOR));
-  } else if (header.includes("image/jpeg") || header.includes("image/jpg")) {
-    const dims = parseJpegDimensions(bytes);
-    if (dims)
-      return clampImageTokens(Math.ceil(dims.w * dims.h / IMAGE_TOKEN_DIVISOR));
-  } else if (header.includes("image/webp")) {
-    const dims = parseWebpDimensions(bytes);
-    if (dims)
-      return clampImageTokens(Math.ceil(dims.w * dims.h / IMAGE_TOKEN_DIVISOR));
-  } else if (header.includes("image/gif")) {
-    const dims = parseGifDimensions(bytes);
-    if (dims)
-      return clampImageTokens(Math.ceil(dims.w * dims.h / IMAGE_TOKEN_DIVISOR));
-  }
-  return IMAGE_FALLBACK_TOKENS;
-}
-function clampImageTokens(n) {
-  if (n < 1)
-    return 1;
-  if (n > IMAGE_TOKEN_CAP)
-    return IMAGE_TOKEN_CAP;
-  return n;
-}
-function base64Decode(b64) {
-  const pad = b64.length % 4;
-  const padded = pad === 0 ? b64 : b64 + "=".repeat(4 - pad);
-  const binary = atob(padded);
-  const out = new Uint8Array(binary.length);
-  for (let i = 0;i < binary.length; i++)
-    out[i] = binary.charCodeAt(i);
-  return out;
-}
-function parsePngDimensions(b) {
-  if (b.length < 24)
-    return null;
-  if (b[0] !== 137 || b[1] !== 80 || b[2] !== 78 || b[3] !== 71 || b[4] !== 13 || b[5] !== 10 || b[6] !== 26 || b[7] !== 10)
-    return null;
-  const w = readUint32BE(b, 16);
-  const h = readUint32BE(b, 20);
-  if (!w || !h)
-    return null;
-  return { w, h };
-}
-function parseJpegDimensions(b) {
-  if (b.length < 4 || b[0] !== 255 || b[1] !== 216)
-    return null;
-  let i = 2;
-  while (i < b.length - 8) {
-    if (b[i] !== 255) {
-      i++;
-      continue;
-    }
-    const marker = b[i + 1];
-    if (marker === undefined)
-      break;
-    if (isSofMarker(marker)) {
-      const h = b[i + 5] << 8 | b[i + 6];
-      const w = b[i + 7] << 8 | b[i + 8];
-      if (w && h)
-        return { w, h };
-      return null;
-    }
-    if (marker === 216 || marker === 217 || marker === 1) {
-      i += 2;
-      continue;
-    }
-    const segLen = b[i + 2] << 8 | b[i + 3];
-    if (segLen < 2)
-      return null;
-    i += 2 + segLen;
-  }
-  return null;
-}
-function isSofMarker(m) {
-  if (m >= 192 && m <= 195)
-    return true;
-  if (m >= 197 && m <= 199)
-    return true;
-  if (m >= 201 && m <= 203)
-    return true;
-  if (m >= 205 && m <= 207)
-    return true;
-  return false;
-}
-function parseWebpDimensions(b) {
-  if (b.length < 30)
-    return null;
-  if (b[0] !== 82 || b[1] !== 73 || b[2] !== 70 || b[3] !== 70)
-    return null;
-  if (b[8] !== 87 || b[9] !== 69 || b[10] !== 66 || b[11] !== 80)
-    return null;
-  const variant = String.fromCharCode(b[12], b[13], b[14], b[15]);
-  if (variant === "VP8 ") {
-    const w = (b[26] | b[27] << 8) & 16383;
-    const h = (b[28] | b[29] << 8) & 16383;
-    if (w && h)
-      return { w, h };
-  } else if (variant === "VP8L") {
-    const b0 = b[21];
-    const b1 = b[22];
-    const b2 = b[23];
-    const b3 = b[24];
-    const w = 1 + ((b0 | b1 << 8) & 16383);
-    const h = 1 + ((b1 >> 6 | b2 << 2 | b3 << 10) & 16383);
-    if (w && h)
-      return { w, h };
-  } else if (variant === "VP8X") {
-    const w = 1 + (b[24] | b[25] << 8 | b[26] << 16);
-    const h = 1 + (b[27] | b[28] << 8 | b[29] << 16);
-    if (w && h)
-      return { w, h };
-  }
-  return null;
-}
-function parseGifDimensions(b) {
-  if (b.length < 10)
-    return null;
-  if (b[0] !== 71 || b[1] !== 73 || b[2] !== 70)
-    return null;
-  const w = b[6] | b[7] << 8;
-  const h = b[8] | b[9] << 8;
-  if (!w || !h)
-    return null;
-  return { w, h };
-}
-function readUint32BE(b, offset) {
-  return (b[offset] << 24 | b[offset + 1] << 16 | b[offset + 2] << 8 | b[offset + 3]) >>> 0;
-}
-
-// ../plugin/src/shared/tag-transcript.ts
 var TEXT_TAG_IDENTITY_MARKER = ":mc-text-v1:";
 function textIdentityDigest(value) {
   return createHash9("sha256").update(value).digest("hex");
@@ -15569,435 +15513,76 @@ function recordPiTransformTiming(sample) {
 }
 
 // src/ctx-reduce-nudge-pi.ts
-function sealDeliveredAfterUnconfirmedSend(db, sessionId) {
-  try {
-    if (getChannel2NudgeState(db, sessionId) === "delivered") {
-      return "already-delivered";
+import { randomUUID as randomUUID2 } from "node:crypto";
+
+// ../plugin/src/hooks/magic-context/system-injection-stripper.ts
+var SYSTEM_INJECTION_MARKERS = [
+  "<!-- OMO_INTERNAL_INITIATOR -->",
+  "[SYSTEM DIRECTIVE: MAGIC-CONTEXT",
+  "[SYSTEM DIRECTIVE: OH-MY-OPENCODE",
+  "[Category+Skill Reminder]",
+  "[EDIT ERROR - IMMEDIATE ACTION REQUIRED]",
+  "[task CALL FAILED - IMMEDIATE RETRY REQUIRED]",
+  "[EMERGENCY CONTEXT WINDOW WARNING]",
+  "Unstable background agent appears idle",
+  "**THE SUBAGENT JUST CLAIMED THIS TASK IS DONE."
+];
+var SYSTEM_REMINDER_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
+var OMO_MARKER_REGEX = /<!-- OMO_INTERNAL_INITIATOR -->/g;
+function stripSystemInjection(text) {
+  let hasInjection = false;
+  for (const marker of SYSTEM_INJECTION_MARKERS) {
+    if (text.includes(marker)) {
+      hasInjection = true;
+      break;
     }
-  } catch {}
-  try {
-    setChannel2NudgeState(db, sessionId, "delivered");
-    return "sealed";
-  } catch {
-    return "stuck-claimed";
-  }
-}
-var channel1StateBySession = new Map;
-function setPiChannel1Baseline(sessionId, state2) {
-  channel1StateBySession.set(sessionId, state2);
-}
-function clearPiChannel1State(sessionId) {
-  channel1StateBySession.delete(sessionId);
-}
-function markPiChannel1Reduced(sessionId, db) {
-  const state2 = channel1StateBySession.get(sessionId);
-  if (state2)
-    state2.reducedSinceRefresh = true;
-  if (db)
-    resetLastNudgeCycle(db, sessionId);
-}
-function isPiTextContent(c) {
-  return c !== null && typeof c === "object" && c.type === "text" && typeof c.text === "string";
-}
-function toolResultText(content) {
-  let text = "";
-  for (const c of content) {
-    if (isPiTextContent(c))
-      text += c.text;
   }
-  return text;
-}
-function jsonTokens(value) {
-  if (value === undefined || value === null)
-    return 0;
-  try {
-    return toolOutputTokens(JSON.stringify(value));
-  } catch {
-    return 0;
+  if (SYSTEM_REMINDER_REGEX.test(text))
+    hasInjection = true;
+  SYSTEM_REMINDER_REGEX.lastIndex = 0;
+  if (!hasInjection)
+    return null;
+  let cleaned = text;
+  cleaned = cleaned.replace(SYSTEM_REMINDER_REGEX, "");
+  cleaned = cleaned.replace(OMO_MARKER_REGEX, "");
+  cleaned = cleaned.replace(/\[SYSTEM DIRECTIVE: OH-MY-(?:OPENCODE|CLAUDE)[^\]]*\][\s\S]*?(?=\n\n(?!\s*[-*])|$)/g, "");
+  for (const marker of SYSTEM_INJECTION_MARKERS) {
+    if (marker.startsWith("<!-- ") || marker.startsWith("[SYSTEM DIRECTIVE"))
+      continue;
+    const idx = cleaned.indexOf(marker);
+    if (idx === -1)
+      continue;
+    const blockEnd = cleaned.indexOf(`
+
+`, idx + marker.length);
+    cleaned = blockEnd !== -1 ? cleaned.slice(0, idx) + cleaned.slice(blockEnd) : cleaned.slice(0, idx);
   }
+  return cleaned.trim();
 }
-function textTokens(content) {
-  if (typeof content === "string")
-    return toolOutputTokens(content);
-  if (!Array.isArray(content))
-    return 0;
-  let tokens = 0;
-  for (const part of content) {
-    if (!part || typeof part !== "object")
+
+// src/heuristic-cleanup-pi.ts
+var PI_CTX_REDUCE_KEEP = 3;
+var DEDUP_SAFE_TOOLS = new Set([
+  "mcp_grep",
+  "mcp_read",
+  "mcp_glob",
+  "mcp_ast_grep_search",
+  "mcp_lsp_diagnostics",
+  "mcp_lsp_symbols",
+  "mcp_lsp_find_references",
+  "mcp_lsp_goto_definition",
+  "mcp_lsp_prepare_rename"
+]);
+function buildPiToolFingerprints(messages, resolveStableId) {
+  const fingerprints = new Map;
+  for (let i = 0;i < messages.length; i++) {
+    const message = messages[i];
+    if (!message || typeof message !== "object")
       continue;
-    const p = part;
-    if (typeof p.text === "string")
-      tokens += toolOutputTokens(p.text);
-    else if (typeof p.thinking === "string")
-      tokens += toolOutputTokens(p.thinking);
-    else if (p.type === "image")
-      tokens += 1200;
-  }
-  return tokens;
-}
-function computeTailTokenEstimatePi(messages) {
-  let tailToolTokens = 0;
-  let liveTailTokens = 0;
-  for (const raw of messages) {
-    if (!raw || typeof raw !== "object")
+    const msg = message;
+    if (msg.role !== "assistant")
       continue;
-    const msg = raw;
-    if (msg.role === "toolResult") {
-      const outputText = Array.isArray(msg.content) ? toolResultText(msg.content) : typeof msg.content === "string" ? msg.content : "";
-      const outputTokens = outputText && !isDroppedToolOutput(outputText) ? toolOutputTokens(outputText) : 0;
-      tailToolTokens += outputTokens;
-      liveTailTokens += outputTokens;
-      continue;
-    }
-    if (msg.role === "assistant" && Array.isArray(msg.content)) {
-      for (const part of msg.content) {
-        if (!part || typeof part !== "object")
-          continue;
-        const p = part;
-        if (p.type === "toolCall") {
-          if (typeof p.name === "string")
-            liveTailTokens += toolOutputTokens(p.name);
-          liveTailTokens += jsonTokens(p.arguments);
-        }
-      }
-    }
-    liveTailTokens += textTokens(msg.content);
-  }
-  return { tailToolTokens, liveTailTokens };
-}
-function maybeChannel1ReminderForToolResult(args) {
-  const { db, sessionId, toolName } = args;
-  const state2 = channel1StateBySession.get(sessionId);
-  if (!state2)
-    return null;
-  if (toolName === "ctx_reduce") {
-    state2.reducedSinceRefresh = true;
-    resetLastNudgeCycle(db, sessionId);
-    return null;
-  }
-  const text = toolResultText(args.content);
-  if (text.length === 0)
-    return null;
-  if (text.includes(CHANNEL1_SENTINEL))
-    return null;
-  state2.turnToolTokens += toolOutputTokens(text);
-  if (state2.reducedSinceRefresh)
-    return null;
-  const undroppedTokens = state2.tailToolTokens + state2.turnToolTokens;
-  const pressure = computePressure({
-    lastInputTokens: state2.lastInputTokens,
-    turnToolTokens: state2.turnToolTokens,
-    contextLimit: state2.contextLimit,
-    executeThresholdPercentage: state2.executeThresholdPercentage
-  });
-  const workingWindowTokens = Math.round(state2.contextLimit * state2.executeThresholdPercentage / 100);
-  const decision = decideChannel1({
-    undroppedTokens,
-    pressure,
-    estimatedInputTokens: state2.lastInputTokens + state2.turnToolTokens,
-    workingWindowTokens,
-    lastNudgeUndropped: getLastNudgeUndropped(db, sessionId),
-    lastNudgeLevel: getLastNudgeLevel(db, sessionId),
-    hasRecentReduce: false
-  });
-  setLastNudgeUndropped(db, sessionId, decision.nextLastNudge);
-  setLastNudgeLevel(db, sessionId, decision.nextLastNudgeLevel);
-  if (!decision.fire)
-    return null;
-  return {
-    type: "text",
-    text: buildChannel1Reminder(decision.level, decision.undroppedTokens, state2.oldestReclaimableToolTags)
-  };
-}
-var CHANNEL2_NUDGE_CUSTOM_TYPE = "magic-context:ceiling-nudge";
-function maybeDeliverChannel2Pi(pi, db, sessionId, deliverAs = "followUp") {
-  let state2;
-  try {
-    state2 = getChannel2NudgeState(db, sessionId);
-  } catch {
-    return false;
-  }
-  if (state2 !== "pending")
-    return false;
-  const baseline = channel1StateBySession.get(sessionId);
-  if (!baseline)
-    return false;
-  if (baseline.reducedSinceRefresh)
-    return false;
-  const undropped = baseline.tailToolTokens + baseline.turnToolTokens;
-  if (!shouldTriggerChannel2({
-    reclaimableTokens: undropped,
-    usableTokens: baseline.usableTokens
-  })) {
-    try {
-      casChannel2NudgeState(db, sessionId, "pending", "");
-    } catch {}
-    return false;
-  }
-  if (!casChannel2NudgeState(db, sessionId, "pending", "claimed"))
-    return false;
-  try {
-    pi.sendMessage({
-      customType: CHANNEL2_NUDGE_CUSTOM_TYPE,
-      content: buildChannel2Reminder(undropped, baseline.oldestReclaimableToolTags),
-      display: false,
-      details: { kind: "channel-2-ceiling-nudge" }
-    }, { deliverAs });
-  } catch (error) {
-    try {
-      casChannel2NudgeState(db, sessionId, "claimed", "pending");
-    } catch (revertError) {
-      sessionLog(sessionId, "channel2 ceiling nudge delivery failed; pending restore was busy so the stale claim will heal later:", { deliveryError: error, revertError });
-      return false;
-    }
-    sessionLog(sessionId, "channel2 ceiling nudge delivery failed (will retry):", error);
-    return false;
-  }
-  try {
-    const confirmed = casChannel2NudgeState(db, sessionId, "claimed", "delivered");
-    if (confirmed) {
-      sessionLog(sessionId, "channel2 ceiling nudge delivered");
-      return true;
-    }
-    const outcome = sealDeliveredAfterUnconfirmedSend(db, sessionId);
-    if (outcome === "already-delivered") {
-      sessionLog(sessionId, "channel2 ceiling nudge duplicate window: our send returned after a sibling reclaimed the stale lease and already delivered");
-    } else if (outcome === "sealed") {
-      sessionLog(sessionId, "channel2 ceiling nudge sent but claim confirmation was lost; sealed delivered without an authoritative confirm");
-    } else {
-      sessionLog(sessionId, "channel2 ceiling nudge sent but claim confirmation was lost; lease stayed claimed and will heal later");
-    }
-    return false;
-  } catch (error) {
-    const outcome = sealDeliveredAfterUnconfirmedSend(db, sessionId);
-    if (outcome === "already-delivered") {
-      sessionLog(sessionId, "channel2 ceiling nudge duplicate window: our send returned after a sibling reclaimed the stale lease and already delivered");
-    } else if (outcome === "sealed") {
-      sessionLog(sessionId, "channel2 ceiling nudge sent but confirm failed:", error);
-    } else {
-      sessionLog(sessionId, "channel2 ceiling nudge sent but confirm failed; lease stayed claimed and will heal later:", error);
-    }
-    return false;
-  }
-}
-
-// src/detect-recent-commit.ts
-var COMMIT_LOOKBACK = 5;
-function detectRecentCommit(messages) {
-  let assistantsScanned = 0;
-  for (let i = messages.length - 1;i >= 0; i--) {
-    const message = messages[i];
-    if (!message || typeof message !== "object" || !("role" in message) || message.role !== "assistant") {
-      continue;
-    }
-    assistantsScanned++;
-    if (assistantsScanned > COMMIT_LOOKBACK)
-      break;
-    if (!("content" in message))
-      continue;
-    const content = message.content;
-    if (!Array.isArray(content))
-      continue;
-    for (const part of content) {
-      if (part && typeof part === "object" && "type" in part && part.type === "text" && "text" in part && typeof part.text === "string") {
-        if (textMentionsRecentCommit(part.text)) {
-          return true;
-        }
-      }
-    }
-  }
-  return false;
-}
-
-// ../plugin/src/hooks/magic-context/emergency-drop.ts
-var TARGET_FRACTION = 0.3;
-var TIER_RECENCY_RESERVE = 0.2;
-var EMERGENCY_REARM_MIN_TOKENS = 2000;
-var T1_TOOLS = new Set(["read", "todowrite", "task", "aft_outline", "aft_zoom"]);
-var T2_TOOLS = new Set(["edit", "write", "apply_patch", "grep", "glob", "aft_search"]);
-function normalizeToolName(toolName) {
-  if (!toolName)
-    return "";
-  let name = toolName.toLowerCase();
-  if (name.startsWith("mcp_"))
-    name = name.slice(4);
-  return name;
-}
-function resolveToolTier(toolName) {
-  const name = normalizeToolName(toolName);
-  if (T1_TOOLS.has(name))
-    return 1;
-  if (T2_TOOLS.has(name))
-    return 2;
-  return 3;
-}
-function tagReclaimBytes(tag) {
-  return tag.byteSize + tag.inputByteSize + tag.reasoningByteSize;
-}
-function estimateEmergencyDropReclaimTokens(tag) {
-  return Math.round(tagReclaimBytes(tag) * TOKENS_PER_BYTE);
-}
-function planEmergencyDrop(input) {
-  const {
-    tags,
-    floorTags,
-    maxTag,
-    protectedTags,
-    currentTotalInputTokens,
-    ceilingTokens,
-    priorInputSample,
-    hasPriorDrop
-  } = input;
-  const noop = (reason) => ({
-    shouldDrop: false,
-    tagNumbers: [],
-    reclaimTokens: 0,
-    reason
-  });
-  if (!Number.isFinite(ceilingTokens) || ceilingTokens <= 0) {
-    return noop("unknown-ceiling");
-  }
-  if (!Number.isFinite(currentTotalInputTokens) || currentTotalInputTokens <= 0) {
-    return noop("unknown-usage");
-  }
-  if (hasPriorDrop && currentTotalInputTokens === priorInputSample) {
-    return noop("same-input-sample (awaiting fresh usage after prior drop)");
-  }
-  let tailTokens = 0;
-  for (const tag of floorTags) {
-    if (tag.status !== "active")
-      continue;
-    tailTokens += estimateEmergencyDropReclaimTokens(tag);
-  }
-  const fixedFloor = Math.max(currentTotalInputTokens - tailTokens, 0);
-  const workingSpan = Math.max(ceilingTokens - fixedFloor, 0);
-  const target = fixedFloor + TARGET_FRACTION * workingSpan;
-  const reclaimTokens = Math.round(currentTotalInputTokens - target);
-  if (reclaimTokens <= EMERGENCY_REARM_MIN_TOKENS) {
-    return noop(`reclaim<=min (${reclaimTokens} <= ${EMERGENCY_REARM_MIN_TOKENS})`);
-  }
-  const protectedCutoff = maxTag - protectedTags;
-  const tierActive = { 1: [], 2: [] };
-  for (const tag of tags) {
-    if (tag.status !== "active" || tag.type !== "tool")
-      continue;
-    const tier = resolveToolTier(tag.toolName);
-    if (tier === 1 || tier === 2)
-      tierActive[tier].push(tag.tagNumber);
-  }
-  const reserved = new Set;
-  for (const tier of [1, 2]) {
-    const nums = tierActive[tier];
-    if (nums.length === 0)
-      continue;
-    nums.sort((a, b) => b - a);
-    const reserveCount = Math.ceil(TIER_RECENCY_RESERVE * nums.length);
-    for (let i = 0;i < reserveCount && i < nums.length; i++) {
-      reserved.add(nums[i]);
-    }
-  }
-  const byTier = { 1: [], 2: [], 3: [] };
-  for (const tag of tags) {
-    if (tag.status !== "active" || tag.type !== "tool")
-      continue;
-    if (tag.tagNumber > protectedCutoff)
-      continue;
-    const tier = resolveToolTier(tag.toolName);
-    if ((tier === 1 || tier === 2) && reserved.has(tag.tagNumber))
-      continue;
-    byTier[tier].push(tag);
-  }
-  const selected = [];
-  let reclaimed = 0;
-  outer:
-    for (const tier of [3, 2, 1]) {
-      const group = byTier[tier];
-      group.sort((a, b) => a.tagNumber - b.tagNumber);
-      for (const tag of group) {
-        selected.push(tag.tagNumber);
-        reclaimed += estimateEmergencyDropReclaimTokens(tag);
-        if (reclaimed >= reclaimTokens)
-          break outer;
-      }
-    }
-  if (selected.length === 0) {
-    return noop("no-candidates");
-  }
-  return {
-    shouldDrop: true,
-    tagNumbers: selected,
-    reclaimTokens,
-    reason: `tiered drop: ${selected.length} tags, reclaim≈${reclaimed}/${reclaimTokens} tokens (floor≈${fixedFloor}, ceiling=${Math.round(ceilingTokens)})`
-  };
-}
-
-// ../plugin/src/hooks/magic-context/system-injection-stripper.ts
-var SYSTEM_INJECTION_MARKERS = [
-  "<!-- OMO_INTERNAL_INITIATOR -->",
-  "[SYSTEM DIRECTIVE: MAGIC-CONTEXT",
-  "[SYSTEM DIRECTIVE: OH-MY-OPENCODE",
-  "[Category+Skill Reminder]",
-  "[EDIT ERROR - IMMEDIATE ACTION REQUIRED]",
-  "[task CALL FAILED - IMMEDIATE RETRY REQUIRED]",
-  "[EMERGENCY CONTEXT WINDOW WARNING]",
-  "Unstable background agent appears idle",
-  "**THE SUBAGENT JUST CLAIMED THIS TASK IS DONE."
-];
-var SYSTEM_REMINDER_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
-var OMO_MARKER_REGEX = /<!-- OMO_INTERNAL_INITIATOR -->/g;
-function stripSystemInjection(text) {
-  let hasInjection = false;
-  for (const marker of SYSTEM_INJECTION_MARKERS) {
-    if (text.includes(marker)) {
-      hasInjection = true;
-      break;
-    }
-  }
-  if (SYSTEM_REMINDER_REGEX.test(text))
-    hasInjection = true;
-  SYSTEM_REMINDER_REGEX.lastIndex = 0;
-  if (!hasInjection)
-    return null;
-  let cleaned = text;
-  cleaned = cleaned.replace(SYSTEM_REMINDER_REGEX, "");
-  cleaned = cleaned.replace(OMO_MARKER_REGEX, "");
-  cleaned = cleaned.replace(/\[SYSTEM DIRECTIVE: OH-MY-(?:OPENCODE|CLAUDE)[^\]]*\][\s\S]*?(?=\n\n(?!\s*[-*])|$)/g, "");
-  for (const marker of SYSTEM_INJECTION_MARKERS) {
-    if (marker.startsWith("<!-- ") || marker.startsWith("[SYSTEM DIRECTIVE"))
-      continue;
-    const idx = cleaned.indexOf(marker);
-    if (idx === -1)
-      continue;
-    const blockEnd = cleaned.indexOf(`
-
-`, idx + marker.length);
-    cleaned = blockEnd !== -1 ? cleaned.slice(0, idx) + cleaned.slice(blockEnd) : cleaned.slice(0, idx);
-  }
-  return cleaned.trim();
-}
-
-// src/heuristic-cleanup-pi.ts
-var DEDUP_SAFE_TOOLS = new Set([
-  "mcp_grep",
-  "mcp_read",
-  "mcp_glob",
-  "mcp_ast_grep_search",
-  "mcp_lsp_diagnostics",
-  "mcp_lsp_symbols",
-  "mcp_lsp_find_references",
-  "mcp_lsp_goto_definition",
-  "mcp_lsp_prepare_rename"
-]);
-function buildPiToolFingerprints(messages, resolveStableId) {
-  const fingerprints = new Map;
-  for (let i = 0;i < messages.length; i++) {
-    const message = messages[i];
-    if (!message || typeof message !== "object")
-      continue;
-    const msg = message;
-    if (msg.role !== "assistant")
-      continue;
-    if (!Array.isArray(msg.content))
+    if (!Array.isArray(msg.content))
       continue;
     const ownerMsgId = resolveStableId(message, i);
     if (!ownerMsgId)
@@ -16031,9 +15616,8 @@ function buildPiToolFingerprints(messages, resolveStableId) {
   }
   return fingerprints;
 }
-function collectStaleReduceCallIds(messages, messageIdToMaxTag, toolAgeCutoff, resolveStableId) {
-  const composite = new Set;
-  const bareCallIds = new Set;
+function collectStaleReduceCallIds(messages, messageIdToMaxTag, ctxReduceTagNumbers, toolAgeCutoff, resolveStableId) {
+  const reduceCalls = new Map;
   for (let i = 0;i < messages.length; i++) {
     const raw = messages[i];
     if (!raw || typeof raw !== "object")
@@ -16044,9 +15628,7 @@ function collectStaleReduceCallIds(messages, messageIdToMaxTag, toolAgeCutoff, r
     const stableId = resolveStableId(raw, i);
     if (!stableId)
       continue;
-    const maxTag = messageIdToMaxTag.get(stableId) ?? 0;
-    if (maxTag === 0 || maxTag > toolAgeCutoff)
-      continue;
+    const ownerMaxTag = messageIdToMaxTag.get(stableId) ?? 0;
     for (const part of msg.content) {
       if (!part || typeof part !== "object")
         continue;
@@ -16057,10 +15639,35 @@ function collectStaleReduceCallIds(messages, messageIdToMaxTag, toolAgeCutoff, r
         continue;
       if (typeof p.id !== "string" || p.id.length === 0)
         continue;
-      composite.add(`${stableId}\x00${p.id}`);
-      bareCallIds.add(p.id);
+      const composite2 = `${stableId}\x00${p.id}`;
+      const maxTag = ctxReduceTagNumbers.get(composite2) ?? ownerMaxTag;
+      if (maxTag === 0)
+        continue;
+      reduceCalls.set(composite2, {
+        composite: composite2,
+        callId: p.id,
+        maxTag,
+        messageIndex: i
+      });
     }
   }
+  const newestFirst = [...reduceCalls.values()].sort((left, right) => {
+    const byPosition = right.maxTag - left.maxTag || right.messageIndex - left.messageIndex;
+    if (byPosition !== 0)
+      return byPosition;
+    if (left.composite === right.composite)
+      return 0;
+    return left.composite < right.composite ? 1 : -1;
+  });
+  const protectedComposite = new Set(newestFirst.slice(0, PI_CTX_REDUCE_KEEP).map((call) => call.composite));
+  const composite = new Set;
+  const bareCallIds = new Set;
+  for (const call of newestFirst) {
+    if (call.maxTag > toolAgeCutoff || protectedComposite.has(call.composite))
+      continue;
+    composite.add(call.composite);
+    bareCallIds.add(call.callId);
+  }
   return { composite, bareCallIds };
 }
 function applyPiHeuristicCleanup(sessionId, db, targets, piMessages, config, preloadedTags, resolveId) {
@@ -16123,7 +15730,7 @@ function applyPiHeuristicCleanup(sessionId, db, targets, piMessages, config, pre
     }
     setEmergencyDropSample(db, sessionId, emergency.currentTotalInputTokens);
   }
-  const staleReduce = config.staleReduceStripEnabled ? collectStaleReduceCallIds(piMessages, buildMessageIdToMaxTagFromTargets(targets), toolAgeCutoff, resolveStableId) : { composite: new Set, bareCallIds: new Set };
+  const staleReduce = config.staleReduceStripEnabled ? collectStaleReduceCallIds(piMessages, buildMessageIdToMaxTagFromTargets(targets), buildCtxReduceTagNumbers(tags), toolAgeCutoff, resolveStableId) : { composite: new Set, bareCallIds: new Set };
   if (config.staleReduceStripEnabled && (staleReduce.composite.size > 0 || staleReduce.bareCallIds.size > 0)) {
     db.transaction(() => {
       for (const tag of tags) {
@@ -16148,115 +15755,843 @@ function applyPiHeuristicCleanup(sessionId, db, targets, piMessages, config, pre
       }
     })();
   }
-  db.transaction(() => {
-    for (const tag of tags) {
-      if (tag.status !== "active")
-        continue;
-      if (tag.tagNumber > protectedCutoff)
-        continue;
-      if (tag.type !== "message")
-        continue;
-      const target = targets.get(tag.tagNumber);
-      if (!target)
-        continue;
-      const content = target.getContent?.();
-      if (!content)
-        continue;
-      const stripped = stripSystemInjection(content);
-      if (stripped === null)
-        continue;
-      const strippedSource = stripTagPrefix(stripped);
-      if (strippedSource.trim().length === 0) {
-        const dropResult = target.drop?.() ?? "absent";
-        const didReplace = dropResult === "absent" ? target.setContent(`[dropped §${tag.tagNumber}§]`) : false;
-        if (dropResult === "removed" || dropResult === "absent") {
-          replaceSourceContent(db, sessionId, tag.tagNumber, "");
-          updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
-          if (dropResult === "removed" || didReplace) {
-            droppedInjections++;
-          }
-        }
-      } else {
-        const didSet = target.setContent(stripped);
-        if (didSet) {
-          replaceSourceContent(db, sessionId, tag.tagNumber, strippedSource);
-          droppedInjections++;
-        }
-      }
+  db.transaction(() => {
+    for (const tag of tags) {
+      if (tag.status !== "active")
+        continue;
+      if (tag.tagNumber > protectedCutoff)
+        continue;
+      if (tag.type !== "message")
+        continue;
+      const target = targets.get(tag.tagNumber);
+      if (!target)
+        continue;
+      const content = target.getContent?.();
+      if (!content)
+        continue;
+      const stripped = stripSystemInjection(content);
+      if (stripped === null)
+        continue;
+      const strippedSource = stripTagPrefix(stripped);
+      if (strippedSource.trim().length === 0) {
+        const dropResult = target.drop?.() ?? "absent";
+        const didReplace = dropResult === "absent" ? target.setContent(`[dropped §${tag.tagNumber}§]`) : false;
+        if (dropResult === "removed" || dropResult === "absent") {
+          replaceSourceContent(db, sessionId, tag.tagNumber, "");
+          updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
+          if (dropResult === "removed" || didReplace) {
+            droppedInjections++;
+          }
+        }
+      } else {
+        const didSet = target.setContent(stripped);
+        if (didSet) {
+          replaceSourceContent(db, sessionId, tag.tagNumber, strippedSource);
+          droppedInjections++;
+        }
+      }
+    }
+  })();
+  const toolFingerprints = buildPiToolFingerprints(piMessages, resolveStableId);
+  if (toolFingerprints.size > 0) {
+    const tagsByCompositeKey = new Map;
+    for (const tag of tags) {
+      if (tag.type === "tool" && tag.status === "active" && tag.messageId) {
+        const key = tag.toolOwnerMessageId ? `${tag.toolOwnerMessageId}\x00${tag.messageId}` : tag.messageId;
+        tagsByCompositeKey.set(key, tag);
+      }
+    }
+    const fingerprintGroups = new Map;
+    for (const [compositeKey, fingerprint] of toolFingerprints) {
+      const tag = tagsByCompositeKey.get(compositeKey);
+      if (!tag || tag.tagNumber > protectedCutoff)
+        continue;
+      const group = fingerprintGroups.get(fingerprint) ?? [];
+      group.push(tag);
+      fingerprintGroups.set(fingerprint, group);
+    }
+    db.transaction(() => {
+      for (const [, group] of fingerprintGroups) {
+        if (group.length <= 1)
+          continue;
+        group.sort((a, b) => a.tagNumber - b.tagNumber);
+        for (let i = 0;i < group.length - 1; i++) {
+          const tag = group[i];
+          const target = targets.get(tag.tagNumber);
+          const result = target?.drop?.() ?? "absent";
+          if (result === "incomplete")
+            continue;
+          updateTagDropMode(db, sessionId, tag.tagNumber, "full");
+          updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
+          if (result === "removed" || result === "truncated") {
+            deduplicatedTools++;
+          }
+        }
+      }
+    })();
+  }
+  if (droppedTools > 0 || deduplicatedTools > 0 || droppedInjections > 0 || droppedStaleReduceCalls > 0) {
+    sessionLog(sessionId, `heuristic cleanup: dropped ${droppedTools} tool tags, stale ctx_reduce=${droppedStaleReduceCalls}, deduplicated ${deduplicatedTools} tool calls, dropped ${droppedInjections} system injections`);
+  }
+  let compressedTextTags = 0;
+  let mutatedTextTags = 0;
+  if (config.caveman?.enabled) {
+    const cavemanResult = applyCavemanCleanup(sessionId, db, targets, tags, {
+      enabled: true,
+      minChars: config.caveman.minChars,
+      protectedTags: config.protectedTags
+    });
+    compressedTextTags = cavemanResult.compressedToLite + cavemanResult.compressedToFull + cavemanResult.compressedToUltra;
+    mutatedTextTags = cavemanResult.mutatedTextTags;
+  }
+  return {
+    droppedTools,
+    deduplicatedTools,
+    droppedInjections,
+    droppedStaleReduceCalls,
+    emergencyDroppedTools,
+    compressedTextTags,
+    mutatedTextTags
+  };
+}
+function buildCtxReduceTagNumbers(tags) {
+  const byComposite = new Map;
+  for (const tag of tags) {
+    if (tag.status !== "active" || tag.type !== "tool" || tag.toolName !== "ctx_reduce" || !tag.toolOwnerMessageId) {
+      continue;
+    }
+    byComposite.set(`${tag.toolOwnerMessageId}\x00${tag.messageId}`, tag.tagNumber);
+  }
+  return byComposite;
+}
+function buildMessageIdToMaxTagFromTargets(targets) {
+  const byMessage = new Map;
+  for (const [tagNumber, target] of targets) {
+    const id = target.message?.info?.id;
+    if (typeof id !== "string" || id.length === 0)
+      continue;
+    if (tagNumber > (byMessage.get(id) ?? 0))
+      byMessage.set(id, tagNumber);
+  }
+  return byMessage;
+}
+
+// src/tail-hygiene-walk-pi.ts
+var TAG_PREFIX = /^§(\d+)§\s*/;
+var SYNTHETIC_TODO_PREFIX = "mc_synthetic_todo_";
+var MAX_CONTENT_MEMO_ENTRIES = 1e5;
+var MAX_CONTENT_MEMO_BYTES = 64 * 1024 * 1024;
+var contentMemo = new Map;
+var contentMemoBytes = 0;
+var FNV1A_32_OFFSET = 2166136261;
+var FNV1A_32_PRIME = 16777619;
+function isRecord3(value) {
+  return value !== null && typeof value === "object";
+}
+function fnv1a32(value) {
+  let hash = FNV1A_32_OFFSET;
+  for (let index = 0;index < value.length; index += 1) {
+    hash ^= value.charCodeAt(index);
+    hash = Math.imul(hash, FNV1A_32_PRIME);
+  }
+  return (hash >>> 0).toString(16).padStart(8, "0");
+}
+function safeStableStringify(value) {
+  const seen = new Set;
+  try {
+    return JSON.stringify(value, (_key, current) => {
+      if (!isRecord3(current) || Array.isArray(current))
+        return current;
+      if (seen.has(current))
+        return "[Circular]";
+      seen.add(current);
+      return Object.fromEntries(Object.entries(current).sort(([left], [right]) => left.localeCompare(right)));
+    }) ?? "";
+  } catch {
+    return "";
+  }
+}
+function memoizedContent(kind, content) {
+  const key = `${kind}\x00${content}`;
+  const cached = contentMemo.get(key);
+  if (cached)
+    return cached;
+  const measured = {
+    hash: fnv1a32(key),
+    tokens: kind === "excluded" ? 0 : estimateTokens(content),
+    keyBytes: key.length * 2 + 32
+  };
+  contentMemo.set(key, measured);
+  contentMemoBytes += measured.keyBytes;
+  while (contentMemo.size > MAX_CONTENT_MEMO_ENTRIES || contentMemoBytes > MAX_CONTENT_MEMO_BYTES) {
+    const oldest = contentMemo.keys().next().value;
+    if (typeof oldest !== "string")
+      break;
+    const removed = contentMemo.get(oldest);
+    if (removed)
+      contentMemoBytes -= removed.keyBytes;
+    contentMemo.delete(oldest);
+  }
+  return measured;
+}
+function memoizedTokens(kind, content) {
+  return memoizedContent(kind, content).tokens;
+}
+function partHash(kind, content) {
+  return memoizedContent(kind, content).hash;
+}
+function parseVisibleTag(content, tagsByNumber) {
+  const match = content.trimStart().match(TAG_PREFIX);
+  if (!match)
+    return;
+  const tagNumber = Number(match[1]);
+  return Number.isSafeInteger(tagNumber) ? tagsByNumber.get(tagNumber) : undefined;
+}
+function isDropSentinel(content) {
+  const head = content.trimStart().replace(TAG_PREFIX, "").trimStart().toLowerCase();
+  return head.startsWith("[dropped") || head.startsWith("[truncated");
+}
+function messageIdentity(message, index, stableId) {
+  const resolved = stableId?.(message, index);
+  if (resolved)
+    return resolved;
+  if (isRecord3(message)) {
+    if (typeof message.responseId === "string" && message.responseId.length > 0) {
+      return `response:${message.responseId}`;
+    }
+    if (typeof message.timestamp === "number") {
+      return `timestamp:${message.timestamp}:${String(message.role ?? "unknown")}`;
+    }
+  }
+  return `pi-message:${index}`;
+}
+function isSyntheticMessage(message, index, input) {
+  if (index < Math.max(0, input.syntheticLeadingCount ?? 0))
+    return true;
+  if (input.syntheticMessages?.has(message))
+    return true;
+  if (message.syntheticTodoMarker === true)
+    return true;
+  const role = typeof message.role === "string" ? message.role : "";
+  return role === "system" || role === "custom" || role === "compactionSummary";
+}
+function imageContentAndTokens(part) {
+  const data = typeof part.data === "string" ? part.data : "";
+  const mimeType = typeof part.mimeType === "string" ? part.mimeType : "image/png";
+  const content = data.startsWith("data:") ? data : `data:${mimeType};base64,${data}`;
+  return {
+    content,
+    tokens: content.length > 0 ? estimateImageTokensFromDataUrl(content) : 0
+  };
+}
+function messageIdForTag(tag) {
+  if (tag.type === "tool")
+    return tag.toolOwnerMessageId;
+  const positional = tag.messageId.match(/^(.*):(?:p|file)\d+$/);
+  if (positional)
+    return positional[1] ?? null;
+  const contentDerived = tag.messageId.indexOf(":mc-text-v1:");
+  return contentDerived >= 0 ? tag.messageId.slice(0, contentDerived) : null;
+}
+function neighborhoodConsistent(input) {
+  let previousMax = null;
+  for (let index = 0;index <= input.messageIndex; index += 1) {
+    const bound = input.boundsByMessageIndex.get(index);
+    if (bound)
+      previousMax = previousMax === null ? bound.max : Math.max(previousMax, bound.max);
+  }
+  let nextMin = null;
+  for (let index = input.messageIndex + 1;index < input.messageCount; index += 1) {
+    const bound = input.boundsByMessageIndex.get(index);
+    if (bound)
+      nextMin = nextMin === null ? bound.min : Math.min(nextMin, bound.min);
+  }
+  return previousMax !== null && nextMin !== null && input.orphanTagNumber >= previousMax && input.orphanTagNumber <= nextMin;
+}
+function collectToolArcs(input) {
+  const arcs = [];
+  const arcByPart = new Map;
+  const pendingByCall = new Map;
+  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 (!isRecord3(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 (!isRecord3(part) || part.type !== "toolCall")
+          continue;
+        if (typeof part.id !== "string" || part.id.length === 0)
+          continue;
+        const ownerId2 = messageIds[messageIndex] ?? `pi-message:${messageIndex}`;
+        const arc2 = {
+          key: `${ownerId2}\x00${part.id}\x00${partIndex}`,
+          callId: part.id,
+          ownerId: ownerId2,
+          ownerIndex: messageIndex,
+          toolName: typeof part.name === "string" ? part.name : null,
+          sentinel: isRecord3(part.arguments) && typeof part.arguments.__magic_context_dropped__ === "string",
+          parts: [part]
+        };
+        arcs.push(arc2);
+        arcByPart.set(part, arc2);
+        const pending2 = pendingByCall.get(part.id) ?? [];
+        pending2.push(arc2);
+        pendingByCall.set(part.id, pending2);
+      }
+      continue;
+    }
+    if (role !== "toolResult")
+      continue;
+    if (typeof raw.toolCallId !== "string" || raw.toolCallId.length === 0)
+      continue;
+    const pending = pendingByCall.get(raw.toolCallId);
+    const matched = pending?.pop();
+    const ownerId = matched?.ownerId ?? messageIds[messageIndex] ?? `pi-message:${messageIndex}`;
+    const arc = matched ?? {
+      key: `${ownerId}\x00${raw.toolCallId}\x00result:${messageIndex}`,
+      callId: raw.toolCallId,
+      ownerId,
+      ownerIndex: messageIndex,
+      toolName: typeof raw.toolName === "string" ? raw.toolName : null,
+      sentinel: false,
+      parts: []
+    };
+    if (!matched)
+      arcs.push(arc);
+    if (!Array.isArray(raw.content))
+      continue;
+    for (const part of raw.content) {
+      if (!isRecord3(part))
+        continue;
+      arc.parts.push(part);
+      arcByPart.set(part, arc);
+      if (part.type === "text" && typeof part.text === "string" && isDropSentinel(part.text)) {
+        arc.sentinel = true;
+      }
+    }
+  }
+  return { arcs, arcByPart, messageIds };
+}
+function attributeTags(input, arcs, messageIds) {
+  const messageTags = new Map;
+  const tagsByNumber = new Map;
+  const exactToolTags = new Map;
+  const orphanTagsByCall = new Map;
+  const messageIndexById = new Map;
+  for (let index = 0;index < messageIds.length; index += 1) {
+    const id = input.stableId?.(input.messages[index], index);
+    if (id)
+      messageIndexById.set(id, index);
+  }
+  const boundsByMessageIndex = new Map;
+  for (const tag of input.tags) {
+    tagsByNumber.set(tag.tagNumber, tag);
+    if (tag.type === "tool") {
+      if (tag.toolOwnerMessageId === null) {
+        const rows = orphanTagsByCall.get(tag.messageId) ?? [];
+        rows.push(tag);
+        orphanTagsByCall.set(tag.messageId, rows);
+      } else {
+        exactToolTags.set(`${tag.toolOwnerMessageId}\x00${tag.messageId}`, tag);
+      }
+    } else {
+      messageTags.set(tag.messageId, tag);
+    }
+    const ownerId = messageIdForTag(tag);
+    const messageIndex = ownerId === null ? undefined : messageIndexById.get(ownerId);
+    if (messageIndex === undefined)
+      continue;
+    const current = boundsByMessageIndex.get(messageIndex);
+    boundsByMessageIndex.set(messageIndex, {
+      min: current ? Math.min(current.min, tag.tagNumber) : tag.tagNumber,
+      max: current ? Math.max(current.max, tag.tagNumber) : tag.tagNumber
+    });
+  }
+  const orphanCandidates = new Map;
+  for (const arc of arcs) {
+    const exact = exactToolTags.get(`${arc.ownerId}\x00${arc.callId}`);
+    if (exact) {
+      arc.tag = exact;
+      continue;
+    }
+    const orphans = orphanTagsByCall.get(arc.callId);
+    if (orphans?.length !== 1)
+      continue;
+    if (!neighborhoodConsistent({
+      orphanTagNumber: orphans[0].tagNumber,
+      messageIndex: arc.ownerIndex,
+      boundsByMessageIndex,
+      messageCount: input.messages.length
+    })) {
+      continue;
+    }
+    const byOwner = orphanCandidates.get(arc.callId) ?? new Map;
+    const ownerArcs = byOwner.get(arc.ownerId) ?? [];
+    ownerArcs.push(arc);
+    byOwner.set(arc.ownerId, ownerArcs);
+    orphanCandidates.set(arc.callId, byOwner);
+  }
+  for (const [callId, byOwner] of orphanCandidates) {
+    if (byOwner.size !== 1)
+      continue;
+    const orphan = orphanTagsByCall.get(callId)?.[0];
+    if (!orphan)
+      continue;
+    for (const ownerArcs of byOwner.values()) {
+      for (const arc of ownerArcs)
+        arc.tag = orphan;
+    }
+  }
+  for (const arc of arcs) {
+    if (arc.tag)
+      continue;
+    for (const part of arc.parts) {
+      if (part.type !== "text" || typeof part.text !== "string")
+        continue;
+      const visible = parseVisibleTag(part.text, tagsByNumber);
+      if (visible?.type === "tool") {
+        arc.tag = visible;
+        break;
+      }
+    }
+  }
+  return { messageTags, tagsByNumber };
+}
+function excludedDraft(key, value) {
+  return {
+    key,
+    kind: "excluded",
+    content: typeof value === "string" ? value : safeStableStringify(value),
+    tokens: 0
+  };
+}
+function finalizeParts(drafts, protectedTags) {
+  const visibleTags = new Map;
+  for (const part of drafts) {
+    if (part.kind !== "excluded" && part.tag)
+      visibleTags.set(part.tag.tagNumber, part.tag);
+  }
+  const protectedNumbers = new Set([...visibleTags.keys()].sort((left, right) => right - left).slice(0, Math.max(0, protectedTags)));
+  const exemplarNumbers = [...visibleTags.values()].filter((tag) => tag.type === "tool" && tag.toolName === "ctx_reduce").sort((left, right) => right.tagNumber - left.tagNumber).slice(0, PI_CTX_REDUCE_KEEP).map((tag) => tag.tagNumber);
+  for (const tagNumber of exemplarNumbers)
+    protectedNumbers.add(tagNumber);
+  let u = 0;
+  let t = 0;
+  const parts = drafts.map((draft) => {
+    const protectedPart = draft.tag ? protectedNumbers.has(draft.tag.tagNumber) : false;
+    const tokens = Math.max(0, draft.tokens);
+    const uTokens = draft.tag && !protectedPart && draft.kind !== "excluded" ? tokens : 0;
+    t += tokens;
+    u += uTokens;
+    return {
+      key: draft.key,
+      contentHash: partHash(draft.kind, draft.content),
+      kind: draft.kind,
+      tokens,
+      uTokens,
+      tagNumber: draft.tag?.tagNumber ?? null,
+      tagStatus: draft.tag ? "active" : null,
+      protected: protectedPart
+    };
+  });
+  const clampedT = Math.max(0, t);
+  return {
+    u: Math.min(clampedT, Math.max(0, u)),
+    t: clampedT,
+    contentSignature: fnv1a32(parts.map((part) => `${part.key}:${part.contentHash}`).join("\x00")),
+    parts
+  };
+}
+function measurePiTailHygiene(input) {
+  const { arcs, arcByPart, messageIds } = collectToolArcs(input);
+  const { messageTags, tagsByNumber } = attributeTags(input, arcs, messageIds);
+  const drafts = [];
+  for (let messageIndex = 0;messageIndex < input.messages.length; messageIndex += 1) {
+    const raw = input.messages[messageIndex];
+    const messageKey = messageIds[messageIndex] ?? `pi-message:${messageIndex}`;
+    if (!isRecord3(raw)) {
+      drafts.push(excludedDraft(`${messageKey}\x00excluded`, raw));
+      continue;
+    }
+    if (isSyntheticMessage(raw, messageIndex, input)) {
+      drafts.push(excludedDraft(`${messageKey}\x00synthetic`, raw));
+      continue;
+    }
+    const role = raw.role;
+    if (role !== "user" && role !== "assistant" && role !== "toolResult") {
+      drafts.push(excludedDraft(`${messageKey}\x00excluded-role`, raw));
+      continue;
+    }
+    if (typeof raw.content === "string") {
+      const content = raw.content;
+      const tag = parseVisibleTag(content, tagsByNumber) ?? messageTags.get(`${messageKey}:p0`);
+      if (!content || isDropSentinel(content)) {
+        drafts.push(excludedDraft(`${messageKey}\x00text:0`, content));
+      } else {
+        drafts.push({
+          key: `${messageKey}\x00text:0`,
+          kind: "text",
+          content,
+          tokens: memoizedTokens("text", content),
+          tag
+        });
+      }
+      continue;
+    }
+    if (!Array.isArray(raw.content)) {
+      drafts.push(excludedDraft(`${messageKey}\x00excluded-content`, raw.content));
+      continue;
+    }
+    let textOrdinal = 0;
+    for (let partIndex = 0;partIndex < raw.content.length; partIndex += 1) {
+      const part = raw.content[partIndex];
+      const key = `${messageKey}\x00${partIndex}`;
+      if (!isRecord3(part)) {
+        drafts.push(excludedDraft(`${key}\x00excluded`, part));
+        continue;
+      }
+      if (part.syntheticTodoMarker === true) {
+        drafts.push(excludedDraft(`${key}\x00synthetic-todo`, part));
+        continue;
+      }
+      if (part.type === "thinking" || part.type === "reasoning" || part.type === "redacted_thinking") {
+        drafts.push(excludedDraft(`${key}\x00reasoning`, part));
+        continue;
+      }
+      if (part.type === "text" && typeof part.text === "string") {
+        if (role === "toolResult") {
+          const arc = arcByPart.get(part);
+          const content2 = stripChannel1ReminderSpans(part.text);
+          const tag2 = parseVisibleTag(content2, tagsByNumber) ?? arc?.tag;
+          if (arc?.sentinel || !content2 || isDropSentinel(content2)) {
+            drafts.push(excludedDraft(`${key}\x00toolOutput`, content2));
+          } else {
+            drafts.push({
+              key: `${key}\x00toolOutput`,
+              kind: "toolOutput",
+              content: content2,
+              tokens: memoizedTokens("toolOutput", content2),
+              tag: tag2
+            });
+          }
+          continue;
+        }
+        const content = part.text;
+        const tag = parseVisibleTag(content, tagsByNumber) ?? messageTags.get(`${messageKey}:p${textOrdinal}`);
+        textOrdinal += 1;
+        if (!content || isDropSentinel(content)) {
+          drafts.push(excludedDraft(`${key}\x00text`, content));
+        } else {
+          drafts.push({
+            key: `${key}\x00text`,
+            kind: "text",
+            content,
+            tokens: memoizedTokens("text", content),
+            tag
+          });
+        }
+        continue;
+      }
+      if (part.type === "image") {
+        const image = imageContentAndTokens(part);
+        const arc = role === "toolResult" ? arcByPart.get(part) : undefined;
+        const tag = arc?.tag ?? messageTags.get(`${messageKey}:file${partIndex}`);
+        if (arc?.sentinel || !image.content) {
+          drafts.push(excludedDraft(`${key}\x00image`, part));
+        } else {
+          drafts.push({
+            key: `${key}\x00${role === "toolResult" ? "toolOutput" : "file"}`,
+            kind: role === "toolResult" ? "toolOutput" : "file",
+            content: image.content,
+            tokens: image.tokens,
+            tag
+          });
+        }
+        continue;
+      }
+      if (part.type === "toolCall") {
+        const arc = arcByPart.get(part);
+        const callId = typeof part.id === "string" ? part.id : "";
+        if (part.syntheticTodoMarker === true || callId.startsWith(SYNTHETIC_TODO_PREFIX) || arc?.sentinel) {
+          drafts.push(excludedDraft(`${key}\x00toolInput`, part));
+          continue;
+        }
+        const content = safeStableStringify(part.arguments);
+        if (!content) {
+          drafts.push(excludedDraft(`${key}\x00toolInput`, part));
+        } else {
+          drafts.push({
+            key: `${key}\x00toolInput`,
+            kind: "toolInput",
+            content,
+            tokens: memoizedTokens("toolInput", content),
+            tag: arc?.tag
+          });
+        }
+        continue;
+      }
+      drafts.push(excludedDraft(`${key}\x00excluded`, part));
+    }
+  }
+  return finalizeParts(drafts, input.protectedTags);
+}
+function sameMeasuredPrefix(baseline, current) {
+  if (current.length < baseline.length)
+    return { valid: false, boundaryAdvanceU: 0 };
+  let boundaryAdvanceU = 0;
+  for (let index = 0;index < baseline.length; index += 1) {
+    const before = baseline[index];
+    const after = current[index];
+    if (before.key !== after.key || before.contentHash !== after.contentHash || before.kind !== after.kind || before.tokens !== after.tokens || before.tagNumber !== after.tagNumber || before.tagStatus !== after.tagStatus) {
+      return { valid: false, boundaryAdvanceU: 0 };
+    }
+    if (!before.protected && after.protected)
+      return { valid: false, boundaryAdvanceU: 0 };
+    if (before.protected && !after.protected) {
+      if (after.tagStatus !== "active")
+        return { valid: false, boundaryAdvanceU: 0 };
+      boundaryAdvanceU += after.tokens;
+    } else if (before.uTokens !== after.uTokens) {
+      return { valid: false, boundaryAdvanceU: 0 };
+    }
+  }
+  return { valid: true, boundaryAdvanceU };
+}
+function refreshPiTailHygieneBaseline(input) {
+  const measured = measurePiTailHygiene(input);
+  const now = input.now ?? Date.now();
+  if (!input.cacheBusting && input.previous?.generationInvalidated) {
+    return { ...input.previous, contentSignature: measured.contentSignature };
+  }
+  if (input.cacheBusting || !input.previous) {
+    return {
+      baselineU: measured.u,
+      baselineT: measured.t,
+      turnDeltaU: 0,
+      turnDeltaT: 0,
+      baselineGeneration: (input.previous?.baselineGeneration ?? 0) + 1,
+      computedAt: now,
+      evaluable: true,
+      generationInvalidated: false,
+      baselineParts: measured.parts,
+      contentSignature: measured.contentSignature
+    };
+  }
+  const prefix = sameMeasuredPrefix(input.previous.baselineParts, measured.parts);
+  if (!prefix.valid) {
+    return {
+      ...input.previous,
+      evaluable: false,
+      generationInvalidated: true,
+      contentSignature: measured.contentSignature
+    };
+  }
+  let turnDeltaT = 0;
+  let turnDeltaU = prefix.boundaryAdvanceU;
+  for (let index = input.previous.baselineParts.length;index < measured.parts.length; index += 1) {
+    const part = measured.parts[index];
+    turnDeltaT += part.tokens;
+    if (part.kind !== "toolOutput")
+      turnDeltaU += part.uTokens;
+  }
+  return {
+    ...input.previous,
+    turnDeltaU,
+    turnDeltaT,
+    evaluable: true,
+    generationInvalidated: false,
+    contentSignature: measured.contentSignature
+  };
+}
+function effectivePiTailHygiene(baseline) {
+  const t = Math.max(0, baseline.baselineT + baseline.turnDeltaT);
+  const u = Math.min(t, Math.max(0, baseline.baselineU + baseline.turnDeltaU));
+  return { u, t };
+}
+function measurePiToolResultDelta(content) {
+  let tokens = 0;
+  for (const part of content) {
+    if (!isRecord3(part))
+      continue;
+    if (part.type === "text" && typeof part.text === "string") {
+      const text = stripChannel1ReminderSpans(part.text);
+      if (text && !isDropSentinel(text))
+        tokens += memoizedTokens("toolOutput", text);
+    } else if (part.type === "image") {
+      tokens += imageContentAndTokens(part).tokens;
+    }
+  }
+  return Math.max(0, tokens);
+}
+function assertPiTailHygieneContentUnchanged(input) {
+  const current = measurePiTailHygiene(input);
+  if (current.contentSignature !== input.expectedSignature) {
+    throw new Error("Pi tail hygiene walk was not the last byte-affecting operation");
+  }
+}
+
+// src/ctx-reduce-nudge-pi.ts
+var channel1StateBySession = new Map;
+function setPiChannel1Baseline(sessionId, state2) {
+  channel1StateBySession.set(sessionId, state2);
+}
+function getPiChannel1Baseline(sessionId) {
+  return channel1StateBySession.get(sessionId);
+}
+function clearPiChannel1State(sessionId) {
+  channel1StateBySession.delete(sessionId);
+}
+function markPiChannel1Reduced(sessionId, db) {
+  const state2 = channel1StateBySession.get(sessionId);
+  if (state2) {
+    state2.reducedSinceRefresh = true;
+    state2.evaluable = false;
+    state2.generationInvalidated = true;
+  }
+  if (db)
+    resetLastNudgeCycle(db, sessionId);
+}
+function isPiTextContent(c) {
+  return c !== null && typeof c === "object" && c.type === "text" && typeof c.text === "string";
+}
+function toolResultText(content) {
+  let text = "";
+  for (const c of content) {
+    if (isPiTextContent(c))
+      text += c.text;
+  }
+  return text;
+}
+function maybeChannel1ReminderForToolResult(args) {
+  const { db, sessionId, toolName } = args;
+  const state2 = channel1StateBySession.get(sessionId);
+  if (!state2)
+    return null;
+  if (toolName === "ctx_reduce") {
+    state2.reducedSinceRefresh = true;
+    state2.evaluable = false;
+    state2.generationInvalidated = true;
+    resetLastNudgeCycle(db, sessionId);
+    return null;
+  }
+  const text = toolResultText(args.content);
+  if (text.includes(CHANNEL1_SENTINEL))
+    return null;
+  const deltaTokens = measurePiToolResultDelta(args.content);
+  if (deltaTokens === 0)
+    return null;
+  state2.turnDeltaT += deltaTokens;
+  const decision = decideChannel1({
+    ...state2,
+    lastNudgeUndropped: getLastNudgeUndropped(db, sessionId),
+    lastNudgeLevel: getLastNudgeLevel(db, sessionId),
+    hasRecentReduce: state2.reducedSinceRefresh
+  });
+  setLastNudgeUndropped(db, sessionId, decision.nextLastNudge);
+  setLastNudgeLevel(db, sessionId, decision.nextLastNudgeLevel);
+  if (!decision.fire)
+    return null;
+  return {
+    type: "text",
+    text: buildChannel1Reminder(decision.level, decision.undroppedTokens, state2.oldestReclaimableToolTags)
+  };
+}
+var CHANNEL2_NUDGE_CUSTOM_TYPE = "magic-context:ceiling-nudge";
+function maybeDeliverChannel2Pi(pi, db, sessionId) {
+  let state2;
+  try {
+    state2 = getChannel2NudgeState(db, sessionId);
+  } catch {
+    return false;
+  }
+  if (state2 !== "pending")
+    return false;
+  const baseline = channel1StateBySession.get(sessionId);
+  if (!baseline)
+    return false;
+  const evaluation = evaluateChannel2(baseline);
+  if (!evaluation.evaluable)
+    return false;
+  if (!evaluation.shouldTrigger) {
+    try {
+      casChannel2NudgeState(db, sessionId, "pending", "");
+    } catch {}
+    return false;
+  }
+  const undropped = evaluation.reclaimableTokens;
+  const claimToken = randomUUID2();
+  if (!claimChannel2NudgeState(db, sessionId, claimToken))
+    return false;
+  try {
+    const message = {
+      customType: CHANNEL2_NUDGE_CUSTOM_TYPE,
+      content: buildChannel2Reminder(undropped, baseline.oldestReclaimableToolTags),
+      display: false,
+      details: { kind: "channel-2-ceiling-nudge" }
+    };
+    const claim = getChannel2NudgeClaim(db, sessionId);
+    if (claim.state !== "claimed" || claim.claimToken !== claimToken) {
+      sessionLog(sessionId, `channel2 ceiling nudge delivery skipped: claim no longer owned before send (state=${claim.state || "empty"})`);
+      return false;
     }
-  })();
-  const toolFingerprints = buildPiToolFingerprints(piMessages, resolveStableId);
-  if (toolFingerprints.size > 0) {
-    const tagsByCompositeKey = new Map;
-    for (const tag of tags) {
-      if (tag.type === "tool" && tag.status === "active" && tag.messageId) {
-        const key = tag.toolOwnerMessageId ? `${tag.toolOwnerMessageId}\x00${tag.messageId}` : tag.messageId;
-        tagsByCompositeKey.set(key, tag);
+    pi.sendMessage(message, { deliverAs: "nextTurn" });
+  } catch (error) {
+    try {
+      const restored = casChannel2NudgeClaim(db, sessionId, "pending", claimToken);
+      if (restored) {
+        sessionLog(sessionId, "channel2 ceiling nudge delivery failed (will retry):", error);
+      } else {
+        sessionLog(sessionId, "channel2 ceiling nudge delivery failed after its claim was no longer owned; lease state left unchanged:", error);
       }
+    } catch (revertError) {
+      sessionLog(sessionId, "channel2 ceiling nudge delivery failed; token-bound pending restore was busy so the stale claim will heal later:", { deliveryError: error, revertError });
     }
-    const fingerprintGroups = new Map;
-    for (const [compositeKey, fingerprint] of toolFingerprints) {
-      const tag = tagsByCompositeKey.get(compositeKey);
-      if (!tag || tag.tagNumber > protectedCutoff)
-        continue;
-      const group = fingerprintGroups.get(fingerprint) ?? [];
-      group.push(tag);
-      fingerprintGroups.set(fingerprint, group);
-    }
-    db.transaction(() => {
-      for (const [, group] of fingerprintGroups) {
-        if (group.length <= 1)
-          continue;
-        group.sort((a, b) => a.tagNumber - b.tagNumber);
-        for (let i = 0;i < group.length - 1; i++) {
-          const tag = group[i];
-          const target = targets.get(tag.tagNumber);
-          const result = target?.drop?.() ?? "absent";
-          if (result === "incomplete")
-            continue;
-          updateTagDropMode(db, sessionId, tag.tagNumber, "full");
-          updateTagStatus(db, sessionId, tag.tagNumber, "dropped");
-          if (result === "removed" || result === "truncated") {
-            deduplicatedTools++;
-          }
-        }
-      }
-    })();
-  }
-  if (droppedTools > 0 || deduplicatedTools > 0 || droppedInjections > 0 || droppedStaleReduceCalls > 0) {
-    sessionLog(sessionId, `heuristic cleanup: dropped ${droppedTools} tool tags, stale ctx_reduce=${droppedStaleReduceCalls}, deduplicated ${deduplicatedTools} tool calls, dropped ${droppedInjections} system injections`);
+    return false;
   }
-  let compressedTextTags = 0;
-  let mutatedTextTags = 0;
-  if (config.caveman?.enabled) {
-    const cavemanResult = applyCavemanCleanup(sessionId, db, targets, tags, {
-      enabled: true,
-      minChars: config.caveman.minChars,
-      protectedTags: config.protectedTags
-    });
-    compressedTextTags = cavemanResult.compressedToLite + cavemanResult.compressedToFull + cavemanResult.compressedToUltra;
-    mutatedTextTags = cavemanResult.mutatedTextTags;
+  try {
+    const confirmed = casChannel2NudgeClaim(db, sessionId, "delivered", claimToken);
+    if (confirmed) {
+      sessionLog(sessionId, "channel2 ceiling nudge delivered");
+      return true;
+    }
+    const claim = getChannel2NudgeClaim(db, sessionId);
+    sessionLog(sessionId, `channel2 ceiling nudge sent but claim confirmation was not ours (state=${claim.state || "empty"}); leaving existing lease state unchanged`);
+    return false;
+  } catch (error) {
+    sessionLog(sessionId, "channel2 ceiling nudge sent but token-confirm failed; lease state left unchanged:", error);
+    return false;
   }
-  return {
-    droppedTools,
-    deduplicatedTools,
-    droppedInjections,
-    droppedStaleReduceCalls,
-    emergencyDroppedTools,
-    compressedTextTags,
-    mutatedTextTags
-  };
 }
-function buildMessageIdToMaxTagFromTargets(targets) {
-  const byMessage = new Map;
-  for (const [tagNumber, target] of targets) {
-    const id = target.message?.info?.id;
-    if (typeof id !== "string" || id.length === 0)
+
+// src/detect-recent-commit.ts
+var COMMIT_LOOKBACK = 5;
+function detectRecentCommit(messages) {
+  let assistantsScanned = 0;
+  for (let i = messages.length - 1;i >= 0; i--) {
+    const message = messages[i];
+    if (!message || typeof message !== "object" || !("role" in message) || message.role !== "assistant") {
       continue;
-    if (tagNumber > (byMessage.get(id) ?? 0))
-      byMessage.set(id, tagNumber);
+    }
+    assistantsScanned++;
+    if (assistantsScanned > COMMIT_LOOKBACK)
+      break;
+    if (!("content" in message))
+      continue;
+    const content = message.content;
+    if (!Array.isArray(content))
+      continue;
+    for (const part of content) {
+      if (part && typeof part === "object" && "type" in part && part.type === "text" && "text" in part && typeof part.text === "string") {
+        if (textMentionsRecentCommit(part.text)) {
+          return true;
+        }
+      }
+    }
   }
-  return byMessage;
+  return false;
 }
 
 // src/inject-compartments-pi.ts
@@ -16370,6 +16705,7 @@ function getPiToolResultCallId(message) {
   return typeof callId === "string" && callId.length > 0 ? callId : null;
 }
 var PI_M1_PLACEHOLDER = "<session-history-since>(no new content since last materialization)</session-history-since>";
+var MAX_FORCED_MEMORIES_PER_DELTA = 10;
 var PI_M0_UPGRADE_STATE = "pi-m0m1-v2";
 var EMPTY_MAX_COMPARTMENT_SEQ = -1;
 function historySliceTokensPi(m0Text) {
@@ -16450,6 +16786,9 @@ var EMPTY_PI_HARD_SIGNALS = {
 function renderBudgetIdentityPi(state2) {
   return `m${state2.injectionBudgetTokens ?? DEFAULT_MEMORY_BUDGET_TOKENS}-h${state2.historyBudgetTokens ?? DEFAULT_HISTORY_BUDGET_TOKENS}`;
 }
+function piMaterializeMismatch(reason, signal, cached, current) {
+  return { value: true, reason, mismatch: { signal, cached, current } };
+}
 var injectionTokenCountsBySession = new Map;
 var cachedMuralBySession = new Map;
 function rememberPiMuralPayload(sessionId, dataUrl, contentHash) {
@@ -16600,7 +16939,7 @@ function readCurrentMarkersFromCompartments(db, state2, compartments, projectDoc
     compartmentRenderEpoch: COMPARTMENT_RENDER_EPOCH,
     lastBaselineEndMessageId: lastBaselineEndMessageId(compartments),
     systemHash: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).systemHash,
-    modelKey: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey,
+    modelKey: piModelRefToCanonical((state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey),
     projectIdentity: state2.projectIdentity,
     muralEnabled: state2.muralEnabled === true,
     renderBudgetIdentity: renderBudgetIdentityPi(state2)
@@ -16622,36 +16961,41 @@ function mustMaterializePi(state2, db, currentCompartmentsOverride) {
     return { value: true, reason: "cache_invalid" };
   }
   if (cached.compartmentRenderEpoch !== current.compartmentRenderEpoch) {
-    return { value: true, reason: "compartment_render_epoch" };
+    return piMaterializeMismatch("compartment_render_epoch", "compartmentRenderEpoch", cached.compartmentRenderEpoch, current.compartmentRenderEpoch);
   }
-  if (cached.muralEnabled !== current.muralEnabled || cached.renderBudgetIdentity !== current.renderBudgetIdentity) {
-    return { value: true, reason: "render_config" };
+  if (cached.muralEnabled !== current.muralEnabled) {
+    return piMaterializeMismatch("render_config", "muralEnabled", cached.muralEnabled, current.muralEnabled);
+  }
+  if (cached.renderBudgetIdentity !== current.renderBudgetIdentity) {
+    return piMaterializeMismatch("render_config", "renderBudgetIdentity", cached.renderBudgetIdentity, current.renderBudgetIdentity);
   }
   const hard = state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS;
-  if (hard.modelKey !== "" && hard.modelKey !== (meta.cachedM0ModelKey ?? "")) {
-    return { value: true, reason: "model_change" };
+  const canonicalHardModelKey = piModelRefToCanonical(hard.modelKey);
+  const canonicalCachedModelKey = piModelRefToCanonical(meta.cachedM0ModelKey ?? "");
+  if (canonicalHardModelKey !== "" && canonicalHardModelKey !== canonicalCachedModelKey) {
+    return piMaterializeMismatch("model_change", "modelKey", canonicalCachedModelKey, canonicalHardModelKey);
   }
   if (hard.systemHash !== "" && hard.systemHash !== (meta.cachedM0SystemHash ?? "")) {
-    return { value: true, reason: "system_hash" };
+    return piMaterializeMismatch("system_hash", "systemHash", meta.cachedM0SystemHash ?? "", hard.systemHash);
   }
   if (meta.cachedM0ProjectIdentity !== null && meta.cachedM0ProjectIdentity !== state2.projectIdentity) {
-    return { value: true, reason: "project_change" };
+    return piMaterializeMismatch("project_change", "projectIdentity", meta.cachedM0ProjectIdentity, state2.projectIdentity);
   }
   if (hard.cacheExpired && hard.lastResponseTime > 0 && hard.lastResponseTime > (meta.cachedM0MaterializedAt ?? 0)) {
-    return { value: true, reason: "ttl_idle" };
+    return piMaterializeMismatch("ttl_idle", "lastResponseTimeAfterMaterialization", meta.cachedM0MaterializedAt ?? 0, hard.lastResponseTime);
   }
   if (cached.upgradeState !== current.upgradeState) {
-    return { value: true, reason: "renderer_upgrade" };
+    return piMaterializeMismatch("renderer_upgrade", "upgradeState", cached.upgradeState, current.upgradeState);
   }
   if (current.workspaceFingerprint !== null || (meta.cachedM0WorkspaceFingerprint ?? null) !== null) {
     if (current.workspaceFingerprint !== (meta.cachedM0WorkspaceFingerprint ?? null)) {
-      return { value: true, reason: "project_memory_change" };
+      return piMaterializeMismatch("project_memory_change", "workspaceFingerprint", meta.cachedM0WorkspaceFingerprint ?? null, current.workspaceFingerprint);
     }
   } else if (current.projectMemoryEpoch !== (meta.cachedM0ProjectMemoryEpoch ?? 0)) {
-    return { value: true, reason: "project_memory_change" };
+    return piMaterializeMismatch("project_memory_change", "projectMemoryEpoch", meta.cachedM0ProjectMemoryEpoch ?? 0, current.projectMemoryEpoch);
   }
   if (current.maxMutationId !== (meta.cachedM0MaxMutationId ?? 0)) {
-    return { value: true, reason: "pending_mutations" };
+    return piMaterializeMismatch("pending_mutations", "maxMutationId", meta.cachedM0MaxMutationId ?? 0, current.maxMutationId);
   }
   return { value: false, reason: null };
 }
@@ -16763,7 +17107,7 @@ function readFrozenM0InputsPi(state2, db, docs = readProjectDocsForPiM0(state2),
       compartmentRenderEpoch: COMPARTMENT_RENDER_EPOCH,
       lastBaselineEndMessageId: lastBaselineEndMessageId(compartments),
       systemHash: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).systemHash,
-      modelKey: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey,
+      modelKey: piModelRefToCanonical((state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey),
       projectIdentity: state2.projectIdentity,
       muralEnabled: state2.muralEnabled === true,
       renderBudgetIdentity: renderBudgetIdentityPi(state2)
@@ -16889,49 +17233,74 @@ function materializeM0PiWithRetry(state2, db, maxRetries = 3) {
   throw lastError ?? new PiMaterializeContentionError("materialization contention exhausted");
 }
 function renderMemoryUpdatesBlockPi(args) {
-  if (args.renderedMemoryIds.length === 0)
-    return { block: "", count: 0 };
   const renderedIds = new Set(args.renderedMemoryIds);
   const mutations = args.workspace.isWorkspaced ? getMemoryMutationsForRenderByProjects(args.db, args.workspace.expandedIdentities, args.afterId, args.renderedMemoryIds) : getMemoryMutationsForRender(args.db, args.projectPath, args.afterId, args.renderedMemoryIds);
-  if (mutations.length === 0)
-    return { block: "", count: 0 };
+  if (mutations.length === 0) {
+    return { block: "", count: 0, forcedMemoryIds: [] };
+  }
+  const forcedIds = new Set;
   const lines = [
     "These memories changed since the snapshot below — trust these:"
   ];
   for (const mutation of mutations) {
-    if (mutation.mutationType === "update") {
-      lines.push(`  <updated id="${mutation.targetMemoryId}">${escapeXmlContent(mutation.newContent ?? "")}</updated>`);
-      continue;
-    }
     if (mutation.mutationType === "superseded") {
-      if (mutation.supersededById !== null && renderedIds.has(mutation.supersededById)) {
-        lines.push(`  <superseded id="${mutation.targetMemoryId}" by="${mutation.supersededById}"/>`);
+      const replacementId = mutation.supersededById;
+      if (replacementId !== null && !renderedIds.has(replacementId) && args.eligibleMemoryIds.has(replacementId)) {
+        forcedIds.add(replacementId);
+      }
+      if (!renderedIds.has(mutation.targetMemoryId))
+        continue;
+      if (replacementId !== null && args.eligibleMemoryIds.has(replacementId)) {
+        lines.push(`  <superseded id="${mutation.targetMemoryId}" by="${replacementId}"/>`);
       } else {
         lines.push(`  <removed id="${mutation.targetMemoryId}"/>`);
       }
       continue;
     }
+    if (!renderedIds.has(mutation.targetMemoryId)) {
+      if (mutation.visibilityChanged && args.eligibleMemoryIds.has(mutation.targetMemoryId)) {
+        forcedIds.add(mutation.targetMemoryId);
+      }
+      continue;
+    }
+    if (!args.eligibleMemoryIds.has(mutation.targetMemoryId)) {
+      lines.push(`  <removed id="${mutation.targetMemoryId}"/>`);
+      continue;
+    }
+    if (mutation.visibilityChanged && mutation.newContent === null)
+      continue;
+    if (mutation.mutationType === "update") {
+      lines.push(`  <updated id="${mutation.targetMemoryId}">${escapeXmlContent(mutation.newContent ?? "")}</updated>`);
+      continue;
+    }
     lines.push(`  <removed id="${mutation.targetMemoryId}"/>`);
   }
+  const forcedMemoryIds = [...forcedIds].sort((left, right) => left - right).slice(0, MAX_FORCED_MEMORIES_PER_DELTA);
+  if (lines.length === 1)
+    return { block: "", count: 0, forcedMemoryIds };
   return {
     block: `<memory-updates>
 ${lines.join(`
 `)}
 </memory-updates>`,
-    count: mutations.length
+    count: lines.length - 1,
+    forcedMemoryIds
   };
 }
 function renderM1PiWithMetadata(state2, db, markers, renderedMemoryIds, compartmentsOverride) {
   const sections = [];
   const workspace = resolveWorkspaceRenderContextPi(state2, db);
   const memPath = memoryProjectPath(state2);
+  const eligibleMemories = memPath ? workspace.isWorkspaced ? getMemoriesByProjects(db, workspace.expandedIdentities, ["active", "permanent"], markers.materializedAt, workspace.ownIdentities, workspace.shareCategories) : getMemoriesByProject(db, memPath, ["active", "permanent"], markers.materializedAt) : [];
+  const eligibleMemoryIds = new Set(eligibleMemories.map((memory) => memory.id));
   const memoryUpdates = memPath ? renderMemoryUpdatesBlockPi({
     db,
     projectPath: memPath,
     workspace,
     afterId: markers.maxMemoryMutationId,
-    renderedMemoryIds
-  }) : { block: undefined, count: 0 };
+    renderedMemoryIds,
+    eligibleMemoryIds
+  }) : { block: undefined, count: 0, forcedMemoryIds: [] };
   if (memoryUpdates.block)
     sections.push(memoryUpdates.block);
   const newCompartments = (compartmentsOverride ?? getRenderableCompartmentsPi(db, state2)).filter((compartment) => compartment.sequence > markers.maxCompartmentSeq);
@@ -16943,21 +17312,24 @@ function renderM1PiWithMetadata(state2, db, markers, renderedMemoryIds, compartm
 ${body}
 </new-compartments>`);
   }
-  const newMemories = memPath ? workspace.isWorkspaced ? readNewMemoriesForM1Union(db, workspace.expandedIdentities, markers.maxMemoryId, markers.materializedAt, workspace.ownIdentities, workspace.shareCategories) : getMemoriesByProject(db, memPath, ["active", "permanent"], markers.materializedAt).filter((memory) => memory.id > markers.maxMemoryId) : [];
-  if (newMemories.length > 0) {
-    const memoryBudget = state2.injectionBudgetTokens ?? DEFAULT_MEMORY_BUDGET_TOKENS;
-    const memoryRenderOptions = {
-      sourceNameByMemoryId: sourceNamesForPiMemories({
-        memories: newMemories,
-        projectPath: memPath,
-        workspace
-      })
-    };
-    const trimmedNewMemories = trimMemoriesToBudgetV2(state2.sessionId, newMemories, Math.max(1, Math.floor(memoryBudget * 0.25)), memoryRenderOptions).renderOrder;
-    const newMemoriesBlock = renderMemoryBlockV2(trimmedNewMemories, "new-memories", memoryRenderOptions);
-    if (newMemoriesBlock)
-      sections.push(newMemoriesBlock);
-  }
+  const forcedMemoryIds = new Set(memoryUpdates.forcedMemoryIds);
+  const newMemories = eligibleMemories.filter((memory) => memory.id > markers.maxMemoryId && !forcedMemoryIds.has(memory.id));
+  const memoryBudget = state2.injectionBudgetTokens ?? DEFAULT_MEMORY_BUDGET_TOKENS;
+  const memoryRenderOptions = {
+    sourceNameByMemoryId: sourceNamesForPiMemories({
+      memories: eligibleMemories,
+      projectPath: memPath,
+      workspace
+    })
+  };
+  const trimmedNewMemories = trimMemoriesToBudgetV2(state2.sessionId, newMemories, Math.max(1, Math.floor(memoryBudget * 0.25)), memoryRenderOptions).renderOrder;
+  const deltaMemories = [
+    ...trimmedNewMemories,
+    ...eligibleMemories.filter((memory) => forcedMemoryIds.has(memory.id))
+  ];
+  const newMemoriesBlock = renderMemoryBlockV2(deltaMemories, "new-memories", memoryRenderOptions);
+  if (newMemoriesBlock)
+    sections.push(newMemoriesBlock);
   const currentUserProfileVersion = getProjectState(db, GLOBAL_USER_PROFILE_PROJECT_PATH)?.projectUserProfileVersion ?? 0;
   if (currentUserProfileVersion !== markers.projectUserProfileVersion) {
     const profileBudget = state2.userProfileBudgetTokens ?? DEFAULT_USER_PROFILE_BUDGET_TOKENS;
@@ -17072,7 +17444,7 @@ function cachedPiRowMatchesSnapshot(args) {
   const rowMarkers = markersFromCachedPiRow(args.row, args.compartmentsForNormalization);
   if (!rowMarkers)
     return false;
-  return bufferEqualsNullable(args.row.cached_m0_bytes, args.m0Bytes) && rowMarkers.projectMemoryEpoch === args.markers.projectMemoryEpoch && rowMarkers.projectUserProfileVersion === args.markers.projectUserProfileVersion && rowMarkers.maxCompartmentSeq === args.markers.maxCompartmentSeq && rowMarkers.maxMemoryId === args.markers.maxMemoryId && rowMarkers.maxMutationId === args.markers.maxMutationId && rowMarkers.maxMemoryMutationId === args.markers.maxMemoryMutationId && rowMarkers.materializedAt === args.markers.materializedAt && rowMarkers.sessionFactsVersion === args.markers.sessionFactsVersion && (rowMarkers.upgradeState ?? null) === (args.markers.upgradeState ?? null) && rowMarkers.compartmentRenderEpoch === args.markers.compartmentRenderEpoch && (rowMarkers.systemHash ?? "") === (args.markers.systemHash ?? "") && (rowMarkers.modelKey ?? "") === (args.markers.modelKey ?? "") && (rowMarkers.projectIdentity ?? null) === (args.markers.projectIdentity ?? null) && (rowMarkers.workspaceFingerprint ?? null) === (args.markers.workspaceFingerprint ?? null);
+  return bufferEqualsNullable(args.row.cached_m0_bytes, args.m0Bytes) && rowMarkers.projectMemoryEpoch === args.markers.projectMemoryEpoch && rowMarkers.projectUserProfileVersion === args.markers.projectUserProfileVersion && rowMarkers.maxCompartmentSeq === args.markers.maxCompartmentSeq && rowMarkers.maxMemoryId === args.markers.maxMemoryId && rowMarkers.maxMutationId === args.markers.maxMutationId && rowMarkers.maxMemoryMutationId === args.markers.maxMemoryMutationId && rowMarkers.materializedAt === args.markers.materializedAt && rowMarkers.sessionFactsVersion === args.markers.sessionFactsVersion && (rowMarkers.upgradeState ?? null) === (args.markers.upgradeState ?? null) && rowMarkers.compartmentRenderEpoch === args.markers.compartmentRenderEpoch && (rowMarkers.systemHash ?? "") === (args.markers.systemHash ?? "") && piModelRefToCanonical(rowMarkers.modelKey ?? "") === piModelRefToCanonical(args.markers.modelKey ?? "") && (rowMarkers.projectIdentity ?? null) === (args.markers.projectIdentity ?? null) && (rowMarkers.workspaceFingerprint ?? null) === (args.markers.workspaceFingerprint ?? null);
 }
 function adoptCachedPiProjectIdentity(db, state2) {
   db.prepare("UPDATE session_meta SET cached_m0_project_identity = ? WHERE session_id = ? AND cached_m0_project_identity IS NULL").run(state2.projectIdentity, state2.sessionId);
@@ -17188,6 +17560,10 @@ function prependM0M1Messages(piMessages, m0, m1, mural) {
 function injectM0M1Pi(state2, db, piMessages, entryIds, recomputeM1ThisPass = false) {
   const currentCompartments = getRenderableCompartmentsPi(db, state2);
   let decision = mustMaterializePi(state2, db, currentCompartments);
+  if (decision.value) {
+    const mismatch = decision.mismatch ? ` mismatch=${JSON.stringify(decision.mismatch)}` : "";
+    sessionLog(state2.sessionId, `pi m[0] HARD fold firing: reason=${decision.reason ?? "unknown"}${mismatch}`);
+  }
   let m0 = "";
   let m1 = PI_M1_PLACEHOLDER;
   let markers = null;
@@ -17386,13 +17762,45 @@ function isSentinelPart(part) {
 }
 
 // src/pi-context-limit.ts
-function resolvePiUsableContextLimit(args) {
-  const rawContext = isSaneLimit(args.rawContextWindow) ? args.rawContextWindow : undefined;
-  const detected = typeof args.detectedContextLimit === "number" && Number.isFinite(args.detectedContextLimit) && args.detectedContextLimit >= 1024 ? args.detectedContextLimit : undefined;
-  const context = rawContext !== undefined && detected !== undefined ? Math.min(rawContext, detected) : rawContext ?? detected;
-  if (context === undefined)
+var MIN_SANE_LIMIT = 16000;
+var MAX_SANE_LIMIT = 1e7;
+function isSaneLimit2(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= MIN_SANE_LIMIT && value <= MAX_SANE_LIMIT;
+}
+function resolvePiWindowGeometry(args) {
+  const runtimeWindow = isSaneLimit2(args.rawContextWindow) ? args.rawContextWindow : isSaneLimit2(args.model?.contextWindow) ? args.model.contextWindow : undefined;
+  const persistedUsable = isSaneLimit2(args.persistedInputTokens) && typeof args.persistedPercentage === "number" && Number.isFinite(args.persistedPercentage) && args.persistedPercentage > 0 ? args.persistedInputTokens / (args.persistedPercentage / 100) : undefined;
+  const persistedWindow = isSaneLimit2(args.persistedInputTokens) && typeof args.persistedPercentage === "number" && Number.isFinite(args.persistedPercentage) && args.persistedPercentage > 0 ? args.persistedInputTokens / (args.persistedPercentage / 100) : undefined;
+  const context = runtimeWindow ?? persistedWindow;
+  if (!isSaneLimit2(context))
     return;
-  return resolveLimit({ context, output: args.model?.maxTokens }, args.model?.provider ?? "unknown", args.model?.id ?? "unknown");
+  const providerID = args.model?.provider ?? "unknown";
+  const modelID = args.model?.id ?? "unknown";
+  const outputReserveOverride = resolveOutputReserve(providerID, modelID, args.reserveConfig);
+  const result = deriveWindowGeometry(providerID, modelID, {
+    context,
+    output: args.model?.maxTokens
+  }, {
+    overlay: resolveWindowOverlayFacts(providerID, modelID, getWindowOverlay()),
+    contextCap: isSaneLimit2(args.detectedContextLimit) ? args.detectedContextLimit : undefined,
+    outputReserveOverride,
+    harness: "pi"
+  });
+  if (!result || outputReserveOverride !== undefined || !isSaneLimit2(persistedUsable))
+    return result;
+  const usableSoft = Math.round(persistedUsable);
+  return {
+    ...result,
+    usableSoft,
+    usableHard: Math.max(usableSoft, result.usableHard),
+    derivation: {
+      ...result.derivation,
+      reserve: Math.max(0, result.derivation.window - usableSoft)
+    }
+  };
+}
+function resolvePiUsableContextLimit(args) {
+  return resolvePiWindowGeometry(args)?.usableSoft;
 }
 
 // src/pi-historian-runner.ts
@@ -21935,6 +22343,11 @@ function buildMagicContextBlock(opts) {
     return null;
   return buildMagicContextSection(null, opts.protectedTags ?? 20, opts.ctxReduceCallable ?? true, opts.dreamerEnabled ?? false, opts.temporalAwarenessEnabled ?? false, opts.cavemanTextCompressionEnabled ?? false, false, opts.language, opts.memoryEnabled !== false, opts.promptSurfacePreset, opts.primaryGuidanceOverride);
 }
+function composeMagicContextSystemPrompt(basePrompt, block) {
+  return block ? `${basePrompt}
+
+${block}` : basePrompt;
+}
 var DATE_PATTERN = /Today's date: .+/;
 function processSystemPromptForCache(args) {
   const { db, sessionId, systemPrompt, isCacheBusting } = args;
@@ -22796,6 +23209,9 @@ function extractStableId(msg, index, entryIds) {
 // src/context-handler.ts
 var EMERGENCY_BLOCK_PERCENTAGE = 95;
 var FORWARD_PRESSURE_LIMIT_FACTOR = 0.85;
+function isPiHardCacheExpired(lastResponseTime, ttlMs, now) {
+  return lastResponseTime > 0 && now - lastResponseTime > ttlMs;
+}
 function applyForwardPressureFloor(trailingPercentage, trailingInputTokens, piUsageTokens, correctedLimit) {
   const forwardTokens = typeof piUsageTokens === "number" && piUsageTokens > 0 ? piUsageTokens : 0;
   if (forwardTokens === 0 || !isSaneLimit(correctedLimit)) {
@@ -22812,6 +23228,7 @@ var injectM0M1PiForRun = injectM0M1Pi;
 var persistReasoningWatermarkForRun = updateSessionMeta;
 var persistStableIdSchemeForRun = updateSessionMeta;
 var afterFallbackAdoptionForTests;
+var mutationGateObserverForTests;
 var DEFAULT_CLEAR_REASONING_AGE = 50;
 var PI_STABLE_ID_SCHEME = 1;
 var lastEmergencyNotificationAtMs = new Map;
@@ -23632,7 +24049,7 @@ function registerPiContextHandler(pi, baseOptions) {
       }
       const previousModelKey = liveModelBySession.get(sessionId);
       const currentModelKey = resolvePiContextModelKey(ctx);
-      const modelChanged = previousModelKey !== undefined && currentModelKey !== undefined && previousModelKey !== currentModelKey;
+      const modelChanged = previousModelKey !== undefined && currentModelKey !== undefined && piModelRefToCanonical(previousModelKey) !== piModelRefToCanonical(currentModelKey);
       if (currentModelKey !== undefined) {
         liveModelBySession.set(sessionId, currentModelKey);
       }
@@ -23731,11 +24148,12 @@ function registerPiContextHandler(pi, baseOptions) {
           usageContextLimit = modelWindow;
         }
       }
-      usageContextLimit = resolvePiUsableContextLimit({
+      const windowGeometry = resolvePiWindowGeometry({
         rawContextWindow: usageContextLimit,
         model: ctx.model,
         detectedContextLimit
       });
+      usageContextLimit = windowGeometry?.usableSoft;
       const effectiveExecuteThresholdPercentage = resolveExecuteThreshold(schedulerConfig.executeThresholdPercentage, modelKey, 65, {
         tokensConfig: schedulerConfig.executeThresholdTokens,
         contextLimit: usageContextLimit,
@@ -23807,7 +24225,9 @@ function registerPiContextHandler(pi, baseOptions) {
       schedulerDecision = midTurnAdjustedSchedulerDecision;
       sessionLog(sessionId, `[boundary-exec] base=${schedulerDecisionEarly} bypass=${bypassReason} midTurn=${midTurn} effective=${midTurnAdjustedSchedulerDecision} sideEffect=${sideEffect}`);
       const forceMaterialization = !options.compactionOff && usagePercentage >= forceMaterializationPercentage;
-      const isEmergency = !options.compactionOff && usagePercentage >= EMERGENCY_BLOCK_PERCENTAGE;
+      const hardUsagePercentage = needsEmergencyBump ? Math.max(EMERGENCY_BLOCK_PERCENTAGE, usagePercentage) : windowGeometry?.usableHard && usageInputTokens > 0 ? usageInputTokens / windowGeometry.usableHard * 100 : usagePercentage;
+      const emergencyPercentage = ctx.model ? hardUsagePercentage : usagePercentage;
+      const isEmergency = !options.compactionOff && emergencyPercentage >= EMERGENCY_BLOCK_PERCENTAGE;
       if (isEmergency) {
         const lastNotifiedAt = lastEmergencyNotificationAtMs.get(sessionId) ?? 0;
         const now = Date.now();
@@ -23929,6 +24349,7 @@ function registerPiContextHandler(pi, baseOptions) {
       logTransformTiming(sessionId, "historianScheduling", tHistorianScheduling);
       const tPostTransform = performance.now();
       let outputMessages = result.messages;
+      let assertTailHygieneLastWriter;
       const tNoteNudges = performance.now();
       try {
         if (!options.compactionOff) {
@@ -23992,60 +24413,61 @@ function registerPiContextHandler(pi, baseOptions) {
       try {
         const sessionMetaForCh1 = getOrCreateSessionMeta(options.db, sessionId);
         if (!options.compactionOff && !sessionMetaForCh1.isSubagent) {
-          const resolvedExecuteThresholdPct = resolveExecuteThreshold(schedulerConfig.executeThresholdPercentage ?? 65, liveModelBySession.get(sessionId), 65, {
-            tokensConfig: schedulerConfig.executeThresholdTokens,
-            contextLimit: usageContextLimit ?? 0
-          });
-          const historyBudgetTokens = resolveHistoryBudgetTokensForPi({
-            historyBudgetPercentage: options.historian?.historyBudgetPercentage,
-            usagePercentage,
-            usageInputTokens,
-            usageContextLimit,
-            executeThresholdPercentage: schedulerConfig.executeThresholdPercentage,
-            executeThresholdTokens: schedulerConfig.executeThresholdTokens,
-            modelKey: liveModelBySession.get(sessionId)
+          const tags = getTagsBySession(options.db, sessionId);
+          const protectedTags = options.protectedTags ?? 20;
+          const stableId = (message) => message && typeof message === "object" ? result.postCommitEntryIdByRef.get(message) : undefined;
+          const baseline = refreshPiTailHygieneBaseline({
+            messages: outputMessages,
+            tags,
+            protectedTags,
+            stableId,
+            syntheticLeadingCount: result.syntheticLeadingCount,
+            cacheBusting: result.bustedThisPass,
+            previous: getPiChannel1Baseline(sessionId)
           });
-          let tailToolTokens;
-          let liveTailTokens;
-          try {
-            const agg = getActiveTagTokenAggregate(options.db, sessionId, options.protectedTags ?? 20);
-            tailToolTokens = agg.toolOutput;
-            liveTailTokens = agg.conversation + agg.toolCall;
-          } catch {
-            const estimate = computeTailTokenEstimatePi(outputMessages);
-            tailToolTokens = estimate.tailToolTokens;
-            liveTailTokens = estimate.liveTailTokens;
-          }
-          const executeThresholdTokensPi = Math.round((usageContextLimit ?? 0) * resolvedExecuteThresholdPct / 100);
-          const usableTokensPi = Math.max(0, executeThresholdTokensPi - usageInputTokens + liveTailTokens);
-          resetLastNudgeCycleIfTailShrank(options.db, sessionId, tailToolTokens);
-          const oldestReclaimableToolTags = getOldestActiveUnprotectedToolTags(options.db, sessionId, options.protectedTags ?? 20);
-          setPiChannel1Baseline(sessionId, {
-            tailToolTokens,
-            historyBudgetTokens: historyBudgetTokens ?? 0,
-            contextLimit: usageContextLimit ?? 0,
-            executeThresholdPercentage: resolvedExecuteThresholdPct,
-            lastInputTokens: usageInputTokens,
-            turnToolTokens: 0,
-            usableTokens: usableTokensPi,
+          const effective = effectivePiTailHygiene(baseline);
+          resetLastNudgeCycleIfTailShrank(options.db, sessionId, effective.u);
+          const oldestReclaimableToolTags = getOldestActiveUnprotectedToolTags(options.db, sessionId, protectedTags);
+          const channelState = {
+            ...baseline,
             reducedSinceRefresh: false,
             oldestReclaimableToolTags
-          });
-          if (usageContextLimit && usageContextLimit > 0 && resolvedExecuteThresholdPct > 0) {
-            const channel2ShouldTrigger = shouldTriggerChannel2({
-              reclaimableTokens: tailToolTokens,
-              usableTokens: usableTokensPi
-            });
-            if (channel2ShouldTrigger) {
+          };
+          setPiChannel1Baseline(sessionId, channelState);
+          const channel2Evaluation = evaluateChannel2(channelState);
+          if (channel2Evaluation.evaluable) {
+            try {
+              rearmChannel2AfterMeasuredCollapse({
+                db: options.db,
+                sessionId,
+                baseline: channelState
+              });
+            } catch (error) {
+              sessionLog(sessionId, `pi channel2 U-collapse reset failed: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            if (channel2Evaluation.shouldTrigger) {
               casChannel2NudgeState(options.db, sessionId, "", "pending");
             } else {
               casChannel2NudgeState(options.db, sessionId, "pending", "");
             }
           }
+          assertTailHygieneLastWriter = () => assertPiTailHygieneContentUnchanged({
+            messages: outputMessages,
+            tags,
+            protectedTags,
+            stableId,
+            syntheticLeadingCount: result.syntheticLeadingCount,
+            expectedSignature: baseline.contentSignature
+          });
         } else {
           clearPiChannel1State(sessionId);
         }
       } catch (err) {
+        const stale = getPiChannel1Baseline(sessionId);
+        if (stale) {
+          stale.evaluable = false;
+          stale.generationInvalidated = true;
+        }
         sessionLog(sessionId, `channel1 baseline / channel2 trigger failed: ${err instanceof Error ? err.message : String(err)}`);
       }
       logTransformTiming(sessionId, "channelNudgeAccounting", tChannelAccounting);
@@ -24081,6 +24503,9 @@ function registerPiContextHandler(pi, baseOptions) {
         extra: `messages=${outputMessages.length} targets=${result.targetCount}`
       });
       sessionLog(sessionId, `transform completed in ${transformElapsedMs.toFixed(1)}ms (${outputMessages.length} messages, ${result.targetCount} targets, watermark: ${result.reasoningWatermark})`);
+      if (assertTailHygieneLastWriter && true) {
+        assertTailHygieneLastWriter();
+      }
       return { messages: outputMessages };
     } catch (err) {
       if (isFailClosedBlockingError(err) && !baseOptions.compactionOff)
@@ -24618,23 +25043,53 @@ async function runPipeline(args) {
     return {
       systemHash: typeof hardMeta.systemPromptHash === "string" ? hardMeta.systemPromptHash : "",
       modelKey: liveModelBySession.get(args.sessionId) ?? "",
-      cacheExpired: hardMeta.lastResponseTime > 0 && Date.now() - hardMeta.lastResponseTime >= piTtlMs,
+      cacheExpired: isPiHardCacheExpired(hardMeta.lastResponseTime, piTtlMs, Date.now()),
       lastResponseTime: hardMeta.lastResponseTime
     };
   })() : undefined;
-  const m0HardFoldThisPass = args.injection && piHardSignals ? mustMaterializePi({
+  const piM0State = args.injection && piHardSignals ? {
     sessionId: args.sessionId,
     projectIdentity: args.projectIdentity,
     projectDirectory: args.projectDirectory,
     memoryEnabled: args.injection.memoryEnabled,
+    injectDocs: args.injection.injectDocs,
     injectionBudgetTokens: args.injection.injectionBudgetTokens,
     historyBudgetTokens: args.injection.historyBudgetTokens,
-    hardSignals: piHardSignals
-  }, args.db, getCompartments(args.db, args.sessionId)).value : false;
+    hardSignals: piHardSignals,
+    muralEnabled: args.injection.muralEnabled === true
+  } : undefined;
+  const foldDueDecision = piM0State ? mustMaterializePi(piM0State, args.db, getCompartments(args.db, args.sessionId)) : { value: false, reason: null };
+  let foldExecutedThisPass = false;
+  let preFoldInjectionResult = null;
+  const persistedM0BeforeFold = getOrCreateSessionMeta(args.db, args.sessionId);
+  const m0CoverageBeforeFold = persistedM0BeforeFold.cachedM0Bytes === null ? -1 : persistedM0BeforeFold.cachedM0MaxCompartmentSeq;
+  if (foldDueDecision.value && piM0State) {
+    try {
+      preFoldInjectionResult = injectM0M1PiForRun(piM0State, args.db, [], undefined, false);
+      foldExecutedThisPass = foldExecutesThisPass(foldDueDecision.value, preFoldInjectionResult.m0Materialized === true);
+      const m0CoverageAfterFold = getOrCreateSessionMeta(args.db, args.sessionId).cachedM0MaxCompartmentSeq;
+      try {
+        rearmChannel2AfterCoverageAdvancingHardFold({
+          db: args.db,
+          sessionId: args.sessionId,
+          foldExecuted: foldExecutedThisPass,
+          compactionOff: false,
+          previousCoverage: m0CoverageBeforeFold,
+          currentCoverage: m0CoverageAfterFold
+        });
+      } catch (error) {
+        sessionLog(args.sessionId, `pi channel2 fold-cycle reset failed: ${error instanceof Error ? error.message : String(error)}`);
+      }
+    } catch (error) {
+      sessionLog(args.sessionId, `pi m[0] HARD fold pre-execution failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    const mismatch = foldDueDecision.mismatch ? ` mismatch=${JSON.stringify(foldDueDecision.mismatch)}` : "";
+    sessionLog(args.sessionId, `pi m[0] HARD fold decision: reason=${foldDueDecision.reason ?? "unknown"}${mismatch} executed=${foldExecutedThisPass}`);
+  }
   const historianRunning = inFlightHistorian.has(args.sessionId);
-  const bypassHistorianGate = args.forceMaterialization === true || m0HardFoldThisPass;
+  const bypassHistorianGate = args.forceMaterialization === true || foldExecutedThisPass;
   const hasPendingMaterializeSignal = hasPendingMaterialization(args.sessionId);
-  const shouldRunHeuristics = args.heuristics !== undefined && (!historianRunning || bypassHistorianGate) && (args.forceMaterialization === true || hasPendingMaterializeSignal || deferredMaterializeEligible || m0HardFoldThisPass || args.schedulerDecision === "execute" && !alreadyRanHeuristicsThisTurn);
+  const shouldRunHeuristics = args.heuristics !== undefined && (!historianRunning || bypassHistorianGate) && (args.forceMaterialization === true || hasPendingMaterializeSignal || deferredMaterializeEligible || foldExecutedThisPass || args.schedulerDecision === "execute" && !alreadyRanHeuristicsThisTurn);
   const tFallbackIdentity = performance.now();
   const hasFallbackMessageTags = hasPiFallbackMessageTags(args.db, args.sessionId);
   const entryFingerprintByMessageId = buildEntryFingerprintMap(args.messages, stableIdResolver, args.reusableMessageIds, hasFallbackMessageTags);
@@ -24689,14 +25144,22 @@ async function runPipeline(args) {
   }
   const deferredMaterializationWasPending = deferredMaterializationSessions.has(args.sessionId);
   const deferredHistoryRefreshWasPending = deferredHistoryWasPendingAtPassStart;
-  const pendingOps = getPendingOps(args.db, args.sessionId);
-  const pendingOperationTags = getTagsForPendingOperations(args.db, args.sessionId, pendingOps.map((operation) => operation.tagId), args.protectedTags, RECENT_TOOL_SKELETON_WINDOW);
-  const baseShouldApplyPendingOps = args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || m0HardFoldThisPass;
+  const shouldReadPendingOps = !args.compactionOff && (args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || foldExecutedThisPass || historianRunning);
+  const pendingOps = shouldReadPendingOps ? getPendingOps(args.db, args.sessionId) : [];
+  const pendingOperationTags = pendingOps.length > 0 ? getTagsForPendingOperations(args.db, args.sessionId, pendingOps.map((operation) => operation.tagId), args.protectedTags, RECENT_TOOL_SKELETON_WINDOW) : [];
+  const baseShouldApplyPendingOps = args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || foldExecutedThisPass;
   const deferredMaterialize = canConsumeDeferredLate && deferredMaterializationWasPending;
   const deferredHistoryRefresh = canConsumeDeferredLate && deferredHistoryRefreshWasPending;
   const shouldApplyPendingOps = (baseShouldApplyPendingOps || deferredMaterialize) && (!historianRunning || bypassHistorianGate);
+  mutationGateObserverForTests?.({
+    foldDue: foldDueDecision.value,
+    foldExecuted: foldExecutedThisPass,
+    shouldApplyPendingOps,
+    shouldRunHeuristics,
+    shouldRunReasoningCleanup: args.reasoningClearing !== undefined && shouldRunHeuristics
+  });
   if (shouldApplyPendingOps) {
-    const applyReason = hasPendingMaterializeSignal ? "explicit_flush" : deferredMaterialize ? "deferred_publication" : args.forceMaterialization ? "force_materialization" : m0HardFoldThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into known m[0] bust, scheduler=${args.schedulerDecision})` : `scheduler_execute (scheduler=${args.schedulerDecision})`;
+    const applyReason = hasPendingMaterializeSignal ? "explicit_flush" : deferredMaterialize ? "deferred_publication" : args.forceMaterialization ? "force_materialization" : foldExecutedThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : `scheduler_execute (scheduler=${args.schedulerDecision})`;
     sessionLog(args.sessionId, `pending ops WILL APPLY — reason=${applyReason}, pendingOps=${pendingOps.length}, context=${args.contextUsage.percentage.toFixed(1)}%`);
     try {
       const tApplyPending = performance.now();
@@ -24774,7 +25237,7 @@ async function runPipeline(args) {
   const activeTags = getActiveTagsBySession(args.db, args.sessionId);
   logTransformTiming(args.sessionId, "getActiveTagsBySession", tActiveTags, `count=${activeTags.length}`);
   if (shouldRunHeuristics) {
-    const reason = args.forceMaterialization ? "force_materialization" : m0HardFoldThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into known m[0] bust, scheduler=${args.schedulerDecision})` : `scheduler_execute (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})`;
+    const reason = args.forceMaterialization ? "force_materialization" : foldExecutedThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : `scheduler_execute (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})`;
     sessionLog(args.sessionId, `heuristics WILL RUN — reason=${reason}, context=${args.contextUsage.percentage.toFixed(1)}%, turn=n/a`);
   } else {
     const reason = args.heuristics === undefined ? "disabled" : "scheduler_defer";
@@ -24958,17 +25421,12 @@ async function runPipeline(args) {
   if (args.injection) {
     try {
       const tInjection = performance.now();
-      injectionResult = injectM0M1PiForRun({
-        sessionId: args.sessionId,
-        projectIdentity: args.projectIdentity,
-        projectDirectory: args.projectDirectory,
-        memoryEnabled: args.injection.memoryEnabled,
-        injectDocs: args.injection.injectDocs,
-        injectionBudgetTokens: args.injection.injectionBudgetTokens,
-        historyBudgetTokens: args.injection.historyBudgetTokens,
-        hardSignals: piHardSignals,
-        muralEnabled: args.injection.muralEnabled === true
-      }, args.db, args.messages, args.entryIds, args.isCacheBusting || deferredHistoryRefresh || executedWorkThisPass);
+      const wireInjectionResult = injectM0M1PiForRun(piM0State, args.db, args.messages, args.entryIds, args.isCacheBusting || deferredHistoryRefresh || executedWorkThisPass);
+      injectionResult = preFoldInjectionResult?.m0Materialized ? {
+        ...wireInjectionResult,
+        m0Materialized: true,
+        m0Reason: preFoldInjectionResult.m0Reason ?? wireInjectionResult.m0Reason
+      } : wireInjectionResult;
       if (args.temporalAwareness && injectionResult.skippedVisibleMessages > 0) {
         const firstRetainedMessage = args.messages[injectionResult.syntheticLeadingCount];
         stripPiLeadingTemporalMarker(firstRetainedMessage);
@@ -26711,9 +27169,19 @@ function updateStatusLine(ctx, deps, force = false) {
 }
 function renderStatusText(ctx, db, sessionId) {
   const usage = ctx.getContextUsage?.();
-  const inputTokens = typeof usage?.tokens === "number" ? usage.tokens : undefined;
-  const pct = typeof usage?.percent === "number" ? usage.percent : undefined;
   const meta = readSessionMetaStatus(db, sessionId);
+  const liveInputTokens = typeof usage?.tokens === "number" && Number.isFinite(usage.tokens) ? usage.tokens : undefined;
+  const persistedInputTokens = typeof meta?.last_input_tokens === "number" && Number.isFinite(meta.last_input_tokens) && meta.last_input_tokens >= 0 ? meta.last_input_tokens : undefined;
+  const inputTokens = liveInputTokens ?? persistedInputTokens;
+  const windowGeometry = resolvePiWindowGeometry({
+    rawContextWindow: usage?.contextWindow ?? ctx.model?.contextWindow,
+    model: ctx.model,
+    detectedContextLimit: typeof meta?.detected_context_limit === "number" && meta.detected_context_limit > 0 ? meta.detected_context_limit : undefined,
+    persistedInputTokens,
+    persistedPercentage: typeof meta?.last_context_percentage === "number" ? meta.last_context_percentage : undefined
+  });
+  const usableSoft = windowGeometry?.usableSoft;
+  const pct = inputTokens !== undefined && usableSoft !== undefined && usableSoft > 0 ? inputTokens / usableSoft * 100 : typeof meta?.last_context_percentage === "number" ? meta.last_context_percentage : undefined;
   const state2 = renderHistorianState(meta, recompSessions.has(sessionId));
   return `mc: ${inputTokens === undefined ? "--" : fmt(inputTokens)} (${pct === undefined ? "--" : `${Math.round(pct)}%`}) · ${state2}`;
 }
@@ -26733,7 +27201,10 @@ function renderHistorianState(meta, recompActive) {
 }
 function readSessionMetaStatus(db, sessionId) {
   try {
-    return db.prepare("SELECT compartment_in_progress, historian_failure_count, historian_last_failure_at FROM session_meta WHERE session_id = ?").get(sessionId);
+    return db.prepare(`SELECT compartment_in_progress, historian_failure_count,
+				        historian_last_failure_at, last_input_tokens,
+				        last_context_percentage, detected_context_limit
+				 FROM session_meta WHERE session_id = ?`).get(sessionId);
   } catch {
     return;
   }
@@ -27514,6 +27985,44 @@ function formatThresholdClampNote(opts) {
   return ` [clamped: ${opts.configuredValue}% > ${opts.maxPercentage}%]`;
 }
 
+// ../plugin/src/shared/tail-hygiene-status.ts
+function finiteNumber(value, fallback = 0) {
+  return typeof value === "number" && Number.isFinite(value) ? value : fallback;
+}
+function resolveTailHygieneStatus(tsBaseline, rustBaseline) {
+  if (rustBaseline !== undefined && rustBaseline !== null) {
+    const t2 = Math.max(0, finiteNumber(rustBaseline.t));
+    const u2 = Math.min(t2, Math.max(0, finiteNumber(rustBaseline.u)));
+    return {
+      u: u2,
+      t: t2,
+      severity: Math.min(1, Math.max(0, finiteNumber(rustBaseline.severity, u2 / Math.max(t2, 1)))),
+      evaluable: rustBaseline.evaluable === true,
+      generationInvalidated: rustBaseline.generation_invalidated === true,
+      baselineGeneration: Math.max(0, finiteNumber(rustBaseline.baseline_generation)),
+      computedAt: Math.max(0, finiteNumber(rustBaseline.computed_at_ms))
+    };
+  }
+  if (tsBaseline === undefined)
+    return;
+  const t = Math.max(0, tsBaseline.baselineT + tsBaseline.turnDeltaT);
+  const u = Math.min(t, Math.max(0, tsBaseline.baselineU + tsBaseline.turnDeltaU));
+  return {
+    u,
+    t,
+    severity: Math.min(1, Math.max(0, u / Math.max(t, 1))),
+    evaluable: tsBaseline.evaluable && !tsBaseline.generationInvalidated,
+    generationInvalidated: tsBaseline.generationInvalidated,
+    baselineGeneration: Math.max(0, tsBaseline.baselineGeneration),
+    computedAt: Math.max(0, tsBaseline.computedAt)
+  };
+}
+function formatTailHygiene(status) {
+  const percentage = (status.severity * 100).toFixed(1);
+  const state2 = status.evaluable ? "" : " · held until baseline refresh";
+  return `${percentage}% · ${status.u.toLocaleString()} / ${status.t.toLocaleString()} tok${state2}`;
+}
+
 // ../plugin/src/shared/format-bytes.ts
 function formatBytes(bytes) {
   if (bytes < 1024)
@@ -27542,7 +28051,7 @@ function formatExecuteThreshold(detail, contextLimit) {
   }
   return `${percentage}%${clampNote}`;
 }
-function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageConfig = DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, liveModelKey, historyBudgetPercentage, commitClusterTrigger, executeThresholdTokens, contextLimit, dreamer) {
+function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageConfig = DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, liveModelKey, historyBudgetPercentage, commitClusterTrigger, executeThresholdTokens, contextLimit, dreamer, windowGeometry, tailHygiene) {
   const thresholdDetail = resolveExecuteThresholdDetail(executeThresholdPercentageConfig, liveModelKey, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, {
     tokensConfig: executeThresholdTokens,
     contextLimit,
@@ -27597,13 +28106,16 @@ function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageC
       `**Protected tags:** ${protectedTags}`,
       `**Subagent session:** ${meta.isSubagent}`
     ];
+    if (tailHygiene !== undefined) {
+      lines.push("", "### Tail Hygiene", `- Reclaimable / eligible: ${formatTailHygiene(tailHygiene)}`, "- Reasoning is excluded from both terms.");
+    }
     if (dreamer?.backlog && Object.keys(dreamer.backlog).length > 0) {
       lines.push("", "### Dreamer", ...dreamer.progress ? [
         `- Running: ${dreamer.progress.task} — ${dreamer.progress.processed}/${dreamer.progress.total} processed`
       ] : [], ...formatDreamTaskBacklogs(dreamer.backlog).split("\\n"));
     }
     if (meta.lastContextPercentage > 0 || meta.lastInputTokens > 0) {
-      lines.push("", "### Context Usage", `- Last percentage: ${meta.lastContextPercentage.toFixed(1)}%`, `- Last input tokens: ${meta.lastInputTokens.toLocaleString()}`, `- Resolved context limit: ${displayContextLimit > 0 ? displayContextLimit.toLocaleString() : "unknown"}`, `- Proactive compartment evaluation: ${proactiveCompartmentTrigger}%`, `- Post-drop target for historian: ${(executeThresholdPercentage * POST_DROP_TARGET_RATIO).toFixed(0)}% (${executeThresholdPercentage}% * ${POST_DROP_TARGET_RATIO})`, `- Commit cluster trigger: ${commitClusterTrigger?.enabled !== false ? `enabled (min ${commitClusterTrigger?.min_clusters ?? 3} clusters)` : "disabled"}, tail-size trigger: > 3x compartment budget`);
+      lines.push("", "### Context Usage", `- Last percentage: ${meta.lastContextPercentage.toFixed(1)}%`, `- Last input tokens: ${meta.lastInputTokens.toLocaleString()}`, `- Resolved context limit: ${displayContextLimit > 0 ? displayContextLimit.toLocaleString() : "unknown"}`, ...windowGeometry ? [`- ${formatWindowDerivationLine(meta.lastInputTokens, windowGeometry)}`] : [], `- Proactive compartment evaluation: ${proactiveCompartmentTrigger}%`, `- Post-drop target for historian: ${(executeThresholdPercentage * POST_DROP_TARGET_RATIO).toFixed(0)}% (${executeThresholdPercentage}% * ${POST_DROP_TARGET_RATIO})`, `- Commit cluster trigger: ${commitClusterTrigger?.enabled !== false ? `enabled (min ${commitClusterTrigger?.min_clusters ?? 3} clusters)` : "disabled"}, tail-size trigger: > 3x compartment budget`);
     }
     const compartments = getCompartments(db, sessionId);
     let historyBlockTokens = 0;
@@ -27704,7 +28216,7 @@ ${c.content}
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.36.1",
+  version: "0.38.0",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -27744,6 +28256,7 @@ var package_default = {
     prepublishOnly: "bun run build"
   },
   dependencies: {
+    "@cortexkit/subc-client": "0.4.1",
     "@huggingface/transformers": "^4.1.0",
     "@jitl/quickjs-singlefile-cjs-release-asyncify": "0.32.0",
     "ai-tokenizer": "^1.0.6",
@@ -27754,8 +28267,9 @@ var package_default = {
   },
   devDependencies: {
     "@biomejs/biome": "^2.5.1",
-    "@earendil-works/pi-coding-agent": "^0.80.2",
-    "@earendil-works/pi-tui": "^0.80.2",
+    "@earendil-works/pi-ai": "0.83.0",
+    "@earendil-works/pi-coding-agent": "0.83.0",
+    "@earendil-works/pi-tui": "0.83.0",
     "@types/better-sqlite3": "^7.6.13",
     "@types/bun": "^1.3.10",
     "@types/node": "^22.20.0",
@@ -27871,7 +28385,13 @@ function renderInner(s, theme, innerWidth) {
   lines.push(`${theme.fg("accent", theme.bold("⚡ Magic Context Status"))}   ${theme.fg("muted", `v${package_default.version}`)}`);
   lines.push("");
   lines.push(`Context  ${theme.fg(pctColor, theme.bold(`${s.usagePercentage.toFixed(1)}%`))} · ${fmt2(s.inputTokens)} / ${s.contextLimit > 0 ? fmt2(s.contextLimit) : "?"} tokens`);
+  if (s.windowGeometry) {
+    lines.push(formatWindowDerivationLine(s.inputTokens, s.windowGeometry).replace(/^Context:.* — window /, "Window "));
+  }
   lines.push(`Work tokens ${fmt2(s.newWorkTokens)} new · ${fmt2(s.totalInputTokens)} total input`);
+  if (s.tailHygiene !== undefined) {
+    lines.push(`Hygiene ${formatTailHygiene(s.tailHygiene)}`);
+  }
   lines.push(renderBar(s, innerWidth));
   for (const seg of breakdownSegments(s)) {
     const pct = (seg.tokens / (s.inputTokens || 1) * 100).toFixed(1);
@@ -27879,6 +28399,7 @@ function renderInner(s, theme, innerWidth) {
     const right = theme.fg("muted", `${fmt2(seg.tokens)} (${pct}%)`);
     lines.push(`${left}   ${right}`);
   }
+  lines.push("* Conversation includes model Reasoning; hygiene excludes it.");
   lines.push("");
   lines.push(`Counts: ${s.compartmentCount} compartments · ${s.memoryCount} memories (${s.memoryBlockCount} injected) · ${s.sessionNoteCount + s.readySmartNoteCount} notes`);
   lines.push(`Historian: ${s.historianRunning ? theme.fg("warning", "running") : theme.fg("accent", "idle")}${s.historianFailureCount > 0 ? ` · ${theme.fg("error", `last failure ${s.historianLastFailureAt ? relTime(s.historianLastFailureAt) : "unknown"}`)}` : ""}`);
@@ -27931,18 +28452,22 @@ function drawBorder(inner, width, theme) {
 function buildPiStatusDetail(pi, ctx, deps, sessionId) {
   const usage = ctx.getContextUsage?.();
   const meta = getOrCreateSessionMeta(deps.db, sessionId);
-  const inputTokens = typeof usage?.tokens === "number" ? usage.tokens : meta.lastInputTokens;
+  const hasPersistedPressure = meta.lastInputTokens > 0 && meta.lastContextPercentage > 0;
+  const inputTokens = hasPersistedPressure ? meta.lastInputTokens : typeof usage?.tokens === "number" ? usage.tokens : 0;
   let detectedContextLimit;
   try {
     const detected = getOverflowState(deps.db, sessionId).detectedContextLimit;
     if (detected > 0)
       detectedContextLimit = detected;
   } catch {}
-  const contextLimit = resolvePiUsableContextLimit({
+  const windowGeometry = resolvePiWindowGeometry({
     rawContextWindow: usage?.contextWindow ?? ctx.model?.contextWindow,
     model: ctx.model,
-    detectedContextLimit
-  }) ?? (meta.lastContextPercentage > 0 ? Math.round(inputTokens / (meta.lastContextPercentage / 100)) : 0);
+    detectedContextLimit,
+    persistedInputTokens: meta.lastInputTokens,
+    persistedPercentage: meta.lastContextPercentage
+  });
+  const contextLimit = windowGeometry?.usableSoft ?? 0;
   const usagePercentage = contextLimit > 0 && inputTokens > 0 ? inputTokens / contextLimit * 100 : meta.lastContextPercentage;
   const compartments = getCompartments(deps.db, sessionId);
   const metaRow = readSessionMetaRow(deps.db, sessionId);
@@ -27984,6 +28509,7 @@ ${safeStringify(tool.parameters)}`);
   } catch {}
   const conversationTokens = Math.max(0, inputTokens - systemPromptTokens - compartmentTokens - factTokens - memoryTokens - docsTokens - profileTokens - toolCallTokens - toolDefinitionTokens);
   const workMetrics = getSessionWorkMetrics(deps.db, sessionId);
+  const tailHygiene = resolveTailHygieneStatus(getPiChannel1Baseline(sessionId));
   const modelKey = ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined;
   const threshold = resolveExecuteThresholdDetail(deps.executeThresholdPercentage ?? 65, modelKey, 65, {
     tokensConfig: deps.executeThresholdTokens,
@@ -28036,6 +28562,7 @@ ${safeStringify(tool.parameters)}`);
     lastTransformError: meta.lastTransformError,
     isSubagent: meta.isSubagent,
     contextLimit,
+    windowGeometry,
     executeThreshold: threshold.percentage,
     executeThresholdMode: threshold.mode,
     executeThresholdClamped: threshold.clamped,
@@ -28056,6 +28583,7 @@ ${safeStringify(tool.parameters)}`);
     conversationTokens,
     toolCallTokens,
     toolDefinitionTokens,
+    ...tailHygiene === undefined ? {} : { tailHygiene },
     newWorkTokens: workMetrics.newWorkTokens,
     totalInputTokens: workMetrics.totalInputTokens,
     upgradeNeededCount: safeRead(() => countCompartmentsNeedingUpgrade(deps.db, sessionId), 0),
@@ -28103,7 +28631,7 @@ function breakdownSegments(s) {
     });
   if (s.conversationTokens > 0)
     segs.push({
-      label: "Conversation",
+      label: "Conversation*",
       tokens: s.conversationTokens,
       color: COLORS.conversation
     });
@@ -28223,14 +28751,18 @@ No active Pi session is available.`,
           if (detected > 0)
             detectedContextLimit = detected;
         } catch {}
-        const usableContextLimit = resolvePiUsableContextLimit({
+        const meta = getOrCreateSessionMeta(currentDeps.db, sessionId);
+        const windowGeometry = resolvePiWindowGeometry({
           rawContextWindow: usage?.contextWindow ?? ctx.model?.contextWindow,
           model: ctx.model,
-          detectedContextLimit
+          detectedContextLimit,
+          persistedInputTokens: meta.lastInputTokens,
+          persistedPercentage: meta.lastContextPercentage
         });
+        const usableContextLimit = windowGeometry?.usableSoft;
         const statusText = executeStatus(currentDeps.db, sessionId, currentDeps.protectedTags ?? 20, currentDeps.executeThresholdPercentage, modelKey, currentDeps.historyBudgetPercentage, currentDeps.commitClusterTrigger, currentDeps.executeThresholdTokens, usableContextLimit, {
           backlog: getDreamTaskBacklogs(currentDeps.db, currentDeps.projectIdentity, CANONICAL_DREAM_TASKS)
-        });
+        }, windowGeometry, resolveTailHygieneStatus(getPiChannel1Baseline(sessionId)));
         const details = buildStatusDetails(currentDeps, sessionId);
         sendCtxStatusMessage(pi, { title: "/ctx-status", text: statusText, level: "info" }, details);
       } catch (error) {
@@ -29111,10 +29643,7 @@ async function src_default(pi) {
       return;
     }
     const migration = getMigrationOnOpenRefusal();
-    const blockingProcesses = migration?.serverPids.map((pid) => ({
-      harness: "OpenCode server",
-      pid
-    })) ?? [];
+    const blockingProcesses = migration?.blockingProcesses ?? migration?.serverPids.map((pid) => ({ kind: "process", pid })) ?? [];
     const fence = getSchemaFenceRejection();
     const reason = migration && blockingProcesses.length > 0 ? {
       kind: "migration_guard",
@@ -29665,9 +30194,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
         isCacheBusting,
         existingSystemPrompt: event.systemPrompt
       });
-      const composedPrompt = block ? `${event.systemPrompt}
-
-${block}` : event.systemPrompt;
+      const composedPrompt = composeMagicContextSystemPrompt(event.systemPrompt, block);
       if (!sessionId) {
         if (block)
           return { systemPrompt: composedPrompt };
@@ -29757,14 +30284,14 @@ ${block}` : event.systemPrompt;
         return;
       if (compactionOff)
         return;
-      if (db)
-        maybeDeliverChannel2Pi(pi, db, sessionId, "steer");
       const block = maybeChannel1ReminderForToolResult({
         db,
         sessionId,
         toolName: event.toolName,
         content: event.content
       });
+      if (db)
+        maybeDeliverChannel2Pi(pi, db, sessionId);
       if (!block)
         return;
       return { content: [...event.content, block] };