@cortexkit/pi-magic-context 0.36.0 → 0.37.0

package/dist/{index-9t7jhq83.js → index-kvttksef.js}

@@ -5,7 +5,7 @@ import {
   getMagicContextStorageDir,
   log,
   sessionLog
-} from "./index-npnqc564.js";
+} from "./index-hk6sj7dn.js";
 import {
   __commonJS,
   __export,
@@ -7696,10 +7696,10 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = EMPTY;
   };
-  var join6 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two)), gap) : EMPTY;
+  var join8 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two)), gap) : EMPTY;
   var join_content = (inside, value, gap) => {
     const comment = process_comments(value, PREFIX_BEFORE, gap + indent, true);
-    return join6(comment, inside, gap);
+    return join8(comment, inside, gap);
   };
   var stringify_string = (holder, key, value) => {
     const raw = get_raw_string_literal(holder, key);
@@ -7721,13 +7721,13 @@ var require_stringify = __commonJS((exports, module) => {
       if (i !== 0) {
         inside += COMMA;
       }
-      const before = join6(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
+      const before = join8(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += stringify(i, value, deeper_gap) || STR_NULL;
       inside += process_comments(value, AFTER_VALUE(i), deeper_gap);
       after_comma = process_comments(value, AFTER(i), deeper_gap);
     }
-    inside += join6(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join8(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return BRACKET_OPEN + join_content(inside, value, gap) + BRACKET_CLOSE;
   };
   var object_stringify = (value, gap) => {
@@ -7748,13 +7748,13 @@ var require_stringify = __commonJS((exports, module) => {
         inside += COMMA;
       }
       first = false;
-      const before = join6(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
+      const before = join8(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += quote(key) + process_comments(value, AFTER_PROP(key), deeper_gap) + COLON + process_comments(value, AFTER_COLON(key), deeper_gap) + SPACE + sv + process_comments(value, AFTER_VALUE(key), deeper_gap);
       after_comma = process_comments(value, AFTER(key), deeper_gap);
     };
     keys.forEach(iteratee);
-    inside += join6(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join8(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return CURLY_BRACKET_OPEN + join_content(inside, value, gap) + CURLY_BRACKET_CLOSE;
   };
   function stringify(key, holder, gap) {
@@ -8292,6 +8292,7 @@ import path from "node:path";
 var GIT_TIMEOUT_MS = 5000;
 var TRANSIENT_FAILURE_COOLDOWN_MS = 5 * 60 * 1000;
 var identityCache = new Map;
+var linkedGitWorktreeCache = new Map;
 var lastKnownGitIdentityCache = new Map;
 var directoryFallbackCache = new Map;
 var transientFailureCooldown = new Map;
@@ -8497,7 +8498,12 @@ function recordDubiousOwnershipFallback(canonical) {
   log(`[magic-context] ${formatDubiousOwnershipWarning(canonical)}`);
 }
 function canonicalUserHomeDirectory() {
-  return realpathSync.native(userHomeDirectoryForIdentity());
+  const homeDirectory = userHomeDirectoryForIdentity();
+  try {
+    return realpathSync.native(homeDirectory);
+  } catch {
+    return homeDirectory;
+  }
 }
 function isUserHomeDirectory(directory) {
   try {
@@ -8648,6 +8654,363 @@ function scheduleAfterBootQuiet(task, additionalDelayMs = 0) {
   return timer;
 }
 
+// ../plugin/src/hooks/magic-context/read-session-formatting.ts
+import { existsSync as existsSync3, readFileSync as readFileSync2, realpathSync as realpathSync2 } from "node:fs";
+import { createRequire } from "node:module";
+import { homedir as homedir3 } from "node:os";
+import { dirname as dirname2, join as join2, resolve } from "node:path";
+import { pathToFileURL } from "node:url";
+
+// ../plugin/src/shared/commit-detection.ts
+var HASH_HEX = "[0-9a-f]{7,12}";
+var COMMIT_HASH_TEST_PATTERN = new RegExp(`\\b${HASH_HEX}\\b`, "i");
+var COMMIT_VERB_PATTERN = /\b(?:commit(?:ted|ting|s)?|cherry-?pick(?:ed|ing|s)?|merge[ds]?|merging|rebas(?:e|ed|es|ing))\b/i;
+function textMentionsRecentCommit(text) {
+  return COMMIT_HASH_TEST_PATTERN.test(text) && COMMIT_VERB_PATTERN.test(text);
+}
+function createCommitHashExtractPattern() {
+  return new RegExp(`\`?\\b(${HASH_HEX})\\b\`?`, "gi");
+}
+
+// ../plugin/src/shared/internal-initiator-marker.ts
+var OMO_INTERNAL_INITIATOR_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->";
+
+// ../plugin/src/shared/system-directive.ts
+var SYSTEM_DIRECTIVE_PREFIX = "[SYSTEM DIRECTIVE: MAGIC-CONTEXT";
+function isSystemDirective(text) {
+  return text.trimStart().startsWith(SYSTEM_DIRECTIVE_PREFIX);
+}
+function removeSystemReminders(text) {
+  return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
+}
+
+// ../plugin/src/hooks/magic-context/read-session-formatting.ts
+var MAX_COMMITS_PER_BLOCK = 5;
+function hasMeaningfulUserText(parts) {
+  for (const part of parts) {
+    if (part === null || typeof part !== "object")
+      continue;
+    const candidate = part;
+    if (candidate.type !== "text" || typeof candidate.text !== "string")
+      continue;
+    if (candidate.ignored === true)
+      continue;
+    const cleaned = removeSystemReminders(candidate.text).replace(OMO_INTERNAL_INITIATOR_MARKER, "").trim();
+    if (!cleaned)
+      continue;
+    if (isSystemDirective(cleaned))
+      continue;
+    return true;
+  }
+  return false;
+}
+function extractTexts(parts) {
+  const texts = [];
+  for (const part of parts) {
+    if (part === null || typeof part !== "object")
+      continue;
+    const p = part;
+    if (p.type === "text" && typeof p.text === "string" && p.text.trim().length > 0) {
+      texts.push(p.text.trim());
+    }
+  }
+  return texts;
+}
+function extractToolCallSummaries(parts) {
+  const summaries = [];
+  for (const part of parts) {
+    if (part === null || typeof part !== "object")
+      continue;
+    const p = part;
+    if (p.type !== "tool" || typeof p.tool !== "string")
+      continue;
+    const state = p.state;
+    if (!state || typeof state !== "object")
+      continue;
+    const input = state.input;
+    const metadata = state.metadata;
+    const description = input && typeof input.description === "string" && input.description || metadata && typeof metadata.description === "string" && metadata.description;
+    if (description) {
+      summaries.push(`TC: ${description}`);
+      continue;
+    }
+    const toolName = p.tool;
+    const keyArg = extractKeyArg(toolName, input);
+    summaries.push(keyArg ? `TC: ${toolName}(${keyArg})` : `TC: ${toolName}`);
+  }
+  return summaries;
+}
+function extractKeyArg(_toolName, input) {
+  if (!input)
+    return null;
+  if (typeof input.filePath === "string")
+    return truncateArg(input.filePath);
+  if (typeof input.path === "string")
+    return truncateArg(input.path);
+  if (typeof input.pattern === "string")
+    return truncateArg(input.pattern);
+  if (typeof input.query === "string")
+    return truncateArg(input.query);
+  if (typeof input.symbol === "string")
+    return input.symbol;
+  if (typeof input.module === "string")
+    return input.module;
+  if (typeof input.action === "string")
+    return input.action;
+  return null;
+}
+function truncateArg(value, maxLen = 60) {
+  if (value.length <= maxLen)
+    return value;
+  return `${value.slice(0, maxLen)}…`;
+}
+var TOKENIZER_PACKAGE_DIRS = [
+  ["@cortexkit", "opencode-magic-context"],
+  ["@cortexkit", "pi-magic-context"]
+];
+var tokenizer;
+var tokenizerLoadAttempted = false;
+var tokenizerLoadPromise;
+var tokenizerWarningSent = false;
+function tokenizerPackageRoots() {
+  const cwd = process.cwd();
+  const openCodeCache = join2(process.env.XDG_CACHE_HOME ?? join2(homedir3(), ".cache"), "opencode");
+  const roots = [cwd, openCodeCache];
+  const candidates = [];
+  for (const root of roots) {
+    for (const packageDir of TOKENIZER_PACKAGE_DIRS) {
+      candidates.push(join2(root, "node_modules", ...packageDir, "node_modules", "ai-tokenizer"));
+    }
+    candidates.push(join2(root, "node_modules", "ai-tokenizer"));
+  }
+  let ancestor = process.argv[1] ? dirname2(resolve(process.argv[1])) : cwd;
+  while (true) {
+    candidates.push(join2(ancestor, "node_modules", "ai-tokenizer"));
+    const parent = dirname2(ancestor);
+    if (parent === ancestor)
+      break;
+    ancestor = parent;
+  }
+  return [...new Set(candidates)];
+}
+function packageImportTarget(value) {
+  if (typeof value === "string")
+    return value;
+  if (!value || typeof value !== "object")
+    return;
+  const conditions = value;
+  return packageImportTarget(conditions.import) ?? packageImportTarget(conditions.default);
+}
+function findTokenizerImportPaths() {
+  for (const packageRoot of tokenizerPackageRoots()) {
+    const packageJsonPath = join2(packageRoot, "package.json");
+    if (!existsSync3(packageJsonPath))
+      continue;
+    try {
+      const packageJson = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
+      const tokenizerTarget = packageImportTarget(packageJson.exports?.["."]) ?? (typeof packageJson.module === "string" ? packageJson.module : undefined) ?? (typeof packageJson.main === "string" ? packageJson.main : undefined);
+      const encodingTarget = packageImportTarget(packageJson.exports?.["./encoding/claude"]);
+      if (!tokenizerTarget || !encodingTarget)
+        continue;
+      return {
+        tokenizerPath: realpathSync2(join2(packageRoot, tokenizerTarget)),
+        encodingPath: realpathSync2(join2(packageRoot, encodingTarget))
+      };
+    } catch {}
+  }
+  return;
+}
+function constructTokenizer(tokenizerModule, claudeEncoding) {
+  const typedModule = tokenizerModule;
+  const Tokenizer = typedModule.default ?? typedModule.Tokenizer;
+  if (!Tokenizer) {
+    throw new Error("ai-tokenizer does not expose a Tokenizer constructor");
+  }
+  return new Tokenizer(claudeEncoding);
+}
+function loadTokenizer() {
+  const requireFromThisModule = createRequire(import.meta.url);
+  return constructTokenizer(requireFromThisModule("ai-" + "tokenizer"), requireFromThisModule("ai-tokenizer/encoding/" + "claude"));
+}
+async function loadTokenizerFromInstalledPackage() {
+  const installedPaths = findTokenizerImportPaths();
+  if (!installedPaths) {
+    throw new Error("ai-tokenizer was not found under the project, runtime, or OpenCode cache node_modules roots");
+  }
+  const [tokenizerModule, claudeEncoding] = await Promise.all([
+    import(pathToFileURL(installedPaths.tokenizerPath).href),
+    import(pathToFileURL(installedPaths.encodingPath).href)
+  ]);
+  return constructTokenizer(tokenizerModule, claudeEncoding);
+}
+function warnTokenizerFallback(error) {
+  if (tokenizerWarningSent)
+    return;
+  tokenizerWarningSent = true;
+  const reason = error instanceof Error ? error.message : String(error);
+  console.warn("[magic-context] ai-tokenizer is unavailable; using approximate character-based token counts for this process. Token budgets, persisted per-message counts, and protected-tail/compartment boundaries may be less accurate until restart:", reason);
+}
+async function preloadTokenizer() {
+  if (tokenizer)
+    return true;
+  if (tokenizerLoadAttempted)
+    return false;
+  if (tokenizerLoadPromise)
+    return tokenizerLoadPromise;
+  tokenizerLoadPromise = (async () => {
+    try {
+      try {
+        tokenizer = loadTokenizer();
+      } catch {
+        tokenizer = await loadTokenizerFromInstalledPackage();
+      }
+      tokenizerLoadAttempted = true;
+      return true;
+    } catch (error) {
+      tokenizerLoadAttempted = true;
+      warnTokenizerFallback(error);
+      return false;
+    } finally {
+      tokenizerLoadPromise = undefined;
+    }
+  })();
+  return tokenizerLoadPromise;
+}
+function getTokenizer() {
+  if (tokenizer || tokenizerLoadAttempted)
+    return tokenizer;
+  tokenizerLoadAttempted = true;
+  try {
+    tokenizer = loadTokenizer();
+  } catch (error) {
+    warnTokenizerFallback(error);
+  }
+  return tokenizer;
+}
+function estimateTokensHeuristically(text) {
+  return Math.ceil(text.length / 3.5);
+}
+function estimateTokens(text) {
+  if (!text)
+    return 0;
+  const activeTokenizer = getTokenizer();
+  if (!activeTokenizer)
+    return estimateTokensHeuristically(text);
+  try {
+    return activeTokenizer.encode(text, "all").length;
+  } catch (error) {
+    tokenizer = undefined;
+    tokenizerLoadAttempted = true;
+    warnTokenizerFallback(error);
+    return estimateTokensHeuristically(text);
+  }
+}
+function normalizeText(text) {
+  return text.replace(/\s+/g, " ").trim();
+}
+function compactRole(role) {
+  if (role === "assistant")
+    return "A";
+  if (role === "user")
+    return "U";
+  return role.slice(0, 1).toUpperCase() || "M";
+}
+function formatBlock(block) {
+  const range = block.startOrdinal === block.endOrdinal ? `[${block.startOrdinal}]` : `[${block.startOrdinal}-${block.endOrdinal}]`;
+  const commitSuffix = block.commitHashes.length > 0 ? ` commits: ${block.commitHashes.join(", ")}` : "";
+  return `${range} ${block.role}:${commitSuffix} ${block.parts.join(" / ")}`;
+}
+function extractCommitHashes(text) {
+  const hashes = [];
+  const seen = new Set;
+  for (const match of text.matchAll(createCommitHashExtractPattern())) {
+    const hash = match[1]?.toLowerCase();
+    if (!hash || seen.has(hash))
+      continue;
+    seen.add(hash);
+    hashes.push(hash);
+    if (hashes.length >= MAX_COMMITS_PER_BLOCK)
+      break;
+  }
+  return hashes;
+}
+function compactTextForSummary(text, role) {
+  const commitHashes = role === "assistant" ? extractCommitHashes(text) : [];
+  if (commitHashes.length === 0 || !COMMIT_VERB_PATTERN.test(text)) {
+    return { text, commitHashes };
+  }
+  const withoutHashes = text.replace(createCommitHashExtractPattern(), "").replace(/\(\s*\)/g, "").replace(/\s+,/g, ",").replace(/,\s*,+/g, ", ").replace(/\s{2,}/g, " ").replace(/\s+([,.;:])/g, "$1").trim();
+  return {
+    text: withoutHashes.length > 0 ? withoutHashes : text,
+    commitHashes
+  };
+}
+function mergeCommitHashes(existing, next) {
+  if (next.length === 0)
+    return existing;
+  const merged = [...existing];
+  for (const hash of next) {
+    if (merged.includes(hash))
+      continue;
+    merged.push(hash);
+    if (merged.length >= MAX_COMMITS_PER_BLOCK)
+      break;
+  }
+  return merged;
+}
+
+// ../plugin/src/shared/harness-provider-map.ts
+var CANONICAL_TO_PI_PROVIDER = {
+  openai: "openai-codex",
+  google: "google-antigravity"
+};
+var PI_TO_CANONICAL_PROVIDER = {
+  "openai-codex": "openai",
+  "google-antigravity": "google"
+};
+var CANONICAL_TO_OMP_PROVIDER = {
+  openai: "openai-codex",
+  google: "google-antigravity"
+};
+var OMP_TO_CANONICAL_PROVIDER = {
+  "openai-codex": "openai",
+  "google-antigravity": "google"
+};
+function remapProviderPrefix(ref, map) {
+  if (typeof ref !== "string")
+    return ref;
+  const slash = ref.indexOf("/");
+  if (slash <= 0)
+    return ref;
+  const provider = ref.slice(0, slash);
+  if (!Object.hasOwn(map, provider))
+    return ref;
+  return `${map[provider]}${ref.slice(slash)}`;
+}
+function piModelRefToCanonical(ref) {
+  return remapProviderPrefix(ref, PI_TO_CANONICAL_PROVIDER);
+}
+function resolveModelRefForPi(ref) {
+  return remapProviderPrefix(piModelRefToCanonical(ref), CANONICAL_TO_PI_PROVIDER);
+}
+function modelRefLookupOrder(ref) {
+  const canonical = piModelRefToCanonical(ompModelRefToCanonical(ref));
+  return [
+    ...new Set([
+      canonical,
+      ref,
+      resolveModelRefForPi(canonical),
+      resolveModelRefForOmp(canonical)
+    ])
+  ];
+}
+function ompModelRefToCanonical(ref) {
+  return remapProviderPrefix(ref, OMP_TO_CANONICAL_PROVIDER);
+}
+function resolveModelRefForOmp(ref) {
+  return remapProviderPrefix(ompModelRefToCanonical(ref), CANONICAL_TO_OMP_PROVIDER);
+}
+
 // ../plugin/src/shared/storage-permissions.ts
 var enforcePrivateStoragePermissions = true;
 function setStoragePrivatePermissionEnforcement(enforce) {
@@ -8662,14 +9025,14 @@ import {
   chmodSync,
   copyFileSync,
   cpSync,
-  existsSync as existsSync4,
+  existsSync as existsSync5,
   mkdirSync as mkdirSync2,
   readdirSync,
-  readFileSync as readFileSync3,
+  readFileSync as readFileSync4,
   statSync as statSync3,
   unlinkSync as unlinkSync2
 } from "node:fs";
-import { basename as basename2, dirname as dirname2, join as join3 } from "node:path";
+import { basename as basename2, dirname as dirname3, join as join4 } from "node:path";
 
 // ../plugin/src/shared/error-message.ts
 function getErrorMessage(error) {
@@ -8749,23 +9112,28 @@ function safeString(value) {
 
 // ../plugin/src/shared/rpc-utils.ts
 import { execFileSync as execFileSync2 } from "node:child_process";
-import { readFileSync as readFileSync2 } from "node:fs";
+import { readFileSync as readFileSync3 } from "node:fs";
 function isPidAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0)
-    return false;
+    return "dead";
+  if (rpcIdentityPlatform === "win32")
+    return readWindowsProcess(pid).state;
   try {
-    process.kill(pid, 0);
-    return true;
-  } catch (err) {
-    return err.code === "EPERM";
+    rpcIdentityProcessKill(pid, 0);
+    return "alive";
+  } catch (error) {
+    return error.code === "ESRCH" ? "dead" : "inconclusive";
   }
 }
 var RPC_IDENTITY_SKEW_TOLERANCE_MS = 120000;
 var LINUX_CLOCK_TICKS_PER_SECOND = 100;
 var PS_PROBE_TIMEOUT_MS = 1000;
 var OPEN_CODE_COMMAND_MARKERS = ["opencode", "node", "bun", "electron"];
-var rpcIdentityReadFileSync = readFileSync2;
+var TASKLIST_NO_TASKS_PATTERN = /^INFO:\s+No tasks are running which match the specified criteria\.?$/im;
+var rpcIdentityReadFileSync = readFileSync3;
 var rpcIdentityExecFileSync = execFileSync2;
+var rpcIdentityProcessKill = process.kill;
+var rpcProcessListExecFileSync = execFileSync2;
 var rpcIdentityPlatform = process.platform;
 var rpcIdentityNowMs = () => Date.now();
 function parseLinuxProcessStartTime(statContent, uptimeContent) {
@@ -8794,7 +9162,8 @@ function readPsProcessStartTime(pid) {
   try {
     const output = rpcIdentityExecFileSync("ps", ["-p", String(pid), "-o", "lstart="], {
       encoding: "utf8",
-      timeout: PS_PROBE_TIMEOUT_MS
+      timeout: PS_PROBE_TIMEOUT_MS,
+      stdio: ["ignore", "pipe", "pipe"]
     });
     const processStartTime = Date.parse(String(output).trim());
     return Number.isFinite(processStartTime) ? processStartTime : null;
@@ -8802,6 +9171,70 @@ function readPsProcessStartTime(pid) {
     return null;
   }
 }
+function parseCsvLine(line) {
+  const fields = [];
+  let field = "";
+  let quoted = false;
+  for (let index = 0;index < line.length; index += 1) {
+    const character = line[index];
+    if (character === '"') {
+      if (quoted && line[index + 1] === '"') {
+        field += '"';
+        index += 1;
+      } else {
+        quoted = !quoted;
+      }
+    } else if (character === "," && !quoted) {
+      fields.push(field);
+      field = "";
+    } else {
+      field += character;
+    }
+  }
+  if (quoted)
+    return null;
+  fields.push(field);
+  return fields;
+}
+function parseTasklistOutput(output) {
+  const entries = [];
+  let sawHeader = false;
+  for (const rawLine of output.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (!line)
+      continue;
+    if (TASKLIST_NO_TASKS_PATTERN.test(line))
+      return [];
+    const fields = parseCsvLine(line);
+    if (!fields)
+      continue;
+    if (fields[1]?.trim().toLowerCase() === "pid") {
+      sawHeader = true;
+      continue;
+    }
+    const pid = Number(fields[1]);
+    if (!Number.isInteger(pid) || pid <= 0 || !fields[0])
+      continue;
+    entries.push({ pid, command: fields[0] });
+  }
+  return entries.length > 0 || sawHeader ? entries : null;
+}
+function readWindowsProcess(pid) {
+  try {
+    const output = rpcIdentityExecFileSync("tasklist", ["/FO", "CSV", "/FI", `PID eq ${pid}`], {
+      encoding: "utf8",
+      timeout: PS_PROBE_TIMEOUT_MS,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    const entries = parseTasklistOutput(String(output));
+    if (entries === null)
+      return { state: "inconclusive" };
+    const process2 = entries.find((entry) => entry.pid === pid);
+    return process2 ? { state: "alive", command: process2.command } : { state: "dead" };
+  } catch {
+    return { state: "inconclusive" };
+  }
+}
 function readLinuxProcessCommand(pid) {
   try {
     return String(rpcIdentityReadFileSync(`/proc/${pid}/cmdline`, "utf8"));
@@ -8813,7 +9246,8 @@ function readPsProcessCommand(pid) {
   try {
     const output = rpcIdentityExecFileSync("ps", ["-p", String(pid), "-o", "command="], {
       encoding: "utf8",
-      timeout: PS_PROBE_TIMEOUT_MS
+      timeout: PS_PROBE_TIMEOUT_MS,
+      stdio: ["ignore", "pipe", "pipe"]
     });
     return String(output);
   } catch {
@@ -8826,17 +9260,76 @@ function commandLooksLikeOpenCode(command) {
 }
 function isPidIdentityPlausible(record) {
   if (!Number.isInteger(record.pid) || record.pid <= 0)
-    return false;
+    return "implausible";
   if (Number.isFinite(record.started_at) && record.started_at > 0) {
-    const processStartTime = rpcIdentityPlatform === "linux" ? readLinuxProcessStartTime(record.pid) : readPsProcessStartTime(record.pid);
+    const processStartTime = rpcIdentityPlatform === "linux" ? readLinuxProcessStartTime(record.pid) : rpcIdentityPlatform === "win32" ? null : readPsProcessStartTime(record.pid);
     if (processStartTime === null)
-      return true;
-    return processStartTime <= record.started_at + RPC_IDENTITY_SKEW_TOLERANCE_MS;
+      return "inconclusive";
+    return processStartTime <= record.started_at + RPC_IDENTITY_SKEW_TOLERANCE_MS ? "plausible" : "implausible";
   }
-  const command = rpcIdentityPlatform === "linux" ? readLinuxProcessCommand(record.pid) : readPsProcessCommand(record.pid);
+  const command = rpcIdentityPlatform === "linux" ? readLinuxProcessCommand(record.pid) : rpcIdentityPlatform === "win32" ? readWindowsProcess(record.pid).command ?? null : readPsProcessCommand(record.pid);
   if (command === null)
+    return "inconclusive";
+  return commandLooksLikeOpenCode(command) ? "plausible" : "implausible";
+}
+function commandLooksLikePi(command) {
+  const normalized = command.trim().toLowerCase().replaceAll("\\", "/");
+  const tokens = normalized.split(/\s+/).filter(Boolean);
+  const executableName = (token) => (token ?? "").split("/").at(-1) ?? "";
+  const first = executableName(tokens[0]).replace(/\.exe$/, "");
+  if (["pi", "pi.cmd", "omp", "oh-my-pi"].includes(first))
     return true;
-  return commandLooksLikeOpenCode(command);
+  if (["node", "bun", "deno"].includes(first)) {
+    const script = executableName(tokens[1]);
+    return ["pi", "pi.js", "pi.mjs", "pi.cjs"].includes(script) || normalized.includes("pi-coding-agent");
+  }
+  return false;
+}
+function inspectLivePiProcesses() {
+  if (false) {}
+  try {
+    const isWindows = rpcIdentityPlatform === "win32";
+    const output = String(rpcProcessListExecFileSync(isWindows ? "tasklist" : "ps", isWindows ? ["/FO", "CSV"] : ["-axo", "pid=,command="], {
+      encoding: "utf8",
+      timeout: PS_PROBE_TIMEOUT_MS,
+      stdio: ["ignore", "pipe", "pipe"]
+    }));
+    const pids = new Set;
+    if (isWindows) {
+      const entries = parseTasklistOutput(output);
+      if (entries === null) {
+        return {
+          state: "unreadable",
+          processIds: [],
+          error: "tasklist output unavailable"
+        };
+      }
+      for (const entry of entries) {
+        if (entry.pid === process.pid)
+          continue;
+        if (commandLooksLikePi(entry.command))
+          pids.add(entry.pid);
+      }
+    } else {
+      for (const line of output.split(/\r?\n/)) {
+        const match = /^\s*(\d+)\s+(.+)$/.exec(line);
+        if (!match)
+          continue;
+        const pid = Number(match[1]);
+        if (!Number.isInteger(pid) || pid <= 0 || pid === process.pid)
+          continue;
+        if (commandLooksLikePi(match[2]))
+          pids.add(pid);
+      }
+    }
+    return { state: "known", processIds: [...pids].sort((left, right) => left - right) };
+  } catch (error) {
+    return {
+      state: "unreadable",
+      processIds: [],
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
 }
 function parseRpcPortFile(content, fallbackPid = 0) {
   const trimmed = content.trim();
@@ -9282,6 +9775,8 @@ function healAllNullColumns(db) {
     ["stripped_placeholder_ids", ""],
     ["stale_reduce_stripped_ids", ""],
     ["processed_image_stripped_ids", ""],
+    ["merged_reasoning_stripped_ids", ""],
+    ["trailing_blank_decisions", ""],
     ["memory_block_cache", ""],
     ["memory_block_ids", ""],
     ["compaction_marker_state", ""],
@@ -9874,6 +10369,7 @@ var MIGRATIONS = [
                     status TEXT NOT NULL DEFAULT 'active',
                     promoted_at INTEGER NOT NULL,
                     source_candidate_ids TEXT DEFAULT '[]',
+                    source_candidate_provenance TEXT,
                     created_at INTEGER NOT NULL,
                     updated_at INTEGER NOT NULL
                 );
@@ -10900,6 +11396,7 @@ var MIGRATIONS = [
                     last_observed_at INTEGER,
                     answer_refreshed_at INTEGER,
                     source_candidate_ids TEXT NOT NULL DEFAULT '[]',
+                    source_candidate_provenance TEXT,
                     created_at INTEGER NOT NULL,
                     updated_at INTEGER NOT NULL
                 );
@@ -11709,6 +12206,37 @@ var MIGRATIONS = [
       ensureColumn(db, "notes", "compiled_at", "INTEGER");
       ensureColumn(db, "notes", "compile_status", "TEXT CHECK(compile_status IN ('compiled', 'plain', 'refused'))");
     }
+  },
+  {
+    version: 77,
+    description: "persist scoped provenance for promoted user memories and primers",
+    up(db) {
+      if (tableExists2(db, "user_memories")) {
+        ensureColumn(db, "user_memories", "source_candidate_provenance", "TEXT");
+      }
+      if (tableExists2(db, "primers")) {
+        ensureColumn(db, "primers", "source_candidate_provenance", "TEXT");
+      }
+    }
+  },
+  {
+    version: 78,
+    description: "add migration_pending journal for crash-safe cross-harness session migration",
+    up(db) {
+      db.exec(`
+                CREATE TABLE IF NOT EXISTS migration_pending (
+                    migration_key TEXT PRIMARY KEY,
+                    source_session_id TEXT NOT NULL,
+                    target_harness TEXT NOT NULL,
+                    pi_session_id TEXT NOT NULL,
+                    final_path TEXT NOT NULL,
+                    stage_path TEXT NOT NULL,
+                    content_sha256 TEXT NOT NULL,
+                    phase TEXT NOT NULL CHECK (phase IN ('staged', 'db_committed')),
+                    created_at INTEGER NOT NULL
+                );
+            `);
+    }
   }
 ];
 var LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
@@ -11803,7 +12331,7 @@ function runMigrations(db) {
 }
 async function runMigrationsWithRetry(db, options = {}) {
   const retryDelaysMs = options.retryDelaysMs ?? MIGRATION_LOCK_RETRY_DELAYS_MS;
-  const sleep = options.sleep ?? ((delayMs) => new Promise((resolve) => setTimeout(resolve, delayMs)));
+  const sleep = options.sleep ?? ((delayMs) => new Promise((resolve2) => setTimeout(resolve2, delayMs)));
   const totalAttempts = retryDelaysMs.length + 1;
   for (let attempt = 1;attempt <= totalAttempts; attempt += 1) {
     log(`[migrations] migration lock check attempt ${attempt}/${totalAttempts}`);
@@ -11822,184 +12350,6 @@ async function runMigrationsWithRetry(db, options = {}) {
   }
 }
 
-// ../plugin/src/hooks/magic-context/read-session-formatting.ts
-import { createRequire } from "node:module";
-
-// ../plugin/src/shared/commit-detection.ts
-var HASH_HEX = "[0-9a-f]{7,12}";
-var COMMIT_HASH_TEST_PATTERN = new RegExp(`\\b${HASH_HEX}\\b`, "i");
-var COMMIT_VERB_PATTERN = /\b(?:commit(?:ted|ting|s)?|cherry-?pick(?:ed|ing|s)?|merge[ds]?|merging|rebas(?:e|ed|es|ing))\b/i;
-function textMentionsRecentCommit(text) {
-  return COMMIT_HASH_TEST_PATTERN.test(text) && COMMIT_VERB_PATTERN.test(text);
-}
-function createCommitHashExtractPattern() {
-  return new RegExp(`\`?\\b(${HASH_HEX})\\b\`?`, "gi");
-}
-
-// ../plugin/src/shared/internal-initiator-marker.ts
-var OMO_INTERNAL_INITIATOR_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->";
-
-// ../plugin/src/shared/system-directive.ts
-var SYSTEM_DIRECTIVE_PREFIX = "[SYSTEM DIRECTIVE: MAGIC-CONTEXT";
-function isSystemDirective(text) {
-  return text.trimStart().startsWith(SYSTEM_DIRECTIVE_PREFIX);
-}
-function removeSystemReminders(text) {
-  return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
-}
-
-// ../plugin/src/hooks/magic-context/read-session-formatting.ts
-var MAX_COMMITS_PER_BLOCK = 5;
-function hasMeaningfulUserText(parts) {
-  for (const part of parts) {
-    if (part === null || typeof part !== "object")
-      continue;
-    const candidate = part;
-    if (candidate.type !== "text" || typeof candidate.text !== "string")
-      continue;
-    if (candidate.ignored === true)
-      continue;
-    const cleaned = removeSystemReminders(candidate.text).replace(OMO_INTERNAL_INITIATOR_MARKER, "").trim();
-    if (!cleaned)
-      continue;
-    if (isSystemDirective(cleaned))
-      continue;
-    return true;
-  }
-  return false;
-}
-function extractTexts(parts) {
-  const texts = [];
-  for (const part of parts) {
-    if (part === null || typeof part !== "object")
-      continue;
-    const p = part;
-    if (p.type === "text" && typeof p.text === "string" && p.text.trim().length > 0) {
-      texts.push(p.text.trim());
-    }
-  }
-  return texts;
-}
-function extractToolCallSummaries(parts) {
-  const summaries = [];
-  for (const part of parts) {
-    if (part === null || typeof part !== "object")
-      continue;
-    const p = part;
-    if (p.type !== "tool" || typeof p.tool !== "string")
-      continue;
-    const state = p.state;
-    if (!state || typeof state !== "object")
-      continue;
-    const input = state.input;
-    const metadata = state.metadata;
-    const description = input && typeof input.description === "string" && input.description || metadata && typeof metadata.description === "string" && metadata.description;
-    if (description) {
-      summaries.push(`TC: ${description}`);
-      continue;
-    }
-    const toolName = p.tool;
-    const keyArg = extractKeyArg(toolName, input);
-    summaries.push(keyArg ? `TC: ${toolName}(${keyArg})` : `TC: ${toolName}`);
-  }
-  return summaries;
-}
-function extractKeyArg(_toolName, input) {
-  if (!input)
-    return null;
-  if (typeof input.filePath === "string")
-    return truncateArg(input.filePath);
-  if (typeof input.path === "string")
-    return truncateArg(input.path);
-  if (typeof input.pattern === "string")
-    return truncateArg(input.pattern);
-  if (typeof input.query === "string")
-    return truncateArg(input.query);
-  if (typeof input.symbol === "string")
-    return input.symbol;
-  if (typeof input.module === "string")
-    return input.module;
-  if (typeof input.action === "string")
-    return input.action;
-  return null;
-}
-function truncateArg(value, maxLen = 60) {
-  if (value.length <= maxLen)
-    return value;
-  return `${value.slice(0, maxLen)}…`;
-}
-var requireFromThisModule = createRequire(import.meta.url);
-var tokenizer;
-function getTokenizer() {
-  if (tokenizer)
-    return tokenizer;
-  const tokenizerModule = requireFromThisModule("ai-" + "tokenizer");
-  const Tokenizer = tokenizerModule.default ?? tokenizerModule.Tokenizer;
-  if (!Tokenizer)
-    throw new Error("ai-tokenizer does not expose a Tokenizer constructor");
-  const claudeEncoding = requireFromThisModule("ai-tokenizer/encoding/" + "claude");
-  tokenizer = new Tokenizer(claudeEncoding);
-  return tokenizer;
-}
-function estimateTokens(text) {
-  if (!text)
-    return 0;
-  return getTokenizer().encode(text, "all").length;
-}
-function normalizeText(text) {
-  return text.replace(/\s+/g, " ").trim();
-}
-function compactRole(role) {
-  if (role === "assistant")
-    return "A";
-  if (role === "user")
-    return "U";
-  return role.slice(0, 1).toUpperCase() || "M";
-}
-function formatBlock(block) {
-  const range = block.startOrdinal === block.endOrdinal ? `[${block.startOrdinal}]` : `[${block.startOrdinal}-${block.endOrdinal}]`;
-  const commitSuffix = block.commitHashes.length > 0 ? ` commits: ${block.commitHashes.join(", ")}` : "";
-  return `${range} ${block.role}:${commitSuffix} ${block.parts.join(" / ")}`;
-}
-function extractCommitHashes(text) {
-  const hashes = [];
-  const seen = new Set;
-  for (const match of text.matchAll(createCommitHashExtractPattern())) {
-    const hash = match[1]?.toLowerCase();
-    if (!hash || seen.has(hash))
-      continue;
-    seen.add(hash);
-    hashes.push(hash);
-    if (hashes.length >= MAX_COMMITS_PER_BLOCK)
-      break;
-  }
-  return hashes;
-}
-function compactTextForSummary(text, role) {
-  const commitHashes = role === "assistant" ? extractCommitHashes(text) : [];
-  if (commitHashes.length === 0 || !COMMIT_VERB_PATTERN.test(text)) {
-    return { text, commitHashes };
-  }
-  const withoutHashes = text.replace(createCommitHashExtractPattern(), "").replace(/\(\s*\)/g, "").replace(/\s+,/g, ",").replace(/,\s*,+/g, ", ").replace(/\s{2,}/g, " ").replace(/\s+([,.;:])/g, "$1").trim();
-  return {
-    text: withoutHashes.length > 0 ? withoutHashes : text,
-    commitHashes
-  };
-}
-function mergeCommitHashes(existing, next) {
-  if (next.length === 0)
-    return existing;
-  const merged = [...existing];
-  for (const hash of next) {
-    if (merged.includes(hash))
-      continue;
-    merged.push(hash);
-    if (merged.length >= MAX_COMMITS_PER_BLOCK)
-      break;
-  }
-  return merged;
-}
-
 // ../plugin/src/shared/stable-json.ts
 function stableStringify(value, seen = new WeakSet) {
   if (value === undefined)
@@ -12054,12 +12404,12 @@ function loadToolDefinitionMeasurements(db) {
 }
 
 // ../plugin/src/features/magic-context/tool-owner-backfill.ts
-import { existsSync as existsSync3 } from "node:fs";
-import { join as join2 } from "node:path";
+import { existsSync as existsSync4 } from "node:fs";
+import { join as join3 } from "node:path";
 var LEASE_DURATION_MS = 5 * 60 * 1000;
 var LEASE_RENEWAL_MS = 60 * 1000;
 function resolveOpencodeDbPath() {
-  return join2(getDataDir(), "opencode", "opencode.db");
+  return join3(getDataDir(), "opencode", "opencode.db");
 }
 function ensureBackfillStateTable(db) {
   db.exec(`
@@ -12094,7 +12444,7 @@ function runToolOwnerBackfill(db) {
     return result;
   }
   const opencodeDbPath = resolveOpencodeDbPath();
-  if (!existsSync3(opencodeDbPath)) {
+  if (!existsSync4(opencodeDbPath)) {
     log(`[backfill] OpenCode DB not found at ${opencodeDbPath} — marking all unbackfilled sessions as skipped. Lazy adoption (defense-in-depth) handles legacy rows at runtime.`);
     markAllUnbackfilledSessionsSkipped(db);
     result.sessionsSkippedNoOcDb = countSessionsByStatus(db, "skipped");
@@ -12321,7 +12671,7 @@ function getSchemaFenceRejection() {
 function getMigrationOnOpenRefusal() {
   return lastMigrationOnOpenRefusal;
 }
-var LATEST_SUPPORTED_VERSION = 76;
+var LATEST_SUPPORTED_VERSION = 78;
 var PERMISSIONS_ENFORCEABLE = process.platform !== "win32";
 var defaultStoragePermissionFs = { chmodSync, mkdirSync: mkdirSync2 };
 var storagePermissionFs = defaultStoragePermissionFs;
@@ -12344,7 +12694,7 @@ function restrictDatabaseFilePermissions(dbPath) {
     return;
   for (const suffix of ["", "-wal", "-shm"]) {
     const file = `${dbPath}${suffix}`;
-    if (!existsSync4(file))
+    if (!existsSync5(file))
       continue;
     try {
       storagePermissionFs.chmodSync(file, 384);
@@ -12355,20 +12705,20 @@ function restrictDatabaseFilePermissions(dbPath) {
 }
 function resolveDatabasePath(dbPathOverride) {
   if (dbPathOverride) {
-    return { dbDir: dirname2(dbPathOverride), dbPath: dbPathOverride };
+    return { dbDir: dirname3(dbPathOverride), dbPath: dbPathOverride };
   }
   const dbDir = getMagicContextStorageDir();
-  return { dbDir, dbPath: join3(dbDir, "context.db") };
+  return { dbDir, dbPath: join4(dbDir, "context.db") };
 }
 function getDatabasePath(db) {
   return pathByDatabase.get(db) ?? null;
 }
 function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
-  if (existsSync4(targetDbPath))
+  if (existsSync5(targetDbPath))
     return;
   const legacyDir = getLegacyOpenCodeMagicContextStorageDir();
-  const legacyDbPath = join3(legacyDir, "context.db");
-  if (!existsSync4(legacyDbPath))
+  const legacyDbPath = join4(legacyDir, "context.db");
+  if (!existsSync5(legacyDbPath))
     return;
   log(`[magic-context] migrating legacy plugin storage: ${legacyDir} -> ${targetDbDir} (legacy left in place as backup)`);
   ensureSecureStorageDir(targetDbDir);
@@ -12384,8 +12734,8 @@ function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
   }
   for (const suffix of ["", "-wal", "-shm"]) {
     const src = `${legacyDbPath}${suffix}`;
-    const dst = join3(targetDbDir, `context.db${suffix}`);
-    if (existsSync4(src)) {
+    const dst = join4(targetDbDir, `context.db${suffix}`);
+    if (existsSync5(src)) {
       try {
         copyFileSync(src, dst);
       } catch (error) {
@@ -12393,9 +12743,9 @@ function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
       }
     }
   }
-  const legacyModelsDir = join3(legacyDir, "models");
-  const targetModelsDir = join3(targetDbDir, "models");
-  if (existsSync4(legacyModelsDir) && !existsSync4(targetModelsDir)) {
+  const legacyModelsDir = join4(legacyDir, "models");
+  const targetModelsDir = join4(targetDbDir, "models");
+  if (existsSync5(legacyModelsDir) && !existsSync5(targetModelsDir)) {
     try {
       cpSync(legacyModelsDir, targetModelsDir, { recursive: true });
     } catch (error) {
@@ -12449,7 +12799,7 @@ function unreadableDiscovery(path2, arm) {
 var RPC_DISCOVERY_PARSE_GRACE_MS = 10 * 60 * 1000;
 var defaultRpcDiscoveryFs = {
   readdirSync: (path2, options) => options?.withFileTypes ? readdirSync(path2, { withFileTypes: true }) : readdirSync(path2),
-  readFileSync: (path2, encoding) => String(readFileSync3(path2, encoding)),
+  readFileSync: (path2, encoding) => String(readFileSync4(path2, encoding)),
   statSync: (path2) => ({ mtimeMs: statSync3(path2).mtimeMs }),
   unlinkSync: (path2) => unlinkSync2(path2)
 };
@@ -12487,7 +12837,7 @@ function classifyJunkDiscovery(portFile, raw, staleFiles) {
   return null;
 }
 function inspectRpcServerDiscovery(storageDir) {
-  const rpcRoot = join3(storageDir, "rpc");
+  const rpcRoot = join4(storageDir, "rpc");
   let projectEntries;
   try {
     projectEntries = rpcDiscoveryFs.readdirSync(rpcRoot, { withFileTypes: true });
@@ -12501,7 +12851,7 @@ function inspectRpcServerDiscovery(storageDir) {
   for (const projectEntry of projectEntries) {
     if (!projectEntry.isDirectory())
       continue;
-    const projectDir = join3(rpcRoot, projectEntry.name);
+    const projectDir = join4(rpcRoot, projectEntry.name);
     let entries;
     try {
       entries = rpcDiscoveryFs.readdirSync(projectDir);
@@ -12512,7 +12862,7 @@ function inspectRpcServerDiscovery(storageDir) {
     }
     for (const entry of entries) {
       if (entry === "port" || entry.startsWith("port-") && entry.endsWith(".json")) {
-        portFiles.push(join3(projectDir, entry));
+        portFiles.push(join4(projectDir, entry));
       }
     }
   }
@@ -12521,6 +12871,7 @@ function inspectRpcServerDiscovery(storageDir) {
   }
   const pids = new Set;
   const staleFiles = [];
+  const inconclusivePids = new Set;
   for (const portFile of portFiles) {
     let raw;
     try {
@@ -12540,10 +12891,15 @@ function inspectRpcServerDiscovery(storageDir) {
         return junk;
       continue;
     }
-    if (isPidAlive(record.pid) && isPidIdentityPlausible(record))
+    const liveness = isPidAlive(record.pid);
+    const identity = liveness === "dead" ? "implausible" : isPidIdentityPlausible(record);
+    if (liveness === "alive" && identity === "plausible") {
       pids.add(record.pid);
-    else
+    } else if (liveness === "dead" || identity === "implausible") {
       staleFiles.push(portFile);
+    } else {
+      inconclusivePids.add(record.pid);
+    }
   }
   for (const staleFile of staleFiles) {
     try {
@@ -12556,8 +12912,29 @@ function inspectRpcServerDiscovery(storageDir) {
   if (serverPids.length > 0) {
     return { state: "live", serverPids, staleFiles };
   }
+  const uncertainPids = [...inconclusivePids].sort((a, b) => a - b);
+  if (uncertainPids.length > 0) {
+    return {
+      state: "inconclusive",
+      serverPids: [],
+      staleFiles,
+      inconclusivePids: uncertainPids
+    };
+  }
   return { state: "stale", serverPids: [], staleFiles };
 }
+function formatInconclusiveOpenCodeMigrationWarning(dbPath, pids) {
+  return `[magic-context] storage warning: continuing migration for ${dbPath}; OpenCode server PID ${pids.join(", ")} was not confirmed because its liveness or identity check could not run. This commonly means an OS sandbox denied kill(0) or ps. No live OpenCode server was confirmed.`;
+}
+function logInconclusiveMigrationProbes(dbPath, discovery, piProbeState) {
+  const uncertainPids = discovery.inconclusivePids ?? [];
+  if (uncertainPids.length > 0) {
+    log(formatInconclusiveOpenCodeMigrationWarning(dbPath, uncertainPids));
+  }
+  if (piProbeState === "unreadable") {
+    log(`[magic-context] storage warning: continuing migration for ${dbPath}; the Pi/OMP process-list probe could not run, which commonly means an OS sandbox denied ps. No live Pi harness was confirmed.`);
+  }
+}
 function enforceMigrationOnOpenGuard(db, dbPath, dbDir, latestSupportedVersion) {
   const persistedVersion = getPersistedSchemaVersion(db);
   if (persistedVersion >= latestSupportedVersion) {
@@ -12565,14 +12942,18 @@ function enforceMigrationOnOpenGuard(db, dbPath, dbDir, latestSupportedVersion)
     return true;
   }
   const discovery = inspectRpcServerDiscovery(dbDir);
-  if (discovery.state === "absent" || discovery.state === "stale") {
+  const piDiscovery = inspectLivePiProcesses();
+  const piPids = piDiscovery.processIds;
+  if ((discovery.state === "absent" || discovery.state === "stale" || discovery.state === "inconclusive") && piPids.length === 0) {
     lastMigrationOnOpenRefusal = null;
+    logInconclusiveMigrationProbes(dbPath, discovery, piDiscovery.state);
     return true;
   }
+  const blockingPids = [...new Set([...discovery.serverPids, ...piPids])].sort((left, right) => left - right);
   lastMigrationOnOpenRefusal = {
     persistedVersion,
     supportedVersion: latestSupportedVersion,
-    serverPids: discovery.serverPids,
+    serverPids: blockingPids,
     ...discovery.unreadableFile ? { unreadableFile: discovery.unreadableFile } : {},
     ...discovery.unreadableArm ? { unreadableArm: discovery.unreadableArm } : {}
   };
@@ -12582,7 +12963,11 @@ function enforceMigrationOnOpenGuard(db, dbPath, dbDir, latestSupportedVersion)
     const recovery = arm === "io" ? `If no OpenCode server is running, it is safe to delete ${unreadableFile} and retry.` : `Retry after the file is older than the ten-minute grace window, or stop OpenCode before deleting it.`;
     log(`[magic-context] storage fatal: refusing to migrate ${dbPath} from upstream migration v${persistedVersion} to v${latestSupportedVersion} because RPC discovery file ${unreadableFile} is uncertain (${arm} arm), so the absence of a live OpenCode server cannot be proven. ${recovery}`);
   } else {
-    log(`[magic-context] storage fatal: refusing to migrate ${dbPath} from upstream migration v${persistedVersion} to v${latestSupportedVersion} while live OpenCode server PID(s) ${discovery.serverPids.join(", ")} may still use the old plugin build. Restart OpenCode, then retry this process.`);
+    const blockers = [
+      ...discovery.serverPids.map((pid) => `confirmed OpenCode server PID ${pid}`),
+      ...piPids.map((pid) => `confirmed Pi harness PID ${pid}`)
+    ];
+    log(`[magic-context] storage fatal: refusing to migrate ${dbPath} from upstream migration v${persistedVersion} to v${latestSupportedVersion} while ${blockers.join(", ")} still use the old plugin build. Restart the blocking harness, then retry this process.`);
   }
   return false;
 }
@@ -12806,6 +13191,7 @@ function initializeDatabase(db) {
       last_observed_at INTEGER,
       answer_refreshed_at INTEGER,
       source_candidate_ids TEXT NOT NULL DEFAULT '[]',
+      source_candidate_provenance TEXT,
       created_at INTEGER NOT NULL,
       updated_at INTEGER NOT NULL
     );
@@ -13441,6 +13827,11 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "primer_candidates", "question_embedding", "BLOB");
   ensureColumn(db, "primer_candidates", "question_embedding_model_id", "TEXT");
   ensureColumn(db, "primers", "question_embedding_model_id", "TEXT");
+  ensureColumn(db, "primers", "source_candidate_provenance", "TEXT");
+  const hasUserMemoriesTable = db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = 'user_memories'").get();
+  if (hasUserMemoriesTable) {
+    ensureColumn(db, "user_memories", "source_candidate_provenance", "TEXT");
+  }
   db.exec(`
       CREATE UNIQUE INDEX IF NOT EXISTS idx_primer_candidates_occurrence
         ON primer_candidates(project_path, harness, session_id, source_start_message_id, source_end_message_id);
@@ -13514,6 +13905,8 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "stripped_placeholder_ids", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "stale_reduce_stripped_ids", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "processed_image_stripped_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "merged_reasoning_stripped_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "trailing_blank_decisions", "TEXT DEFAULT ''");
   ensureColumn(db, "compartments", "start_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "compartments", "end_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "memory_embeddings", "model_id", "TEXT");
@@ -14161,7 +14554,7 @@ function persistCachedM0(db, sessionId, payload) {
             cached_m0_system_hash = ?,
             cached_m0_model_key = ?,
             cached_m0_project_identity = ?
-         WHERE session_id = ?`).run(Buffer2.from(payload.m0Bytes), payload.muralDataUrl ?? null, payload.muralHash ?? null, payload.projectMemoryEpoch, payload.workspaceFingerprint ?? null, payload.projectUserProfileVersion, payload.maxCompartmentSeq, payload.maxMemoryId, payload.maxMutationId, payload.maxMemoryMutationId ?? null, payload.m1Bytes ? Buffer2.from(payload.m1Bytes) : null, payload.projectDocsHash, payload.materializedAt, payload.sessionFactsVersion, payload.upgradeState, payload.systemHash ?? "", payload.modelKey ?? "", payload.projectIdentity ?? null, sessionId);
+         WHERE session_id = ?`).run(Buffer2.from(payload.m0Bytes), payload.muralDataUrl ?? null, payload.muralHash ?? null, payload.projectMemoryEpoch, payload.workspaceFingerprint ?? null, payload.projectUserProfileVersion, payload.maxCompartmentSeq, payload.maxMemoryId, payload.maxMutationId, payload.maxMemoryMutationId ?? null, payload.m1Bytes ? Buffer2.from(payload.m1Bytes) : null, payload.projectDocsHash, payload.materializedAt, payload.sessionFactsVersion, payload.upgradeState, payload.systemHash ?? "", payload.modelKey ? piModelRefToCanonical(payload.modelKey) : "", payload.projectIdentity ?? null, sessionId);
 }
 function clearCachedM0M1(db, sessionId) {
   ensureSessionMetaRow(db, sessionId);
@@ -14938,7 +15331,7 @@ function clearHistorianFailureState(db, sessionId) {
   })();
 }
 function normalizeDetectedLimitModelKey(modelKey) {
-  return typeof modelKey === "string" && modelKey.length > 0 ? modelKey : null;
+  return typeof modelKey === "string" && modelKey.length > 0 ? piModelRefToCanonical(modelKey) : null;
 }
 function normalizeEmergencyRecoveryOrigin(value) {
   return value === "provider_overflow" || value === "proactive_model_shrink" ? value : null;
@@ -15227,13 +15620,13 @@ function clearCompressionDepthRange(db, sessionId, startOrdinal, endOrdinal) {
 import { createHash as createHash4 } from "node:crypto";
 
 // ../plugin/src/hooks/magic-context/read-session-db.ts
-import { existsSync as existsSync5 } from "node:fs";
-import { join as join4 } from "node:path";
+import { existsSync as existsSync6 } from "node:fs";
+import { join as join5 } from "node:path";
 function getOpenCodeDbPath() {
-  return join4(getDataDir(), "opencode", "opencode.db");
+  return join5(getDataDir(), "opencode", "opencode.db");
 }
 function openCodeDbExists() {
-  return existsSync5(getOpenCodeDbPath());
+  return existsSync6(getOpenCodeDbPath());
 }
 var cachedReadOnlyDb = null;
 function closeCachedReadOnlyDb() {
@@ -17048,7 +17441,7 @@ function updateSessionMeta(db, sessionId, updates) {
       values.push(value ? 1 : 0);
     } else if (typeof value === "string" || typeof value === "number") {
       setClauses.push(`${column} = ?`);
-      values.push(value);
+      values.push(key === "lastObservedModelKey" && typeof value === "string" ? piModelRefToCanonical(value) : value);
     }
   }
   if (setClauses.length === 0) {
@@ -17313,7 +17706,7 @@ function escapeXmlContent(s) {
 }
 // ../plugin/src/features/magic-context/project-docs-hash.ts
 import { createHash as createHash5 } from "node:crypto";
-import { lstatSync, readFileSync as readFileSync4, statSync as statSync4 } from "node:fs";
+import { lstatSync, readFileSync as readFileSync5, statSync as statSync4 } from "node:fs";
 import path2 from "node:path";
 var PROJECT_DOC_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 var PROJECT_DOCS_DELIMITER = `
@@ -17387,7 +17780,7 @@ function readCanonicalPieces(projectDirectory, files) {
     if (!safeToRead) {
       continue;
     }
-    const canonicalContent = canonicalizeDocContent(readFileSync4(filePath, "utf8"));
+    const canonicalContent = canonicalizeDocContent(readFileSync5(filePath, "utf8"));
     hashPieces.push(`file:${filename}
 ${canonicalContent}`);
     renderedSections.push(`<file name="${escapeXmlAttr(filename)}">
@@ -17460,6 +17853,67 @@ function mapMessageId(filter, messageId) {
     return null;
   return filter.mapMessageId?.(messageId) ?? messageId;
 }
+function tableExists3(db, table) {
+  const row = db.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ?").get(table);
+  return row !== null && row !== undefined;
+}
+function insertDynamicRow(db, table, row) {
+  const names = Object.keys(row);
+  const quoted = names.map((name) => `"${name.replaceAll('"', '""')}"`);
+  const placeholders2 = names.map(() => "?").join(", ");
+  db.prepare(`INSERT INTO "${table.replaceAll('"', '""')}" (${quoted.join(", ")}) VALUES (${placeholders2})`).run(...names.map((name) => row[name]));
+}
+function anchoredMessageId(blockId) {
+  const separator = blockId.lastIndexOf("#");
+  return separator > 0 ? blockId.slice(0, separator) : blockId;
+}
+function copyPiSessionNotesAndFacts(db, sourceSessionId, destinationSessionId, filter) {
+  let notesCopied = 0;
+  if (tableExists3(db, "notes")) {
+    const sourceNotes = db.prepare("SELECT * FROM notes WHERE session_id = ? AND type = 'session' ORDER BY id ASC").all(sourceSessionId);
+    for (const source of sourceNotes) {
+      const row = {
+        ...source,
+        session_id: destinationSessionId
+      };
+      delete row.id;
+      const blockId = typeof source.anchor_block_id === "string" ? source.anchor_block_id : "";
+      if (blockId) {
+        const sourceMessageId = anchoredMessageId(blockId);
+        if (!filter.includeMessageId(sourceMessageId))
+          continue;
+        const mappedMessageId = mapMessageId(filter, sourceMessageId) ?? sourceMessageId;
+        row.anchor_block_id = `${mappedMessageId}${blockId.slice(sourceMessageId.length)}`;
+        const mappedOrdinal = filter.resolveBoundaryOrdinal(sourceMessageId);
+        if (mappedOrdinal === undefined)
+          continue;
+        if ("anchor_ordinal" in row)
+          row.anchor_ordinal = mappedOrdinal;
+      } else if (typeof source.anchor_ordinal === "number" && filter.mapOrdinal) {
+        const mappedOrdinal = filter.mapOrdinal(source.anchor_ordinal);
+        if (mappedOrdinal === undefined)
+          continue;
+        row.anchor_ordinal = mappedOrdinal;
+      }
+      insertDynamicRow(db, "notes", row);
+      notesCopied += 1;
+    }
+  }
+  let factsCopied = 0;
+  if (tableExists3(db, "session_facts")) {
+    const sourceFacts = db.prepare("SELECT * FROM session_facts WHERE session_id = ? ORDER BY id ASC").all(sourceSessionId);
+    for (const source of sourceFacts) {
+      const row = {
+        ...source,
+        session_id: destinationSessionId
+      };
+      delete row.id;
+      insertDynamicRow(db, "session_facts", row);
+      factsCopied += 1;
+    }
+  }
+  return { notesCopied, factsCopied };
+}
 function filterIdBlob(raw, filter) {
   if (!raw)
     return "";
@@ -17480,12 +17934,14 @@ function clampWatermark(value, maxCopiedTag) {
 }
 function copySessionStateForClone(db, sourceSessionId, destinationSessionId, filter) {
   return runImmediate(db, () => {
-    if (countRows(db, "compartments", destinationSessionId) > 0 || countRows(db, "tags", destinationSessionId) > 0) {
+    if (countRows(db, "compartments", destinationSessionId) > 0 || countRows(db, "tags", destinationSessionId) > 0 || filter.copySessionNotesAndFacts === true && (tableExists3(db, "notes") && countRows(db, "notes", destinationSessionId) > 0 || tableExists3(db, "session_facts") && countRows(db, "session_facts", destinationSessionId) > 0)) {
       return {
         kind: "destination-not-empty",
         compartmentsCopied: 0,
         tagsCopied: 0,
         pendingOpsCopied: 0,
+        notesCopied: 0,
+        factsCopied: 0,
         pendingMarkerMigrated: false
       };
     }
@@ -17569,6 +18025,7 @@ function copySessionStateForClone(db, sourceSessionId, destinationSessionId, fil
         insertPendingOp.run(destinationSessionId, destinationTagId, row.operation, row.queued_at, row.harness);
       }
     }
+    const inherited = filter.copySessionNotesAndFacts === true ? copyPiSessionNotesAndFacts(db, sourceSessionId, destinationSessionId, filter) : { notesCopied: 0, factsCopied: 0 };
     const meta = db.prepare(`SELECT cleared_reasoning_through_tag, tool_reclaim_watermark,
                         pi_stable_id_scheme, stripped_placeholder_ids,
                         stale_reduce_stripped_ids, processed_image_stripped_ids,
@@ -17610,6 +18067,8 @@ function copySessionStateForClone(db, sourceSessionId, destinationSessionId, fil
       compartmentsCopied: copiedCompartments.length,
       tagsCopied: copiedTagNumbers.length,
       pendingOpsCopied: typeof pendingOpsRow?.count === "number" ? pendingOpsRow.count : 0,
+      notesCopied: inherited.notesCopied,
+      factsCopied: inherited.factsCopied,
       pendingMarkerMigrated: pendingMarker !== null
     };
   });
@@ -18192,6 +18651,76 @@ function parseCandidateIds(raw) {
     return [];
   }
 }
+function parsePrimerSourceProvenance(raw) {
+  if (raw === null)
+    return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed))
+      return null;
+    const provenance = [];
+    for (const value of parsed) {
+      if (!value || typeof value !== "object")
+        return null;
+      const source = value;
+      if (typeof source.candidate_id !== "number" || !Number.isFinite(source.candidate_id) || typeof source.project_path !== "string" || typeof source.harness !== "string" || typeof source.session_id !== "string" || source.source_compartment_start !== null && typeof source.source_compartment_start !== "number" || source.source_compartment_end !== null && typeof source.source_compartment_end !== "number" || typeof source.source_start_message_id !== "string" || typeof source.source_end_message_id !== "string") {
+        return null;
+      }
+      provenance.push({
+        candidateId: source.candidate_id,
+        projectPath: source.project_path,
+        harness: source.harness,
+        sessionId: source.session_id,
+        sourceCompartmentStart: source.source_compartment_start,
+        sourceCompartmentEnd: source.source_compartment_end,
+        sourceStartMessageId: source.source_start_message_id,
+        sourceEndMessageId: source.source_end_message_id
+      });
+    }
+    return provenance;
+  } catch {
+    return null;
+  }
+}
+function loadPrimerSourceProvenance(db, candidateIds) {
+  const ids = [...new Set(candidateIds)].sort((a, b) => a - b);
+  if (ids.length === 0)
+    return [];
+  const placeholders3 = ids.map(() => "?").join(",");
+  const rows = db.prepare(`SELECT id, project_path, harness, session_id,
+                    source_compartment_start, source_compartment_end,
+                    source_start_message_id, source_end_message_id
+               FROM primer_candidates
+              WHERE id IN (${placeholders3})
+              ORDER BY id ASC`).all(...ids);
+  return rows.map((row) => ({
+    candidateId: row.id,
+    projectPath: row.project_path,
+    harness: row.harness,
+    sessionId: row.session_id,
+    sourceCompartmentStart: row.source_compartment_start,
+    sourceCompartmentEnd: row.source_compartment_end,
+    sourceStartMessageId: row.source_start_message_id,
+    sourceEndMessageId: row.source_end_message_id
+  }));
+}
+function serializePrimerSourceProvenance(provenance, sourceCandidateIds) {
+  if (provenance.length === 0 && sourceCandidateIds.length > 0)
+    return null;
+  return JSON.stringify(provenance.map((source) => ({
+    candidate_id: source.candidateId,
+    project_path: source.projectPath,
+    harness: source.harness,
+    session_id: source.sessionId,
+    source_compartment_start: source.sourceCompartmentStart,
+    source_compartment_end: source.sourceCompartmentEnd,
+    source_start_message_id: source.sourceStartMessageId,
+    source_end_message_id: source.sourceEndMessageId
+  })));
+}
+function normalizedCandidateIds(candidateIds) {
+  return [...new Set(candidateIds)].sort((a, b) => a - b);
+}
 function toCandidate(row) {
   return {
     id: row.id,
@@ -18224,6 +18753,7 @@ function toPrimer(row) {
     lastObservedAt: row.last_observed_at,
     answerRefreshedAt: row.answer_refreshed_at,
     sourceCandidateIds: parseCandidateIds(row.source_candidate_ids),
+    sourceProvenance: parsePrimerSourceProvenance(row.source_candidate_provenance),
     createdAt: row.created_at,
     updatedAt: row.updated_at
   };
@@ -18295,23 +18825,43 @@ function getActivePrimers(db, projectPath) {
   return rows.map(toPrimer);
 }
 function createPrimer(db, input) {
-  const now = input.now ?? Date.now();
-  const info = db.prepare(`INSERT INTO primers (
-                project_path, question, question_embedding, question_embedding_model_id, answer,
-                status, total_support, last_observed_at, answer_refreshed_at,
-                source_candidate_ids, created_at, updated_at
-             ) VALUES (?, ?, ?, ?, ?, 'active', ?, ?, NULL, ?, ?, ?)`).run(input.projectPath, input.question, vectorBlob(input.questionEmbedding), input.questionEmbeddingModelId ?? null, input.answer ?? "", input.totalSupport, input.lastObservedAt, JSON.stringify([...new Set(input.sourceCandidateIds)].sort((a, b) => a - b)), now, now);
-  return Number(info.lastInsertRowid);
+  return db.transaction(() => {
+    const now = input.now ?? Date.now();
+    const sourceCandidateIds = normalizedCandidateIds(input.sourceCandidateIds);
+    const sourceProvenance = loadPrimerSourceProvenance(db, sourceCandidateIds);
+    const info = db.prepare(`INSERT INTO primers (
+                    project_path, question, question_embedding, question_embedding_model_id, answer,
+                    status, total_support, last_observed_at, answer_refreshed_at,
+                    source_candidate_ids, source_candidate_provenance, created_at, updated_at
+                 ) VALUES (?, ?, ?, ?, ?, 'active', ?, ?, NULL, ?, ?, ?, ?)`).run(input.projectPath, input.question, vectorBlob(input.questionEmbedding), input.questionEmbeddingModelId ?? null, input.answer ?? "", input.totalSupport, input.lastObservedAt, JSON.stringify(sourceCandidateIds), serializePrimerSourceProvenance(sourceProvenance, sourceCandidateIds), now, now);
+    return Number(info.lastInsertRowid);
+  })();
 }
 function updatePrimerSupport(db, input) {
-  db.prepare(`UPDATE primers
-         SET question_embedding = COALESCE(?, question_embedding),
-             question_embedding_model_id = COALESCE(?, question_embedding_model_id),
-             total_support = ?,
-             last_observed_at = ?,
-             source_candidate_ids = ?,
-             updated_at = ?
-         WHERE id = ?`).run(vectorBlob(input.questionEmbedding), input.questionEmbeddingModelId ?? null, input.totalSupport, input.lastObservedAt, JSON.stringify([...new Set(input.sourceCandidateIds)].sort((a, b) => a - b)), input.now ?? Date.now(), input.primerId);
+  db.transaction(() => {
+    const sourceCandidateIds = normalizedCandidateIds(input.sourceCandidateIds);
+    const allowedIds = new Set(sourceCandidateIds);
+    const existingRow = db.prepare("SELECT source_candidate_provenance FROM primers WHERE id = ?").get(input.primerId);
+    const provenanceByCandidateId = new Map;
+    for (const source of parsePrimerSourceProvenance(existingRow?.source_candidate_provenance ?? null) ?? []) {
+      if (allowedIds.has(source.candidateId)) {
+        provenanceByCandidateId.set(source.candidateId, source);
+      }
+    }
+    for (const source of loadPrimerSourceProvenance(db, sourceCandidateIds)) {
+      provenanceByCandidateId.set(source.candidateId, source);
+    }
+    const sourceProvenance = [...provenanceByCandidateId.values()].sort((a, b) => a.candidateId - b.candidateId);
+    db.prepare(`UPDATE primers
+             SET question_embedding = COALESCE(?, question_embedding),
+                 question_embedding_model_id = COALESCE(?, question_embedding_model_id),
+                 total_support = ?,
+                 last_observed_at = ?,
+                 source_candidate_ids = ?,
+                 source_candidate_provenance = ?,
+                 updated_at = ?
+             WHERE id = ?`).run(vectorBlob(input.questionEmbedding), input.questionEmbeddingModelId ?? null, input.totalSupport, input.lastObservedAt, JSON.stringify(sourceCandidateIds), serializePrimerSourceProvenance(sourceProvenance, sourceCandidateIds), input.now ?? Date.now(), input.primerId);
+  })();
 }
 function updatePrimerAnswer(db, primerId, answer, refreshedAt = Date.now()) {
   db.prepare("UPDATE primers SET answer = ?, answer_refreshed_at = ?, updated_at = ? WHERE id = ?").run(answer, refreshedAt, refreshedAt, primerId);
@@ -19040,6 +19590,20 @@ function getTagsByNumbers(db, sessionId, tagNumbers) {
   const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND tag_number IN (${placeholders3}) ORDER BY tag_number ASC, id ASC`).all(sessionId, ...tagNumbers).filter(isTagRow);
   return rows.map(toTagEntry);
 }
+function getDroppedTagsByNumbers(db, sessionId, tagNumbers) {
+  if (tagNumbers.length === 0)
+    return [];
+  if (tagNumbers.length > 900) {
+    const all = [];
+    for (let i = 0;i < tagNumbers.length; i += 900) {
+      all.push(...getDroppedTagsByNumbers(db, sessionId, tagNumbers.slice(i, i + 900)));
+    }
+    return all;
+  }
+  const placeholders3 = tagNumbers.map(() => "?").join(",");
+  const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND status = 'dropped' AND tag_number IN (${placeholders3}) ORDER BY tag_number ASC, id ASC`).all(sessionId, ...tagNumbers).filter(isTagRow);
+  return rows.map(toTagEntry);
+}
 function getMaxDroppedTagNumber(db, sessionId) {
   const row = getMaxDroppedTagNumberStatement(db).get(sessionId);
   return isMaxTagNumberRow(row) ? row.max_tag_number : 0;
@@ -19217,8 +19781,8 @@ function isTodoItem(value) {
 }
 
 // ../plugin/src/shared/prompt-surface-runtime.ts
-import { existsSync as existsSync7, readFileSync as readFileSync6, statSync as statSync5 } from "node:fs";
-import { dirname as dirname3, isAbsolute as isAbsolute2, resolve } from "node:path";
+import { existsSync as existsSync8, readFileSync as readFileSync7, statSync as statSync5 } from "node:fs";
+import { dirname as dirname4, isAbsolute as isAbsolute2, resolve as resolve2 } from "node:path";
 
 // ../plugin/src/tools/light-descriptions.ts
 var CTX_REDUCE_LIGHT_DESCRIPTION = `For ctx_reduce users, mark spent §N§ outputs discardable; release is QUEUED, not immediate, so content stays visible until space is needed. Newest tags stay protected until they age out. Released content becomes a placeholder; recover it only by rerunning the source or recovery tool, so mark only genuinely finished material. Mark analyzed, redundant, persisted, or merely confirmatory outputs; keep user messages, unresolved errors, unextracted evidence, and exact wording. NEVER blanket-mark a large range: review every tag first.`;
@@ -19228,7 +19792,7 @@ var CTX_MEMORY_LIGHT_DESCRIPTION = `For ctx_memory users, write one standalone d
 var CTX_SEARCH_LIGHT_DESCRIPTION = `For ctx_search users, retrieve only hidden recall: memories not already in <project-memory>, compacted messages outside the live tail, commits, and notes. Omit sources for broad search; select memory, message, git_commit, or note to target a source, or pass memory IDs to bypass text search. Message hits continue through ctx_expand.`;
 
 // ../plugin/src/shared/jsonc-parser.ts
-import { existsSync as existsSync6, readFileSync as readFileSync5 } from "node:fs";
+import { existsSync as existsSync7, readFileSync as readFileSync6 } from "node:fs";
 function stripJsonComments(content) {
   let result = "";
   let inString = false;
@@ -19283,13 +19847,43 @@ function stripJsonComments(content) {
   }
   return result;
 }
+var PROTOTYPE_POLLUTION_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+function isPrototypePollutionKey(key) {
+  return PROTOTYPE_POLLUTION_KEYS.has(key);
+}
+function sanitizeParsedJson(value, options = {}, path3 = []) {
+  if (Array.isArray(value)) {
+    return value.map((entry, index) => sanitizeParsedJson(entry, options, [...path3, index]));
+  }
+  if (value === null || typeof value !== "object")
+    return value;
+  const source = value;
+  const sourcePrototype = Object.getPrototypeOf(source);
+  if (sourcePrototype !== null && sourcePrototype !== Object.prototype) {
+    options.onRejectedKey?.([...path3, "__proto__"]);
+  }
+  const sanitized = {};
+  for (const key of Object.keys(source)) {
+    if (isPrototypePollutionKey(key)) {
+      options.onRejectedKey?.([...path3, key]);
+      continue;
+    }
+    Object.defineProperty(sanitized, key, {
+      value: sanitizeParsedJson(source[key], options, [...path3, key]),
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  }
+  return sanitized;
+}
 function detectConfigFile(basePath) {
   const jsoncPath = `${basePath}.jsonc`;
   const jsonPath = `${basePath}.json`;
-  if (existsSync6(jsoncPath)) {
+  if (existsSync7(jsoncPath)) {
     return { format: "jsonc", path: jsoncPath };
   }
-  if (existsSync6(jsonPath)) {
+  if (existsSync7(jsonPath)) {
     return { format: "json", path: jsonPath };
   }
   return { format: "none", path: jsoncPath };
@@ -19300,7 +19894,9 @@ function isValidPromptSurfaceModelKey(key) {
   if (key.length === 0 || key.trim() !== key)
     return false;
   const slash = key.indexOf("/");
-  if (slash <= 0 || slash === key.length - 1)
+  if (slash < 0)
+    return !key.includes("*");
+  if (slash === 0 || slash === key.length - 1)
     return false;
   const provider = key.slice(0, slash);
   const modelID = key.slice(slash + 1);
@@ -19319,16 +19915,25 @@ function modelKeyLookupOrder(modelKey) {
     return [];
   const provider = modelKey.slice(0, slash);
   let modelID = modelKey.slice(slash + 1);
+  const providerRefs = modelRefLookupOrder(`${provider}/${modelID}`);
   const candidates = [];
   while (modelID.length > 0) {
-    candidates.push({ key: `${provider}/${modelID}`, source: "exact" });
+    for (const providerRef of providerRefs) {
+      const providerSlash = providerRef.indexOf("/");
+      const providerPrefix = providerRef.slice(0, providerSlash);
+      candidates.push({ key: `${providerPrefix}/${modelID}`, source: "exact" });
+    }
     candidates.push({ key: modelID, source: "bare" });
     const lastDash = modelID.lastIndexOf("-");
     if (lastDash <= 0)
       break;
     modelID = modelID.slice(0, lastDash);
   }
-  candidates.push({ key: `${provider}/*`, source: "wildcard" });
+  for (const providerRef of providerRefs) {
+    const providerSlash = providerRef.indexOf("/");
+    const providerPrefix = providerRef.slice(0, providerSlash);
+    candidates.push({ key: `${providerPrefix}/*`, source: "wildcard" });
+  }
   const seen = new Set;
   return candidates.filter((candidate) => {
     if (seen.has(candidate.key))
@@ -19351,7 +19956,7 @@ function resolveModelConfigValue(values, modelKey) {
 function resolvePromptSurface(config, modelKey) {
   const fallback = config?.default ?? "full";
   const match = resolveModelConfigValue(config?.models, modelKey);
-  if (match && match.source !== "bare") {
+  if (match) {
     return { preset: match.value, source: match.source };
   }
   return { preset: fallback, source: "default" };
@@ -19384,17 +19989,17 @@ function promptSurfaceHashMaterial(systemContent, preset = "full") {
 var PROMPT_SURFACE_TOOL_ID_SET = new Set(ACTIVE_TOOL_IDS);
 function resolveUserConfigDirectory(options) {
   if (options.userConfigDirectory)
-    return resolve(options.userConfigDirectory);
+    return resolve2(options.userConfigDirectory);
   const sharedBase = cortexKitUserConfigBasePath();
   const shared = detectConfigFile(sharedBase);
   if (shared.format !== "none")
-    return dirname3(shared.path);
+    return dirname4(shared.path);
   if (options.harness) {
-    const legacy = resolveLegacyConfigSourcesForHarness(options.directory ?? process.cwd(), options.harness).user.find((source) => existsSync7(source.path));
+    const legacy = resolveLegacyConfigSourcesForHarness(options.directory ?? process.cwd(), options.harness).user.find((source) => existsSync8(source.path));
     if (legacy)
-      return dirname3(legacy.path);
+      return dirname4(legacy.path);
   }
-  return dirname3(sharedBase);
+  return dirname4(sharedBase);
 }
 function markerCount(content) {
   return content.match(GUIDANCE_MARKER_LINE)?.length ?? 0;
@@ -19411,14 +20016,14 @@ function createPromptSurfaceRuntime(options) {
   const readGuidanceOverride = (configuredPath) => {
     if (!configuredPath)
       return;
-    const path3 = isAbsolute2(configuredPath) ? configuredPath : resolve(userConfigDirectory, configuredPath);
+    const path3 = isAbsolute2(configuredPath) ? configuredPath : resolve2(userConfigDirectory, configuredPath);
     let content;
     try {
       if (!statSync5(path3).isFile()) {
         warnOnce(`guidance-not-file:${path3}`, `prompt_surface.guidance_override_path (${path3}) is not a file; using built-in guidance.`);
         return;
       }
-      content = readFileSync6(path3, "utf8");
+      content = readFileSync7(path3, "utf8");
     } catch (error) {
       const reason = error instanceof Error ? error.message : String(error);
       warnOnce(`guidance-unreadable:${path3}:${reason}`, `prompt_surface.guidance_override_path (${path3}) could not be read (${reason}); using built-in guidance.`);
@@ -19471,12 +20076,13 @@ function createPromptSurfaceGuidanceEpochCache(runtime) {
   const epochs = new Map;
   return {
     resolve(sessionId, config, modelKey) {
+      const canonicalModelKey = modelKey ? piModelRefToCanonical(modelKey) : undefined;
       const cached = epochs.get(sessionId);
-      if (cached && cached.config === config && cached.modelKey === modelKey) {
+      if (cached && cached.config === config && cached.modelKey === canonicalModelKey) {
         return cached.selection;
       }
-      const selection = runtime.resolveGuidance(config, modelKey);
-      epochs.set(sessionId, { config, modelKey, selection });
+      const selection = runtime.resolveGuidance(config, canonicalModelKey);
+      epochs.set(sessionId, { config, modelKey: canonicalModelKey, selection });
       return selection;
     },
     clear(sessionId) {
@@ -19835,7 +20441,7 @@ function pruneNestedConfigLeaf(block, relativePath) {
 }
 
 // src/config/index.ts
-import { existsSync as existsSync9, readFileSync as readFileSync9 } from "node:fs";
+import { existsSync as existsSync10, readFileSync as readFileSync11 } from "node:fs";
 
 // ../plugin/src/config/migrate-dreamer-v2.ts
 var OLD_VERIFY_TASK = "verify";
@@ -20146,7 +20752,7 @@ function migrateLegacyExperimental(rawConfig, warnings) {
 }
 
 // ../plugin/src/config/schema/magic-context.ts
-import { homedir as homedir3 } from "node:os";
+import { homedir as homedir4 } from "node:os";
 
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -34694,14 +35300,14 @@ var PiConfigSchema = exports_external.object({
 }).optional();
 var PromptSurfacePresetSchema = exports_external.enum(["full", "light"]);
 var PromptSurfaceModelKeySchema = exports_external.string().refine(isValidPromptSurfaceModelKey, {
-  message: "Use a non-empty provider/model key or the literal provider/* wildcard; model IDs may contain additional slashes and matching is case-sensitive."
+  message: "Use a non-empty bare model key, provider/model key, or the literal provider/* wildcard; model IDs may contain additional slashes and matching is case-sensitive."
 });
 var PromptSurfaceToolKeySchema = exports_external.string().refine((value) => value.trim().length > 0, {
   message: "tool description keys must not be empty or whitespace-only"
 });
 var PromptSurfaceConfigSchema = exports_external.object({
   default: PromptSurfacePresetSchema.default("full").describe('Fallback prompt-surface preset ("full" or "light").'),
-  models: exports_external.record(PromptSurfaceModelKeySchema, PromptSurfacePresetSchema).optional().describe("Literal per-model routing. Keys are provider/model or provider/*; matching is case-sensitive and preserves additional slashes in model IDs."),
+  models: exports_external.record(PromptSurfaceModelKeySchema, PromptSurfacePresetSchema).optional().describe("Literal per-model routing. Keys are bare model IDs, provider/model, or provider/*; matching is case-sensitive and preserves additional slashes in model IDs."),
   guidance_override_path: exports_external.string().refine((value) => value.trim().length > 0, {
     message: "guidance_override_path must not be empty or whitespace-only"
   }).optional().describe("USER-LEVEL ONLY path to a complete primary guidance section. Relative paths resolve from the user config file."),
@@ -34785,9 +35391,9 @@ var EmbeddingFallbackProviderSchema = exports_external.enum(["local", "openai-co
 function expandConfigPath(value) {
   const trimmed = value.trim();
   if (trimmed === "~")
-    return homedir3();
+    return homedir4();
   if (trimmed.startsWith("~/"))
-    return `${homedir3()}/${trimmed.slice(2)}`;
+    return `${homedir4()}/${trimmed.slice(2)}`;
   return trimmed;
 }
 var BaseEmbeddingConfigSchema = exports_external.object({
@@ -34894,11 +35500,14 @@ var MagicContextConfigSchema = exports_external.object({
     retina_handoff: exports_external.boolean().default(false).describe("When true, dreamer skips smart notes whose surface conditions compiled to retina provider configs at authoring time. Default false keeps both paths active until the retina consumer is deployed.")
   }).default({ retina_handoff: false }).describe("Smart-note ownership transition controls."),
   cache_ttl: exports_external.union([exports_external.string(), exports_external.object({ default: exports_external.string() }).catchall(exports_external.string())]).default("5m").describe('Cache TTL: string (e.g. "5m", "1h", "30s") or per-model object ({ default: "5m", "model-id": "10m" }). Set to "never" for lanes kept warm by an external keepwarm proxy — disables the idle-TTL heuristic so MC never initiates a rebuild based on elapsed time.'),
-  prompt_surface: PromptSurfaceConfigSchema.default({ default: "full" }).describe("Prompt-surface presets: default is full; models use the literal provider/model or provider/* routing grammar. Guidance and tool-description overrides are user-level only. On OpenCode and Pi, per-model routing applies to the guidance block only: tool descriptions are registered once per process, so they follow the default preset (a v1 plugin-surface limitation; per-model tool descriptions are planned for the OpenCode v2 plugin API once the SDK stabilizes)."),
+  prompt_surface: PromptSurfaceConfigSchema.default({ default: "full" }).describe("Prompt-surface presets: default is full; models use bare model IDs, provider/model, or provider/* routing keys. Guidance and tool-description overrides are user-level only. On OpenCode and Pi, per-model routing applies to the guidance block only: tool descriptions are registered once per process, so they follow the default preset (a v1 plugin-surface limitation; per-model tool descriptions are planned for the OpenCode v2 plugin API once the SDK stabilizes)."),
   output_reserve: exports_external.union([
     exports_external.number().min(0),
     exports_external.object({ default: exports_external.number().min(0) }).catchall(exports_external.number().min(0))
   ]).optional().describe('User-only output-token reservation override. Number or per-model object ({ default: 16384, "provider/model": 8192 }); 0 disables reservation. When unset, Magic Context reserves the catalog output limit (capped at 25% of context) for shared-window providers and keeps proven separate-quota Google/Gemini windows unchanged.'),
+  models: exports_external.object({
+    window_overlay_path: exports_external.string().trim().min(1).optional()
+  }).optional().describe("User-only Fusiform window-overlay settings. The path defaults to <dataDir>/fusiform/window-overlay.json."),
   toast_duration_ms: exports_external.number().min(0).max(60000).default(5000).describe("TUI toast lifetime in milliseconds for Magic Context notifications. Set to 0 to disable Magic Context toasts entirely (min: 0, max: 60000, default: 5000)"),
   execute_threshold_percentage: exports_external.union([
     exports_external.number().min(20).max(90, EXECUTE_THRESHOLD_CAP_MESSAGE),
@@ -35112,6 +35721,11 @@ function stripUnsafeProjectConfigFields(projectRaw) {
     delete projectRaw.output_reserve;
     warnings.push("Ignoring output_reserve from project config (security: output-token reservation only honors user-level config).");
   }
+  const models = projectRaw.models;
+  if (isPlainObject3(models) && "window_overlay_path" in models) {
+    delete models.window_overlay_path;
+    warnings.push("Ignoring models.window_overlay_path from project config (security: only user-level config may select model geometry metadata).");
+  }
   if ("language" in projectRaw) {
     delete projectRaw.language;
     warnings.push("Ignoring language from project config (security: output language is a user-level setting).");
@@ -35334,18 +35948,18 @@ function dropInheritedEmbeddingKeyOnRedirect(projectRaw, mergedRaw, userRaw) {
 }
 
 // ../plugin/src/config/variable.ts
-import { existsSync as existsSync8, readFileSync as readFileSync7 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { dirname as dirname4, isAbsolute as isAbsolute3, resolve as resolve2 } from "node:path";
+import { existsSync as existsSync9, readFileSync as readFileSync8 } from "node:fs";
+import { homedir as homedir5 } from "node:os";
+import { dirname as dirname5, isAbsolute as isAbsolute3, resolve as resolve3 } from "node:path";
 var ENV_PATTERN = /\{env:([^}]+)\}/g;
 var FILE_PATTERN = /\{file:([^}]+)\}/g;
 function sensitiveFilePathReason(resolvedPath) {
-  const home = homedir4();
+  const home = homedir5();
   const sensitiveDirs = [
-    { dir: resolve2(home, ".ssh"), label: "SSH keys" },
-    { dir: resolve2(home, ".aws"), label: "AWS credentials" },
-    { dir: resolve2(home, ".gnupg"), label: "GnuPG keyring" },
-    { dir: resolve2(home, ".config", "gh"), label: "GitHub CLI auth" }
+    { dir: resolve3(home, ".ssh"), label: "SSH keys" },
+    { dir: resolve3(home, ".aws"), label: "AWS credentials" },
+    { dir: resolve3(home, ".gnupg"), label: "GnuPG keyring" },
+    { dir: resolve3(home, ".config", "gh"), label: "GitHub CLI auth" }
   ];
   for (const { dir, label } of sensitiveDirs) {
     if (resolvedPath === dir || resolvedPath.startsWith(`${dir}/`)) {
@@ -35385,7 +35999,7 @@ function substituteConfigVariables(input) {
   if (fileMatches.length === 0) {
     return { text, warnings };
   }
-  const configDir = input.configPath ? dirname4(input.configPath) : process.cwd();
+  const configDir = input.configPath ? dirname5(input.configPath) : process.cwd();
   let output = "";
   let cursor = 0;
   for (const match of fileMatches) {
@@ -35403,21 +36017,21 @@ function substituteConfigVariables(input) {
     }
     let filePath = rawPath.trim();
     if (filePath.startsWith("~/")) {
-      filePath = resolve2(homedir4(), filePath.slice(2));
+      filePath = resolve3(homedir5(), filePath.slice(2));
     } else if (!isAbsolute3(filePath)) {
-      filePath = resolve2(configDir, filePath);
+      filePath = resolve3(configDir, filePath);
     }
     const sensitiveReason = sensitiveFilePathReason(filePath);
     if (sensitiveReason) {
       warnings.push(`${token} resolves to a sensitive path (${sensitiveReason}: ${filePath}); ` + "inlining its contents into config — make sure this is intentional.");
     }
-    if (!existsSync8(filePath)) {
+    if (!existsSync9(filePath)) {
       warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
       continue;
     }
     let contents;
     try {
-      contents = readFileSync7(filePath, "utf-8").trim();
+      contents = readFileSync8(filePath, "utf-8").trim();
     } catch (error51) {
       const message = error51 instanceof Error ? error51.message : String(error51);
       warnings.push(`Failed to read file for ${token} (${filePath}): ${message}; using empty string`);
@@ -35430,48 +36044,394 @@ function substituteConfigVariables(input) {
 }
 
 // ../plugin/src/shared/models-dev-cache.ts
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync8, renameSync as renameSync2, writeFileSync as writeFileSync2 } from "node:fs";
-import { join as join5 } from "node:path";
-
-// ../plugin/src/shared/harness-provider-map.ts
-var CANONICAL_TO_PI_PROVIDER = {
-  openai: "openai-codex",
-  google: "google-antigravity"
-};
-var PI_TO_CANONICAL_PROVIDER = {
-  "openai-codex": "openai",
-  "google-antigravity": "google"
-};
-var CANONICAL_TO_OMP_PROVIDER = {
-  openai: "openai-codex",
-  google: "google-antigravity"
-};
-var OMP_TO_CANONICAL_PROVIDER = {
-  "openai-codex": "openai",
-  "google-antigravity": "google"
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync10, renameSync as renameSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { join as join7 } from "node:path";
+
+// ../plugin/src/shared/window-geometry.ts
+import { readFileSync as readFileSync9 } from "node:fs";
+import { join as join6 } from "node:path";
+var WINDOW_OVERLAY_SCHEMA = "fusiform-window-overlay/v1";
+var PROMPT_WALL_MARGIN = 4096;
+var PI_OUTPUT_FLOOR = 4096;
+var OPENCODE_OUTPUT_CAP = 32000;
+var MIN_PLAUSIBLE_CONTEXT_LIMIT = 1024;
+var OUTPUT_RESERVE_CAP_RATIO = 0.25;
+var PROVIDER_GEOMETRY = {
+  anthropic: "shared_truncating",
+  xai: "shared_truncating",
+  google: "separate",
+  "google-antigravity": "separate"
 };
-function remapProviderPrefix(ref, map2) {
-  if (typeof ref !== "string")
-    return ref;
-  const slash = ref.indexOf("/");
-  if (slash <= 0)
-    return ref;
-  const provider = ref.slice(0, slash);
-  if (!Object.hasOwn(map2, provider))
-    return ref;
-  return `${map2[provider]}${ref.slice(slash)}`;
+var GRADES = new Set([
+  "provider_asserted_runtime",
+  "measured",
+  "provider_asserted_doc",
+  "catalog",
+  "unknown"
+]);
+var UNITS = new Set(["provider", "estimate"]);
+var BOUNDARIES = new Set(["Observed", "Asserted", "Corrected"]);
+var UNKNOWN_REASONS = new Set([
+  "placeholder_output_equals_context",
+  "placeholder_zero",
+  "never_measured",
+  "not_single_valued_at_key",
+  "retracted"
+]);
+var NUMERIC_FACT_KEYS = new Set([
+  "window.advertised",
+  "window.enforced",
+  "output.advertised",
+  "output.enforced",
+  "output.default"
+]);
+var configuredOverlayPath;
+var loadedOverlayPath;
+var loadedOverlay;
+var geometryClampLogSeen = new Set;
+function isRecord2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function piModelRefToCanonical(ref) {
-  return remapProviderPrefix(ref, PI_TO_CANONICAL_PROVIDER);
+function isFinitePositive(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0;
 }
-function resolveModelRefForPi(ref) {
-  return remapProviderPrefix(piModelRefToCanonical(ref), CANONICAL_TO_PI_PROVIDER);
+function modelKeyLookupOrder2(providerID, modelID) {
+  const candidates = [...modelRefLookupOrder(`${providerID}/${modelID}`), modelID];
+  const colon = modelID.lastIndexOf(":");
+  if (colon > 0) {
+    const bareModel = modelID.slice(0, colon);
+    candidates.push(...modelRefLookupOrder(`${providerID}/${bareModel}`), bareModel);
+  }
+  return [...new Set(candidates)];
 }
-function ompModelRefToCanonical(ref) {
-  return remapProviderPrefix(ref, OMP_TO_CANONICAL_PROVIDER);
+function configuredOutputReserve(config2, providerID, modelID) {
+  if (typeof config2 === "number") {
+    return Number.isFinite(config2) && config2 >= 0 ? config2 : undefined;
+  }
+  if (!config2)
+    return;
+  for (const candidate of modelKeyLookupOrder2(providerID, modelID)) {
+    const value = config2[candidate];
+    if (typeof value === "number" && Number.isFinite(value) && value >= 0)
+      return value;
+  }
+  return Number.isFinite(config2.default) && config2.default >= 0 ? config2.default : undefined;
 }
-function resolveModelRefForOmp(ref) {
-  return remapProviderPrefix(ompModelRefToCanonical(ref), CANONICAL_TO_OMP_PROVIDER);
+function scalarizeFact(value) {
+  if (value.kind === "stated")
+    return isFinitePositive(value.value) ? value.value : undefined;
+  if (value.kind === "bracket") {
+    return isFinitePositive(value.at_least) ? value.at_least : undefined;
+  }
+  return;
+}
+function parseFactValue(value) {
+  if (!isRecord2(value) || typeof value.kind !== "string")
+    return;
+  if (value.kind === "stated") {
+    if ((typeof value.value !== "number" || !Number.isFinite(value.value)) && typeof value.value !== "string") {
+      return;
+    }
+    return { kind: "stated", value: value.value };
+  }
+  if (value.kind === "bracket") {
+    const atLeast = value.at_least;
+    const below = value.below;
+    if (atLeast === undefined && below === undefined)
+      return { kind: "bracket" };
+    if (atLeast !== undefined && !isFinitePositive(atLeast))
+      return;
+    if (below !== undefined && !isFinitePositive(below))
+      return;
+    if (isFinitePositive(atLeast) && isFinitePositive(below) && below <= atLeast) {
+      return;
+    }
+    return {
+      kind: "bracket",
+      ...isFinitePositive(atLeast) ? { at_least: atLeast } : {},
+      ...isFinitePositive(below) ? { below } : {}
+    };
+  }
+  if (value.kind === "unknown" && UNKNOWN_REASONS.has(value.why)) {
+    return { kind: "unknown", why: value.why };
+  }
+  return;
+}
+function parseFact(key, value) {
+  if (!isRecord2(value))
+    return;
+  const parsedValue = parseFactValue(value.value);
+  if (!parsedValue || !GRADES.has(value.grade) || !UNITS.has(value.units) || !BOUNDARIES.has(value.boundary) || typeof value.source_ref !== "string" || value.source_ref.length === 0 || typeof value.observed_at !== "string" || value.observed_at.length === 0) {
+    return;
+  }
+  if (NUMERIC_FACT_KEYS.has(key) && parsedValue.kind === "stated" && !isFinitePositive(parsedValue.value)) {
+    return;
+  }
+  if (key === "geometry" && parsedValue.kind === "stated" && !["shared_upfront", "shared_truncating", "separate"].includes(String(parsedValue.value))) {
+    return;
+  }
+  return {
+    ...value,
+    value: parsedValue,
+    grade: value.grade,
+    units: value.units,
+    boundary: value.boundary,
+    source_ref: value.source_ref,
+    observed_at: value.observed_at
+  };
+}
+function parseWindowOverlay(value) {
+  if (!isRecord2(value)) {
+    return { badCells: 0, refusal: "overlay root is not an object" };
+  }
+  if (value.schema !== WINDOW_OVERLAY_SCHEMA) {
+    return {
+      badCells: 0,
+      refusal: `unrecognized schema ${JSON.stringify(value.schema)}`
+    };
+  }
+  if (typeof value.generated_at !== "string" || !Array.isArray(value.minted_provider_ids) || !value.minted_provider_ids.every((id) => typeof id === "string" && id.length > 0) || !Array.isArray(value.cells)) {
+    return { badCells: 0, refusal: "invalid v1 envelope" };
+  }
+  const cells = [];
+  let badCells = 0;
+  for (const rawCell of value.cells) {
+    if (!isRecord2(rawCell) || typeof rawCell.provider_id !== "string" || rawCell.provider_id.length === 0 || typeof rawCell.model_id !== "string" || rawCell.model_id.length === 0 || !isRecord2(rawCell.facts)) {
+      badCells++;
+      continue;
+    }
+    const facts = {};
+    let valid = true;
+    for (const [key, rawFact] of Object.entries(rawCell.facts)) {
+      const fact = parseFact(key, rawFact);
+      if (!fact) {
+        valid = false;
+        break;
+      }
+      facts[key] = fact;
+    }
+    if (!valid) {
+      badCells++;
+      continue;
+    }
+    cells.push({
+      provider_id: rawCell.provider_id,
+      model_id: rawCell.model_id,
+      facts
+    });
+  }
+  return {
+    overlay: {
+      schema: WINDOW_OVERLAY_SCHEMA,
+      generated_at: value.generated_at,
+      minted_provider_ids: [...value.minted_provider_ids],
+      cells
+    },
+    badCells
+  };
+}
+function defaultWindowOverlayPath() {
+  return join6(getDataDir(), "fusiform", "window-overlay.json");
+}
+function readWindowOverlayFile(path3, log2 = (message) => sessionLog("global", message)) {
+  let raw;
+  try {
+    raw = readFileSync9(path3, "utf8");
+  } catch (error51) {
+    if (error51.code === "ENOENT")
+      return;
+    log2(`window-overlay: unable to read ${path3}; overlay ignored`);
+    return;
+  }
+  let decoded;
+  try {
+    decoded = JSON.parse(raw);
+  } catch {
+    log2(`window-overlay: invalid JSON in ${path3}; overlay ignored`);
+    return;
+  }
+  const parsed = parseWindowOverlay(decoded);
+  if (parsed.refusal) {
+    log2(`window-overlay: ${parsed.refusal} in ${path3}; entire overlay ignored`);
+    return;
+  }
+  if (parsed.badCells > 0) {
+    log2(`window-overlay: skipped ${parsed.badCells} invalid cell(s) from ${path3}`);
+  }
+  return parsed.overlay;
+}
+function setWindowOverlayPath(path3) {
+  configuredOverlayPath = path3;
+  loadedOverlayPath = undefined;
+  loadedOverlay = undefined;
+}
+function getWindowOverlay() {
+  const path3 = configuredOverlayPath ?? defaultWindowOverlayPath();
+  if (loadedOverlayPath === path3 && loadedOverlay !== undefined) {
+    return loadedOverlay ?? undefined;
+  }
+  loadedOverlayPath = path3;
+  loadedOverlay = readWindowOverlayFile(path3) ?? null;
+  return loadedOverlay ?? undefined;
+}
+function resolveWindowOverlayFacts(providerID, modelID, overlay = getWindowOverlay()) {
+  if (!overlay)
+    return;
+  const modelRefs = modelRefLookupOrder(`${providerID}/${modelID}`);
+  const providerCandidates = new Set(modelRefs.map((ref) => ref.slice(0, ref.indexOf("/"))));
+  const modelCandidates = new Set([
+    modelID,
+    ...modelRefs.map((ref) => ref.slice(ref.indexOf("/") + 1))
+  ]);
+  const colon = modelID.lastIndexOf(":");
+  if (colon > 0)
+    modelCandidates.add(modelID.slice(0, colon));
+  const wildcardFacts = {};
+  const specificFacts = {};
+  for (const cell of overlay.cells) {
+    if (!providerCandidates.has(cell.provider_id))
+      continue;
+    if (cell.model_id === "*")
+      Object.assign(wildcardFacts, cell.facts);
+    else if (modelCandidates.has(cell.model_id))
+      Object.assign(specificFacts, cell.facts);
+  }
+  const facts = { ...wildcardFacts, ...specificFacts };
+  return Object.keys(facts).length > 0 ? { facts } : undefined;
+}
+function numericOverlayFact(overlay, key) {
+  const fact = overlay?.facts[key];
+  return fact ? scalarizeFact(fact.value) : undefined;
+}
+function overlayGeometry(overlay) {
+  const fact = overlay?.facts.geometry;
+  if (fact === undefined)
+    return;
+  if (fact.value.kind === "unknown")
+    return { kind: "unknown" };
+  if (fact.value.kind !== "stated")
+    return;
+  const value = fact.value.value;
+  return value === "shared_upfront" || value === "shared_truncating" || value === "separate" ? { kind: "stated", value } : undefined;
+}
+function placeholderFilteredOutput(output, context) {
+  if (!isFinitePositive(output))
+    return;
+  if (isFinitePositive(context) && output >= context)
+    return;
+  return output;
+}
+function mergePositive(overlayValue, providerValue) {
+  return isFinitePositive(providerValue) ? providerValue : overlayValue;
+}
+function logGeometryClampOnce(key, message, log2) {
+  if (geometryClampLogSeen.has(key))
+    return;
+  geometryClampLogSeen.add(key);
+  (log2 ?? ((entry) => sessionLog("global", `window-geometry: ${entry}`)))(message);
+}
+function deriveWindowGeometry(providerID, modelID, catalogLimit, options = {}) {
+  if (!catalogLimit && !options.providerLimit)
+    return;
+  const providerLimit = options.providerLimit;
+  const catalogContext = isFinitePositive(catalogLimit?.context) ? catalogLimit.context : undefined;
+  const advertised = numericOverlayFact(options.overlay, "window.advertised");
+  const enforced = numericOverlayFact(options.overlay, "window.enforced");
+  let softContext = mergePositive(enforced ?? advertised ?? catalogContext, providerLimit?.context);
+  let hardContext = mergePositive(enforced ?? softContext, providerLimit?.context);
+  if (isFinitePositive(options.contextCap)) {
+    softContext = isFinitePositive(softContext) ? Math.min(softContext, options.contextCap) : options.contextCap;
+    hardContext = isFinitePositive(hardContext) ? Math.min(hardContext, options.contextCap) : options.contextCap;
+  }
+  const input = mergePositive(isFinitePositive(catalogLimit?.input) ? catalogLimit.input : undefined, providerLimit?.input);
+  if (!isFinitePositive(softContext) && !isFinitePositive(input))
+    return;
+  const catalogOutput = options.overlay === undefined && options.providerLimit === undefined ? isFinitePositive(catalogLimit?.output) ? catalogLimit.output : undefined : placeholderFilteredOutput(catalogLimit?.output, softContext);
+  const overlayOutput = placeholderFilteredOutput(numericOverlayFact(options.overlay, "output.enforced") ?? numericOverlayFact(options.overlay, "output.default") ?? numericOverlayFact(options.overlay, "output.advertised"), softContext);
+  const providerOutput = placeholderFilteredOutput(providerLimit?.output, softContext);
+  const output = providerOutput ?? overlayOutput ?? catalogOutput;
+  const geometryFact = overlayGeometry(options.overlay);
+  const geometry = geometryFact?.kind === "stated" ? geometryFact.value : geometryFact?.kind === "unknown" ? "shared_upfront" : PROVIDER_GEOMETRY[providerID] ?? "shared_upfront";
+  const geometryOverride = geometryFact?.kind === "stated" ? geometryFact.value : undefined;
+  let usableSoft;
+  let softReserve = 0;
+  let reserveSource = "none";
+  if (isFinitePositive(input) && (!isFinitePositive(softContext) || input < softContext)) {
+    usableSoft = input;
+    if (isFinitePositive(softContext)) {
+      softReserve = Math.max(0, softContext - input);
+      reserveSource = "output_catalog";
+    }
+  } else if (isFinitePositive(softContext)) {
+    const configuredReserve = configuredOutputReserve(options.reserveConfig, providerID, modelID);
+    if (configuredReserve !== undefined) {
+      softReserve = configuredReserve;
+      reserveSource = "output_config";
+    } else if (geometry === "separate" && (options.overlay === undefined || options.harness === "pi" || geometryOverride !== undefined)) {
+      softReserve = 0;
+      reserveSource = "none";
+    } else {
+      softReserve = output ?? 0;
+      reserveSource = output === undefined ? "none" : "output_catalog";
+      const cap = softContext * OUTPUT_RESERVE_CAP_RATIO;
+      softReserve = Math.min(softReserve, options.harness === "pi" || options.overlay === undefined ? cap : Math.min(cap, OPENCODE_OUTPUT_CAP));
+    }
+    const floor = Math.max(MIN_PLAUSIBLE_CONTEXT_LIMIT, softContext * 0.5);
+    const flooredReserve = Math.min(softReserve, Math.max(0, softContext - floor));
+    if (flooredReserve < softReserve) {
+      logGeometryClampOnce(`soft-floor|${providerID}/${modelID}|${softReserve}|${flooredReserve}`, `output reserve clamped by the half-window floor for ${providerID}/${modelID}: reserve ${softReserve} → ${flooredReserve} (catalog context/output pair is contradictory)`, options.log);
+    }
+    softReserve = flooredReserve;
+    usableSoft = Math.floor(softContext - softReserve);
+  } else {
+    usableSoft = input;
+  }
+  const hardWindow = hardContext ?? softContext ?? input;
+  if (!isFinitePositive(hardWindow))
+    return;
+  let usableHard;
+  if (geometry === "separate") {
+    usableHard = hardWindow;
+  } else if (geometry === "shared_truncating") {
+    usableHard = hardWindow - PROMPT_WALL_MARGIN;
+  } else if (options.harness === "pi" && providerID !== "openai-codex") {
+    usableHard = hardWindow - PI_OUTPUT_FLOOR;
+  } else if (options.harness === "pi") {
+    usableHard = hardWindow - (output ?? OPENCODE_OUTPUT_CAP);
+  } else {
+    const requestedOutput = Math.min(output ?? OPENCODE_OUTPUT_CAP, OPENCODE_OUTPUT_CAP);
+    usableHard = hardWindow - requestedOutput;
+  }
+  usableHard = Math.max(MIN_PLAUSIBLE_CONTEXT_LIMIT, Math.floor(usableHard));
+  if (usableHard < usableSoft) {
+    logGeometryClampOnce(`${providerID}/${modelID}|${usableSoft}|${usableHard}`, `usable hard limit clamped for ${providerID}/${modelID}: ${usableHard} → ${usableSoft} (overlay/provider inversion)`, options.log);
+    usableHard = usableSoft;
+  }
+  return {
+    usableSoft,
+    usableHard,
+    geometry,
+    derivation: {
+      window: Math.floor(softContext ?? usableSoft),
+      reserve: Math.floor(Math.max(0, (softContext ?? usableSoft) - usableSoft)),
+      reserveSource,
+      geometry
+    }
+  };
+}
+function formatWindowDerivationLine(inputTokens, result) {
+  const percentage = result.usableSoft > 0 ? inputTokens / result.usableSoft * 100 : 0;
+  const reserveLabel = result.derivation.reserveSource === "wall_margin" ? "wall margin" : result.derivation.reserveSource === "none" ? "reserve" : "output reserve";
+  return `Context: ${formatCompactTokens(inputTokens)} / ${formatCompactTokens(result.usableSoft)} usable (${percentage.toFixed(1)}%) — window ${formatCompactTokens(result.derivation.window)} − ${formatCompactTokens(result.derivation.reserve)} ${reserveLabel} [${result.geometry}]`;
+}
+function formatCompactTokens(value) {
+  if (Math.abs(value) >= 1e6) {
+    return `${(value / 1e6).toFixed(1).replace(/\.0$/, "")}m`;
+  }
+  if (Math.abs(value) >= 1000) {
+    return `${(value / 1000).toFixed(1).replace(/\.0$/, "")}k`;
+  }
+  return Math.round(value).toLocaleString();
 }
 
 // ../plugin/src/shared/models-dev-cache.ts
@@ -35481,21 +36441,21 @@ function isSaneLimit(limit) {
   return typeof limit === "number" && limit >= MIN_SANE_LIMIT && limit <= MAX_SANE_LIMIT;
 }
 var SEPARATE_OUTPUT_QUOTA_PROVIDERS = new Set(["google", "google-antigravity"]);
-var MIN_PLAUSIBLE_CONTEXT_LIMIT = 1024;
-var OUTPUT_RESERVE_CAP_RATIO = 0.25;
+var MIN_PLAUSIBLE_CONTEXT_LIMIT2 = 1024;
+var OUTPUT_RESERVE_CAP_RATIO2 = 0.25;
 var outputReserveConfig;
 var reserveClampLogSeen = new Set;
 var apiCache = null;
 var persistSeedLoaded = false;
 function persistFilePath() {
-  return join5(getMagicContextStorageDir(), `model-context-limits-${getHarness()}.json`);
+  return join7(getMagicContextStorageDir(), `model-context-limits-${getHarness()}.json`);
 }
 function loadPersistedApiCacheOnce() {
   if (persistSeedLoaded || apiCache !== null)
     return;
   persistSeedLoaded = true;
   try {
-    const raw = readFileSync8(persistFilePath(), "utf-8");
+    const raw = readFileSync10(persistFilePath(), "utf-8");
     const obj = JSON.parse(raw);
     const map2 = new Map;
     for (const [key, persisted] of Object.entries(obj)) {
@@ -35509,7 +36469,7 @@ function loadPersistedApiCacheOnce() {
           limit: isSaneLimit(limit) ? limit : undefined,
           contextLimit: isSaneLimit(contextLimit) ? contextLimit : undefined,
           inputLimit: isSaneLimit(inputLimit) ? inputLimit : undefined,
-          outputLimit: isFinitePositive(outputLimit) ? outputLimit : undefined,
+          outputLimit: isFinitePositive2(outputLimit) ? outputLimit : undefined,
           vision
         });
       }
@@ -35520,27 +36480,24 @@ function loadPersistedApiCacheOnce() {
     }
   } catch {}
 }
-function isFinitePositive(value) {
+function isFinitePositive2(value) {
   return typeof value === "number" && Number.isFinite(value) && value > 0;
 }
-function modelKeyLookupOrder2(providerID, modelID) {
-  const full = `${providerID}/${modelID}`;
-  const canonicalFull = piModelRefToCanonical(full);
-  const candidates = [full, canonicalFull, modelID];
+function modelKeyLookupOrder3(providerID, modelID) {
+  const candidates = [...modelRefLookupOrder(`${providerID}/${modelID}`), modelID];
   const colon = modelID.lastIndexOf(":");
   if (colon > 0) {
     const bareModel = modelID.slice(0, colon);
-    const providerBare = `${providerID}/${bareModel}`;
-    candidates.push(providerBare, piModelRefToCanonical(providerBare), bareModel);
+    candidates.push(...modelRefLookupOrder(`${providerID}/${bareModel}`), bareModel);
   }
   return [...new Set(candidates)];
 }
-function configuredOutputReserve(config2, providerID, modelID) {
+function configuredOutputReserve2(config2, providerID, modelID) {
   if (typeof config2 === "number")
     return Number.isFinite(config2) && config2 >= 0 ? config2 : undefined;
   if (!config2)
     return;
-  for (const candidate of modelKeyLookupOrder2(providerID, modelID)) {
+  for (const candidate of modelKeyLookupOrder3(providerID, modelID)) {
     const value = config2[candidate];
     if (typeof value === "number" && Number.isFinite(value) && value >= 0)
       return value;
@@ -35559,27 +36516,27 @@ function setOutputReserveConfig(config2) {
 function resolveLimit(limit, providerID, modelID, reserveConfig = outputReserveConfig) {
   if (!limit)
     return;
-  const context = isFinitePositive(limit.context) ? limit.context : undefined;
-  const input = isFinitePositive(limit.input) ? limit.input : undefined;
+  const context = isFinitePositive2(limit.context) ? limit.context : undefined;
+  const input = isFinitePositive2(limit.input) ? limit.input : undefined;
   if (input !== undefined && (context === undefined || input < context))
     return input;
   if (context === undefined)
     return;
-  const configuredReserve = configuredOutputReserve(reserveConfig, providerID, modelID);
+  const configuredReserve = configuredOutputReserve2(reserveConfig, providerID, modelID);
   let reserve;
   if (configuredReserve !== undefined) {
     reserve = configuredReserve;
   } else if (SEPARATE_OUTPUT_QUOTA_PROVIDERS.has(providerID)) {
     reserve = 0;
   } else {
-    const output = isFinitePositive(limit.output) ? limit.output : 0;
-    const cap = context * OUTPUT_RESERVE_CAP_RATIO;
+    const output = isFinitePositive2(limit.output) ? limit.output : 0;
+    const cap = context * OUTPUT_RESERVE_CAP_RATIO2;
     reserve = Math.min(output, cap);
     if (output > cap) {
       logReserveClampOnce(`cap|${providerID}/${modelID}|${context}|${output}`, `output reserve capped at 25% for ${providerID}/${modelID}: ${output} → ${cap}`);
     }
   }
-  const floor = Math.max(MIN_PLAUSIBLE_CONTEXT_LIMIT, context * 0.5);
+  const floor = Math.max(MIN_PLAUSIBLE_CONTEXT_LIMIT2, context * 0.5);
   const maxReserve = Math.max(0, context - floor);
   if (reserve > maxReserve) {
     logReserveClampOnce(`floor|${providerID}/${modelID}|${context}|${reserve}`, `output reserve clamped for ${providerID}/${modelID}: ${reserve} → ${maxReserve} (usable floor ${floor})`);
@@ -35587,15 +36544,46 @@ function resolveLimit(limit, providerID, modelID, reserveConfig = outputReserveC
   }
   return Math.floor(context - reserve);
 }
+function getSdkWindowGeometry(providerID, modelID, detectedContextLimit, options) {
+  loadPersistedApiCacheOnce();
+  const metadata = lookupMetadataWithTagFallback(apiCache, providerID, modelID);
+  if (!metadata)
+    return;
+  const rawContext = metadata.contextLimit ?? metadata.limit;
+  const promptOnlyDetected = options?.detectedLimitProvenance === "prompt_only" && isFinitePositive2(detectedContextLimit) ? detectedContextLimit : undefined;
+  const result = deriveWindowGeometry(providerID, modelID, {
+    context: rawContext,
+    input: metadata.inputLimit,
+    output: metadata.outputLimit
+  }, {
+    overlay: resolveWindowOverlayFacts(providerID, modelID, getWindowOverlay()),
+    reserveConfig: outputReserveConfig,
+    harness: options?.harness ?? "opencode",
+    contextCap: promptOnlyDetected === undefined && isFinitePositive2(detectedContextLimit) ? detectedContextLimit : undefined
+  });
+  if (!result || promptOnlyDetected === undefined)
+    return result;
+  const usableSoft = promptOnlyDetected;
+  return {
+    ...result,
+    usableSoft,
+    usableHard: Math.max(usableSoft, Math.min(result.usableHard, promptOnlyDetected))
+  };
+}
 function getSdkContextLimit(providerID, modelID, detectedContextLimit, options) {
+  if (options?.reservation !== "none") {
+    return getSdkWindowGeometry(providerID, modelID, detectedContextLimit, {
+      detectedLimitProvenance: options?.detectedLimitProvenance
+    })?.usableSoft;
+  }
   loadPersistedApiCacheOnce();
   const metadata = lookupMetadataWithTagFallback(apiCache, providerID, modelID);
   if (!metadata)
     return;
   const rawContext = metadata.contextLimit ?? metadata.limit;
-  const promptOnlyDetected = options?.detectedLimitProvenance === "prompt_only" && isFinitePositive(detectedContextLimit) ? detectedContextLimit : undefined;
-  const context = promptOnlyDetected === undefined && isFinitePositive(detectedContextLimit) && isFinitePositive(rawContext) ? Math.min(rawContext, detectedContextLimit) : promptOnlyDetected === undefined && isFinitePositive(detectedContextLimit) ? detectedContextLimit : rawContext;
-  const inputCandidates = [metadata.inputLimit, promptOnlyDetected].filter(isFinitePositive);
+  const promptOnlyDetected = options?.detectedLimitProvenance === "prompt_only" && isFinitePositive2(detectedContextLimit) ? detectedContextLimit : undefined;
+  const context = promptOnlyDetected === undefined && isFinitePositive2(detectedContextLimit) && isFinitePositive2(rawContext) ? Math.min(rawContext, detectedContextLimit) : promptOnlyDetected === undefined && isFinitePositive2(detectedContextLimit) ? detectedContextLimit : rawContext;
+  const inputCandidates = [metadata.inputLimit, promptOnlyDetected].filter(isFinitePositive2);
   const input = inputCandidates.length > 0 ? Math.min(...inputCandidates) : undefined;
   return resolveLimit({
     context,
@@ -35637,25 +36625,28 @@ function getUserConfigPaths() {
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function resolveFirstExisting(paths) {
-  return paths.find((path3) => existsSync9(path3));
+  return paths.find((path3) => existsSync10(path3));
 }
 function resolvePiLegacyFallback(sources) {
-  return sources.find((source) => existsSync9(source.path)) ?? null;
+  return sources.find((source) => existsSync10(source.path)) ?? null;
 }
 function loadConfigFile(path3, scope) {
   try {
-    const rawText = readFileSync9(path3, "utf-8");
+    const rawText = readFileSync11(path3, "utf-8");
     const substituted = substituteConfigVariables({
       text: rawText,
       configPath: path3,
       isProjectConfig: scope === "project"
     });
+    const rejectedKeyPaths = [];
+    const config2 = sanitizeParsedJson(import_comment_json.parse(substituted.text), { onRejectedKey: (keyPath) => rejectedKeyPaths.push(keyPath.join(".")) });
+    const unsafeKeyWarnings = rejectedKeyPaths.map((keyPath) => `Ignored unsafe config key "${keyPath}" (security: prototype-pollution keys are not allowed).`);
     return {
       path: path3,
       scope,
-      config: import_comment_json.parse(substituted.text),
-      warnings: substituted.warnings.map((warning) => `${path3}: ${warning}`),
-      loadOutcome: substituted.warnings.length > 0 ? "substitution-failure" : "ok"
+      config: config2,
+      warnings: [...substituted.warnings, ...unsafeKeyWarnings].map((warning) => `${path3}: ${warning}`),
+      loadOutcome: rejectedKeyPaths.length > 0 ? "schema-recovery" : substituted.warnings.length > 0 ? "substitution-failure" : "ok"
     };
   } catch (error51) {
     const message = error51 instanceof Error ? error51.message : String(error51);
@@ -35693,11 +36684,28 @@ function redactConfigValue(value) {
 function isPlainObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function defineOwnConfigValue(target, key, value) {
+  Object.defineProperty(target, key, {
+    value,
+    enumerable: true,
+    configurable: true,
+    writable: true
+  });
+}
 function mergeRawConfigs(base, override) {
-  const merged = { ...base };
-  for (const [key, overrideValue] of Object.entries(override)) {
-    const baseValue = merged[key];
-    merged[key] = isPlainObject4(baseValue) && isPlainObject4(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
+  const merged = {};
+  for (const key of Object.keys(base)) {
+    if (isPrototypePollutionKey(key))
+      continue;
+    defineOwnConfigValue(merged, key, base[key]);
+  }
+  for (const key of Object.keys(override)) {
+    if (isPrototypePollutionKey(key))
+      continue;
+    const overrideValue = override[key];
+    const baseValue = Object.hasOwn(base, key) ? base[key] : undefined;
+    const mergedValue = isPlainObject4(baseValue) && isPlainObject4(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
+    defineOwnConfigValue(merged, key, mergedValue);
   }
   return merged;
 }
@@ -35777,7 +36785,7 @@ function loadPiConfig(opts = {}) {
     if (loaded)
       loadedFiles.push(loaded);
   }
-  const legacyProjectUnmigrated = !projectPath && !projectLegacyFallback && legacySources.project.some((source) => existsSync9(source.path));
+  const legacyProjectUnmigrated = !projectPath && !projectLegacyFallback && legacySources.project.some((source) => existsSync10(source.path));
   const userPath = resolveFirstExisting(getUserConfigPaths());
   const userLegacyFallback = userPath ? null : resolvePiLegacyFallback(harnessLegacy.user);
   const userReadPath = userPath ?? userLegacyFallback?.path;
@@ -35786,7 +36794,7 @@ function loadPiConfig(opts = {}) {
     if (loaded)
       loadedFiles.push(loaded);
   }
-  const legacyUserUnmigrated = !userPath && !userLegacyFallback && legacySources.user.some((source) => existsSync9(source.path));
+  const legacyUserUnmigrated = !userPath && !userLegacyFallback && legacySources.user.some((source) => existsSync10(source.path));
   if (userLegacyFallback) {
     warnings.push(`[user config] reading legacy config from ${userLegacyFallback.path} until migration completes; run \`npx @cortexkit/magic-context doctor\` to consolidate into the shared CortexKit location.`);
   } else if (legacyUserUnmigrated) {
@@ -35830,6 +36838,7 @@ function loadPiConfig(opts = {}) {
   }
   const parsed = parsePiConfig(rawConfig);
   setOutputReserveConfig(parsed.config.output_reserve);
+  setWindowOverlayPath(parsed.config.models?.window_overlay_path);
   warnings.push(...parsed.warnings.map((warning) => `[merged config] ${warning}`));
   return {
     config: parsed.config,
@@ -35897,7 +36906,7 @@ function loadPiConfigDetailed(opts = {}) {
     if (loaded)
       loadedFiles.push(loaded);
   }
-  const legacyProjectUnmigrated = !projectPath && !projectLegacyFallback && legacySources.project.some((source) => existsSync9(source.path));
+  const legacyProjectUnmigrated = !projectPath && !projectLegacyFallback && legacySources.project.some((source) => existsSync10(source.path));
   const userPath = resolveFirstExisting(getUserConfigPaths());
   const userLegacyFallback = userPath ? null : resolvePiLegacyFallback(harnessLegacy.user);
   const userReadPath = userPath ?? userLegacyFallback?.path;
@@ -35906,7 +36915,7 @@ function loadPiConfigDetailed(opts = {}) {
     if (loaded)
       loadedFiles.push(loaded);
   }
-  const legacyUserUnmigrated = !userPath && !userLegacyFallback && legacySources.user.some((source) => existsSync9(source.path));
+  const legacyUserUnmigrated = !userPath && !userLegacyFallback && legacySources.user.some((source) => existsSync10(source.path));
   if (userLegacyFallback) {
     warnings.push(`[user config] reading legacy config from ${userLegacyFallback.path} until migration completes; run \`npx @cortexkit/magic-context doctor\` to consolidate into the shared CortexKit location.`);
   } else if (legacyUserUnmigrated) {
@@ -35951,6 +36960,7 @@ function loadPiConfigDetailed(opts = {}) {
   const recoveredTopLevelKeys = [];
   const parsed = parsePiConfig(rawConfig, recoveredTopLevelKeys);
   setOutputReserveConfig(parsed.config.output_reserve);
+  setWindowOverlayPath(parsed.config.models?.window_overlay_path);
   warnings.push(...parsed.warnings.map((warning) => `[merged config] ${warning}`));
   const substitutionFailures = loadedFiles.flatMap(bindSubstitutionFailures);
   const userLoaded = loadedFiles.find((loaded) => loaded.scope === "user");
@@ -37046,7 +38056,7 @@ class SubcSocket {
     return this.sock.localPort ?? null;
   }
   static connect(host, port, deadlineMs) {
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const sock = net.connect({ host, port });
       sock.setNoDelay(true);
       const timer = setTimeout(() => {
@@ -37055,7 +38065,7 @@ class SubcSocket {
       }, Math.max(0, deadlineMs - Date.now()));
       sock.once("connect", () => {
         clearTimeout(timer);
-        resolve3(new SubcSocket(sock));
+        resolve4(new SubcSocket(sock));
       });
       sock.once("error", (err) => {
         clearTimeout(timer);
@@ -37087,7 +38097,7 @@ class SubcSocket {
     }
     if (n === 0)
       return Promise.resolve(new Uint8Array(0));
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       let timer = null;
       if (Number.isFinite(deadlineMs)) {
         const remaining = deadlineMs - Date.now();
@@ -37100,7 +38110,7 @@ class SubcSocket {
           reject(new SocketTimeoutError(`timed out waiting for ${n} bytes`));
         }, remaining);
       }
-      this.waiter = { need: n, resolve: resolve3, reject, timer };
+      this.waiter = { need: n, resolve: resolve4, reject, timer };
       this.tryServe();
     });
   }
@@ -37124,7 +38134,7 @@ class SubcSocket {
     let queued = false;
     let settled = false;
     let timer = null;
-    const completed = new Promise((resolve3, reject) => {
+    const completed = new Promise((resolve4, reject) => {
       const settle = (run) => {
         if (settled)
           return;
@@ -37148,7 +38158,7 @@ class SubcSocket {
             if (err) {
               reject(new SocketWriteQueuedError("subc socket reported a write error after bytes were handed to the socket", err instanceof Error ? err : new Error(String(err))));
             } else {
-              resolve3();
+              resolve4();
             }
           });
         });
@@ -37364,14 +38374,14 @@ class SubcClient {
     const admission = opts.admissionClass ?? AdmissionClass.Normal;
     const corr = this.allocateCorr();
     const key = pendingKey(handle, corr);
-    const closed = new Promise((resolve3, reject) => {
+    const closed = new Promise((resolve4, reject) => {
       if (this.closedErr) {
         reject(this.closedErr);
         return;
       }
       this.pending.set(key, {
         handle,
-        resolve: () => resolve3(),
+        resolve: () => resolve4(),
         reject,
         onProgress: onEvent,
         timer: null,
@@ -37456,11 +38466,11 @@ class SubcClient {
     const waiters = [];
     for (const pending of this.pending.values()) {
       if (pending.handle === handle && !pending.subscription) {
-        waiters.push(new Promise((resolve3) => {
+        waiters.push(new Promise((resolve4) => {
           const previous = pending.onSettle;
           pending.onSettle = () => {
             previous?.();
-            resolve3();
+            resolve4();
           };
         }));
       }
@@ -37516,11 +38526,11 @@ class SubcClient {
     const channel = handle?.channel ?? 0;
     const epoch = handle?.epoch ?? 0;
     const frame = buildFrame(FrameType.Request, buildFlags(false, priority, false, admission), channel, epoch, corr, body);
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const ms = timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
       const pending = {
         handle,
-        resolve: resolve3,
+        resolve: resolve4,
         reject,
         onProgress,
         timer: null,
@@ -37594,11 +38604,11 @@ class SubcClient {
       }
       return this.outcomeUnknownCallError("connection dropped before the managed call returned a response", error51);
     };
-    return new Promise((resolve3, reject) => {
+    return new Promise((resolve4, reject) => {
       const ms = timeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
       const pending = {
         handle,
-        resolve: resolve3,
+        resolve: resolve4,
         reject,
         onProgress,
         timer: null,
@@ -37986,7 +38996,7 @@ function normalizeConnectOptions(opts) {
     identity: opts.identity,
     targetKind: opts.targetKind ?? DEFAULT_MANAGED_TARGET_KIND,
     reconnectBackoff: opts.reconnectBackoff ?? DEFAULT_RECONNECT_BACKOFF,
-    sleep: opts.sleep ?? ((ms) => new Promise((resolve3) => setTimeout(resolve3, ms))),
+    sleep: opts.sleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms))),
     timeoutArbitrationGraceMs: opts.timeoutArbitrationGraceMs ?? TIMEOUT_ARBITRATION_GRACE_MS
   };
 }
@@ -38043,8 +39053,8 @@ class AsyncPermitPool {
       this.available -= 1;
       return this.releaseOnce();
     }
-    await new Promise((resolve3) => {
-      this.waiters.push(resolve3);
+    await new Promise((resolve4) => {
+      this.waiters.push(resolve4);
     });
     return this.releaseOnce();
   }
@@ -38100,8 +39110,8 @@ class SubcProvider {
     this.currentConn = currentConn;
     this.opts = opts;
     this.storage = storage;
-    this.closed = new Promise((resolve3) => {
-      this.resolveClosed = resolve3;
+    this.closed = new Promise((resolve4) => {
+      this.resolveClosed = resolve4;
     });
     this.readLoop(sock, this.generation);
     this.enqueueConnectionState({ state: "connected", epoch: this.connectionEpoch });
@@ -38121,13 +39131,13 @@ class SubcProvider {
     const key = routeKey(handle, corr);
     const timeoutMs = opts.timeoutMs ?? WRITE_TIMEOUT_MS;
     const frame = buildFrame(FrameType.Request, buildFlags(false, opts.priority ?? Priority.Interactive, false, opts.admissionClass ?? AdmissionClass.Normal), handle.channel, handle.epoch, corr, body);
-    return await new Promise((resolve3, reject) => {
+    return await new Promise((resolve4, reject) => {
       const timer = setTimeout(() => {
         if (this.pending.delete(key))
           reject(new SubcProviderError("reverse request timed out", "request_timeout"));
       }, timeoutMs);
       this.pending.set(key, {
-        resolve: (response) => resolve3(response.body),
+        resolve: (response) => resolve4(response.body),
         reject,
         timer
       });
@@ -38599,7 +39609,7 @@ function normalizeProviderConnectOptions(opts) {
     onBound: opts.onBound,
     onRouteGone: opts.onRouteGone,
     reconnectBackoff: opts.reconnectBackoff ?? DEFAULT_RECONNECT_BACKOFF,
-    sleep: opts.sleep ?? ((ms) => new Promise((resolve3) => setTimeout(resolve3, ms))),
+    sleep: opts.sleep ?? ((ms) => new Promise((resolve4) => setTimeout(resolve4, ms))),
     restoredDebounceMs: opts.restoredDebounceMs ?? DEFAULT_RESTORED_DEBOUNCE_MS,
     onConnectionState: opts.onConnectionState,
     launchNonce: opts.launchNonce
@@ -38644,7 +39654,7 @@ function errorCode2(err) {
   return;
 }
 async function pauseBeforeStateRetry() {
-  await new Promise((resolve3) => setTimeout(resolve3, 0));
+  await new Promise((resolve4) => setTimeout(resolve4, 0));
 }
 function controlFlags() {
   return buildFlags(false, Priority.Passive, false);
@@ -38882,7 +39892,7 @@ function classifyError(value) {
   });
 }
 function wait(ms) {
-  return new Promise((resolve3) => setTimeout(resolve3, ms));
+  return new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 function sha256(value) {
   return createHash9("sha256").update(value).digest("hex");
@@ -39361,8 +40371,8 @@ function getEmbeddingProviderIdentity(config2) {
 // ../plugin/src/features/magic-context/memory/embedding-local.ts
 import { chmodSync as chmodSync2, mkdirSync as mkdirSync4 } from "node:fs";
 import { open, stat, unlink, writeFile } from "node:fs/promises";
-import { dirname as dirname5, join as join6 } from "node:path";
-import { pathToFileURL } from "node:url";
+import { dirname as dirname6, join as join8 } from "node:path";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
 var LOCK_POLL_MS = 150;
 var STALE_LOCK_MS = 3 * 60000;
 var MAX_LOCK_WAIT_MS = 5 * 60000;
@@ -39401,7 +40411,7 @@ async function acquireModelLoadLock(lockPath) {
       if (Date.now() - waitStart > MAX_LOCK_WAIT_MS) {
         throw new Error(`[magic-context] embedding-load lock wait exceeded ${MAX_LOCK_WAIT_MS}ms; another process is still loading the model. Skipping this init attempt to avoid an unsynchronized native load.`);
       }
-      await new Promise((resolve3) => setTimeout(resolve3, LOCK_POLL_MS));
+      await new Promise((resolve4) => setTimeout(resolve4, LOCK_POLL_MS));
     }
   }
 }
@@ -39425,8 +40435,8 @@ async function injectWasmOrtForElectron() {
       const { createRequire: createRequireFn } = await import("node:module");
       const requireFn = createRequireFn(import.meta.url);
       const mainEntry = requireFn.resolve("onnxruntime-web");
-      const distDir = dirname5(mainEntry);
-      const wasmPathsPrefix = `${pathToFileURL(distDir).href}/`;
+      const distDir = dirname6(mainEntry);
+      const wasmPathsPrefix = `${pathToFileURL2(distDir).href}/`;
       if (ortWeb.env?.wasm) {
         ortWeb.env.wasm.wasmPaths = wasmPathsPrefix;
       }
@@ -39562,7 +40572,7 @@ class LocalEmbeddingProvider {
         if (LogLevel && "ERROR" in LogLevel) {
           env.logLevel = LogLevel.ERROR;
         }
-        const modelCacheDir = join6(getMagicContextStorageDir(), "models");
+        const modelCacheDir = join8(getMagicContextStorageDir(), "models");
         try {
           if (shouldEnforcePrivateStoragePermissions()) {
             mkdirSync4(modelCacheDir, { recursive: true, mode: 448 });
@@ -39579,7 +40589,7 @@ class LocalEmbeddingProvider {
           log("[magic-context] could not create model cache dir, using library default");
         }
         const createPipeline = transformersModule.pipeline;
-        const lockPath = join6(modelCacheDir, ".load.lock");
+        const lockPath = join8(modelCacheDir, ".load.lock");
         const releaseLock = await acquireModelLoadLock(lockPath);
         const stopHeartbeat = startLockHeartbeat(lockPath);
         try {
@@ -39606,7 +40616,7 @@ class LocalEmbeddingProvider {
               }
               const delayMs = 300 * attempt + Math.floor(Math.random() * 200);
               log(`[magic-context] embedding model load attempt ${attempt}/${MAX_ATTEMPTS} failed transiently, retrying in ${delayMs}ms`);
-              await new Promise((resolve3) => setTimeout(resolve3, delayMs));
+              await new Promise((resolve4) => setTimeout(resolve4, delayMs));
             }
           }
           if (this.pipeline) {
@@ -39639,8 +40649,8 @@ class LocalEmbeddingProvider {
     if (this.inFlight === 0) {
       return Promise.resolve();
     }
-    return new Promise((resolve3) => {
-      this.inFlightWaiters.push(resolve3);
+    return new Promise((resolve4) => {
+      this.inFlightWaiters.push(resolve4);
     });
   }
   finishInFlight() {
@@ -39795,9 +40805,14 @@ function blockedEmbeddingEndpointReason(endpoint) {
 function normalizeEndpoint3(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
-function embeddingModelsMatch(served, requested) {
-  const a = served.trim().toLowerCase();
-  const b = requested.trim().toLowerCase();
+function parseEmbeddingModel(model) {
+  const lastColon = model.lastIndexOf(":");
+  if (lastColon > model.lastIndexOf("/")) {
+    return { base: model.slice(0, lastColon), tag: model.slice(lastColon + 1) };
+  }
+  return { base: model };
+}
+function matchNormalizedEmbeddingModels(a, b) {
   if (a.length === 0 || b.length === 0)
     return true;
   if (a === b)
@@ -39811,6 +40826,16 @@ function embeddingModelsMatch(served, requested) {
     return true;
   return false;
 }
+function embeddingModelsMatch(served, requested) {
+  const a = served.trim().toLowerCase();
+  const b = requested.trim().toLowerCase();
+  const servedModel = parseEmbeddingModel(a);
+  const requestedModel = parseEmbeddingModel(b);
+  if (servedModel.tag !== undefined && requestedModel.tag !== undefined && servedModel.tag !== requestedModel.tag) {
+    return false;
+  }
+  return matchNormalizedEmbeddingModels(servedModel.base, requestedModel.base);
+}
 var FAILURE_THRESHOLD = 3;
 var FAILURE_WINDOW_MS = 60000;
 var OPEN_DURATION_MS = 5 * 60000;
@@ -39941,7 +40966,7 @@ class OpenAICompatibleEmbeddingProvider {
       const servedModel = typeof body.model === "string" ? body.model : "";
       if (this.model && servedModel && !embeddingModelsMatch(servedModel, this.model)) {
         if (!this.modelMismatchLogged) {
-          log(`[magic-context] embedding endpoint served a DIFFERENT model than requested — refusing the substituted vectors (they have the wrong dimensions/space). requested="${this.model}" served="${servedModel}". The endpoint likely substituted a loaded model; load/select "${this.model}" on the endpoint, or set embedding.model to the served model.`);
+          log(`[magic-context] embedding endpoint served a DIFFERENT model than requested — refusing the substituted vectors (they have the wrong dimensions/space). requested="${this.model}" served="${servedModel}". Check that the endpoint serves the requested model; variant suffixes and vendor prefixes are matched automatically.`);
           this.modelMismatchLogged = true;
         }
         this.recordFailure(isProbe);
@@ -41338,7 +42363,7 @@ async function runShadowWorker() {
     }
     processed += item.ids.length;
     processedBytes += itemBytes;
-    await new Promise((resolve3) => setTimeout(resolve3, 0));
+    await new Promise((resolve4) => setTimeout(resolve4, 0));
   }
 }
 function registerProjectInObservationMode(db, projectIdentity, sourceDirectory, failedConfig, failureSummary) {
@@ -41699,7 +42724,7 @@ async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates
       if (Date.now() - attemptStart >= EMBED_SLOW_FAILURE_NO_RETRY_MS)
         break;
       if (attempt < EMBED_SLICE_RETRY_ATTEMPTS - 1) {
-        await new Promise((resolve3) => setTimeout(resolve3, EMBED_SLICE_RETRY_BASE_MS * 2 ** attempt));
+        await new Promise((resolve4) => setTimeout(resolve4, EMBED_SLICE_RETRY_BASE_MS * 2 ** attempt));
       }
     }
     embedded += persistedIds.size;
@@ -41784,7 +42809,7 @@ async function embedSessionCompartmentChunks(db, projectIdentity, sessionId, opt
       }
       embedded += n;
       options?.onProgress?.({ embedded: Math.min(embedded, total), total });
-      await new Promise((resolve3) => setTimeout(resolve3, 0));
+      await new Promise((resolve4) => setTimeout(resolve4, 0));
     }
   } finally {
     clearInterval(renewal);
@@ -42526,7 +43551,7 @@ Two recovery modes for finer detail:
 var CTX_EXPAND_TOKEN_BUDGET = 15000;
 
 // ../plugin/src/tools/ctx-expand/render.ts
-function isRecord2(value) {
+function isRecord3(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function roleLabel(role) {
@@ -42555,15 +43580,15 @@ function keyArg(input) {
 function asToolPart(part) {
   const type = typeof part.type === "string" ? part.type : "";
   if (type === "tool") {
-    const state = isRecord2(part.state) ? part.state : null;
+    const state = isRecord3(part.state) ? part.state : null;
     const output = state && typeof state.output === "string" ? state.output : state && state.output != null ? JSON.stringify(state.output) : null;
-    const metadata = state && isRecord2(state.metadata) ? state.metadata : null;
+    const metadata = state && isRecord3(state.metadata) ? state.metadata : null;
     const title = state && typeof state.title === "string" && state.title || metadata && typeof metadata.title === "string" && metadata.title || null;
     return {
       name: typeof part.tool === "string" ? part.tool : "tool",
       callId: typeof part.callID === "string" ? part.callID : "",
       title,
-      input: state && isRecord2(state.input) ? state.input : null,
+      input: state && isRecord3(state.input) ? state.input : null,
       output
     };
   }
@@ -42572,7 +43597,7 @@ function asToolPart(part) {
       name: typeof part.name === "string" ? part.name : "tool",
       callId: typeof part.id === "string" ? part.id : "",
       title: null,
-      input: isRecord2(part.input) ? part.input : null,
+      input: isRecord3(part.input) ? part.input : null,
       output: null
     };
   }
@@ -42601,7 +43626,7 @@ function reasoningOf(part) {
   return null;
 }
 function renderPartPreview(part) {
-  if (!isRecord2(part))
+  if (!isRecord3(part))
     return null;
   const text = textOf(part);
   if (text !== null) {
@@ -42625,7 +43650,7 @@ function renderPartPreview(part) {
   return `    • [${type}]`;
 }
 function renderPartFull(part) {
-  if (!isRecord2(part))
+  if (!isRecord3(part))
     return null;
   const text = textOf(part);
   if (text !== null) {
@@ -47732,25 +48757,6 @@ function getMaxMemoryIdForProjects(db, projectPaths, ownIdentities, shareCategor
                 AND (expires_at IS NULL OR expires_at > ?)${sharingFilter.clause}`).get(...identities, expiryCutoff, ...sharingFilter.params);
   return typeof row?.max_id === "number" ? row.max_id : 0;
 }
-function readNewMemoriesForM1Union(db, projectPaths, afterId, expiryCutoff, ownIdentities, shareCategories) {
-  const identities = uniqueValues(projectPaths);
-  if (identities.length === 0)
-    return [];
-  const sharingFilter = buildWorkspaceMemorySqlFilter({
-    identities,
-    ownIdentities,
-    shareCategories,
-    includeClassificationFields: hasMemoryShareableColumn(db) && hasMemoryScopeColumn(db)
-  });
-  const rows = db.prepare(`SELECT ${getMemorySelectColumns(db)}
-               FROM memories
-              WHERE project_path IN (${sqlPlaceholders(identities)})
-                AND id > ?
-                AND status IN ('active', 'permanent')
-                AND (expires_at IS NULL OR expires_at > ?)${sharingFilter.clause}
-              ORDER BY ${MEMORY_CATEGORY_ORDER_SQL}, id ASC`).all(...identities, afterId, expiryCutoff, ...sharingFilter.params).filter(isMemoryRow);
-  return rows.map(toMemory);
-}
 function getAllActiveMemoriesForMigration(db, projectPath) {
   const rows = getActiveMemoriesNoExpiryStatement(db).all(projectPath).filter(isMemoryRow);
   return rows.map(toMemory);
@@ -48145,7 +49151,7 @@ function getMemoryVerifications(db, memoryIds) {
 }
 // ../plugin/src/features/magic-context/memory/verification-paths.ts
 import { execFile } from "node:child_process";
-import { existsSync as existsSync10, realpathSync as realpathSync2, statSync as statSync7 } from "node:fs";
+import { existsSync as existsSync11, realpathSync as realpathSync3, statSync as statSync7 } from "node:fs";
 import path3 from "node:path";
 import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
@@ -48174,7 +49180,7 @@ function isWithin(root, candidate) {
 }
 function safeRealpath(value) {
   try {
-    return realpathSync2.native(value);
+    return realpathSync3.native(value);
   } catch {
     return null;
   }
@@ -48252,7 +49258,7 @@ function verificationFileExists(baseRoot, filePath) {
     return false;
   const root = path3.resolve(baseRoot);
   const candidate = path3.resolve(root, filePath);
-  return isWithin(root, candidate) && existsSync10(candidate);
+  return isWithin(root, candidate) && existsSync11(candidate);
 }
 async function normalizeVerificationFiles(args) {
   const cwd = path3.resolve(args.cwd);
@@ -48285,7 +49291,7 @@ async function normalizeVerificationFiles(args) {
       warnings.push(`Skipped verification path "${value}" because it is the repo/project root.`);
       continue;
     }
-    if (existsSync10(candidate)) {
+    if (existsSync11(candidate)) {
       try {
         if (statSync7(candidate).isDirectory()) {
           warnings.push(`Skipped verification path "${value}" because it is a directory.`);
@@ -48316,7 +49322,7 @@ async function normalizeVerificationFiles(args) {
       }
       normalized.push(tracked);
     } else {
-      if (!existsSync10(candidate)) {
+      if (!existsSync11(candidate)) {
         warnings.push(`Skipped verification path "${value}" because it does not exist.`);
         continue;
       }
@@ -48806,13 +49812,13 @@ function createCtxMemoryTool(deps) {
 }
 
 // ../plugin/src/features/magic-context/smart-notes/condition-compiler.ts
-import { existsSync as existsSync11 } from "node:fs";
+import { existsSync as existsSync12 } from "node:fs";
 import { isAbsolute as isAbsolute5 } from "node:path";
 
 // ../retina-local-fs/src/path-fence.ts
 import { lstat, readlink, realpath } from "node:fs/promises";
-import { homedir as homedir5 } from "node:os";
-import { basename as basename3, dirname as dirname6, isAbsolute as isAbsolute4, join as join7, relative, resolve as resolve3, sep } from "node:path";
+import { homedir as homedir6 } from "node:os";
+import { basename as basename3, dirname as dirname7, isAbsolute as isAbsolute4, join as join9, relative, resolve as resolve4, sep } from "node:path";
 
 // ../retina-local-fs/src/errors.ts
 class ProviderError extends Error {
@@ -48826,20 +49832,26 @@ class ProviderError extends Error {
 
 // ../retina-local-fs/src/path-fence.ts
 async function resolveAndFenceProviderPath(configuredPath, options) {
-  const configuredHomePath = resolve3(options.homeDirectory ?? process.env.HOME ?? homedir5());
+  const { home, dataDirectory } = await resolveFenceRoots(options);
+  const expanded = configuredPath.startsWith("~/") ? join9(home, configuredPath.slice(2)) : configuredPath === "~" ? home : configuredPath;
+  const absolute = isAbsolute4(expanded) ? resolve4(expanded) : resolve4(options.cwd ?? process.cwd(), expanded);
+  const canonical = await canonicalPath(absolute, options.allowMissing);
+  if (isFencedPath(canonical, home, dataDirectory)) {
+    throw new ProviderError("fenced_path", `Refusing fenced path: ${canonical}`);
+  }
+  return canonical;
+}
+async function resolveFenceRoots(options) {
+  const configuredHomePath = resolve4(options.homeDirectory ?? process.env.HOME ?? homedir6());
   let home;
   try {
     home = await realpath(configuredHomePath);
   } catch (error51) {
     throw fsError(configuredHomePath, error51);
   }
-  const expanded = configuredPath.startsWith("~/") ? join7(home, configuredPath.slice(2)) : configuredPath === "~" ? home : configuredPath;
-  const absolute = isAbsolute4(expanded) ? resolve3(expanded) : resolve3(options.cwd ?? process.cwd(), expanded);
-  const canonical = await canonicalPath(absolute, options.allowMissing);
-  if (isFencedPath(canonical, home)) {
-    throw new ProviderError("fenced_path", `Refusing fenced path: ${canonical}`);
-  }
-  return canonical;
+  const configuredDataDirectory = resolve4(options.dataDirectory ?? process.env.XDG_DATA_HOME ?? join9(home, ".local", "share"));
+  const dataDirectory = await canonicalPath(configuredDataDirectory, true);
+  return { home, dataDirectory };
 }
 async function canonicalPath(path4, allowMissing) {
   try {
@@ -48855,22 +49867,22 @@ async function canonicalPath(path4, allowMissing) {
         const metadata = await lstat(candidate);
         if (metadata.isSymbolicLink()) {
           const target2 = await readlink(candidate);
-          const resolvedTarget = resolve3(dirname6(candidate), target2);
-          return canonicalPath(join7(resolvedTarget, ...suffix), true);
+          const resolvedTarget = resolve4(dirname7(candidate), target2);
+          return canonicalPath(join9(resolvedTarget, ...suffix), true);
         }
       } catch (candidateError) {
         if (!isMissingError(candidateError)) {
           throw fsError(path4, candidateError);
         }
       }
-      const parent = dirname6(candidate);
+      const parent = dirname7(candidate);
       if (parent === candidate) {
         throw fsError(path4, error51);
       }
       suffix.unshift(basename3(candidate));
       candidate = parent;
       try {
-        return join7(await realpath(candidate), ...suffix);
+        return join9(await realpath(candidate), ...suffix);
       } catch (parentError) {
         if (!isMissingError(parentError)) {
           throw fsError(path4, parentError);
@@ -48879,9 +49891,8 @@ async function canonicalPath(path4, allowMissing) {
     }
   }
 }
-function isFencedPath(canonicalPath2, homeDirectory) {
-  const home = resolve3(homeDirectory);
-  const cortexkitRoot = join7(home, ".local", "share", "cortexkit");
+function isFencedPath(canonicalPath2, homeDirectory, dataDirectory = process.env.XDG_DATA_HOME ?? join9(resolve4(homeDirectory), ".local", "share")) {
+  const cortexkitRoot = join9(resolve4(dataDirectory), "cortexkit");
   const relativeToCortexkit = relative(cortexkitRoot, canonicalPath2);
   const insideCortexkit = relativeToCortexkit !== "" && relativeToCortexkit !== ".." && !relativeToCortexkit.startsWith(`..${sep}`) && !isAbsolute4(relativeToCortexkit);
   const parts = insideCortexkit ? relativeToCortexkit.split(sep) : [];
@@ -48890,10 +49901,11 @@ function isFencedPath(canonicalPath2, homeDirectory) {
   const catalogDirectoryCarveIn = pathParts.includes("catalog");
   const moduleBinCarveIn = parts.length >= 2 && parts[1] === "bin";
   const catalogJsonCarveIn = name.endsWith(".json") && name.includes("catalog");
-  if (catalogDirectoryCarveIn || moduleBinCarveIn || catalogJsonCarveIn) {
+  const rootWithoutCarveIns = insideCortexkit && (parts[0] === "run" || parts[0] === "magic-context");
+  if (!rootWithoutCarveIns && (catalogDirectoryCarveIn || moduleBinCarveIn || catalogJsonCarveIn)) {
     return false;
   }
-  const inFencedRoot = insideCortexkit && ["plexus", "claustrum", "staging"].includes(parts[0] ?? "");
+  const inFencedRoot = insideCortexkit && ["plexus", "claustrum", "staging", "run", "magic-context"].includes(parts[0] ?? "");
   const fencedBasename = name.includes("binding-key") || name.endsWith(".handle");
   const plexusStore = insideCortexkit && parts[0] === "plexus" && name.startsWith("store.db");
   return inFencedRoot || fencedBasename || plexusStore;
@@ -49043,6 +50055,9 @@ function invalid(message) {
 var RETINA_LOCAL_FS_PROVIDER = "local-fs";
 var VALUE = String.raw`(?:"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|\S+)`;
 async function compileSurfaceCondition(surfaceCondition, options) {
+  const plainReason = unsafeGrammarReason(surfaceCondition);
+  if (plainReason)
+    return { status: "plain", reason: plainReason };
   const parsed = parseCondition(surfaceCondition, options.projectPath);
   if (parsed === null)
     return { status: "plain" };
@@ -49053,7 +50068,7 @@ async function compileSurfaceCondition(surfaceCondition, options) {
       homeDirectory: options.homeDirectory,
       cwd: options.projectPath
     });
-    return { path: resolved, exists: existsSync11(resolved) };
+    return { path: resolved, exists: existsSync12(resolved) };
   });
   let predicates;
   try {
@@ -49124,23 +50139,27 @@ function parseCondition(surfaceCondition, projectPath) {
   return predicates.every((predicate) => predicate !== null) ? predicates : null;
 }
 function parseAtomicCondition(text, projectPath) {
-  const fileContains = text.match(new RegExp(`^(?:when\\s+)?file\\s+(${VALUE})\\s+(no longer contains|contains)\\s+(.+)$`, "i"));
+  const fileContains = text.match(new RegExp(`^(?:when\\s+)?file\\s+(${VALUE})\\s+(no longer contains|contains)\\s+(${VALUE})$`, "i"));
   if (fileContains) {
+    const path4 = unquote(fileContains[1]);
     const needle = unquote(fileContains[3].trim());
-    if (needle === null)
+    if (path4 === null || needle === null)
       return null;
     return {
       kind: "file_contains",
-      path: unquote(fileContains[1]) ?? fileContains[1],
+      path: path4,
       needle,
       ...fileContains[2].toLowerCase() === "no longer contains" ? { absent: true } : {}
     };
   }
   const commit = text.match(new RegExp(`^(?:when\\s+)?(?:repo(?:sitory)?\\s+)?(${VALUE})\\s+has\\s+a\\s+commit\\s+(?:after|newer than)\\s+([0-9a-f]{7,64})$`, "i"));
   if (commit) {
+    const repoPath = unquote(commit[1]);
+    if (repoPath === null)
+      return null;
     return {
       kind: "git_commit_after",
-      repo_path: unquote(commit[1]) ?? commit[1],
+      repo_path: repoPath,
       sha: commit[2]
     };
   }
@@ -49160,16 +50179,22 @@ function parseAtomicCondition(text, projectPath) {
   }
   const mtime = text.match(new RegExp(`^(?:when\\s+)?(?:file\\s+)?(${VALUE})\\s+(changes|is rebuilt|mtime moves)$`, "i"));
   if (mtime) {
+    const path4 = unquote(mtime[1]);
+    if (path4 === null)
+      return null;
     return {
       kind: "mtime_after",
-      path: unquote(mtime[1]) ?? mtime[1]
+      path: path4
     };
   }
   const pathExists = text.match(new RegExp(`^(?:when\\s+)?(?:path\\s+)?(${VALUE})\\s+(exists|is gone)$`, "i"));
   if (pathExists) {
+    const path4 = unquote(pathExists[1]);
+    if (path4 === null)
+      return null;
     return {
       kind: "path_exists",
-      path: unquote(pathExists[1]) ?? pathExists[1],
+      path: path4,
       ...pathExists[2].toLowerCase() === "is gone" ? { gone: true } : {}
     };
   }
@@ -49224,12 +50249,42 @@ function splitOrClauses(text) {
   clauses.push(text.slice(start).trim());
   return clauses.filter(Boolean);
 }
+function unsafeGrammarReason(value) {
+  let quote = null;
+  let escaped = false;
+  for (const character of value) {
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (quote && character === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (character === '"' || character === "'") {
+      quote = quote === character ? null : quote === null ? character : quote;
+    }
+  }
+  if (quote !== null)
+    return "unbalanced quote; leaving condition dreamer-evaluated";
+  if (/\bcontains\s+no(?:\s|$)/i.test(value)) {
+    return "ambiguous negation after contains; leaving condition dreamer-evaluated";
+  }
+  const temporalSuffix = new RegExp(`\\bcontains\\s+${VALUE}\\s+(?:since|until|after|before|when|while|for|as\\s+of)\\b`, "i");
+  if (temporalSuffix.test(value)) {
+    return "temporal suffix after contains; leaving condition dreamer-evaluated";
+  }
+  return null;
+}
 function unquote(value) {
-  if (value.length < 2)
-    return value;
   const quote = value[0];
-  if (quote !== '"' && quote !== "'" || value.at(-1) !== quote)
+  const final = value.at(-1);
+  const startsQuoted = quote === '"' || quote === "'";
+  const endsQuoted = final === '"' || final === "'";
+  if (!startsQuoted && !endsQuoted)
     return value;
+  if (!startsQuoted || final !== quote || value.length < 2)
+    return null;
   if (quote === '"') {
     try {
       const parsed = JSON.parse(value);
@@ -49244,6 +50299,63 @@ function singleLine(value) {
   return value.replace(/\s+/g, " ").trim();
 }
 
+// ../plugin/src/features/magic-context/smart-notes/wake-plane.ts
+import { join as join10 } from "node:path";
+var WAKE_PLANE_CAPABILITY = "wake.create";
+var WAKE_PLANE_STATUS_TTL_MS = 5 * 60 * 1000;
+var WAKE_PLANE_HANDSHAKE_TIMEOUT_MS = 2000;
+var cachedStatus = null;
+var inFlightProbe = null;
+var catalogProbe = probeWakePlaneCatalog;
+var now = () => Date.now();
+function connectionFile() {
+  return join10(getDataDir(), "cortexkit", "run", "subc-connection.json");
+}
+async function probeWakePlaneCatalog() {
+  const file2 = connectionFile();
+  if (!await connectionFileExists(file2)) {
+    throw new Error("subc connection is not configured");
+  }
+  const client = await SubcClient.connect({
+    connectionFile: file2,
+    handshakeTimeoutMs: WAKE_PLANE_HANDSHAKE_TIMEOUT_MS
+  });
+  try {
+    return await client.catalogList();
+  } finally {
+    client.close();
+  }
+}
+function catalogHasWakePlane(entries) {
+  return entries.some((entry) => Array.isArray(entry.control_ops) && entry.control_ops.includes(WAKE_PLANE_CAPABILITY));
+}
+async function probeStatus() {
+  try {
+    return catalogHasWakePlane(await catalogProbe()) ? "present" : "absent";
+  } catch {
+    return "unknown";
+  }
+}
+async function wakePlaneStatus() {
+  const cached2 = cachedStatus;
+  if (cached2 && now() < cached2.expiresAt)
+    return cached2.status;
+  if (inFlightProbe)
+    return await inFlightProbe;
+  const startedAt = now();
+  const probe = probeStatus().then((status) => {
+    cachedStatus = { status, expiresAt: startedAt + WAKE_PLANE_STATUS_TTL_MS };
+    return status;
+  });
+  inFlightProbe = probe;
+  try {
+    return await probe;
+  } finally {
+    if (inFlightProbe === probe)
+      inFlightProbe = null;
+  }
+}
+
 // ../plugin/src/tools/ctx-note/constants.ts
 var CTX_NOTE_DESCRIPTION = `Working notes for this session's future — reminders, follow-ups, and things to revisit later.
 
@@ -49371,6 +50483,15 @@ function createCtxNoteTool(deps) {
         const anchorOrdinal = captureAnchorOrdinal(deps.db, sessionId);
         const surfaceCondition = params.surface_condition?.trim();
         if (surfaceCondition) {
+          if (await wakePlaneStatus() === "present") {
+            const note3 = addNote(deps.db, "session", {
+              sessionId,
+              content,
+              anchorOrdinal
+            });
+            return ok3(`Saved session note #${note3.id}.
+wake plane active — create a scheduled wake instead; stored as a plain note.`);
+          }
           if (dreamerEnabled !== true) {
             return err3("Error: Smart notes require dreamer to be enabled. Enable dreamer in magic-context.jsonc to use surface_condition.");
           }
@@ -49685,9 +50806,9 @@ function createCtxReduceTool(deps) {
       }
       try {
         deps.db.transaction(() => {
-          const now = Date.now();
+          const now2 = Date.now();
           for (const id of dropIds) {
-            queuePendingOp(deps.db, sessionId, id, "drop", now);
+            queuePendingOp(deps.db, sessionId, id, "drop", now2);
           }
         })();
       } catch (error51) {
@@ -51900,11 +53021,11 @@ var USER_MEMORY_CANDIDATE_TTL_MS = 30 * 24 * 60 * 60 * 1000;
 function insertUserMemoryCandidates(db, candidates2) {
   if (candidates2.length === 0)
     return;
-  const now = Date.now();
+  const now2 = Date.now();
   const stmt = db.prepare("INSERT INTO user_memory_candidates (content, session_id, source_compartment_start, source_compartment_end, created_at) VALUES (?, ?, ?, ?, ?)");
   db.transaction(() => {
     for (const c of candidates2) {
-      stmt.run(c.content, c.sessionId, c.sourceCompartmentStart ?? null, c.sourceCompartmentEnd ?? null, now);
+      stmt.run(c.content, c.sessionId, c.sourceCompartmentStart ?? null, c.sourceCompartmentEnd ?? null, now2);
     }
   })();
 }
@@ -51925,18 +53046,49 @@ function deleteUserMemoryCandidates(db, ids) {
   const placeholders4 = ids.map(() => "?").join(",");
   db.prepare(`DELETE FROM user_memory_candidates WHERE id IN (${placeholders4})`).run(...ids);
 }
-function pruneExpiredUserMemoryCandidates(db, ttlMs, now = Date.now()) {
-  const cutoff = now - ttlMs;
+function pruneExpiredUserMemoryCandidates(db, ttlMs, now2 = Date.now()) {
+  const cutoff = now2 - ttlMs;
   const result = db.prepare("DELETE FROM user_memory_candidates WHERE created_at < ?").run(cutoff);
   return Number(result.changes ?? 0);
 }
+function loadUserMemorySourceProvenance(db, candidateIds) {
+  const ids = [...new Set(candidateIds)].sort((a, b) => a - b);
+  if (ids.length === 0)
+    return [];
+  const placeholders4 = ids.map(() => "?").join(",");
+  const rows = db.prepare(`SELECT id, session_id, source_compartment_start, source_compartment_end
+               FROM user_memory_candidates
+              WHERE id IN (${placeholders4})
+              ORDER BY id ASC`).all(...ids);
+  return rows.map((row) => ({
+    candidateId: row.id,
+    sessionId: row.session_id,
+    sourceCompartmentStart: row.source_compartment_start,
+    sourceCompartmentEnd: row.source_compartment_end
+  }));
+}
+function serializeUserMemorySourceProvenance(provenance, sourceCandidateIds) {
+  if (provenance.length === 0 && sourceCandidateIds.length > 0)
+    return null;
+  return JSON.stringify(provenance.map((source) => ({
+    candidate_id: source.candidateId,
+    session_id: source.sessionId,
+    source_compartment_start: source.sourceCompartmentStart,
+    source_compartment_end: source.sourceCompartmentEnd
+  })));
+}
 function insertUserMemory(db, content, sourceCandidateIds) {
-  const now = Date.now();
-  const result = db.prepare("INSERT INTO user_memories (content, status, promoted_at, source_candidate_ids, created_at, updated_at) VALUES (?, 'active', ?, ?, ?, ?)").run(content, now, JSON.stringify(sourceCandidateIds), now, now);
-  return Number(result.lastInsertRowid);
+  return db.transaction(() => {
+    const now2 = Date.now();
+    const sourceProvenance = loadUserMemorySourceProvenance(db, sourceCandidateIds);
+    const result = db.prepare(`INSERT INTO user_memories
+                    (content, status, promoted_at, source_candidate_ids, source_candidate_provenance, created_at, updated_at)
+                 VALUES (?, 'active', ?, ?, ?, ?, ?)`).run(content, now2, JSON.stringify(sourceCandidateIds), serializeUserMemorySourceProvenance(sourceProvenance, sourceCandidateIds), now2, now2);
+    return Number(result.lastInsertRowid);
+  })();
 }
 function getActiveUserMemories(db) {
-  const rows = db.prepare("SELECT id, content, status, promoted_at, source_candidate_ids, created_at, updated_at FROM user_memories WHERE status = 'active' ORDER BY promoted_at ASC, id ASC").all();
+  const rows = db.prepare("SELECT id, content, status, promoted_at, source_candidate_ids, source_candidate_provenance, created_at, updated_at FROM user_memories WHERE status = 'active' ORDER BY promoted_at ASC, id ASC").all();
   return rows.map(parseUserMemoryRow);
 }
 function updateUserMemoryContent(db, id, content) {
@@ -51945,17 +53097,49 @@ function updateUserMemoryContent(db, id, content) {
 function dismissUserMemory(db, id) {
   db.prepare("UPDATE user_memories SET status = 'dismissed', updated_at = ? WHERE id = ?").run(Date.now(), id);
 }
-function parseUserMemoryRow(row) {
-  let candidateIds = [];
+function parseCandidateIds2(raw) {
   try {
-    candidateIds = JSON.parse(row.source_candidate_ids);
-  } catch {}
+    const parsed = JSON.parse(raw);
+    return Array.isArray(parsed) ? parsed.filter((id) => typeof id === "number" && Number.isFinite(id)) : [];
+  } catch {
+    return [];
+  }
+}
+function parseUserMemorySourceProvenance(raw) {
+  if (raw === null)
+    return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (!Array.isArray(parsed))
+      return null;
+    const provenance = [];
+    for (const value of parsed) {
+      if (!value || typeof value !== "object")
+        return null;
+      const source = value;
+      if (typeof source.candidate_id !== "number" || !Number.isFinite(source.candidate_id) || typeof source.session_id !== "string" || source.source_compartment_start !== null && typeof source.source_compartment_start !== "number" || source.source_compartment_end !== null && typeof source.source_compartment_end !== "number") {
+        return null;
+      }
+      provenance.push({
+        candidateId: source.candidate_id,
+        sessionId: source.session_id,
+        sourceCompartmentStart: source.source_compartment_start,
+        sourceCompartmentEnd: source.source_compartment_end
+      });
+    }
+    return provenance;
+  } catch {
+    return null;
+  }
+}
+function parseUserMemoryRow(row) {
   return {
     id: row.id,
     content: row.content,
     status: row.status === "dismissed" ? "dismissed" : "active",
     promotedAt: row.promoted_at,
-    sourceCandidateIds: candidateIds,
+    sourceCandidateIds: parseCandidateIds2(row.source_candidate_ids),
+    sourceProvenance: parseUserMemorySourceProvenance(row.source_candidate_provenance),
     createdAt: row.created_at,
     updatedAt: row.updated_at
   };
@@ -52008,8 +53192,8 @@ class BoundedSessionMap {
 
 // ../plugin/src/features/magic-context/compaction-marker.ts
 import { createHash as createHash16 } from "node:crypto";
-import { existsSync as existsSync12 } from "node:fs";
-import { join as join8 } from "node:path";
+import { existsSync as existsSync13 } from "node:fs";
+import { join as join11 } from "node:path";
 var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 var ID_PREFIX_HEX_LENGTH = 12;
 var ID_SUFFIX_LENGTH = 14;
@@ -52035,7 +53219,7 @@ function generatePartId(timestampMs, counter = 0n, identity = "") {
   return generateId("prt", timestampMs, counter, identity);
 }
 function getOpenCodeDbPath2() {
-  return join8(getDataDir(), "opencode", "opencode.db");
+  return join11(getDataDir(), "opencode", "opencode.db");
 }
 var cachedWriteDb = null;
 var REQUIRED_MESSAGE_COLUMNS = ["id", "session_id", "time_created", "time_updated", "data"];
@@ -52080,7 +53264,7 @@ function getWritableOpenCodeDb() {
       closeQuietly(cachedWriteDb.db);
     } catch {}
   }
-  if (!existsSync12(dbPath)) {
+  if (!existsSync13(dbPath)) {
     throw new Error(`OpenCode database not found at ${dbPath} (is OpenCode installed?)`);
   }
   const db = new Database(dbPath);
@@ -52356,24 +53540,52 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
 // ../plugin/src/hooks/magic-context/compartment-render-epoch.ts
 var COMPARTMENT_RENDER_EPOCH = "cre2";
 var EPOCH_COMPONENT_PREFIX = "|compartment-render:";
-function encodeCachedM0UpgradeIdentity(upgradeState, compartmentRenderEpoch = COMPARTMENT_RENDER_EPOCH) {
-  if (compartmentRenderEpoch === null)
-    return upgradeState;
-  return `${upgradeState ?? ""}${EPOCH_COMPONENT_PREFIX}${compartmentRenderEpoch}`;
+var MURAL_COMPONENT_PREFIX = "|mural-enabled:";
+var BUDGET_COMPONENT_PREFIX = "|render-budgets:";
+function encodeCachedM0UpgradeIdentity(upgradeState, compartmentRenderEpoch = COMPARTMENT_RENDER_EPOCH, muralEnabled = null, renderBudgetIdentity = null) {
+  let encoded = upgradeState ?? "";
+  if (compartmentRenderEpoch !== null) {
+    encoded += `${EPOCH_COMPONENT_PREFIX}${compartmentRenderEpoch}`;
+  }
+  if (muralEnabled !== null) {
+    encoded += `${MURAL_COMPONENT_PREFIX}${muralEnabled ? "1" : "0"}`;
+  }
+  if (renderBudgetIdentity !== null) {
+    encoded += `${BUDGET_COMPONENT_PREFIX}${renderBudgetIdentity}`;
+  }
+  return encoded.length > 0 ? encoded : null;
+}
+function component(value, prefix) {
+  const start = value.lastIndexOf(prefix);
+  if (start < 0)
+    return null;
+  const valueStart = start + prefix.length;
+  const end = value.indexOf("|", valueStart);
+  const result = value.slice(valueStart, end < 0 ? value.length : end);
+  return result.length > 0 ? result : null;
 }
 function decodeCachedM0UpgradeIdentity(value) {
   if (value === null) {
-    return { upgradeState: null, compartmentRenderEpoch: null };
-  }
-  const componentIndex = value.lastIndexOf(EPOCH_COMPONENT_PREFIX);
-  if (componentIndex < 0) {
-    return { upgradeState: value, compartmentRenderEpoch: null };
+    return {
+      upgradeState: null,
+      compartmentRenderEpoch: null,
+      muralEnabled: null,
+      renderBudgetIdentity: null
+    };
   }
-  const upgradeState = value.slice(0, componentIndex);
-  const compartmentRenderEpoch = value.slice(componentIndex + EPOCH_COMPONENT_PREFIX.length);
+  const componentIndexes = [
+    value.indexOf(EPOCH_COMPONENT_PREFIX),
+    value.indexOf(MURAL_COMPONENT_PREFIX),
+    value.indexOf(BUDGET_COMPONENT_PREFIX)
+  ].filter((index) => index >= 0);
+  const identityEnd = componentIndexes.length > 0 ? Math.min(...componentIndexes) : value.length;
+  const upgradeState = value.slice(0, identityEnd);
+  const muralComponent = component(value, MURAL_COMPONENT_PREFIX);
   return {
     upgradeState: upgradeState.length > 0 ? upgradeState : null,
-    compartmentRenderEpoch: compartmentRenderEpoch.length > 0 ? compartmentRenderEpoch : null
+    compartmentRenderEpoch: component(value, EPOCH_COMPONENT_PREFIX),
+    muralEnabled: muralComponent === "1" ? true : muralComponent === "0" ? false : null,
+    renderBudgetIdentity: component(value, BUDGET_COMPONENT_PREFIX)
   };
 }
 
@@ -53193,4 +54405,4 @@ function registerMagicContextTools(pi, opts) {
   }
 }
 
-export { COMPACTION_ENABLED_PATH, isDreamerRunnable, isCompactionEnabled, migrateMagicContextConfigLocations, ProjectIdentityError, resolveProjectIdentityStrict, resolveProjectIdentity, resolveProjectIdentityForSession, beginBootQuietPeriod, scheduleAfterBootQuiet, Database, closeQuietly, isMidTurn, textMentionsRecentCommit, hasMeaningfulUserText, extractTexts, extractToolCallSummaries, estimateTokens, normalizeText, isRecord, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isEditTool, applyEditMarkerToInput, setRawMessageProvider, withRawMessageProvider, cleanUserText, withRawSessionMessageCache, readRawSessionMessages, primeTailRawMessageCache, getCachedAbsoluteMessageCount, primeInMemoryTailRawMessageCache, getRawSessionMessageCount, getRawSessionTagKeysThrough, getLegacyProtectedTailStartOrdinal, readSessionChunk, clearCompressionDepth, clearCompressionDepthRange, getMessageIndexSourceIdentity, isMessageIndexSourceCurrent, getLastIndexedOrdinal, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, indexSingleMessage, indexMessagesAfterOrdinal, sweepOrphanedOpenCodeMessageIndexes, recordSessionProjectIdentity, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLease, isCompartmentLeaseHeld, persistCachedM0, clearCachedM0M1, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getCompartmentsByEndMessageId, appendCompartments, saveRecompStagingPass, getRecompStaging, clearRecompStaging, getRecompPartialRange, setRecompPartialRange, escapeXmlAttr, escapeXmlContent, getModuleNoteEvaluationBridge, getContextStoreUuid, parseCompartmentOutput, resolveWorkspaceShareCategories, resolveWorkspaceIdentitySet, expandWorkspaceIdentitySetWithAliases, sourceNameForMemory, computeWorkspaceEpochFingerprint, bumpEpochsForWorkspaceMembers, readProjectDocsCanonical, copySessionStateForClone, getErrorMessage, describeError, setStoragePrivatePermissionEnforcement, getSchemaFenceRejection, getMigrationOnOpenRefusal, LATEST_SUPPORTED_VERSION, getDatabasePath, getPersistedSchemaVersion, setSqlitePragmaConfig, applySqliteTuningPragmas, runSqliteOptimize, openDatabase, openDatabaseAsync, queueM0Mutation, getMaxM0MutationId, queueMemoryMutation, getMemoryMutationsForRender, getMemoryMutationsForRenderByProjects, getMaxMemoryMutationId, getMaxMemoryMutationIdForProjects, MAX_EXECUTE_THRESHOLD, escalationBands, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getLastNudgeLevel, setLastNudgeLevel, resetLastNudgeCycle, resetLastNudgeCycleIfTailShrank, getChannel2NudgeState, setChannel2NudgeState, casChannel2NudgeState, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, pruneAutoSearchHintDecisions, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, recordOverflowDetected, clearEmergencyRecovery, clearDetectedContextLimit, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, getProcessedImageStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, setPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, getSessionsWithPendingPiMarker, peekDeferredExecutePending, setDeferredExecutePendingIfAbsent, clearDeferredExecutePendingIfMatches, setSessionWorkMetrics, getSessionWorkMetrics, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, retryPendingSessionCleanups, getNotes, getSessionNotes, getPendingSmartNotes, getReadySmartNotes, markNoteReady, markNoteChecked, queuePendingOp, getPendingOps, clearPendingOps, removePendingOp, PRIMER_CANDIDATE_TTL_MS, PRIMER_CANDIDATE_MAX_AGE_MS, primerOccurrenceKey, primerOccurrenceUtcDay, insertPrimerCandidates, updatePrimerCandidateEmbedding, getPrimerCandidatesByIds, getPrimerCandidatesForPromotion, countPrimerCandidatesForProject, getActivePrimers, createPrimer, updatePrimerSupport, updatePrimerAnswer, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, recordSubagentInvocation, getLatestHistorianInvocationId, updateTagByteSize, getActiveTagTokenAggregate, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, updateTagInputByteSize, updateTagTokenCount, getPersistedToolTagAccounting, getAllStatusTagTokenTotalsFlat, updateTagInputTokenCount, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, updateTagDropMode, updateCavemanDepth, hasPiFallbackMessageTags, findAdoptableFallbackTags, hasPiFallbackToolOwnerTags, findPiFallbackToolOwnerTags, adoptPiFallbackToolOwnerTag, adoptPiFallbackMessageTag, getMaxTagNumberBySession, getTagNumberByMessageId, deriveTagLoadFloor, getTagsBySession, getActiveTagsBySession, getTagsForPendingOperations, getTagsByNumbers, getMaxDroppedTagNumber, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, BoundedSessionMap, piModelRefToCanonical, resolveModelRefForPi, ompModelRefToCanonical, resolveModelRefForOmp, isSaneLimit, resolveLimit, getSdkContextLimit, resolveModelConfigOrDefault, normalizeTodoStateJson, buildSyntheticTodoPart, promptSurfaceHashMaterial, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, SYNTH_USER_ID_PREFIX, resolvePiStableId, isMidTurnPi, readPiSessionMessages, findLastModelKeyFromBranch, convertEntriesToRawMessages, withContentLanguageDirective, withMigrationLanguageDirective, buildPrimaryLanguageDirective, computeCueContentHash, hasMuralCueColumns, getMuralCueState, memoryNeedsCue, setMuralCue, recordMuralCueRejection, invalidateMemory, computeNormalizedHash, hasMemoryShareableColumn, hasMemoryClassifiedAtColumn, getUnclassifiedMemoryIds, insertMemory, getMemoryByHash, getMemoriesByProject, getMemoriesByProjects, getMaxMemoryIdForProjects, readNewMemoriesForM1Union, getAllActiveMemoriesForMigration, getMemoryById, setMemoryClassification, archiveMemory, deleteMemory, getMemoryCount, getMemoryCountsByStatus, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getOpenCodeDbPath2 as getOpenCodeDbPath, parseCron, nextOccurrence, nextDueAtMs, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, DEFAULT_HISTORIAN_TIMEOUT_MS, buildCanonicalChunkTextFromFts, buildCompartmentSummaryFallbackText, canonicalizeInMemoryChunkTextForEmbedding, chunkCanonicalText, chunkEmbeddingWindowsAreCurrent, replaceCompartmentChunkEmbeddings, cosineSimilarity, GIT_SWEEP_LEASE_RENEWAL_MS, acquireGitSweepLease, renewGitSweepLease, markGitSweepSuccessAndRelease, parkGitSweepNonIndexable, releaseGitSweepLease, contentSha256, sweepStaleEmbeddingIdentitiesForProject, enqueueShadowEmbeddingItems, getProjectEmbeddingSnapshot, getProjectChunkEmbeddingModelId, getProjectEmbeddingMaxInputTokens, embedTextForProject, embedBatchForProject, embedItemsForProject, embedUnembeddedMemoriesForProject, drainCommitBacklogForProject, embedSessionCompartmentChunks, getEmbeddingCoverageStatus, promoteSessionFactsDurable, embedPromotedFacts, recordMemoryMapping, recordMemoryVerifications, getUnmappedMemoryIds, clearMemoryVerifications, getMemoryVerifications, resolveGitTopLevel, readGitHead, readGitChangedFilesSince, readGitFileChangeTimesSince, verificationFileExists, normalizeVerificationFiles, indexCommitsForProject, embedUnembeddedCommits, loadPiConfig, ensureProjectRegisteredFromPiDirectory, resolveMuralWire, updateCompactionMarkerAfterPublication, COMPARTMENT_RENDER_EPOCH, encodeCachedM0UpgradeIdentity, decodeCachedM0UpgradeIdentity, DEFAULT_HISTORY_BUDGET_TOKENS, renderCompartmentAtTier, renderDecayedCompartments, extractM0Block, TEMPORAL_MARKER_PATTERN, temporalMarkerPrefix, clearInjectionCache, getVisibleMemoryIds, renderMemoryBlock, DEFAULT_MEMORY_BUDGET_TOKENS, DEFAULT_USER_PROFILE_BUDGET_TOKENS, trimMemoriesToBudgetV2, trimWorkspaceMemoriesToBudgetV2, trimUserMemoriesToBudget, renderMemoryBlockV2, stripMemoryMuralBlock, unifiedSearch, rememberTodowriteToolCallTodos, parseTodos, setTodoSnapshot, registerTodoOverlay, registerTodoStateLifecycle, registerMagicContextTools };
+export { COMPACTION_ENABLED_PATH, isDreamerRunnable, isCompactionEnabled, migrateMagicContextConfigLocations, ProjectIdentityError, resolveProjectIdentityStrict, resolveProjectIdentity, resolveProjectIdentityForSession, beginBootQuietPeriod, scheduleAfterBootQuiet, Database, closeQuietly, isMidTurn, textMentionsRecentCommit, hasMeaningfulUserText, extractTexts, extractToolCallSummaries, preloadTokenizer, estimateTokens, normalizeText, isRecord, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isEditTool, applyEditMarkerToInput, setRawMessageProvider, withRawMessageProvider, cleanUserText, withRawSessionMessageCache, readRawSessionMessages, primeTailRawMessageCache, getCachedAbsoluteMessageCount, primeInMemoryTailRawMessageCache, getRawSessionMessageCount, getRawSessionTagKeysThrough, getLegacyProtectedTailStartOrdinal, readSessionChunk, clearCompressionDepth, clearCompressionDepthRange, getMessageIndexSourceIdentity, isMessageIndexSourceCurrent, getLastIndexedOrdinal, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, indexSingleMessage, indexMessagesAfterOrdinal, sweepOrphanedOpenCodeMessageIndexes, recordSessionProjectIdentity, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLease, isCompartmentLeaseHeld, piModelRefToCanonical, resolveModelRefForPi, modelRefLookupOrder, ompModelRefToCanonical, resolveModelRefForOmp, persistCachedM0, clearCachedM0M1, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getCompartmentsByEndMessageId, appendCompartments, saveRecompStagingPass, getRecompStaging, clearRecompStaging, getRecompPartialRange, setRecompPartialRange, escapeXmlAttr, escapeXmlContent, getModuleNoteEvaluationBridge, getContextStoreUuid, parseCompartmentOutput, resolveWorkspaceShareCategories, resolveWorkspaceIdentitySet, expandWorkspaceIdentitySetWithAliases, sourceNameForMemory, computeWorkspaceEpochFingerprint, bumpEpochsForWorkspaceMembers, readProjectDocsCanonical, copySessionStateForClone, getErrorMessage, describeError, setStoragePrivatePermissionEnforcement, getSchemaFenceRejection, getMigrationOnOpenRefusal, LATEST_SUPPORTED_VERSION, getDatabasePath, getPersistedSchemaVersion, setSqlitePragmaConfig, applySqliteTuningPragmas, runSqliteOptimize, openDatabase, openDatabaseAsync, queueM0Mutation, getMaxM0MutationId, queueMemoryMutation, getMemoryMutationsForRender, getMemoryMutationsForRenderByProjects, getMaxMemoryMutationId, getMaxMemoryMutationIdForProjects, MAX_EXECUTE_THRESHOLD, escalationBands, loadProtectedTailMeta, markProtectedTailPolicyV3Seeded, recordProtectedTailPublicationFloor, recordProtectedTailNoEligibleHead, getWrapupInProgressState, isWrapupInProgress, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, reserveProtectedTailDrainTokens, clearEmergencyDrainLatch, recordHistorianDrainFailure, clearHistorianDrainFailure, rollbackProtectedTailDrainReservation, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getLastNudgeLevel, setLastNudgeLevel, resetLastNudgeCycle, resetLastNudgeCycleIfTailShrank, getChannel2NudgeState, setChannel2NudgeState, casChannel2NudgeState, getPersistedNoteNudge, setPersistedNoteNudgeTrigger, setPersistedNoteNudgeTriggerMessageId, getNoteNudgeAnchors, getAutoSearchHintDecisions, deliverNoteNudgeAtomic, appendAutoSearchHintDecision, pruneNoteNudgeAnchors, pruneAutoSearchHintDecisions, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getNoteLastReadAt, getHistorianFailureState, incrementHistorianFailure, clearHistorianFailureState, getOverflowState, recordOverflowDetected, clearEmergencyRecovery, clearDetectedContextLimit, getStrippedPlaceholderIds, applyStrippedPlaceholderDelta, getProcessedImageStrippedIds, addProcessedImageStrippedIds, getPendingCompactionMarkerState, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, setPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, getSessionsWithPendingPiMarker, peekDeferredExecutePending, setDeferredExecutePendingIfAbsent, clearDeferredExecutePendingIfMatches, setSessionWorkMetrics, getSessionWorkMetrics, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, retryPendingSessionCleanups, getNotes, getSessionNotes, getPendingSmartNotes, getReadySmartNotes, markNoteReady, markNoteChecked, queuePendingOp, getPendingOps, clearPendingOps, removePendingOp, PRIMER_CANDIDATE_TTL_MS, PRIMER_CANDIDATE_MAX_AGE_MS, primerOccurrenceKey, primerOccurrenceUtcDay, insertPrimerCandidates, updatePrimerCandidateEmbedding, getPrimerCandidatesByIds, getPrimerCandidatesForPromotion, countPrimerCandidatesForProject, getActivePrimers, createPrimer, updatePrimerSupport, updatePrimerAnswer, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, recordSubagentInvocation, getLatestHistorianInvocationId, updateTagByteSize, getActiveTagTokenAggregate, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, updateTagInputByteSize, updateTagTokenCount, getPersistedToolTagAccounting, getAllStatusTagTokenTotalsFlat, updateTagInputTokenCount, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, updateTagDropMode, updateCavemanDepth, hasPiFallbackMessageTags, findAdoptableFallbackTags, hasPiFallbackToolOwnerTags, findPiFallbackToolOwnerTags, adoptPiFallbackToolOwnerTag, adoptPiFallbackMessageTag, getMaxTagNumberBySession, getTagNumberByMessageId, deriveTagLoadFloor, getTagsBySession, getActiveTagsBySession, getTagsForPendingOperations, getTagsByNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, BoundedSessionMap, getWindowOverlay, resolveWindowOverlayFacts, deriveWindowGeometry, formatWindowDerivationLine, isSaneLimit, getSdkContextLimit, resolveModelConfigOrDefault, normalizeTodoStateJson, buildSyntheticTodoPart, promptSurfaceHashMaterial, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, SYNTH_USER_ID_PREFIX, resolvePiStableId, isMidTurnPi, readPiSessionMessages, findLastModelKeyFromBranch, convertEntriesToRawMessages, withContentLanguageDirective, withMigrationLanguageDirective, buildPrimaryLanguageDirective, computeCueContentHash, hasMuralCueColumns, getMuralCueState, memoryNeedsCue, setMuralCue, recordMuralCueRejection, invalidateMemory, computeNormalizedHash, hasMemoryShareableColumn, hasMemoryClassifiedAtColumn, getUnclassifiedMemoryIds, insertMemory, getMemoryByHash, getMemoriesByProject, getMemoriesByProjects, getMaxMemoryIdForProjects, getAllActiveMemoriesForMigration, getMemoryById, setMemoryClassification, archiveMemory, deleteMemory, getMemoryCount, getMemoryCountsByStatus, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getOpenCodeDbPath2 as getOpenCodeDbPath, parseCron, nextOccurrence, nextDueAtMs, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, DEFAULT_HISTORIAN_TIMEOUT_MS, buildCanonicalChunkTextFromFts, buildCompartmentSummaryFallbackText, canonicalizeInMemoryChunkTextForEmbedding, chunkCanonicalText, chunkEmbeddingWindowsAreCurrent, replaceCompartmentChunkEmbeddings, cosineSimilarity, GIT_SWEEP_LEASE_RENEWAL_MS, acquireGitSweepLease, renewGitSweepLease, markGitSweepSuccessAndRelease, parkGitSweepNonIndexable, releaseGitSweepLease, contentSha256, sweepStaleEmbeddingIdentitiesForProject, enqueueShadowEmbeddingItems, getProjectEmbeddingSnapshot, getProjectChunkEmbeddingModelId, getProjectEmbeddingMaxInputTokens, embedTextForProject, embedBatchForProject, embedItemsForProject, embedUnembeddedMemoriesForProject, drainCommitBacklogForProject, embedSessionCompartmentChunks, getEmbeddingCoverageStatus, promoteSessionFactsDurable, embedPromotedFacts, recordMemoryMapping, recordMemoryVerifications, getUnmappedMemoryIds, clearMemoryVerifications, getMemoryVerifications, resolveGitTopLevel, readGitHead, readGitChangedFilesSince, readGitFileChangeTimesSince, verificationFileExists, normalizeVerificationFiles, wakePlaneStatus, indexCommitsForProject, embedUnembeddedCommits, loadPiConfig, ensureProjectRegisteredFromPiDirectory, resolveMuralWire, updateCompactionMarkerAfterPublication, COMPARTMENT_RENDER_EPOCH, encodeCachedM0UpgradeIdentity, decodeCachedM0UpgradeIdentity, DEFAULT_HISTORY_BUDGET_TOKENS, renderCompartmentAtTier, renderDecayedCompartments, extractM0Block, TEMPORAL_MARKER_PATTERN, temporalMarkerPrefix, clearInjectionCache, getVisibleMemoryIds, renderMemoryBlock, DEFAULT_MEMORY_BUDGET_TOKENS, DEFAULT_USER_PROFILE_BUDGET_TOKENS, trimMemoriesToBudgetV2, trimWorkspaceMemoriesToBudgetV2, trimUserMemoriesToBudget, renderMemoryBlockV2, stripMemoryMuralBlock, unifiedSearch, rememberTodowriteToolCallTodos, parseTodos, setTodoSnapshot, registerTodoOverlay, registerTodoStateLifecycle, registerMagicContextTools };