@cortexkit/pi-magic-context 0.35.1 → 0.36.1

package/dist/index.js

@@ -128,6 +128,7 @@ import {
   getCompartmentsByEndMessageId,
   getContextStoreUuid,
   getDatabasePath,
+  getDroppedTagsByNumbers,
   getEmbeddingCoverageStatus,
   getEmergencyInputSample,
   getErrorMessage,
@@ -246,6 +247,7 @@ import {
   normalizeText,
   normalizeTodoStateJson,
   normalizeVerificationFiles,
+  ompModelRefToCanonical,
   openDatabase,
   openDatabaseAsync,
   parkGitSweepNonIndexable,
@@ -256,6 +258,7 @@ import {
   peelLeadingMcTagNotation,
   persistCachedM0,
   piModelRefToCanonical,
+  preloadTokenizer,
   prependTag,
   primeInMemoryTailRawMessageCache,
   primeTailRawMessageCache,
@@ -309,6 +312,7 @@ import {
   resolveGitTopLevel,
   resolveLimit,
   resolveModelConfigOrDefault,
+  resolveModelRefForOmp,
   resolveModelRefForPi,
   resolveMuralWire,
   resolvePiStableId,
@@ -373,7 +377,7 @@ import {
   withMigrationLanguageDirective,
   withRawMessageProvider,
   withRawSessionMessageCache
-} from "./index-gxftx2a4.js";
+} from "./index-zxgbtsnj.js";
 import {
   pushNotification
 } from "./index-hw34xmzk.js";
@@ -385,7 +389,7 @@ import {
   log,
   sessionLog,
   setHarness
-} from "./index-zmyx6nf5.js";
+} from "./index-npnqc564.js";
 import {
   __require,
   __toESM
@@ -1948,6 +1952,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)
@@ -1957,6 +1962,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);
@@ -2034,7 +2041,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`);
@@ -2064,7 +2071,13 @@ function isEmptySidekickResult(text) {
 
 // src/subagent-runner.ts
 import * as childProcess from "node:child_process";
-import { existsSync as existsSync3, mkdtempSync, rmSync, writeFileSync as writeFileSync2 } from "node:fs";
+import {
+  existsSync as existsSync3,
+  mkdtempSync,
+  readFileSync as readFileSync2,
+  rmSync,
+  writeFileSync as writeFileSync2
+} from "node:fs";
 import { createRequire } from "node:module";
 import { homedir, tmpdir } from "node:os";
 import {
@@ -2087,13 +2100,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,
@@ -2120,7 +2134,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;
@@ -2263,7 +2277,61 @@ function resolveSubagentEntryPath() {
 var SUBAGENT_ENTRY_PATH = resolveSubagentEntryPath();
 var TERMINAL_DRAIN_GRACE_MS = 2000;
 var MAGIC_CONTEXT_PI_SUBAGENT_ENV = "MAGIC_CONTEXT_PI_SUBAGENT";
-var PI_AGENT_SETTINGS_DIR = join2(homedir(), ".pi", "agent");
+function packageRootIsOmp(packageRoot) {
+  try {
+    const manifest = JSON.parse(readFileSync2(join2(packageRoot, "package.json"), "utf-8"));
+    return manifest.name === "@oh-my-pi/pi-coding-agent";
+  } catch {
+    return false;
+  }
+}
+function expandHomePath(value) {
+  if (value === "~")
+    return homedir();
+  if (value.startsWith("~/") || value.startsWith("~\\")) {
+    return resolvePath(homedir(), value.slice(2));
+  }
+  return resolvePath(value);
+}
+function isOmpHostProcess() {
+  const execName = basename(process.execPath).toLowerCase();
+  if (/^omp(?:\.exe)?$/.test(execName))
+    return true;
+  const packageOverride = process.env.PI_PACKAGE_DIR?.trim();
+  if (packageOverride && packageRootIsOmp(expandHomePath(packageOverride))) {
+    return true;
+  }
+  let current = process.argv[1] ? dirname(resolvePath(process.argv[1])) : "";
+  while (current) {
+    if (packageRootIsOmp(current))
+      return true;
+    const parent = dirname(current);
+    if (parent === current)
+      break;
+    current = parent;
+  }
+  return false;
+}
+function normalizedOmpProfile() {
+  const raw = (process.env.OMP_PROFILE ?? process.env.PI_PROFILE)?.trim();
+  return raw && raw !== "default" && /^[a-z0-9][a-z0-9._-]{0,63}$/.test(raw) ? raw : undefined;
+}
+function getHostAgentSettingsDir() {
+  if (!isOmpHostProcess())
+    return join2(homedir(), ".pi", "agent");
+  const configRoot = join2(homedir(), process.env.PI_CONFIG_DIR?.trim() || ".omp");
+  const profile = normalizedOmpProfile();
+  if (profile)
+    return join2(configRoot, "profiles", profile, "agent");
+  const configured = process.env.PI_CODING_AGENT_DIR?.trim();
+  return configured ? resolvePath(configured) : join2(configRoot, "agent");
+}
+function modelRefToCanonicalForHost(ref) {
+  return isOmpHostProcess() ? ompModelRefToCanonical(ref) : piModelRefToCanonical(ref);
+}
+function resolveModelRefForHost(ref) {
+  return isOmpHostProcess() ? resolveModelRefForOmp(ref) : resolveModelRefForPi(ref);
+}
 var configuredSubagentExtensions;
 function configurePiSubagentExtensions(extensions) {
   configuredSubagentExtensions = extensions?.slice();
@@ -2271,7 +2339,7 @@ function configurePiSubagentExtensions(extensions) {
 function resolveSubagentExtensionEntry(entry) {
   const trimmed = entry.trim();
   const isNpmSource = trimmed.startsWith("npm:");
-  return !isNpmSource && !isAbsolute(trimmed) ? resolvePath(PI_AGENT_SETTINGS_DIR, trimmed) : trimmed;
+  return !isNpmSource && !isAbsolute(trimmed) ? resolvePath(getHostAgentSettingsDir(), trimmed) : trimmed;
 }
 var PI_READ_ONLY_BUILTINS = ["read", "grep", "find", "ls"];
 var PI_AFT_READ_TOOLS = ["aft_outline", "aft_zoom", "aft_search"];
@@ -2309,6 +2377,32 @@ var STRICT_TOOL_ALLOWLIST_ENTRIES = [
 ];
 var STRICT_TOOL_ALLOWLIST = new Map(STRICT_TOOL_ALLOWLIST_ENTRIES);
 var ZERO_TOOL_PROMPT_REQUIRED_AGENTS = new Set(STRICT_TOOL_ALLOWLIST_ENTRIES.filter(([, tools]) => tools.length === 0).map(([agent]) => agent));
+var OMP_TOOL_ALIASES = {
+  find: "glob",
+  ls: "glob"
+};
+var OMP_ALLOWLISTABLE_TOOLS = {
+  read: true,
+  grep: true,
+  glob: true,
+  bash: true,
+  edit: true,
+  write: true
+};
+function resolveHostToolAllowlist(tools, ompHost = isOmpHostProcess()) {
+  if (!ompHost)
+    return tools;
+  const resolved = [];
+  const seen = new Set;
+  for (const tool of tools) {
+    const mapped = OMP_TOOL_ALIASES[tool] ?? tool;
+    if (OMP_ALLOWLISTABLE_TOOLS[mapped] !== true || seen.has(mapped))
+      continue;
+    seen.add(mapped);
+    resolved.push(mapped);
+  }
+  return resolved;
+}
 function inferAccountingSubagent(agent) {
   if (agent.includes("sidekick"))
     return "sidekick";
@@ -2882,11 +2976,11 @@ function replaceProviderPrefix(ref, provider) {
 function resolveProviderModelAttempt(model) {
   if (typeof model !== "string" || model.length === 0)
     return;
-  const canonicalRef = piModelRefToCanonical(model);
+  const canonicalRef = modelRefToCanonicalForHost(model);
   const canonicalProvider = providerPrefix(canonicalRef);
   if (!canonicalProvider)
     return;
-  const translatedRef = resolveModelRefForPi(canonicalRef);
+  const translatedRef = resolveModelRefForHost(canonicalRef);
   const translatedProvider = providerPrefix(translatedRef);
   const cachedProvider = PI_PROVIDER_FORM_CACHE.get(canonicalProvider);
   if (!translatedProvider || translatedProvider === canonicalProvider && cachedProvider === undefined) {
@@ -2906,14 +3000,14 @@ function isProviderCredentialFailure(result, attempt) {
 }
 var PROMPT_ARGV_MAX_BYTES = 96 * 1024;
 function buildArgs(options, opts) {
+  const ompHost = isOmpHostProcess();
   const args = [
     "--print",
     "--mode",
     "json",
     "--no-session",
     "--no-skills",
-    "--no-prompt-templates",
-    "--no-context-files"
+    ...ompHost ? ["--no-rules"] : ["--no-prompt-templates", "--no-context-files"]
   ];
   if (opts?.disableDiscoveredExtensions || opts?.subagentExtensions !== undefined) {
     args.push("--no-extensions");
@@ -2936,8 +3030,9 @@ function buildArgs(options, opts) {
     sessionLog(options.accountingSessionId ?? "pi-subagent", `Pi subagent agent "${options.agent}" has no strict tool allow-list; forcing --no-tools`);
     args.push("--no-tools");
   } else {
-    if (strictTools.length > 0) {
-      args.push("--tools", strictTools.join(","));
+    const hostTools = resolveHostToolAllowlist(strictTools, ompHost);
+    if (hostTools.length > 0) {
+      args.push("--tools", hostTools.join(","));
     } else {
       args.push("--no-tools");
     }
@@ -2946,7 +3041,7 @@ function buildArgs(options, opts) {
     args.push("--system-prompt", opts.systemPromptPath);
   }
   if (typeof options.model === "string" && options.model.length > 0) {
-    args.push("--model", opts?.modelRef ?? resolveModelRefForPi(options.model));
+    args.push("--model", opts?.modelRef ?? resolveModelRefForHost(options.model));
   }
   if (options.thinkingLevel) {
     args.push("--thinking", options.thinkingLevel);
@@ -3206,16 +3301,16 @@ function claimExpectedState(db, expected) {
                  WHERE id = ? AND type = 'smart' AND status = 'pending'
                    AND content = ? AND surface_condition IS ? AND updated_at = ?${statusClause}`).run(...params).changes > 0;
 }
-function getDueCompiledSmartNoteChecks(db, projectPath, now, limit) {
-  return getPendingSmartNotes(db, projectPath).map(toSmartNote).filter((note) => note.checkStatus === "compiled" && note.compiledCheck !== null && note.policyVersion === SMART_NOTE_CHECK_POLICY_VERSION && (note.checkQuarantinedUntil === null || note.checkQuarantinedUntil <= now) && (note.checkNextDueAt === null || note.checkNextDueAt <= now)).sort((a, b) => (a.checkNextDueAt ?? 0) - (b.checkNextDueAt ?? 0) || a.id - b.id).slice(0, Math.max(1, limit));
+function getDueCompiledSmartNoteChecks(db, projectPath, now, limit, retinaHandoff = false) {
+  return getPendingSmartNotes(db, projectPath).filter((note) => !retinaHandoff || note.compileStatus !== "compiled").map(toSmartNote).filter((note) => note.checkStatus === "compiled" && note.compiledCheck !== null && note.policyVersion === SMART_NOTE_CHECK_POLICY_VERSION && (note.checkQuarantinedUntil === null || note.checkQuarantinedUntil <= now) && (note.checkNextDueAt === null || note.checkNextDueAt <= now)).sort((a, b) => (a.checkNextDueAt ?? 0) - (b.checkNextDueAt ?? 0) || a.id - b.id).slice(0, Math.max(1, limit));
 }
-function getSmartNotesNeedingCompilation(db, projectPath, now, limit) {
-  return getPendingSmartNotes(db, projectPath).map(toSmartNote).filter((note) => (note.checkNextDueAt === null || note.checkNextDueAt <= now) && (note.checkStatus === "uncompiled" || note.checkStatus === "failing" || note.compiledCheck === null || note.policyVersion !== SMART_NOTE_CHECK_POLICY_VERSION)).sort((a, b) => a.createdAt - b.createdAt || a.id - b.id).slice(0, Math.max(1, limit));
+function getSmartNotesNeedingCompilation(db, projectPath, now, limit, retinaHandoff = false) {
+  return getPendingSmartNotes(db, projectPath).filter((note) => !retinaHandoff || note.compileStatus !== "compiled").map(toSmartNote).filter((note) => (note.checkNextDueAt === null || note.checkNextDueAt <= now) && (note.checkStatus === "uncompiled" || note.checkStatus === "failing" || note.compiledCheck === null || note.policyVersion !== SMART_NOTE_CHECK_POLICY_VERSION)).sort((a, b) => a.createdAt - b.createdAt || a.id - b.id).slice(0, Math.max(1, limit));
 }
-function getStaleCompiledSmartNotes(db, projectPath, now, limit) {
+function getStaleCompiledSmartNotes(db, projectPath, now, limit, retinaHandoff = false) {
   const staleBefore = now - SMART_NOTE_CHECK_MAX_STALENESS_MS;
   const livenessBefore = now - SMART_NOTE_CHECK_LIVENESS_RECHECK_MS;
-  return getPendingSmartNotes(db, projectPath).map(toSmartNote).filter((note) => note.checkStatus === "compiled" && note.compiledCheck !== null && note.policyVersion === SMART_NOTE_CHECK_POLICY_VERSION && note.checkFalseSinceAt !== null && note.checkFalseSinceAt <= staleBefore && (note.checkLastLivenessAt === null || note.checkLastLivenessAt <= livenessBefore)).sort((a, b) => (a.checkFalseSinceAt ?? 0) - (b.checkFalseSinceAt ?? 0) || a.id - b.id).slice(0, Math.max(1, limit));
+  return getPendingSmartNotes(db, projectPath).filter((note) => !retinaHandoff || note.compileStatus !== "compiled").map(toSmartNote).filter((note) => note.checkStatus === "compiled" && note.compiledCheck !== null && note.policyVersion === SMART_NOTE_CHECK_POLICY_VERSION && note.checkFalseSinceAt !== null && note.checkFalseSinceAt <= staleBefore && (note.checkLastLivenessAt === null || note.checkLastLivenessAt <= livenessBefore)).sort((a, b) => (a.checkFalseSinceAt ?? 0) - (b.checkFalseSinceAt ?? 0) || a.id - b.id).slice(0, Math.max(1, limit));
 }
 function storeCompiledSmartNoteCheck(db, args) {
   db.prepare(`UPDATE notes
@@ -3666,7 +3761,7 @@ async function sendIgnoredMessageNow(client, sessionId, text, params, forcePersi
     queueIgnoredNotification({ client, sessionId, text, params, forcePersist });
     return "queued";
   }
-  const { waitForSafeNotificationTarget } = await import("./safe-notification-target-ng8ygena.js");
+  const { waitForSafeNotificationTarget } = await import("./safe-notification-target-0s6j4m9f.js");
   if (await waitForSafeNotificationTarget(client, sessionId) === "skip") {
     sessionLog(sessionId, "notification skipped (session not titled yet)");
     return "skipped";
@@ -3743,25 +3838,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) {
@@ -3774,7 +3875,7 @@ async function createChildSessionWithFence(args) {
       if (args.onFenceLatched)
         await args.onFenceLatched(verdict.failure);
       else
-        await surfaceStalePluginBuild(args);
+        await surfaceSchemaFenceFailure(args, verdict.failure);
     }
     return null;
   }
@@ -4166,7 +4267,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;
@@ -4215,13 +4316,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) {
@@ -4239,6 +4342,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);
@@ -4250,6 +4360,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;
@@ -4266,26 +4379,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();
@@ -4303,9 +4420,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;
@@ -4316,15 +4436,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;
       }
@@ -4393,6 +4523,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) {
@@ -4414,9 +4554,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 {
@@ -4450,6 +4593,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;
@@ -4622,7 +4827,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 = [];
@@ -4717,7 +4922,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;
       }
     });
@@ -4725,7 +4937,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,
@@ -4833,7 +5045,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({
@@ -5275,7 +5487,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,
@@ -5398,7 +5610,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) {
@@ -5782,7 +5994,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());
@@ -5862,7 +6074,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;
       }
     });
@@ -5873,7 +6092,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 {
@@ -5902,7 +6121,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,
@@ -6540,7 +6759,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.
@@ -6964,7 +7183,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);
@@ -7055,7 +7274,7 @@ var MAX_FAILURES_BEFORE_REAUTHOR = 3;
 async function runDueCompiledSmartNoteChecks(args) {
   const startedAt = Date.now();
   const now = args.now ?? startedAt;
-  const due = getDueCompiledSmartNoteChecks(args.db, args.projectIdentity, now, args.maxChecks ?? DEFAULT_MAX_CHECKS);
+  const due = getDueCompiledSmartNoteChecks(args.db, args.projectIdentity, now, args.maxChecks ?? DEFAULT_MAX_CHECKS, args.retinaHandoff);
   let ran = 0;
   let surfaced = 0;
   let failed = 0;
@@ -7185,7 +7404,8 @@ async function evaluateSmartNotes(args) {
   const projectRoot = args.sessionDirectory ?? args.projectIdentity;
   const moduleBridge = getModuleNoteEvaluationBridge(args.projectIdentity);
   await moduleBridge?.sync();
-  const pendingAtStart = getPendingSmartNotes(args.db, args.projectIdentity).length;
+  const pendingNotes = () => getPendingSmartNotes(args.db, args.projectIdentity).filter((note) => !args.retinaHandoff || note.compileStatus !== "compiled");
+  const pendingAtStart = pendingNotes().length;
   if (pendingAtStart === 0) {
     log("[dreamer] smart notes: no pending notes");
     return { surfaced: 0, pending: 0, ran: false };
@@ -7204,12 +7424,12 @@ 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 {
     if (moduleBridge) {
-      const candidates2 = getPendingSmartNotes(args.db, args.projectIdentity).slice(0, MAX_COMPILE_PER_RUN);
+      const candidates2 = pendingNotes().slice(0, MAX_COMPILE_PER_RUN);
       for (const note of candidates2) {
         if (Date.now() >= args.deadline)
           break;
@@ -7230,7 +7450,7 @@ async function evaluateSmartNotes(args) {
           surfaced += 1;
       }
       await moduleBridge.sync();
-      const pending2 = getPendingSmartNotes(args.db, args.projectIdentity).length;
+      const pending2 = pendingNotes().length;
       return { surfaced, pending: pending2, ran: didWork };
     }
     const dueRun = await runDueCompiledSmartNoteChecks({
@@ -7240,11 +7460,12 @@ async function evaluateSmartNotes(args) {
       maxChecks: 10,
       sweepBudgetMs: 1e4,
       leaseHeld,
-      signal: leaseAbortController.signal
+      signal: leaseAbortController.signal,
+      retinaHandoff: args.retinaHandoff
     });
     surfaced += dueRun.surfaced;
     didWork ||= dueRun.ran > 0;
-    const candidates = getSmartNotesNeedingCompilation(args.db, args.projectIdentity, Date.now(), MAX_COMPILE_PER_RUN);
+    const candidates = getSmartNotesNeedingCompilation(args.db, args.projectIdentity, Date.now(), MAX_COMPILE_PER_RUN, args.retinaHandoff);
     for (const note of candidates) {
       if (Date.now() >= args.deadline)
         break;
@@ -7254,7 +7475,7 @@ async function evaluateSmartNotes(args) {
       if (compiled)
         surfaced += 1;
     }
-    const stale = getStaleCompiledSmartNotes(args.db, args.projectIdentity, Date.now(), MAX_FALLBACK_PER_RUN);
+    const stale = getStaleCompiledSmartNotes(args.db, args.projectIdentity, Date.now(), MAX_FALLBACK_PER_RUN, args.retinaHandoff);
     for (const note of stale) {
       if (Date.now() >= args.deadline)
         break;
@@ -7264,7 +7485,7 @@ async function evaluateSmartNotes(args) {
       if (met)
         surfaced += 1;
     }
-    const fallbackNotes = getPendingSmartNotes(args.db, args.projectIdentity).filter((note) => note.checkStatus === "fallback").slice(0, MAX_FALLBACK_PER_RUN);
+    const fallbackNotes = pendingNotes().filter((note) => note.checkStatus === "fallback").slice(0, MAX_FALLBACK_PER_RUN);
     for (const note of fallbackNotes) {
       if (Date.now() >= args.deadline)
         break;
@@ -7515,7 +7736,7 @@ Output exactly JSON: {"met": false}`;
 }
 
 // ../plugin/src/features/magic-context/dreamer/maintain-docs-protected-enforcement.ts
-import { existsSync as existsSync5, readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync5, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "node:fs";
 import { join as join3 } from "node:path";
 
 // ../plugin/src/features/magic-context/dreamer/protected-regions.ts
@@ -7620,7 +7841,7 @@ function snapshotMaintainDocsFiles(docsDir) {
     const path4 = join3(docsDir, name);
     try {
       if (existsSync5(path4)) {
-        snapshot.set(name, readFileSync2(path4, "utf8"));
+        snapshot.set(name, readFileSync3(path4, "utf8"));
       }
     } catch {}
   }
@@ -7630,7 +7851,7 @@ function enforceMaintainDocsProtectedRegions(args) {
   for (const [fileName, original] of args.snapshot) {
     const path4 = join3(args.docsDir, fileName);
     try {
-      const current = readFileSync2(path4, "utf8");
+      const current = readFileSync3(path4, "utf8");
       const { text, violated } = enforceProtectedRegions(original, current);
       if (!violated) {
         continue;
@@ -7644,7 +7865,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";
@@ -7761,7 +7982,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());
@@ -7905,7 +8126,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
           }
         }
@@ -8130,7 +8351,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);
@@ -8362,7 +8583,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];
@@ -8965,68 +9186,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) {
@@ -9271,7 +9430,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;
@@ -9607,6 +9766,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) => {
@@ -9624,7 +9786,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,
@@ -9638,6 +9800,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, {
@@ -9710,6 +9875,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           model: config.model ?? deps.mural.model ?? deps.dreamerModel,
           fallbackModels: config.fallbackModels,
           moduleRoute,
@@ -9733,6 +9899,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           promotionThreshold: config.promotionThreshold ?? 3,
           model: config.model,
           fallbackModels: config.fallbackModels,
@@ -9752,6 +9919,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           model: config.model,
           fallbackModels: config.fallbackModels,
           moduleRoute,
@@ -9777,6 +9945,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           forceBroad: config.task === "verify-broad",
           model: config.model,
           fallbackModels: config.fallbackModels,
@@ -9810,40 +9979,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,
@@ -9854,6 +9998,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           model: config.model,
           fallbackModels: config.fallbackModels,
           ...moduleArgs,
@@ -9877,6 +10022,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           promotionThreshold: config.promotionThreshold ?? 2,
           ensureProjectRegistered: deps.ensureProjectRegistered
         });
@@ -9894,6 +10040,7 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           model: config.model,
           fallbackModels: config.fallbackModels,
           language: config.language ?? deps.language,
@@ -9914,8 +10061,10 @@ function createDreamTaskExecutor(deps) {
           holderId,
           leaseKey,
           deadline,
+          leaseAcquisition,
           model: config.model,
-          fallbackModels: config.fallbackModels
+          fallbackModels: config.fallbackModels,
+          retinaHandoff: deps.retinaHandoff
         });
         recordRun("completed", null, {
           smartNotesSurfaced: result.surfaced,
@@ -10058,7 +10207,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({
@@ -10248,7 +10397,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({
@@ -10431,15 +10580,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);
@@ -10447,7 +10596,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;
       }
@@ -10466,7 +10615,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) };
       }
@@ -10873,6 +11028,7 @@ async function sweepProject(reg, origin, db, gitCommitEnabled) {
       dreamerModel: dreamerConfig.model,
       mural: reg.mural,
       memoryInjectionBudgetTokens: reg.memoryInjectionBudgetTokens,
+      retinaHandoff: reg.retinaHandoff,
       transformMode: reg.transformMode,
       moduleClient: reg.moduleClient,
       onProgress: (progress, completedTask) => reg.onDreamerProgress?.(progress, completedTask)
@@ -10916,7 +11072,8 @@ async function runCompiledSmartNoteSweep(reg, db) {
     const result = await runDueCompiledSmartNoteChecks({
       db,
       projectIdentity: reg.projectIdentity,
-      projectRoot: reg.directory
+      projectRoot: reg.directory,
+      retinaHandoff: reg.retinaHandoff
     });
     if (result.ran > 0) {
       log(`[dreamer] compiled smart-note sweep ${reg.projectIdentity}: ran=${result.ran} surfaced=${result.surfaced} logic_failed=${result.failed} network_failed=${result.networkFailed}`);
@@ -10991,7 +11148,7 @@ async function sweepGitCommits(args) {
 }
 
 // src/dreamer/pi-session-api.ts
-import { readFileSync as readFileSync3 } from "node:fs";
+import { readFileSync as readFileSync4 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 import { pathToFileURL } from "node:url";
 var PI_CODING_AGENT_MODULE = "@earendil-works/pi-coding-agent";
@@ -11047,7 +11204,7 @@ async function loadDefaultPiSessionApi(loaders) {
     throw new Error("Pi session APIs unavailable: expected SessionManager.listAll on pi-coding-agent");
   }
   const loadEntriesFromFile = mod.loadEntriesFromFile ?? ((filePath) => {
-    const content = readFileSync3(filePath, "utf8");
+    const content = readFileSync4(filePath, "utf8");
     return mod.parseSessionEntries?.(content) ?? [];
   });
   return {
@@ -11237,6 +11394,7 @@ function registerPiDreamerProject(opts) {
     dreamerConfig: opts.config,
     language: opts.language,
     gitCommitIndexing: opts.gitCommitIndexing,
+    retinaHandoff: opts.retinaHandoff,
     ensureRegistered: ensureProjectRegisteredFromPiDirectory,
     retrospectiveRawProvider: () => new PiRetrospectiveRawProvider({ projectCwd: opts.projectDir }),
     primerRawProviderFactory: createPiPrimerRawProviderFactory()
@@ -11261,7 +11419,8 @@ function registerPiDreamerProject(opts) {
       primerRawProviderFactory: createPiPrimerRawProviderFactory(),
       userMemoryCollectionEnabled: userMemoryCollectionEnabled(opts.config),
       ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
-      language: opts.language
+      language: opts.language,
+      retinaHandoff: opts.retinaHandoff
     }),
     task
   });
@@ -11866,6 +12025,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);
@@ -11876,9 +12036,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);
+    }
   })();
 }
 
@@ -16283,6 +16447,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) {
@@ -16400,7 +16567,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) {
@@ -16432,7 +16601,9 @@ function readCurrentMarkersFromCompartments(db, state2, compartments, projectDoc
     lastBaselineEndMessageId: lastBaselineEndMessageId(compartments),
     systemHash: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).systemHash,
     modelKey: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey,
-    projectIdentity: state2.projectIdentity
+    projectIdentity: state2.projectIdentity,
+    muralEnabled: state2.muralEnabled === true,
+    renderBudgetIdentity: renderBudgetIdentityPi(state2)
   };
 }
 function mustMaterializePi(state2, db, currentCompartmentsOverride) {
@@ -16453,6 +16624,9 @@ 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 ?? "")) {
     return { value: true, reason: "model_change" };
@@ -16590,7 +16764,9 @@ function readFrozenM0InputsPi(state2, db, docs = readProjectDocsForPiM0(state2),
       lastBaselineEndMessageId: lastBaselineEndMessageId(compartments),
       systemHash: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).systemHash,
       modelKey: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey,
-      projectIdentity: state2.projectIdentity
+      projectIdentity: state2.projectIdentity,
+      muralEnabled: state2.muralEnabled === true,
+      renderBudgetIdentity: renderBudgetIdentityPi(state2)
     };
     return { docs, markers, compartments, memories, userProfile, workspace };
   });
@@ -16677,7 +16853,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
@@ -16887,7 +17063,9 @@ 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) {
@@ -21772,10 +21950,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 {
@@ -21812,6 +21994,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;
@@ -22636,7 +22849,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;
@@ -22682,7 +22895,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);
   }
@@ -22990,6 +23203,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)
@@ -23351,6 +23588,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) {
@@ -24482,10 +24722,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);
@@ -24729,6 +24969,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;
@@ -26907,6 +27151,14 @@ var MIGRATION_SYSTEM_PROMPT = "You re-organize a software project's long-term me
 var LKG_TOTAL_BYTES = 64 * 1024 * 1024;
 var LKG_SINGLE_SLOT_BYTES = 24 * 1024 * 1024;
 var slots = new Map;
+var LKG_SNAPSHOT_ARRAY = Symbol("array");
+var LKG_SNAPSHOT_OBJECT = Symbol("object");
+var LKG_SNAPSHOT_KEY = Symbol("key");
+var LKG_SNAPSHOT_STRING = Symbol("string");
+var LKG_SNAPSHOT_NUMBER = Symbol("number");
+var LKG_SNAPSHOT_BOOLEAN = Symbol("boolean");
+var LKG_SNAPSHOT_NULL = Symbol("null");
+var LKG_SNAPSHOT_UNDEFINED = Symbol("undefined");
 
 // ../plugin/src/hooks/magic-context/recomp-orchestrator.ts
 function isRecompFailure(message) {
@@ -27452,15 +27704,17 @@ ${c.content}
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.35.1",
+  version: "0.36.1",
   type: "module",
-  description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
+  description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
   license: "MIT",
   author: "ualtinok",
   keywords: [
     "pi",
     "pi-coding-agent",
+    "omp",
+    "oh-my-pi",
     "extension",
     "context",
     "memory",
@@ -27478,8 +27732,9 @@ var package_default = {
     "README.md"
   ],
   scripts: {
-    build: "rm -f dist/index.js dist/subagent-entry.js dist/*-*.js && bun build src/index.ts src/subagent-entry.ts --outdir dist --target node --format esm --splitting --external @earendil-works/pi-coding-agent --external @earendil-works/pi-tui --external @huggingface/transformers --external node:sqlite",
-    typecheck: "tsc --noEmit",
+    build: "tsc -p ../retina-local-fs/tsconfig.build.json && rm -f dist/index.js dist/subagent-entry.js dist/*-*.js && bun build src/index.ts src/subagent-entry.ts --outdir dist --target node --format esm --splitting --external @earendil-works/pi-coding-agent --external @earendil-works/pi-tui --external @huggingface/transformers --external node:sqlite",
+    "build:e2e-argv": "bun build src/subagent-runner.ts --outfile ../../tests/docker/.generated/subagent-runner-e2e.mjs --target node --format esm --external node:sqlite",
+    typecheck: "tsc -p ../retina-local-fs/tsconfig.build.json && tsc --noEmit",
     test: "bun test",
     lint: "biome check src",
     "lint:fix": "biome check --write src",
@@ -27510,6 +27765,14 @@ var package_default = {
     "@earendil-works/pi-coding-agent": "^0.80.2",
     "@earendil-works/pi-tui": "^0.80.2"
   },
+  peerDependenciesMeta: {
+    "@earendil-works/pi-coding-agent": {
+      optional: true
+    },
+    "@earendil-works/pi-tui": {
+      optional: true
+    }
+  },
   exports: {
     ".": {
       import: "./dist/index.js"
@@ -27519,6 +27782,11 @@ var package_default = {
     extensions: [
       "./dist/index.js"
     ]
+  },
+  omp: {
+    extensions: [
+      "./dist/index.js"
+    ]
   }
 };
 
@@ -28555,6 +28823,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;
@@ -28562,7 +28833,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);
@@ -29268,6 +29539,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
       config: dreamerConfig,
       embeddingConfig: bootProjectDeps.config.embedding,
       memoryEnabled: bootProjectDeps.config.memory.enabled,
+      retinaHandoff: bootProjectDeps.config.smart_notes.retina_handoff,
       language: bootProjectDeps.config.language,
       gitCommitIndexing: bootProjectDeps.config.memory.git_commit_indexing,
       onAdjunctsRefreshNeeded: signalPiSystemPromptRefreshForProject
@@ -29277,6 +29549,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(`
@@ -29312,6 +29585,7 @@ async function startPiMagicContextRuntime(pi, database, dbPath) {
             config: effectiveDreamerConfig,
             embeddingConfig: effectiveConfig.embedding,
             memoryEnabled: effectiveConfig.memory.enabled,
+            retinaHandoff: effectiveConfig.smart_notes.retina_handoff,
             language: effectiveConfig.language,
             gitCommitIndexing: effectiveConfig.memory.git_commit_indexing,
             onAdjunctsRefreshNeeded: signalPiSystemPromptRefreshForProject
@@ -29371,7 +29645,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,
@@ -29656,5 +29930,6 @@ export {
   src_default as default,
   capturePiTodowriteMessageIfCompatible,
   capturePiTodowriteArgsIfCompatible,
+  canonicalPiModelKey,
   __test
 };