@cortexkit/pi-magic-context 0.36.0 → 0.37.0

package/dist/index.js

@@ -87,6 +87,7 @@ import {
   deleteUserMemoryCandidates,
   deliverNoteNudgeAtomic,
   deriveTagLoadFloor,
+  deriveWindowGeometry,
   describeError,
   dismissUserMemory,
   drainCommitBacklogForProject,
@@ -113,6 +114,7 @@ import {
   findAdoptableFallbackTags,
   findLastModelKeyFromBranch,
   findPiFallbackToolOwnerTags,
+  formatWindowDerivationLine,
   getActivePrimers,
   getActiveTagTokenAggregate,
   getActiveTagsBySession,
@@ -128,6 +130,7 @@ import {
   getCompartmentsByEndMessageId,
   getContextStoreUuid,
   getDatabasePath,
+  getDroppedTagsByNumbers,
   getEmbeddingCoverageStatus,
   getEmergencyInputSample,
   getErrorMessage,
@@ -204,6 +207,7 @@ import {
   getUnmappedMemoryIds,
   getUserMemoryCandidates,
   getVisibleMemoryIds,
+  getWindowOverlay,
   getWrapupInProgressState,
   hasMeaningfulUserText,
   hasMemoryClassifiedAtColumn,
@@ -241,6 +245,7 @@ import {
   markProtectedTailPolicyV3Seeded,
   memoryNeedsCue,
   migrateMagicContextConfigLocations,
+  modelRefLookupOrder,
   nextDueAtMs,
   nextOccurrence,
   normalizeText,
@@ -257,6 +262,7 @@ import {
   peelLeadingMcTagNotation,
   persistCachedM0,
   piModelRefToCanonical,
+  preloadTokenizer,
   prependTag,
   primeInMemoryTailRawMessageCache,
   primeTailRawMessageCache,
@@ -273,7 +279,6 @@ import {
   readGitChangedFilesSince,
   readGitFileChangeTimesSince,
   readGitHead,
-  readNewMemoriesForM1Union,
   readPiSessionMessages,
   readProjectDocsCanonical,
   readRawSessionMessages,
@@ -308,7 +313,6 @@ import {
   resetLastNudgeCycleIfTailShrank,
   resolveCompactionModeRecord,
   resolveGitTopLevel,
-  resolveLimit,
   resolveModelConfigOrDefault,
   resolveModelRefForOmp,
   resolveModelRefForPi,
@@ -317,6 +321,7 @@ import {
   resolveProjectIdentity,
   resolveProjectIdentityForSession,
   resolveProjectIdentityStrict,
+  resolveWindowOverlayFacts,
   resolveWorkspaceIdentitySet,
   resolveWorkspaceShareCategories,
   retryPendingSessionCleanups,
@@ -371,11 +376,12 @@ import {
   updateUserMemoryContent,
   updateWrapupInProgress,
   verificationFileExists,
+  wakePlaneStatus,
   withContentLanguageDirective,
   withMigrationLanguageDirective,
   withRawMessageProvider,
   withRawSessionMessageCache
-} from "./index-9t7jhq83.js";
+} from "./index-kvttksef.js";
 import {
   pushNotification
 } from "./index-hw34xmzk.js";
@@ -387,7 +393,7 @@ import {
   log,
   sessionLog,
   setHarness
-} from "./index-npnqc564.js";
+} from "./index-hk6sj7dn.js";
 import {
   __require,
   __toESM
@@ -885,7 +891,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,
@@ -1508,11 +1514,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)
@@ -1950,6 +1958,7 @@ function createCloneFilter(entries) {
   const rawMessages = convertEntriesToRawMessages([...entries]);
   const rawOrdinalById = new Map(rawMessages.map((message) => [message.id, message.ordinal]));
   const validStateIds = new Set(rawOrdinalById.keys());
+  const validOrdinals = new Set(rawOrdinalById.values());
   for (const entry of entries) {
     const id = entryId(entry);
     if (id)
@@ -1959,6 +1968,8 @@ function createCloneFilter(entries) {
   return {
     resolveBoundaryOrdinal: (id) => rawOrdinalById.get(id),
     includeMessageId,
+    copySessionNotesAndFacts: true,
+    mapOrdinal: (ordinal) => validOrdinals.has(ordinal) ? ordinal : undefined,
     includeTag: (tag) => {
       if (tag.type === "tool") {
         return typeof tag.toolOwnerMessageId === "string" && includeMessageId(tag.toolOwnerMessageId);
@@ -2036,7 +2047,7 @@ async function handlePiCloneSessionStart(event, ctx, deps) {
     if (result.pendingMarkerMigrated) {
       deps.signalPendingMarker(destinationSessionId);
     }
-    writeLog(`[magic-context][pi] clone-inheritance: migrated compartments=${result.compartmentsCopied} tags=${result.tagsCopied} source=${sourceSessionId} dest=${destinationSessionId} reason=fork`);
+    writeLog(`[magic-context][pi] clone-inheritance: migrated compartments=${result.compartmentsCopied} tags=${result.tagsCopied} notes=${result.notesCopied} facts=${result.factsCopied} source=${sourceSessionId} dest=${destinationSessionId} reason=fork`);
     return result;
   } catch (error) {
     writeLog(`[magic-context][pi] clone-inheritance: failed source=${sourceSessionId} dest=${destinationSessionId} stage=${stage} error=${error instanceof Error ? error.message : String(error)}; run /ctx-wrapup to rebuild, or re-clone`);
@@ -2095,13 +2106,14 @@ var state = {
   noticeEmitted: false,
   failure: null
 };
-function recordStaleFence(persistedVersion, supportedVersion) {
+function recordStaleFence(persistedVersion, supportedVersion, reason = "newer_schema") {
   state.consecutiveFailures += 1;
   state.totalFailures += 1;
   const latched = state.consecutiveFailures >= STALE_CHILD_SPAWN_LATCH_THRESHOLD;
   state.latched ||= latched;
   const failure = {
     failureClass: STALE_CHILD_SPAWN_FAILURE,
+    reason,
     persistedVersion,
     supportedVersion,
     consecutiveFailures: state.consecutiveFailures,
@@ -2128,7 +2140,7 @@ function probeChildSpawnFence(db) {
       return recordStaleFence(persistedVersion, LATEST_SUPPORTED_VERSION);
     }
   } catch {
-    return { allowSpawn: true };
+    return recordStaleFence(LATEST_SUPPORTED_VERSION, LATEST_SUPPORTED_VERSION, "read_error");
   }
   state.consecutiveFailures = 0;
   state.latched = false;
@@ -3755,7 +3767,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";
@@ -3832,25 +3844,31 @@ async function sendIgnoredMessage(client, sessionId, text, params, forcePersist
 
 // ../plugin/src/hooks/magic-context/child-session-spawn.ts
 var STALE_PLUGIN_RESTART_NOTICE = "Magic Context: plugin build is older than its database — restart OpenCode";
-async function surfaceStalePluginBuild(args) {
+var SCHEMA_PROBE_FAILURE_NOTICE = `Magic Context: unable to verify the database schema before spawning a child — run ${FAIL_CLOSED_DOCTOR_COMMAND}`;
+async function surfaceSchemaFenceFailure(args, failure) {
   if (!args.parentSessionId)
     return;
-  try {
-    if (args.db) {
+  const notice = failure.reason === "read_error" ? SCHEMA_PROBE_FAILURE_NOTICE : STALE_PLUGIN_RESTART_NOTICE;
+  if (args.db) {
+    try {
       updateSessionMeta(args.db, args.parentSessionId, {
-        lastTransformError: STALE_PLUGIN_RESTART_NOTICE
+        lastTransformError: notice
       });
+    } catch (error) {
+      sessionLog(args.parentSessionId, `schema-fence warning persistence failed: ${error instanceof Error ? error.message : String(error)}`);
     }
+  }
+  try {
     pushNotification("toast", {
       title: "Magic Context",
-      message: STALE_PLUGIN_RESTART_NOTICE,
+      message: notice,
       variant: "error",
       duration: 1e4
     }, args.parentSessionId);
     pushNotification("action", { action: "refresh-sidebar" }, args.parentSessionId);
-    await sendIgnoredMessage(args.client, args.parentSessionId, STALE_PLUGIN_RESTART_NOTICE, args.notificationParams ?? {}, true);
+    await sendIgnoredMessage(args.client, args.parentSessionId, notice, args.notificationParams ?? {}, true);
   } catch (error) {
-    sessionLog(args.parentSessionId, `stale plugin-build warning delivery failed: ${error instanceof Error ? error.message : String(error)}`);
+    sessionLog(args.parentSessionId, `schema-fence warning delivery failed: ${error instanceof Error ? error.message : String(error)}`);
   }
 }
 async function createChildSessionWithFence(args) {
@@ -3863,7 +3881,7 @@ async function createChildSessionWithFence(args) {
       if (args.onFenceLatched)
         await args.onFenceLatched(verdict.failure);
       else
-        await surfaceStalePluginBuild(args);
+        await surfaceSchemaFenceFailure(args, verdict.failure);
     }
     return null;
   }
@@ -4255,7 +4273,7 @@ function parseFields(json) {
 }
 
 // ../plugin/src/features/magic-context/mural/compress-cues.ts
-import { createHash as createHash2 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 
 // ../plugin/src/features/magic-context/dreamer/storage-dream-state.ts
 var getDreamStateStatements = new WeakMap;
@@ -4304,13 +4322,15 @@ function rowKeys(leaseKey) {
     return {
       holder: "dreaming_lease_holder",
       heartbeat: "dreaming_lease_heartbeat",
-      expiry: "dreaming_lease_expiry"
+      expiry: "dreaming_lease_expiry",
+      generation: "dreaming_lease_generation"
     };
   }
   return {
     holder: `lease:${leaseKey}:holder`,
     heartbeat: `lease:${leaseKey}:heartbeat`,
-    expiry: `lease:${leaseKey}:expiry`
+    expiry: `lease:${leaseKey}:expiry`,
+    generation: `lease:${leaseKey}:generation`
   };
 }
 function getLeaseExpiry(db, keys) {
@@ -4328,6 +4348,13 @@ function isLeaseActive(db, leaseKey = DREAMING_LEASE_KEY) {
 function getLeaseHolder(db, leaseKey = DREAMING_LEASE_KEY) {
   return getDreamState(db, rowKeys(leaseKey).holder);
 }
+function getLeaseGeneration(db, leaseKey = DREAMING_LEASE_KEY) {
+  const value = getDreamState(db, rowKeys(leaseKey).generation);
+  if (!value)
+    return null;
+  const generation = Number(value);
+  return Number.isSafeInteger(generation) && generation > 0 ? generation : null;
+}
 function peekLeaseHolderAndExpiry(db, expectedHolder, leaseKey = DREAMING_LEASE_KEY) {
   const keys = rowKeys(leaseKey);
   const holder = getDreamState(db, keys.holder);
@@ -4339,6 +4366,9 @@ function peekLeaseHolderAndExpiry(db, expectedHolder, leaseKey = DREAMING_LEASE_
   const expiry = Number(expiryStr);
   return Number.isFinite(expiry) && expiry >= Date.now();
 }
+function leaseOwnershipMatches(db, expectedHolder, expectedGeneration, leaseKey = DREAMING_LEASE_KEY) {
+  return getLeaseGeneration(db, leaseKey) === expectedGeneration && peekLeaseHolderAndExpiry(db, expectedHolder, leaseKey);
+}
 function runImmediate(db, body) {
   db.exec("BEGIN IMMEDIATE");
   let committed = false;
@@ -4355,26 +4385,30 @@ function runImmediate(db, body) {
     }
   }
 }
-function acquireLease(db, holderId, leaseKey = DREAMING_LEASE_KEY) {
+function acquireLeaseWithAcquisition(db, holderId, leaseKey = DREAMING_LEASE_KEY) {
   const keys = rowKeys(leaseKey);
   return runImmediate(db, () => {
-    if (isLeaseActive(db, leaseKey)) {
-      const existingHolder = getLeaseHolder(db, leaseKey);
-      if (existingHolder && existingHolder !== holderId) {
-        return false;
-      }
+    const existingHolder = getLeaseHolder(db, leaseKey);
+    if (isLeaseActive(db, leaseKey) && existingHolder && existingHolder !== holderId) {
+      return null;
     }
     const now = Date.now();
+    const priorGeneration = getLeaseGeneration(db, leaseKey) ?? 0;
+    const generation = existingHolder === holderId ? Math.max(1, priorGeneration) : priorGeneration + 1;
     setDreamState(db, keys.holder, holderId);
     setDreamState(db, keys.heartbeat, String(now));
     setDreamState(db, keys.expiry, String(now + LEASE_DURATION_MS));
-    return true;
+    setDreamState(db, keys.generation, String(generation));
+    return { acquiredAt: now, generation };
   });
 }
-function renewLease(db, holderId, leaseKey = DREAMING_LEASE_KEY) {
+function acquireLease(db, holderId, leaseKey = DREAMING_LEASE_KEY) {
+  return acquireLeaseWithAcquisition(db, holderId, leaseKey) !== null;
+}
+function renewLease(db, holderId, leaseKey = DREAMING_LEASE_KEY, expectedGeneration) {
   const keys = rowKeys(leaseKey);
   return runImmediate(db, () => {
-    if (getLeaseHolder(db, leaseKey) !== holderId || !isLeaseActive(db, leaseKey)) {
+    if (getLeaseHolder(db, leaseKey) !== holderId || !isLeaseActive(db, leaseKey) || expectedGeneration !== undefined && getLeaseGeneration(db, leaseKey) !== expectedGeneration) {
       return false;
     }
     const now = Date.now();
@@ -4392,9 +4426,12 @@ function runLeaseGuardedWrite(db, holderId, leaseKey, fn) {
   });
 }
 var LEASE_HEARTBEAT_INTERVAL_MS = 60 * 1000;
-function startLeaseHeartbeat(db, holderId, leaseKey, onLost, intervalMs = LEASE_HEARTBEAT_INTERVAL_MS) {
+function startLeaseHeartbeat(db, holderId, leaseKey, onLost, intervalOrAcquisition = LEASE_HEARTBEAT_INTERVAL_MS) {
+  const intervalMs = typeof intervalOrAcquisition === "number" ? intervalOrAcquisition : LEASE_HEARTBEAT_INTERVAL_MS;
+  const acquisition = typeof intervalOrAcquisition === "number" ? undefined : intervalOrAcquisition;
   let lost = false;
-  let lastConfirmedAt = Date.now();
+  let expectedGeneration = acquisition?.generation ?? getLeaseGeneration(db, leaseKey);
+  let lastConfirmedAt = acquisition?.acquiredAt ?? Date.now();
   const declareLost = (reason) => {
     if (lost)
       return;
@@ -4405,15 +4442,25 @@ function startLeaseHeartbeat(db, holderId, leaseKey, onLost, intervalMs = LEASE_
     if (lost)
       return;
     try {
-      if (renewLease(db, holderId, leaseKey)) {
+      if (renewLease(db, holderId, leaseKey, expectedGeneration === null ? undefined : expectedGeneration)) {
         lastConfirmedAt = Date.now();
         return;
       }
+      if (expectedGeneration !== null && getLeaseGeneration(db, leaseKey) !== expectedGeneration) {
+        declareLost("lease generation changed — another holder acquired it");
+        return;
+      }
       if (Date.now() - lastConfirmedAt > LEASE_DURATION_MS) {
         declareLost("lease lapsed past TTL — another holder may have run");
         return;
       }
-      if (acquireLease(db, holderId, leaseKey)) {
+      const reacquired = acquireLeaseWithAcquisition(db, holderId, leaseKey);
+      if (reacquired) {
+        if (expectedGeneration !== null && reacquired.generation !== expectedGeneration) {
+          declareLost("lease generation changed during reacquisition");
+          return;
+        }
+        expectedGeneration = reacquired.generation;
         lastConfirmedAt = Date.now();
         return;
       }
@@ -4482,6 +4529,16 @@ function assertManifestCoversExactly(ids, expectedIds, rootName) {
 }
 
 // ../plugin/src/features/magic-context/dreamer/module-apply.ts
+class DreamerModuleBusyError extends Error {
+  state;
+  transient = true;
+  constructor(state2) {
+    super(`Rust memory authority is ${state2}; dreamer mutation deferred until authority settles.`);
+    this.state = state2;
+    this.name = "DreamerModuleBusyError";
+  }
+}
+
 class DreamerModuleFailureError extends Error {
   transient = true;
   constructor(operation, cause) {
@@ -4503,9 +4560,12 @@ async function resolveDreamerModuleRoute(args) {
     projectRoot: args.projectRoot,
     domain: "memories"
   });
-  if (result.authority?.state !== "MODULE")
+  const authority = result.authority;
+  if (authority?.state === "DRAINING")
+    throw new DreamerModuleBusyError(authority.state);
+  if (authority?.state !== "MODULE")
     return;
-  const generation = result.authority.generation;
+  const generation = authority.generation;
   if (typeof generation !== "number")
     throw new Error("Rust authority status omitted generation");
   return {
@@ -4539,6 +4599,68 @@ function getModuleMemoryIdentities(db, projectIdentity, contextIds) {
   ] : []));
 }
 
+// ../plugin/src/features/magic-context/dreamer/provider-output-failure.ts
+import { createHash as createHash2 } from "node:crypto";
+var MAX_NEAR_ZERO_OUTPUT_TOKENS = 32;
+
+class DreamerProviderOutputFailureError extends Error {
+  fingerprint;
+  outputTokens;
+  reasoningTokens;
+  transient = true;
+  constructor(fingerprint, outputTokens, reasoningTokens, responseText) {
+    const preview = responseText.trim().replace(/\s+/g, " ").slice(0, 160);
+    super(`dreamer provider-outage completion (output_tokens=${outputTokens}, reasoning_tokens=${reasoningTokens}): ${JSON.stringify(preview)}`);
+    this.fingerprint = fingerprint;
+    this.outputTokens = outputTokens;
+    this.reasoningTokens = reasoningTokens;
+    this.name = "DreamerProviderOutputFailureError";
+  }
+}
+function finiteTokenCount(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
+}
+function completionShape(value) {
+  if (!isRecord(value))
+    return null;
+  const info = isRecord(value.info) ? value.info : value;
+  if (info.role !== "assistant")
+    return null;
+  const time = isRecord(info.time) ? info.time : null;
+  const tokens = isRecord(info.tokens) ? info.tokens : null;
+  return {
+    createdAt: typeof time?.created === "number" ? time.created : 0,
+    finish: typeof info.finish === "string" ? info.finish : typeof info.finish_reason === "string" ? info.finish_reason : typeof info.finishReason === "string" ? info.finishReason : null,
+    error: info.error,
+    outputTokens: finiteTokenCount(tokens?.output),
+    reasoningTokens: finiteTokenCount(tokens?.reasoning)
+  };
+}
+function latestAssistantCompletion(messages) {
+  if (!Array.isArray(messages))
+    return null;
+  let latest = null;
+  for (const message of messages) {
+    const completion = completionShape(message);
+    if (completion && (!latest || completion.createdAt >= latest.createdAt))
+      latest = completion;
+  }
+  return latest;
+}
+function providerOutputFailureFromInvalidManifest(messages, responseText) {
+  const completion = latestAssistantCompletion(messages);
+  if (completion?.finish?.toLowerCase() !== "stop")
+    return null;
+  if (completion.error != null || completion.outputTokens === null || completion.outputTokens > MAX_NEAR_ZERO_OUTPUT_TOKENS || completion.reasoningTokens !== 0) {
+    return null;
+  }
+  const normalized = responseText.trim().replace(/\s+/g, " ").toLowerCase();
+  if (!normalized)
+    return null;
+  const fingerprint = createHash2("sha256").update(normalized).digest("hex").slice(0, 16);
+  return new DreamerProviderOutputFailureError(fingerprint, completion.outputTokens, completion.reasoningTokens, responseText);
+}
+
 // ../plugin/src/features/magic-context/mural/compress-cues-prompt.ts
 var CUE_BUDGET_HIGH = 90;
 var CUE_BUDGET_LOW = 50;
@@ -4711,7 +4833,7 @@ async function runCompressCues(args) {
     chunks.push(candidates.slice(i, i + COMPRESS_CUES_CHUNK_SIZE));
   }
   const abortController = new AbortController;
-  const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => abortController.abort());
+  const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => abortController.abort(), args.leaseAcquisition);
   try {
     let consecutiveTimeouts = 0;
     let timeoutStreakElapsedMs = [];
@@ -4806,7 +4928,14 @@ async function compressOneChunk(args, chunk, sliceMs, signal) {
         const text = extractLatestAssistantText(messages);
         if (!text)
           throw new Error("compress-cues returned no output");
-        parseCuesManifest(text);
+        try {
+          parseCuesManifest(text);
+        } catch (error) {
+          const providerFailure = providerOutputFailureFromInvalidManifest(messages, text);
+          if (providerFailure)
+            throw providerFailure;
+          throw error;
+        }
         return text;
       }
     });
@@ -4814,7 +4943,7 @@ async function compressOneChunk(args, chunk, sliceMs, signal) {
   } catch (error) {
     const desc = describeError(error);
     log(`[dreamer] compress-cues chunk failed: ${desc.brief}`, desc.stackHead ? { stackHead: desc.stackHead } : undefined);
-    if (signal.aborted)
+    if (signal.aborted || error instanceof DreamerProviderOutputFailureError)
       throw error;
     return {
       compressed: 0,
@@ -4922,7 +5051,7 @@ async function applyCuesThroughModule(args, chunk, manifestText, signal) {
       log(`[dreamer] compress-cues: skipped cue for memory ${entry.id} (${failure.reason}; rejection ${rejectionCount}/${CUE_REJECTION_LATCH_THRESHOLD})`);
     }
   }
-  const commandId = `mural-cues:${route.moduleCommandId}:${createHash2("sha256").update(chunk.map((candidate) => candidate.memory.id).join(",")).digest("hex").slice(0, 24)}`;
+  const commandId = `mural-cues:${route.moduleCommandId}:${createHash3("sha256").update(chunk.map((candidate) => candidate.memory.id).join(",")).digest("hex").slice(0, 24)}`;
   let response;
   try {
     response = await route.moduleClient.call({
@@ -5364,7 +5493,7 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
   const heartbeat = startLeaseHeartbeat(args.db, args.holderId, leaseKey, (reason) => {
     log(`[dreamer] user-memories: lease lost (${reason}) — aborting`);
     abortController.abort();
-  });
+  }, args.leaseAcquisition);
   try {
     const createResponse = await createChildSessionWithFence({
       client: args.client,
@@ -5487,7 +5616,7 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
 }
 
 // ../plugin/src/features/magic-context/dreamer/classify.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 
 // ../plugin/src/plugin/rust-tool-backends.ts
 function isRustAuthorityDrainingError(error) {
@@ -5871,7 +6000,7 @@ async function runClassify(args) {
     chunks.push(toClassify.slice(i, i + CLASSIFY_CHUNK_SIZE));
   }
   const abortController = new AbortController;
-  const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => abortController.abort());
+  const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => abortController.abort(), args.leaseAcquisition);
   try {
     for (let i = 0;i < chunks.length; i += 1) {
       const remainingMs = Math.max(0, args.deadline - Date.now());
@@ -5951,7 +6080,14 @@ async function classifyOneChunk(args, chunk, anchors, sliceMs, signal) {
         const text = extractLatestAssistantText(messages);
         if (!text)
           throw new Error("classify returned no output");
-        parseClassifyManifest(text);
+        try {
+          parseClassifyManifest(text);
+        } catch (error) {
+          const providerFailure = providerOutputFailureFromInvalidManifest(messages, text);
+          if (providerFailure)
+            throw providerFailure;
+          throw error;
+        }
         return text;
       }
     });
@@ -5962,7 +6098,7 @@ async function classifyOneChunk(args, chunk, anchors, sliceMs, signal) {
     const desc = describeError(failure);
     log(`[dreamer] classify chunk failed: ${desc.brief}`, desc.stackHead ? { stackHead: desc.stackHead } : undefined);
     recordInvocation(args, startedAt, { status: "failed", error: failure });
-    if (moduleRoute || signal.aborted)
+    if (moduleRoute || signal.aborted || failure instanceof DreamerProviderOutputFailureError)
       throw failure;
     return { classified: 0, changed: 0 };
   } finally {
@@ -5991,7 +6127,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal) {
       v: 1,
       session_id: args.moduleSessionId,
       task: "classify",
-      command_id: `classify:${args.moduleCommandId ?? Date.now()}:${createHash3("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`,
+      command_id: `classify:${args.moduleCommandId ?? Date.now()}:${createHash4("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`,
       authority_generation: args.moduleAuthorityGeneration,
       payload: {
         prompt_body: prompt,
@@ -6629,7 +6765,7 @@ function throwIfAborted2(signal) {
 }
 
 // ../plugin/src/features/magic-context/smart-notes/compiler.ts
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 
 // ../plugin/src/features/magic-context/smart-notes/compiler-prompt.ts
 var SMART_NOTE_COMPILER_SYSTEM_PROMPT = `You are the Magic Context smart-note compiler for the magic-context system.
@@ -7053,7 +7189,7 @@ function manifestAdvisoryWarnings(code, manifest) {
   return warnings;
 }
 function hashCheck(surfaceCondition, compiledCheck, manifest, checkCron) {
-  return createHash4("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
+  return createHash5("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
 }
 function extractJsonObject(output) {
   const fenced = output.match(/```(?:json)?\s*([\s\S]*?)```/i);
@@ -7142,6 +7278,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);
@@ -7271,6 +7410,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();
@@ -7294,7 +7438,7 @@ async function evaluateSmartNotes(args) {
     leaseAbortController.abort(new Error("Dream lease lost during smart notes"));
     log("[dreamer] smart notes: lease lost — aborting");
     args.onLeaseLost?.("smart notes");
-  });
+  }, args.leaseAcquisition);
   let surfaced = 0;
   let didWork = false;
   try {
@@ -7735,7 +7879,7 @@ function enforceMaintainDocsProtectedRegions(args) {
 }
 
 // ../plugin/src/features/magic-context/dreamer/map-memories.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 
 // ../plugin/src/features/magic-context/dreamer/map-memories-prompt.ts
 import { existsSync as existsSync6, statSync } from "node:fs";
@@ -7852,7 +7996,7 @@ async function mapMemories(args) {
   }
   result.remaining = inputs.length;
   const abortController = new AbortController;
-  const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => abortController.abort());
+  const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => abortController.abort(), args.leaseAcquisition);
   try {
     for (let i = 0;i < batches.length; i += 1) {
       const remainingMs = Math.max(0, args.deadline - Date.now());
@@ -7996,7 +8140,7 @@ async function applyBatchMappings(args, batch, manifestText) {
             memory_project: args.projectIdentity,
             context_store_uuid: args.moduleRoute.moduleContextStoreUuid,
             authority_generation: args.moduleRoute.moduleAuthorityGeneration,
-            command_id: `${args.moduleRoute.moduleCommandId}:${createHash5("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
+            command_id: `${args.moduleRoute.moduleCommandId}:${createHash6("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
             rows
           }
         }
@@ -8221,7 +8365,7 @@ async function promotePrimers(args) {
   const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => {
     leaseLost = true;
     log("[dreamer] primers: lease lost during promote-primers — aborting");
-  });
+  }, args.leaseAcquisition);
   try {
     assertLeaseHeld("prune start");
     result.pruned = pruneExpiredPrimerCandidatesForProject(args.db, args.projectIdentity, Date.now(), PRIMER_CANDIDATE_TTL_MS);
@@ -8453,7 +8597,7 @@ async function refreshPrimers(args) {
   if (primers.length === 0)
     return result;
   const abortController = new AbortController;
-  const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => abortController.abort());
+  const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => abortController.abort(), args.leaseAcquisition);
   try {
     for (let i = 0;i < primers.length; i += 1) {
       const primer = primers[i];
@@ -9056,68 +9200,6 @@ function insertDreamRun(db, run) {
 // ../plugin/src/features/magic-context/dreamer/verify.ts
 import { createHash as createHash7 } from "node:crypto";
 
-// ../plugin/src/features/magic-context/dreamer/provider-output-failure.ts
-import { createHash as createHash6 } from "node:crypto";
-var MAX_NEAR_ZERO_OUTPUT_TOKENS = 32;
-
-class DreamerProviderOutputFailureError extends Error {
-  fingerprint;
-  outputTokens;
-  reasoningTokens;
-  transient = true;
-  constructor(fingerprint, outputTokens, reasoningTokens, responseText) {
-    const preview = responseText.trim().replace(/\s+/g, " ").slice(0, 160);
-    super(`verify provider-outage completion (output_tokens=${outputTokens}, reasoning_tokens=${reasoningTokens}): ${JSON.stringify(preview)}`);
-    this.fingerprint = fingerprint;
-    this.outputTokens = outputTokens;
-    this.reasoningTokens = reasoningTokens;
-    this.name = "DreamerProviderOutputFailureError";
-  }
-}
-function finiteTokenCount(value) {
-  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : null;
-}
-function completionShape(value) {
-  if (!isRecord(value))
-    return null;
-  const info = isRecord(value.info) ? value.info : value;
-  if (info.role !== "assistant")
-    return null;
-  const time = isRecord(info.time) ? info.time : null;
-  const tokens = isRecord(info.tokens) ? info.tokens : null;
-  return {
-    createdAt: typeof time?.created === "number" ? time.created : 0,
-    finish: typeof info.finish === "string" ? info.finish : typeof info.finish_reason === "string" ? info.finish_reason : typeof info.finishReason === "string" ? info.finishReason : null,
-    error: info.error,
-    outputTokens: finiteTokenCount(tokens?.output),
-    reasoningTokens: finiteTokenCount(tokens?.reasoning)
-  };
-}
-function latestAssistantCompletion(messages) {
-  if (!Array.isArray(messages))
-    return null;
-  let latest = null;
-  for (const message of messages) {
-    const completion = completionShape(message);
-    if (completion && (!latest || completion.createdAt >= latest.createdAt))
-      latest = completion;
-  }
-  return latest;
-}
-function providerOutputFailureFromInvalidManifest(messages, responseText) {
-  const completion = latestAssistantCompletion(messages);
-  if (completion?.finish?.toLowerCase() !== "stop")
-    return null;
-  if (completion.error != null || completion.outputTokens === null || completion.outputTokens > MAX_NEAR_ZERO_OUTPUT_TOKENS || completion.reasoningTokens !== 0) {
-    return null;
-  }
-  const normalized = responseText.trim().replace(/\s+/g, " ").toLowerCase();
-  if (!normalized)
-    return null;
-  const fingerprint = createHash6("sha256").update(normalized).digest("hex").slice(0, 16);
-  return new DreamerProviderOutputFailureError(fingerprint, completion.outputTokens, completion.reasoningTokens, responseText);
-}
-
 // ../plugin/src/features/magic-context/dreamer/verify-gate.ts
 import path5 from "node:path";
 function minOf(values) {
@@ -9362,7 +9444,7 @@ async function runVerify(args) {
     batches.push(gate.inScope.slice(i, i + VERIFY_BATCH_SIZE));
   }
   const abortController = new AbortController;
-  const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => abortController.abort());
+  const heartbeat = startLeaseHeartbeat(args.db, args.holderId, args.leaseKey, () => abortController.abort(), args.leaseAcquisition);
   let consecutiveProviderFailures = 0;
   let priorProviderFailureFingerprint = null;
   let lastProviderFailure = null;
@@ -9698,6 +9780,9 @@ function createDreamTaskExecutor(deps) {
   return async (config, ctx) => {
     const { db, projectIdentity, holderId, leaseKey } = ctx;
     const startedAt = Date.now();
+    const leaseAcquisition = ctx.leaseAcquisition ?? acquireLeaseWithAcquisition(db, holderId, leaseKey) ?? (() => {
+      throw new Error("Dream lease unavailable during executor setup");
+    })();
     const deadline = startedAt + config.timeoutMinutes * 60 * 1000;
     const backlogAtStart = getDreamTaskBacklog(db, projectIdentity, config.task);
     const reportProgress = (processed) => {
@@ -9715,7 +9800,7 @@ function createDreamTaskExecutor(deps) {
     };
     const parent = await resolveParentSessionId();
     let moduleRoute;
-    if (config.task === "map-memories" || config.task === "compress-cues" || config.task === "verify" || config.task === "verify-broad" || config.task === "retrospective") {
+    if (config.task === "map-memories" || config.task === "compress-cues" || config.task === "classify-memories" || config.task === "verify" || config.task === "verify-broad" || config.task === "retrospective") {
       try {
         moduleRoute = await resolveDreamerModuleRoute({
           db,
@@ -9729,6 +9814,9 @@ function createDreamTaskExecutor(deps) {
         throw new DreamerModuleFailureError("authority.status", error);
       }
     }
+    if (!leaseOwnershipMatches(db, holderId, leaseAcquisition.generation, leaseKey)) {
+      throw new Error("Dream lease lost during executor setup");
+    }
     const recordRun = (status, error, extra) => {
       try {
         insertDreamRun(db, {
@@ -9801,6 +9889,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           model: config.model ?? deps.mural.model ?? deps.dreamerModel,
           fallbackModels: config.fallbackModels,
           moduleRoute,
@@ -9824,6 +9913,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           promotionThreshold: config.promotionThreshold ?? 3,
           model: config.model,
           fallbackModels: config.fallbackModels,
@@ -9843,6 +9933,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           model: config.model,
           fallbackModels: config.fallbackModels,
           moduleRoute,
@@ -9868,6 +9959,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           forceBroad: config.task === "verify-broad",
           model: config.model,
           fallbackModels: config.fallbackModels,
@@ -9901,40 +9993,15 @@ function createDreamTaskExecutor(deps) {
       }
       if (config.task === "classify-memories") {
         let moduleArgs;
-        const moduleTransport = deps.transformMode === "ts" ? undefined : deps.moduleClient;
-        if (moduleTransport?.authorityStatus) {
-          const contextStoreUuid = getContextStoreUuid(db);
-          if (!contextStoreUuid) {
-            throw new Error("Rust classify requires a context store identity");
-          }
-          let authority;
-          try {
-            authority = await moduleTransport.authorityStatus({
-              context_store_uuid: contextStoreUuid,
-              project: projectIdentity,
-              projectRoot: deps.sessionDirectory,
-              domain: "memories"
-            });
-          } catch (error) {
-            throw new ClassifyModuleFailureError("authority.status", error);
-          }
-          if (authority.authority?.state === "MODULE") {
-            const generation = authority.authority.generation;
-            if (typeof generation !== "number") {
-              throw new ClassifyModuleFailureError("authority.status", new Error("response omitted generation"));
-            }
-            const moduleClient = {
-              call: (callArgs) => moduleTransport.call(callArgs)
-            };
-            moduleArgs = {
-              moduleClient,
-              moduleSessionId: projectIdentity,
-              moduleProjectRoot: deps.sessionDirectory,
-              moduleContextStoreUuid: contextStoreUuid,
-              moduleAuthorityGeneration: generation,
-              moduleCommandId: `${startedAt}:${holderId}`
-            };
-          }
+        if (moduleRoute) {
+          moduleArgs = {
+            moduleClient: moduleRoute.moduleClient,
+            moduleSessionId: moduleRoute.moduleSessionId,
+            moduleProjectRoot: moduleRoute.moduleProjectRoot,
+            moduleContextStoreUuid: moduleRoute.moduleContextStoreUuid,
+            moduleAuthorityGeneration: moduleRoute.moduleAuthorityGeneration,
+            moduleCommandId: moduleRoute.moduleCommandId
+          };
         }
         const result = await runClassify({
           db,
@@ -9945,6 +10012,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           model: config.model,
           fallbackModels: config.fallbackModels,
           ...moduleArgs,
@@ -9968,6 +10036,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           promotionThreshold: config.promotionThreshold ?? 2,
           ensureProjectRegistered: deps.ensureProjectRegistered
         });
@@ -9985,6 +10054,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           model: config.model,
           fallbackModels: config.fallbackModels,
           language: config.language ?? deps.language,
@@ -10005,6 +10075,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           model: config.model,
           fallbackModels: config.fallbackModels,
           retinaHandoff: deps.retinaHandoff
@@ -10150,7 +10221,7 @@ async function runRetrospectiveTask(config, ctx, helpers) {
   const heartbeat = startLeaseHeartbeat(db, holderId, leaseKey, () => {
     leaseLost = true;
     abortController.abort();
-  });
+  }, ctx.leaseAcquisition);
   let childSessionId = null;
   try {
     const createResponse = await createChildSessionWithFence({
@@ -10340,7 +10411,7 @@ async function runAgenticTask(config, ctx, helpers) {
   const heartbeat = startLeaseHeartbeat(db, holderId, leaseKey, () => {
     leaseLost = true;
     abortController.abort();
-  });
+  }, ctx.leaseAcquisition);
   let childSessionId = null;
   try {
     const createResponse = await createChildSessionWithFence({
@@ -10523,15 +10594,15 @@ async function runDomainGroup(deps, group, cb) {
   const { db, projectIdentity, executor } = deps;
   const leaseKey = leaseKeyFor(group[0].config.task, projectIdentity);
   const holderId = crypto.randomUUID();
-  let acquired = acquireLease(db, holderId, leaseKey);
-  if (!acquired && cb?.leaseWaitMs) {
+  let acquisition = acquireLeaseWithAcquisition(db, holderId, leaseKey);
+  if (!acquisition && cb?.leaseWaitMs) {
     const deadline = Date.now() + cb.leaseWaitMs;
-    while (!acquired && Date.now() < deadline) {
+    while (!acquisition && Date.now() < deadline) {
       await new Promise((resolve) => setTimeout(resolve, LEASE_WAIT_POLL_MS));
-      acquired = acquireLease(db, holderId, leaseKey);
+      acquisition = acquireLeaseWithAcquisition(db, holderId, leaseKey);
     }
   }
-  if (!acquired) {
+  if (!acquisition) {
     log(`[dreamer] domain lease busy (${leaseKey}) — deferring ${group.length} task(s)`);
     for (const due of group)
       cb?.onBusy?.(due.config.task);
@@ -10539,7 +10610,7 @@ async function runDomainGroup(deps, group, cb) {
   }
   try {
     for (const due of [...group].sort((a, b) => compareTaskOrder(a.config.task, b.config.task))) {
-      if (!peekLeaseHolderAndExpiry(db, holderId, leaseKey)) {
+      if (!leaseOwnershipMatches(db, holderId, acquisition.generation, leaseKey)) {
         log(`[dreamer] domain lease lost (${leaseKey}) — stopping remaining task(s)`);
         break;
       }
@@ -10558,7 +10629,13 @@ async function runDomainGroup(deps, group, cb) {
       }
       let outcome;
       try {
-        outcome = await executor(due.config, { db, projectIdentity, holderId, leaseKey });
+        outcome = await executor(due.config, {
+          db,
+          projectIdentity,
+          holderId,
+          leaseKey,
+          leaseAcquisition: acquisition
+        });
       } catch (error) {
         outcome = { status: "failed", transient: true, error: String(error) };
       }
@@ -11962,6 +12039,7 @@ function maybeAutoEmbedPiSession(deps, sessionId, projectDir, projectIdentity, n
     return;
   autoEmbedAttemptedBySession.add(sessionId);
   (async () => {
+    let completedDrainWithWork = false;
     try {
       await new Promise((resolve2) => setTimeout(resolve2, 0));
       await ensureProjectRegisteredFromPiDirectory(projectDir, deps.db);
@@ -11972,9 +12050,13 @@ function maybeAutoEmbedPiSession(deps, sessionId, projectDir, projectIdentity, n
       if (remaining <= 0)
         return;
       notify(`Embedding ${remaining} compartment${remaining === 1 ? "" : "s"} of history in the background…`);
-      const { text } = await runEmbedDrain(deps.db, projectIdentity, sessionId);
+      const { text, level } = await runEmbedDrain(deps.db, projectIdentity, sessionId);
+      completedDrainWithWork = level === "success";
       notify(text.replace(/^## \/ctx-embed\n\n/, ""));
-    } catch {}
+    } catch {} finally {
+      if (!completedDrainWithWork)
+        autoEmbedAttemptedBySession.delete(sessionId);
+    }
   })();
 }
 
@@ -16302,6 +16384,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) {
@@ -16379,6 +16462,9 @@ var EMPTY_PI_HARD_SIGNALS = {
   cacheExpired: false,
   lastResponseTime: 0
 };
+function renderBudgetIdentityPi(state2) {
+  return `m${state2.injectionBudgetTokens ?? DEFAULT_MEMORY_BUDGET_TOKENS}-h${state2.historyBudgetTokens ?? DEFAULT_HISTORY_BUDGET_TOKENS}`;
+}
 var injectionTokenCountsBySession = new Map;
 var cachedMuralBySession = new Map;
 function rememberPiMuralPayload(sessionId, dataUrl, contentHash) {
@@ -16496,7 +16582,9 @@ function getCachedMarkers(db, state2, compartmentsForNormalization) {
     lastBaselineEndMessageId: cachedBoundary,
     systemHash: meta.cachedM0SystemHash ?? "",
     modelKey: meta.cachedM0ModelKey ?? "",
-    projectIdentity: meta.cachedM0ProjectIdentity ?? null
+    projectIdentity: meta.cachedM0ProjectIdentity ?? null,
+    muralEnabled: cachedUpgradeIdentity.muralEnabled ?? false,
+    renderBudgetIdentity: cachedUpgradeIdentity.renderBudgetIdentity ?? ""
   };
 }
 function lastBaselineEndMessageId(compartments) {
@@ -16527,8 +16615,10 @@ 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,
-    projectIdentity: state2.projectIdentity
+    modelKey: piModelRefToCanonical((state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey),
+    projectIdentity: state2.projectIdentity,
+    muralEnabled: state2.muralEnabled === true,
+    renderBudgetIdentity: renderBudgetIdentityPi(state2)
   };
 }
 function mustMaterializePi(state2, db, currentCompartmentsOverride) {
@@ -16549,8 +16639,13 @@ function mustMaterializePi(state2, db, currentCompartmentsOverride) {
   if (cached.compartmentRenderEpoch !== current.compartmentRenderEpoch) {
     return { value: true, reason: "compartment_render_epoch" };
   }
+  if (cached.muralEnabled !== current.muralEnabled || cached.renderBudgetIdentity !== current.renderBudgetIdentity) {
+    return { value: true, reason: "render_config" };
+  }
   const hard = state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS;
-  if (hard.modelKey !== "" && hard.modelKey !== (meta.cachedM0ModelKey ?? "")) {
+  const canonicalHardModelKey = piModelRefToCanonical(hard.modelKey);
+  const canonicalCachedModelKey = piModelRefToCanonical(meta.cachedM0ModelKey ?? "");
+  if (canonicalHardModelKey !== "" && canonicalHardModelKey !== canonicalCachedModelKey) {
     return { value: true, reason: "model_change" };
   }
   if (hard.systemHash !== "" && hard.systemHash !== (meta.cachedM0SystemHash ?? "")) {
@@ -16685,8 +16780,10 @@ 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,
-      projectIdentity: state2.projectIdentity
+      modelKey: piModelRefToCanonical((state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey),
+      projectIdentity: state2.projectIdentity,
+      muralEnabled: state2.muralEnabled === true,
+      renderBudgetIdentity: renderBudgetIdentityPi(state2)
     };
     return { docs, markers, compartments, memories, userProfile, workspace };
   });
@@ -16773,7 +16870,7 @@ function materializeM0Pi(state2, db) {
       projectDocsHash: snapshotMarkers.projectDocsHash,
       materializedAt: snapshotMarkers.materializedAt,
       sessionFactsVersion: snapshotMarkers.sessionFactsVersion,
-      upgradeState: encodeCachedM0UpgradeIdentity(snapshotMarkers.upgradeState, snapshotMarkers.compartmentRenderEpoch),
+      upgradeState: encodeCachedM0UpgradeIdentity(snapshotMarkers.upgradeState, snapshotMarkers.compartmentRenderEpoch, snapshotMarkers.muralEnabled, snapshotMarkers.renderBudgetIdentity),
       systemHash: snapshotMarkers.systemHash,
       modelKey: snapshotMarkers.modelKey,
       projectIdentity: snapshotMarkers.projectIdentity
@@ -16809,49 +16906,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);
@@ -16863,21 +16985,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;
@@ -16983,14 +17108,16 @@ function markersFromCachedPiRow(row, compartmentsForNormalization) {
     lastBaselineEndMessageId: typeof row.cached_m0_last_baseline_end_message_id === "string" && row.cached_m0_last_baseline_end_message_id.length > 0 ? row.cached_m0_last_baseline_end_message_id : null,
     systemHash: row.cached_m0_system_hash ?? "",
     modelKey: row.cached_m0_model_key ?? "",
-    projectIdentity: row.cached_m0_project_identity ?? null
+    projectIdentity: row.cached_m0_project_identity ?? null,
+    muralEnabled: cachedUpgradeIdentity.muralEnabled ?? false,
+    renderBudgetIdentity: cachedUpgradeIdentity.renderBudgetIdentity ?? ""
   };
 }
 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);
@@ -17304,13 +17431,44 @@ 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 result = deriveWindowGeometry(providerID, modelID, {
+    context,
+    output: args.model?.maxTokens
+  }, {
+    overlay: resolveWindowOverlayFacts(providerID, modelID, getWindowOverlay()),
+    contextCap: isSaneLimit2(args.detectedContextLimit) ? args.detectedContextLimit : undefined,
+    reserveConfig: args.reserveConfig,
+    harness: "pi"
+  });
+  if (!result || !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
@@ -21868,10 +22026,14 @@ function processSystemPromptForCache(args) {
   const dateMatch = systemPrompt.match(DATE_PATTERN);
   const liveDate = dateMatch ? dateMatch[0] : null;
   const stickyDate = stickyDateBySession.get(sessionId);
+  const stableCandidate = liveDate && stickyDate && liveDate !== stickyDate ? systemPrompt.replace(DATE_PATTERN, stickyDate) : systemPrompt;
+  const stableCandidateHash = createHash10("md5").update(promptSurfaceHashMaterial(stableCandidate, args.promptSurfacePreset)).digest("hex");
+  const contentOrPresetChanged = !isFirstHash && stableCandidateHash !== previousHash;
+  const dateMayAdvance = isCacheBusting || contentOrPresetChanged;
   if (liveDate && !stickyDate) {
     stickyDateBySession.set(sessionId, liveDate);
   } else if (liveDate && stickyDate && liveDate !== stickyDate) {
-    if (isCacheBusting) {
+    if (dateMayAdvance) {
       stickyDateBySession.set(sessionId, liveDate);
       sessionLog(sessionId, `system prompt date updated: ${stickyDate} → ${liveDate} (cache-busting pass)`);
     } else {
@@ -21908,6 +22070,37 @@ function clearPiSystemPromptSession(sessionId) {
 }
 
 // src/temporal-awareness-pi.ts
+function withoutPiLeadingTemporalMarker(text) {
+  const { tagPrefix, body } = peelLeadingMcTagNotation(text);
+  return tagPrefix + body.replace(TEMPORAL_MARKER_PATTERN, "");
+}
+function stripPiLeadingTemporalMarker(message) {
+  if (!message || typeof message !== "object")
+    return false;
+  const userMessage = message;
+  if (userMessage.role !== "user")
+    return false;
+  if (typeof userMessage.content === "string") {
+    const stripped2 = withoutPiLeadingTemporalMarker(userMessage.content);
+    if (stripped2 === userMessage.content)
+      return false;
+    userMessage.content = stripped2;
+    return true;
+  }
+  if (!Array.isArray(userMessage.content))
+    return false;
+  const firstTextIndex = userMessage.content.findIndex((part) => part?.type === "text");
+  if (firstTextIndex < 0)
+    return false;
+  const firstText = userMessage.content[firstTextIndex];
+  const stripped = withoutPiLeadingTemporalMarker(firstText.text);
+  if (stripped === firstText.text)
+    return false;
+  const content = userMessage.content.slice();
+  content[firstTextIndex] = { ...firstText, text: stripped };
+  userMessage.content = content;
+  return true;
+}
 function injectPiTemporalMarkers(messages) {
   let injected = 0;
   let prevTimestampMs;
@@ -22679,6 +22872,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)) {
@@ -22732,7 +22928,7 @@ function buildPiTextIdentityPlan(db, sessionId, tagger, transcript, reuseCandida
     const messageId = message.info.id;
     if (messageId === undefined)
       continue;
-    currentSourcesByMessageId.set(messageId, message.parts.filter((part) => part.kind === "text").map((part) => stripTagPrefix(part.getText() ?? "")));
+    currentSourcesByMessageId.set(messageId, message.parts.filter((part) => part.kind === "text").map((part) => withoutPiLeadingTemporalMarker(stripTagPrefix(part.getText() ?? ""))));
   }
   const legacyRowsByMessageId = new Map;
   const versionedMessageIds = new Set;
@@ -22778,7 +22974,7 @@ function buildPiTextIdentityPlan(db, sessionId, tagger, transcript, reuseCandida
     if (legacyRows.length === 0)
       continue;
     legacyRows.sort((left, right) => left.ordinal - right.ordinal);
-    const vectorMatches = legacyRows.length === currentSources.length && legacyRows.every((row, index) => row.ordinal === index && sourceCache.get(row.tagId) === currentSources[index]);
+    const vectorMatches = legacyRows.length === currentSources.length && legacyRows.every((row, index) => row.ordinal === index && withoutPiLeadingTemporalMarker(sourceCache.get(row.tagId) ?? "") === currentSources[index]);
     if (!vectorMatches)
       driftedMessageIds.add(messageId);
   }
@@ -23086,6 +23282,30 @@ function buildPiAlignedEntryIds(entries) {
   }
   return ids;
 }
+function stripMcOwnedPiCompactionSummary(messages, entryIds, branchEntries) {
+  const summaryMessage = messages[0];
+  if (summaryMessage?.role !== "compactionSummary")
+    return false;
+  let compaction;
+  for (let index = branchEntries.length - 1;index >= 0; index -= 1) {
+    const entry = branchEntries[index];
+    if (entry?.type === "compaction") {
+      compaction = entry;
+      break;
+    }
+  }
+  if (compaction?.fromHook !== true)
+    return false;
+  const details = compaction.details;
+  if (details?.source !== "magic-context")
+    return false;
+  if (summaryMessage.summary !== compaction.summary || summaryMessage.tokensBefore !== compaction.tokensBefore || entryIds[0] !== undefined) {
+    return false;
+  }
+  messages.splice(0, 1);
+  entryIds.splice(0, 1);
+  return true;
+}
 function getPiBranchEntryLookup(entries) {
   const cached = piBranchLookupByProjection.get(entries);
   if (cached)
@@ -23447,6 +23667,9 @@ function registerPiContextHandler(pi, baseOptions) {
       const alignedEntryIds = branchLookup?.alignedEntryIds ?? null;
       const resolvedEntryIds = alignedEntryIds?.length === event.messages.length ? alignedEntryIds : branchEntries === null ? null : collectMessageEntryIdsByRef(ctx, event.messages, sessionId, branchEntries);
       const strictEntryIds = resolvedEntryIds ? [...resolvedEntryIds] : null;
+      if (strictEntryIds && branchEntries && options.injection && !options.compactionOff && stripMcOwnedPiCompactionSummary(event.messages, strictEntryIds, branchEntries)) {
+        logTransformTiming(sessionId, "mcCompactionSummarySuppression", tEntryBranch);
+      }
       if (strictEntryIds && options.injection && !options.compactionOff) {
         const removed = trimPiMessagesToCachedBoundary(options.db, sessionId, event.messages, strictEntryIds);
         if (removed > 0) {
@@ -23488,7 +23711,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);
       }
@@ -23587,11 +23810,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,
@@ -23663,7 +23887,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();
@@ -24474,7 +24700,7 @@ 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;
@@ -24545,8 +24771,9 @@ 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 shouldReadPendingOps = !args.compactionOff && (args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || m0HardFoldThisPass || 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 || m0HardFoldThisPass;
   const deferredMaterialize = canConsumeDeferredLate && deferredMaterializationWasPending;
   const deferredHistoryRefresh = canConsumeDeferredLate && deferredHistoryRefreshWasPending;
@@ -24578,10 +24805,10 @@ async function runPipeline(args) {
   }
   const targetTagNumbers = [...targets.keys()];
   const tGetTags = performance.now();
-  const flushedSliceTags = getTagsByNumbers(args.db, args.sessionId, targetTagNumbers);
-  logTransformTiming(args.sessionId, "getTagsByNumbers", tGetTags, `targets=${targetTagNumbers.length} fetched=${flushedSliceTags.length}`);
+  const flushedDroppedTags = getDroppedTagsByNumbers(args.db, args.sessionId, targetTagNumbers);
+  logTransformTiming(args.sessionId, "getDroppedTagsByNumbers", tGetTags, `targets=${targetTagNumbers.length} fetched=${flushedDroppedTags.length}`);
   const tFlushed = performance.now();
-  didMutateFromFlushedStatuses = applyFlushedStatuses(args.sessionId, args.db, targets, flushedSliceTags);
+  didMutateFromFlushedStatuses = applyFlushedStatuses(args.sessionId, args.db, targets, flushedDroppedTags);
   logTransformTiming(args.sessionId, "applyFlushedStatuses", tFlushed);
   logTransformTiming(args.sessionId, "batchFinalize:flushed", tFlushed);
   const messageIdToMaxTag = buildMessageIdToMaxTag(targets);
@@ -24825,6 +25052,10 @@ async function runPipeline(args) {
         hardSignals: piHardSignals,
         muralEnabled: args.injection.muralEnabled === true
       }, args.db, args.messages, args.entryIds, args.isCacheBusting || deferredHistoryRefresh || executedWorkThisPass);
+      if (args.temporalAwareness && injectionResult.skippedVisibleMessages > 0) {
+        const firstRetainedMessage = args.messages[injectionResult.syntheticLeadingCount];
+        stripPiLeadingTemporalMarker(firstRetainedMessage);
+      }
       if (args.isCacheBusting) {
         historyRefreshSessions.delete(args.sessionId);
         historyWasConsumedThisPass = true;
@@ -27394,7 +27625,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) {
   const thresholdDetail = resolveExecuteThresholdDetail(executeThresholdPercentageConfig, liveModelKey, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, {
     tokensConfig: executeThresholdTokens,
     contextLimit,
@@ -27455,7 +27686,7 @@ function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageC
       ] : [], ...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;
@@ -27556,7 +27787,7 @@ ${c.content}
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.36.0",
+  version: "0.37.0",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -27596,6 +27827,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",
@@ -27723,6 +27955,9 @@ 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));
+  }
   lines.push(`Work tokens ${fmt2(s.newWorkTokens)} new · ${fmt2(s.totalInputTokens)} total input`);
   lines.push(renderBar(s, innerWidth));
   for (const seg of breakdownSegments(s)) {
@@ -27783,18 +28018,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);
@@ -27888,6 +28127,7 @@ ${safeStringify(tool.parameters)}`);
     lastTransformError: meta.lastTransformError,
     isSubagent: meta.isSubagent,
     contextLimit,
+    windowGeometry,
     executeThreshold: threshold.percentage,
     executeThresholdMode: threshold.mode,
     executeThresholdClamped: threshold.clamped,
@@ -28075,14 +28315,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);
         const details = buildStatusDetails(currentDeps, sessionId);
         sendCtxStatusMessage(pi, { title: "/ctx-status", text: statusText, level: "info" }, details);
       } catch (error) {
@@ -28675,6 +28919,9 @@ async function handlePiSessionBeforeCompact(args) {
   info("session_before_compact: cancelling — magic-context owns compaction");
   return { cancel: true };
 }
+function canonicalPiModelKey(provider, model) {
+  return piModelRefToCanonical(`${provider}/${model}`);
+}
 function persistPiMessageEndModelMeta(args) {
   if (!args.message || typeof args.message !== "object")
     return;
@@ -28682,7 +28929,7 @@ function persistPiMessageEndModelMeta(args) {
   if (msg.role !== "assistant" || typeof msg.provider !== "string" || msg.provider.length === 0 || typeof msg.model !== "string" || msg.model.length === 0) {
     return;
   }
-  const modelKey = `${msg.provider}/${msg.model}`;
+  const modelKey = canonicalPiModelKey(msg.provider, msg.model);
   recordPiLiveModel(args.sessionId, modelKey);
   const cacheTtl = resolveCacheTtl(args.cacheTtlConfig, modelKey);
   const currentMeta = getOrCreateSessionMeta(args.db, args.sessionId);
@@ -29398,6 +29645,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
     info(bootProjectDeps.dreamerEnabled ? "registered dreamer: DISABLED (no dreamer config)" : "registered dreamer: DISABLED (dreamer.disable=true or no dreamer config)");
   }
   pi.on("before_agent_start", async (event, ctx) => {
+    await preloadTokenizer();
     try {
       if (ctx.hasUI && shouldShowAnnouncement()) {
         const featureText = ANNOUNCEMENT_FEATURES.map((line) => `  • ${line}`).join(`
@@ -29493,7 +29741,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
       }
       const isCacheBusting = sessionId ? hasSystemPromptRefresh(sessionId) : true;
       const promptSurfaceModel = ctx.model;
-      const promptSurfaceModelKey = typeof promptSurfaceModel?.provider === "string" && promptSurfaceModel.provider.length > 0 && typeof promptSurfaceModel.id === "string" && promptSurfaceModel.id.length > 0 ? `${promptSurfaceModel.provider}/${promptSurfaceModel.id}` : undefined;
+      const promptSurfaceModelKey = typeof promptSurfaceModel?.provider === "string" && promptSurfaceModel.provider.length > 0 && typeof promptSurfaceModel.id === "string" && promptSurfaceModel.id.length > 0 ? canonicalPiModelKey(promptSurfaceModel.provider, promptSurfaceModel.id) : undefined;
       const promptSurface = sessionId ? promptSurfaceGuidanceEpochs.resolve(sessionId, effectiveConfig.prompt_surface, promptSurfaceModelKey) : promptSurfaceRuntime.resolveGuidance(effectiveConfig.prompt_surface, promptSurfaceModelKey);
       const block = buildMagicContextBlock({
         db,
@@ -29778,5 +30026,6 @@ export {
   src_default as default,
   capturePiTodowriteMessageIfCompatible,
   capturePiTodowriteArgsIfCompatible,
+  canonicalPiModelKey,
   __test
 };