@cortexkit/pi-magic-context 0.22.4 → 0.22.5

package/dist/index.js

@@ -8073,6 +8073,19 @@ function hasGitDir(canonical) {
     return false;
   }
 }
+function normalizeStoredProjectPath(rawOrStored) {
+  if (rawOrStored.startsWith("git:") || rawOrStored.startsWith("dir:")) {
+    return rawOrStored;
+  }
+  try {
+    return resolveProjectIdentity(rawOrStored);
+  } catch {
+    return directoryFallback(rawOrStored);
+  }
+}
+function storedPathBelongsToIdentity(storedProjectPath, projectIdentity) {
+  return storedProjectPath === projectIdentity || normalizeStoredProjectPath(storedProjectPath) === projectIdentity;
+}
 
 // ../plugin/src/shared/logger.ts
 import * as fs from "node:fs";
@@ -142072,12 +142085,6 @@ function isCompartmentRow(row) {
   const candidate = row;
   return typeof candidate.id === "number" && typeof candidate.session_id === "string" && typeof candidate.sequence === "number" && typeof candidate.start_message === "number" && typeof candidate.end_message === "number" && typeof candidate.start_message_id === "string" && typeof candidate.end_message_id === "string" && typeof candidate.title === "string" && typeof candidate.content === "string" && isStringOrNullish(candidate.p1) && isStringOrNullish(candidate.p2) && isStringOrNullish(candidate.p3) && isStringOrNullish(candidate.p4) && isNumberOrNullish(candidate.importance) && isStringOrNullish(candidate.episode_type) && isNumberOrNullish(candidate.legacy) && typeof candidate.created_at === "number";
 }
-function isSessionFactRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const candidate = row;
-  return typeof candidate.id === "number" && typeof candidate.session_id === "string" && typeof candidate.category === "string" && typeof candidate.content === "string" && typeof candidate.created_at === "number" && typeof candidate.updated_at === "number";
-}
 function insertCompartmentRows(db, sessionId, compartments, now) {
   const stmt = getInsertCompartmentStatement(db);
   for (const compartment of compartments) {
@@ -142106,16 +142113,6 @@ function toCompartment(row) {
     createdAt: row.created_at
   };
 }
-function toSessionFact(row) {
-  return {
-    id: row.id,
-    sessionId: row.session_id,
-    category: row.category,
-    content: row.content,
-    createdAt: row.created_at,
-    updatedAt: row.updated_at
-  };
-}
 function getCompartments(db, sessionId) {
   const rows = db.prepare("SELECT * FROM compartments WHERE session_id = ? ORDER BY sequence ASC").all(sessionId).filter(isCompartmentRow);
   return rows.map(toCompartment);
@@ -142136,10 +142133,6 @@ function appendCompartments(db, sessionId, compartments) {
     insertCompartmentRows(db, sessionId, compartments, now);
   })();
 }
-function getSessionFacts(db, sessionId) {
-  const rows = db.prepare("SELECT * FROM session_facts WHERE session_id = ? ORDER BY category ASC, id ASC").all(sessionId).filter(isSessionFactRow);
-  return rows.map(toSessionFact);
-}
 function saveRecompStagingPass(db, sessionId, passNumber, compartments, facts) {
   const now = Date.now();
   db.transaction(() => {
@@ -142183,14 +142176,6 @@ function getRecompStaging(db, sessionId) {
     lastEndMessage: lastEnd
   };
 }
-function invalidateAllMemoryBlockCaches(db) {
-  try {
-    const rows = db.prepare("SELECT session_id FROM session_meta").all();
-    for (const row of rows) {
-      clearCachedM0M1(db, row.session_id);
-    }
-  } catch {}
-}
 function clearRecompStaging(db, sessionId) {
   db.transaction(() => {
     db.prepare("DELETE FROM recomp_compartments WHERE session_id = ?").run(sessionId);
@@ -143331,6 +143316,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "system_prompt_hash", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "cleared_reasoning_through_tag", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "stripped_placeholder_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "stale_reduce_stripped_ids", "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");
@@ -143481,6 +143467,7 @@ function healNullTextColumns(db) {
     ["todo_synthetic_state_json", ""],
     ["system_prompt_hash", ""],
     ["stripped_placeholder_ids", ""],
+    ["stale_reduce_stripped_ids", ""],
     ["memory_block_cache", ""],
     ["memory_block_ids", ""],
     ["compaction_marker_state", ""],
@@ -144416,7 +144403,7 @@ function runMigrations(db) {
 }
 // ../plugin/src/features/magic-context/project-docs-hash.ts
 import { createHash as createHash3 } from "node:crypto";
-import { readFileSync as readFileSync2, statSync as statSync2 } from "node:fs";
+import { lstatSync, readFileSync as readFileSync2, statSync as statSync2 } from "node:fs";
 import path4 from "node:path";
 var PROJECT_DOC_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 var PROJECT_DOCS_DELIMITER = `
@@ -144424,6 +144411,7 @@ var PROJECT_DOCS_DELIMITER = `
 ---
 
 `;
+var MAX_PROJECT_DOC_BYTES = 256 * 1024;
 var docsCache = new Map;
 function canonicalizeDocContent(raw) {
   return raw.replace(/^\uFEFF/, "").replace(/\r\n/g, `
@@ -144433,9 +144421,10 @@ function canonicalizeDocContent(raw) {
 }
 function fingerprintFile(filePath) {
   try {
-    const stat = statSync2(filePath);
+    const stat = lstatSync(filePath);
+    const isReadableDoc = stat.isFile() && stat.size <= MAX_PROJECT_DOC_BYTES;
     return {
-      exists: stat.isFile(),
+      exists: isReadableDoc,
       mtimeMs: stat.mtimeMs,
       size: stat.size
     };
@@ -144478,6 +144467,16 @@ function readCanonicalPieces(projectDirectory, files) {
     if (!fingerprint?.exists) {
       continue;
     }
+    let safeToRead = false;
+    try {
+      const st = lstatSync(filePath);
+      safeToRead = st.isFile() && st.size <= MAX_PROJECT_DOC_BYTES;
+    } catch {
+      safeToRead = false;
+    }
+    if (!safeToRead) {
+      continue;
+    }
     const canonicalContent = canonicalizeDocContent(readFileSync2(filePath, "utf8"));
     hashPieces.push(`file:${filename}
 ${canonicalContent}`);
@@ -144798,7 +144797,8 @@ function casUpdateJsonArrayColumn(db, sessionId, column, validator, mutate, opti
   }
   for (let attempt = 0;attempt < CAS_RETRY_LIMIT; attempt += 1) {
     const row = db.prepare(`SELECT ${column} FROM session_meta WHERE session_id = ?`).get(sessionId);
-    const currentBlob = row?.[column] ?? "[]";
+    const rawCurrent = row?.[column] ?? null;
+    const currentBlob = rawCurrent ?? "[]";
     const current = parseJsonArray(currentBlob, validator);
     const next = mutate(current);
     if (next === null)
@@ -144806,7 +144806,7 @@ function casUpdateJsonArrayColumn(db, sessionId, column, validator, mutate, opti
     const nextBlob = stableStringify(next);
     if (nextBlob === currentBlob)
       return true;
-    const result = db.prepare(`UPDATE session_meta SET ${column} = ? WHERE session_id = ? AND ${column} = ?`).run(nextBlob, sessionId, currentBlob);
+    const result = db.prepare(`UPDATE session_meta SET ${column} = ? WHERE session_id = ? AND ${column} IS ?`).run(nextBlob, sessionId, rawCurrent);
     if (result.changes > 0)
       return true;
   }
@@ -144935,14 +144935,16 @@ function getHistorianFailureState(db, sessionId) {
   };
 }
 function incrementHistorianFailure(db, sessionId, error) {
+  let nextCount = 1;
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
     const current = getHistorianFailureState(db, sessionId);
-    const nextCount = current.failureCount + 1;
+    nextCount = current.failureCount + 1;
     db.prepare("UPDATE session_meta SET historian_failure_count = ?, historian_last_error = ?, historian_last_failure_at = ? WHERE session_id = ?").run(nextCount, error, Date.now(), sessionId);
     const reason = error.replace(/\s+/g, " ").trim().slice(0, 300);
     sessionLog(sessionId, `historian failure recorded: count=${nextCount} reason="${reason}"`);
   })();
+  return nextCount;
 }
 function clearHistorianFailureState(db, sessionId) {
   db.transaction(() => {
@@ -145011,10 +145013,39 @@ function getStrippedPlaceholderIds(db, sessionId) {
   } catch {}
   return new Set;
 }
-function setStrippedPlaceholderIds(db, sessionId, ids) {
+function applyStrippedPlaceholderDelta(db, sessionId, delta) {
+  const add = delta.add ? [...delta.add] : [];
+  const remove = delta.remove ? [...delta.remove] : [];
+  if (add.length === 0 && remove.length === 0)
+    return true;
   ensureSessionMetaRow(db, sessionId);
-  const json = ids.size > 0 ? JSON.stringify([...ids]) : "";
-  db.prepare("UPDATE session_meta SET stripped_placeholder_ids = ? WHERE session_id = ?").run(json, sessionId);
+  for (let attempt = 0;attempt < CAS_RETRY_LIMIT; attempt += 1) {
+    const row = db.prepare("SELECT stripped_placeholder_ids FROM session_meta WHERE session_id = ?").get(sessionId);
+    const rawStored = row ? row.stripped_placeholder_ids ?? null : null;
+    const current = new Set(parseStrippedBlob(rawStored));
+    for (const id of add)
+      current.add(id);
+    for (const id of remove)
+      current.delete(id);
+    const nextBlob = current.size > 0 ? JSON.stringify([...current]) : "";
+    if (nextBlob === (rawStored ?? ""))
+      return true;
+    const result = db.prepare("UPDATE session_meta SET stripped_placeholder_ids = ? WHERE session_id = ? AND stripped_placeholder_ids IS ?").run(nextBlob, sessionId, rawStored);
+    if (result.changes > 0)
+      return true;
+  }
+  sessionLog(sessionId, `stripped_placeholder_ids CAS: ${CAS_RETRY_LIMIT} retries exhausted`);
+  return false;
+}
+function parseStrippedBlob(raw) {
+  if (!raw || raw.length === 0)
+    return [];
+  try {
+    const parsed = JSON.parse(raw);
+    if (Array.isArray(parsed))
+      return parsed.filter((v) => typeof v === "string");
+  } catch {}
+  return [];
 }
 function isPendingCompactionMarker(value) {
   return typeof value === "object" && value !== null && typeof value.ordinal === "number" && typeof value.endMessageId === "string" && typeof value.publishedAt === "number";
@@ -149732,7 +149763,7 @@ async function runDream(args) {
     }
   }
   const deadline = startedAt + args.maxRuntimeMinutes * 60 * 1000;
-  const lastDreamAt = getDreamState(args.db, `last_dream_at:${args.projectIdentity}`) ?? getDreamState(args.db, "last_dream_at");
+  const lastDreamAt = getDreamState(args.db, `last_dream_at:${args.projectIdentity}`);
   log(`[dreamer] last dream at: ${lastDreamAt ?? "never"} (project=${args.projectIdentity})`);
   let lastErrorSignature = null;
   let consecutiveSameErrorFailures = 0;
@@ -150114,7 +150145,6 @@ async function runDream(args) {
   const hasSuccessfulTask = result.tasks.some((t) => !t.error && !POST_TASK_NAMES.has(t.name));
   if (hasSuccessfulTask && !lostLease) {
     setDreamState(args.db, `last_dream_at:${args.projectIdentity}`, String(result.finishedAt));
-    setDreamState(args.db, "last_dream_at", String(result.finishedAt));
   }
   const totalDuration = ((result.finishedAt - startedAt) / 1000).toFixed(1);
   const succeeded = result.tasks.filter((t) => !t.error).length;
@@ -150390,8 +150420,7 @@ function findProjectsNeedingDream(db) {
   const now = new Date;
   for (const row of projectRows) {
     const lastDreamAtStr = getDreamState(db, `last_dream_at:${row.project_path}`);
-    const fallbackStr = !lastDreamAtStr ? getDreamState(db, "last_dream_at") : null;
-    const lastDreamAt = Number(lastDreamAtStr ?? fallbackStr ?? "0") || 0;
+    const lastDreamAt = Number(lastDreamAtStr ?? "0") || 0;
     if (lastDreamAt > 0 && isDreamFromCurrentWindow(lastDreamAt, now)) {
       continue;
     }
@@ -165363,6 +165392,59 @@ class LocalEmbeddingProvider {
   }
 }
 
+// ../plugin/src/features/magic-context/memory/embedding-ssrf.ts
+var METADATA_HOSTNAMES = new Set(["metadata.google.internal", "metadata.goog"]);
+var IPV6_METADATA_HOSTS = new Set(["fd00:ec2::254"]);
+function isLinkLocalIpv4(host) {
+  return /^169\.254\.\d{1,3}\.\d{1,3}$/.test(host);
+}
+function ipv4FromMappedIpv6(host) {
+  const m = /^::ffff:(.+)$/.exec(host);
+  if (!m)
+    return null;
+  const tail = m[1];
+  if (/^\d{1,3}(\.\d{1,3}){3}$/.test(tail))
+    return tail;
+  const hex3 = /^([0-9a-f]{1,4}):([0-9a-f]{1,4})$/.exec(tail);
+  if (hex3) {
+    const hi = Number.parseInt(hex3[1], 16);
+    const lo = Number.parseInt(hex3[2], 16);
+    if (Number.isNaN(hi) || Number.isNaN(lo))
+      return null;
+    return `${hi >> 8 & 255}.${hi & 255}.${lo >> 8 & 255}.${lo & 255}`;
+  }
+  return null;
+}
+function blockedEmbeddingEndpointReason(endpoint) {
+  const trimmed = endpoint.trim();
+  if (trimmed.length === 0)
+    return null;
+  let url2;
+  try {
+    url2 = new URL(trimmed);
+  } catch {
+    return `embedding endpoint is not a valid URL: ${trimmed}`;
+  }
+  const host = url2.hostname.toLowerCase().replace(/^\[/, "").replace(/\]$/, "");
+  if (METADATA_HOSTNAMES.has(host)) {
+    return `embedding endpoint host ${host} is a cloud metadata service (blocked)`;
+  }
+  if (IPV6_METADATA_HOSTS.has(host)) {
+    return `embedding endpoint host ${host} is the AWS IPv6 metadata service (blocked)`;
+  }
+  if (isLinkLocalIpv4(host)) {
+    return `embedding endpoint host ${host} is link-local / cloud metadata (blocked)`;
+  }
+  const mappedV4 = ipv4FromMappedIpv6(host);
+  if (mappedV4 && isLinkLocalIpv4(mappedV4)) {
+    return `embedding endpoint host ${host} (IPv4-mapped ${mappedV4}) is link-local / cloud metadata (blocked)`;
+  }
+  if (host.startsWith("fe80:")) {
+    return `embedding endpoint host ${host} is link-local / cloud metadata (blocked)`;
+  }
+  return null;
+}
+
 // ../plugin/src/features/magic-context/memory/embedding-openai.ts
 function normalizeEndpoint2(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
@@ -165405,6 +165487,12 @@ class OpenAICompatibleEmbeddingProvider {
       this.initialized = false;
       return false;
     }
+    const blockedReason = blockedEmbeddingEndpointReason(this.endpoint);
+    if (blockedReason) {
+      log(`[magic-context] embedding endpoint blocked: ${blockedReason}`);
+      this.initialized = false;
+      return false;
+    }
     this.initialized = true;
     return true;
   }
@@ -165450,6 +165538,7 @@ class OpenAICompatibleEmbeddingProvider {
           ...this.inputType ? { input_type: this.inputType } : {},
           ...this.truncate ? { truncate: this.truncate } : {}
         }),
+        redirect: "error",
         signal: internalController.signal
       });
       if (!response.ok) {
@@ -165816,11 +165905,15 @@ function resolveEmbeddingConfig(config2) {
   }
   if (config2.provider === "openai-compatible") {
     const apiKey = config2.api_key?.trim();
+    const inputType = config2.input_type?.trim();
+    const truncate = config2.truncate?.trim();
     return {
       provider: "openai-compatible",
       model: config2.model.trim(),
       endpoint: config2.endpoint.trim(),
-      ...apiKey ? { api_key: apiKey } : {}
+      ...apiKey ? { api_key: apiKey } : {},
+      ...inputType ? { input_type: inputType } : {},
+      ...truncate ? { truncate } : {}
     };
   }
   return { provider: "off" };
@@ -165836,7 +165929,9 @@ function createProvider(config2) {
     return new OpenAICompatibleEmbeddingProvider({
       endpoint: config2.endpoint,
       model: config2.model,
-      apiKey: config2.api_key
+      apiKey: config2.api_key,
+      inputType: config2.input_type,
+      truncate: config2.truncate
     });
   }
   return new LocalEmbeddingProvider(config2.model);
@@ -166648,10 +166743,20 @@ var EMBEDDING_AFFECTING_KEYS = new Set([
   "embedding.api_key",
   "embedding.endpoint",
   "embedding.model",
-  "embedding.provider"
+  "embedding.provider",
+  "embedding.input_type",
+  "embedding.truncate"
 ]);
 var EMBEDDING_AFFECTING_TOP_LEVEL_KEYS = new Set(["embedding", "memory", "experimental"]);
-var EMBEDDING_WARNING_TERMS = ["api_key", "endpoint", "model", "provider", "embedding"];
+var EMBEDDING_WARNING_TERMS = [
+  "api_key",
+  "endpoint",
+  "model",
+  "provider",
+  "embedding",
+  "input_type",
+  "truncate"
+];
 var loggedFailureSignatures = new Map;
 function sha256Prefix2(value, length = 16) {
   return createHash8("sha256").update(value).digest("hex").slice(0, length);
@@ -166717,6 +166822,31 @@ function handleUntrustedLoad(db, projectIdentity, directory, detailed) {
   return true;
 }
 
+// ../plugin/src/config/prune-config-leaf.ts
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function pruneNestedConfigLeaf(block, relativePath) {
+  if (relativePath.length === 0)
+    return null;
+  const result = { ...block };
+  let cursor = result;
+  for (let i = 0;i < relativePath.length - 1; i++) {
+    const seg = String(relativePath[i]);
+    const child = cursor[seg];
+    if (!isPlainObject2(child))
+      return null;
+    const clonedChild = { ...child };
+    cursor[seg] = clonedChild;
+    cursor = clonedChild;
+  }
+  const leaf = String(relativePath[relativePath.length - 1]);
+  if (!(leaf in cursor))
+    return null;
+  delete cursor[leaf];
+  return { block: result, removed: relativePath.map(String).join(".") };
+}
+
 // src/config/index.ts
 import { existsSync as existsSync10, readFileSync as readFileSync8 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
@@ -166808,6 +166938,70 @@ function migrateLegacyExperimental(rawConfig, warnings) {
   return patched;
 }
 
+// ../plugin/src/config/project-security.ts
+var HIDDEN_AGENT_KEYS = ["historian", "dreamer", "sidekick"];
+var AGENT_ESCALATION_FIELDS = ["prompt", "permission", "tools", "system_prompt"];
+function isPlainObject3(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function stripUnsafeProjectConfigFields(projectRaw) {
+  const warnings = [];
+  if ("auto_update" in projectRaw) {
+    delete projectRaw.auto_update;
+    warnings.push("Ignoring auto_update from project config (security: this setting only honors user-level config).");
+  }
+  for (const agentKey of HIDDEN_AGENT_KEYS) {
+    const block = projectRaw[agentKey];
+    if (!isPlainObject3(block))
+      continue;
+    const removed = [];
+    for (const field of AGENT_ESCALATION_FIELDS) {
+      if (field in block) {
+        delete block[field];
+        removed.push(field);
+      }
+    }
+    if (removed.length > 0) {
+      warnings.push(`Ignoring ${agentKey}.${removed.join("/")} from project config ` + "(security: a repository cannot reprogram or re-permission hidden agents).");
+    }
+  }
+  return warnings;
+}
+function normalizeEndpoint3(value) {
+  if (typeof value !== "string")
+    return;
+  const trimmed = value.trim().replace(/\/+$/, "");
+  return trimmed.length > 0 ? trimmed.toLowerCase() : undefined;
+}
+function dropInheritedEmbeddingKeyOnRedirect(projectRaw, mergedRaw, userRaw) {
+  const projectEmbedding = projectRaw.embedding;
+  if (!isPlainObject3(projectEmbedding))
+    return [];
+  const redirectsEndpoint = "endpoint" in projectEmbedding;
+  if (!redirectsEndpoint)
+    return [];
+  const userEmbedding = userRaw?.embedding;
+  if (isPlainObject3(userEmbedding)) {
+    const projectEndpoint = normalizeEndpoint3(projectEmbedding.endpoint);
+    const userEndpoint = normalizeEndpoint3(userEmbedding.endpoint);
+    if (projectEndpoint !== undefined && projectEndpoint === userEndpoint) {
+      return [];
+    }
+  }
+  const providesOwnKey = typeof projectEmbedding.api_key === "string" && projectEmbedding.api_key.length > 0;
+  if (providesOwnKey)
+    return [];
+  const mergedEmbedding = mergedRaw.embedding;
+  if (!isPlainObject3(mergedEmbedding))
+    return [];
+  if (!("api_key" in mergedEmbedding))
+    return [];
+  delete mergedEmbedding.api_key;
+  return [
+    "Dropped inherited user embedding api_key because project config redirected " + "embedding.endpoint without supplying its own key (security: prevents key " + "exfiltration to a repository-chosen endpoint)."
+  ];
+}
+
 // ../plugin/src/config/variable.ts
 import { existsSync as existsSync9, readFileSync as readFileSync7 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
@@ -166872,6 +167066,21 @@ function stripJsonComments(content) {
 // ../plugin/src/config/variable.ts
 var ENV_PATTERN = /\{env:([^}]+)\}/g;
 var FILE_PATTERN = /\{file:([^}]+)\}/g;
+function sensitiveFilePathReason(resolvedPath) {
+  const home = homedir3();
+  const sensitiveDirs = [
+    { dir: resolve4(home, ".ssh"), label: "SSH keys" },
+    { dir: resolve4(home, ".aws"), label: "AWS credentials" },
+    { dir: resolve4(home, ".gnupg"), label: "GnuPG keyring" },
+    { dir: resolve4(home, ".config", "gh"), label: "GitHub CLI auth" }
+  ];
+  for (const { dir, label } of sensitiveDirs) {
+    if (resolvedPath === dir || resolvedPath.startsWith(`${dir}/`)) {
+      return label;
+    }
+  }
+  return null;
+}
 function substituteConfigVariables(input) {
   const warnings = [];
   let text = input.text;
@@ -166925,6 +167134,10 @@ function substituteConfigVariables(input) {
     } else if (!isAbsolute3(filePath)) {
       filePath = resolve4(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 (!existsSync9(filePath)) {
       warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
       continue;
@@ -166963,7 +167176,8 @@ function loadConfigFile(path7, scope) {
     const rawText = readFileSync8(path7, "utf-8");
     const substituted = substituteConfigVariables({
       text: rawText,
-      configPath: path7
+      configPath: path7,
+      isProjectConfig: scope === "project"
     });
     return {
       path: path7,
@@ -167005,14 +167219,14 @@ function redactConfigValue(value) {
   }
   return typeof value;
 }
-function isPlainObject2(value) {
+function isPlainObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function mergeRawConfigs(base, override) {
   const merged = { ...base };
   for (const [key, overrideValue] of Object.entries(override)) {
     const baseValue = merged[key];
-    merged[key] = isPlainObject2(baseValue) && isPlainObject2(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
+    merged[key] = isPlainObject4(baseValue) && isPlainObject4(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
   }
   return merged;
 }
@@ -167026,10 +167240,15 @@ function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
   }
   const defaults = MagicContextConfigSchema.parse({});
   const errorPaths = new Set;
+  const issuePathsByKey = new Map;
   for (const issue2 of parsed.error.issues) {
     const topKey = issue2.path[0];
     if (topKey !== undefined) {
-      errorPaths.add(String(topKey));
+      const key = String(topKey);
+      errorPaths.add(key);
+      const paths = issuePathsByKey.get(key) ?? [];
+      paths.push([...issue2.path]);
+      issuePathsByKey.set(key, paths);
     }
   }
   const patched = { ...migrated };
@@ -167037,11 +167256,32 @@ function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
   for (const key of errorPaths) {
     recoveredTopLevelKeys.push(key);
     const isAgentConfig = key === "historian" || key === "dreamer" || key === "sidekick";
-    delete patched[key];
     if (isAgentConfig) {
+      delete patched[key];
       warnings.push(`"${key}": invalid agent configuration, ignoring. Check your magic-context.jsonc.`);
       continue;
     }
+    const issuePaths = issuePathsByKey.get(key) ?? [];
+    const rawValue = migrated[key];
+    const allNested = issuePaths.length > 0 && issuePaths.every((p) => p.length >= 2) && typeof rawValue === "object" && rawValue !== null && !Array.isArray(rawValue);
+    if (allNested) {
+      let prunedBlock = {
+        ...rawValue
+      };
+      const prunedLeaves = [];
+      for (const p of issuePaths) {
+        const relative3 = p.slice(1);
+        const result = pruneNestedConfigLeaf(prunedBlock, relative3);
+        if (result) {
+          prunedBlock = result.block;
+          prunedLeaves.push(result.removed);
+        }
+      }
+      patched[key] = prunedBlock;
+      warnings.push(`"${key}": invalid nested field(s) ${prunedLeaves.map((l) => `"${l}"`).join(", ")}, using defaults for those.`);
+      continue;
+    }
+    delete patched[key];
     const defaultValue = defaults[key];
     warnings.push(`"${key}": invalid value (${redactConfigValue(rawConfig[key])}), using default ${JSON.stringify(defaultValue)}.`);
   }
@@ -167074,10 +167314,22 @@ function loadPiConfig(opts = {}) {
       return 0;
     return a.scope === "user" ? -1 : 1;
   });
+  const userRaw = mergeFiles.find((f) => f.scope === "user")?.config;
   for (const loaded of mergeFiles) {
     const prefix = loaded.scope === "user" ? "[user config]" : "[project config]";
     warnings.push(...loaded.warnings.map((warning) => `${prefix} ${warning}`));
-    rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+    if (loaded.scope === "project") {
+      const projectRaw = { ...loaded.config };
+      for (const warning of stripUnsafeProjectConfigFields(projectRaw)) {
+        warnings.push(`${prefix} ${warning}`);
+      }
+      rawConfig = mergeRawConfigs(rawConfig, projectRaw);
+      for (const warning of dropInheritedEmbeddingKeyOnRedirect(projectRaw, rawConfig, userRaw)) {
+        warnings.push(`${prefix} ${warning}`);
+      }
+    } else {
+      rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+    }
   }
   const parsed = parsePiConfig(rawConfig);
   warnings.push(...parsed.warnings.map((warning) => `[merged config] ${warning}`));
@@ -167152,10 +167404,22 @@ function loadPiConfigDetailed(opts = {}) {
       return 0;
     return a.scope === "user" ? -1 : 1;
   });
+  const userRaw = mergeFiles.find((f) => f.scope === "user")?.config;
   for (const loaded of mergeFiles) {
     const prefix = loaded.scope === "user" ? "[user config]" : "[project config]";
     warnings.push(...loaded.warnings.map((warning) => `${prefix} ${warning}`));
-    rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+    if (loaded.scope === "project") {
+      const projectRaw = { ...loaded.config };
+      for (const warning of stripUnsafeProjectConfigFields(projectRaw)) {
+        warnings.push(`${prefix} ${warning}`);
+      }
+      rawConfig = mergeRawConfigs(rawConfig, projectRaw);
+      for (const warning of dropInheritedEmbeddingKeyOnRedirect(projectRaw, rawConfig, userRaw)) {
+        warnings.push(`${prefix} ${warning}`);
+      }
+    } else {
+      rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+    }
   }
   const recoveredTopLevelKeys = [];
   const parsed = parsePiConfig(rawConfig, recoveredTopLevelKeys);
@@ -167210,7 +167474,11 @@ function registerPiDreamerProject(opts) {
   }
   const existing = registeredProjects2.get(opts.projectIdentity);
   if (existing) {
-    return;
+    if (existing.projectDir === opts.projectDir) {
+      return;
+    }
+    existing.cleanup();
+    registeredProjects2.delete(opts.projectIdentity);
   }
   registerDreamProjectDirectory(opts.projectIdentity, opts.projectDir);
   const client = createPiDreamerClient(opts);
@@ -167256,7 +167524,8 @@ function registerPiDreamerProject(opts) {
       cancelled = true;
       cleanup?.();
     },
-    runOnce
+    runOnce,
+    projectDir: opts.projectDir
   });
 }
 async function runPiDreamForProject(projectIdentity) {
@@ -167283,7 +167552,7 @@ async function awaitInFlightDreamers() {
 function createPiDreamerClient(opts) {
   const runner2 = piSubagentRunnerFactory();
   const model = opts.config.model;
-  const fallbackModels = normalizeFallbackModels(opts.config.fallback_models);
+  const fallbackModels = resolveFallbackChain(DREAMER_AGENT, opts.config.fallback_models);
   const session = {
     create: async (args) => {
       const sessionId = `magic-context-pi-dream-${++sessionCounter}`;
@@ -167343,15 +167612,6 @@ function createPiDreamerClient(opts) {
   };
   return { session };
 }
-function normalizeFallbackModels(value) {
-  if (Array.isArray(value)) {
-    return value;
-  }
-  if (typeof value === "string" && value.trim().length > 0) {
-    return [value];
-  }
-  return;
-}
 function readDirectory(args) {
   const query = args.query;
   if (typeof query !== "object" || query === null) {
@@ -168682,6 +168942,9 @@ function escapeXmlAttr2(s) {
 function escapeXmlContent2(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
+function isTieredRow(c) {
+  return typeof c.p1 === "string" && c.p1.length > 0;
+}
 function tierBody(c, tier2) {
   const tiers = [c.p1, c.p2, c.p3, c.p4];
   const requested = tiers[tier2 - 1];
@@ -168711,12 +168974,13 @@ function renderOneCompartment(c, tier2) {
   const baseAttrs = `start="${c.startMessage}" end="${c.endMessage}" title="${escapeXmlAttr2(c.title)}"`;
   if (tier2 >= 5)
     return "";
-  if (c.legacy === 1) {
-    if (tier2 >= 4)
+  if (c.legacy === 1 || !isTieredRow(c)) {
+    const flat = (c.content ?? "").trim();
+    if (tier2 >= 4 || flat.length === 0)
       return `<compartment ${baseAttrs} />`;
     return [
       `<compartment ${baseAttrs}>`,
-      escapeXmlContent2(legacyBodyForTier(c.content, tier2)),
+      escapeXmlContent2(legacyBodyForTier(flat, tier2)),
       "</compartment>"
     ].join(`
 `);
@@ -171139,6 +171403,9 @@ function safeGetActiveUserMemoriesPi(db) {
     throw error51;
   }
 }
+function memoryProjectPath(state) {
+  return state.memoryEnabled === false ? undefined : state.projectIdentity;
+}
 var EMPTY_PI_HARD_SIGNALS = {
   systemHash: "",
   toolSetHash: "",
@@ -171206,17 +171473,15 @@ function readCurrentMarkers(db, state, projectDocsHash) {
   return readCurrentMarkersFromCompartments(db, state, getCompartments(db, state.sessionId), projectDocsHash);
 }
 function readCurrentMarkersFromCompartments(db, state, compartments, projectDocsHash) {
-  const memories = getMemoriesByProject(db, state.projectIdentity, [
-    "active",
-    "permanent"
-  ]);
-  const projectState = getProjectState(db, state.projectIdentity);
+  const memPath = memoryProjectPath(state);
+  const memories = memPath ? getMemoriesByProject(db, memPath, ["active", "permanent"]) : [];
+  const projectState = memPath ? getProjectState(db, memPath) : undefined;
   const globalState = getProjectState(db, GLOBAL_USER_PROFILE_PROJECT_PATH);
   return {
     maxCompartmentSeq: compartments.length > 0 ? compartments.reduce((max, compartment) => compartment.sequence > max ? compartment.sequence : max, EMPTY_MAX_COMPARTMENT_SEQ) : EMPTY_MAX_COMPARTMENT_SEQ,
     maxMemoryId: memories.length > 0 ? memories.reduce((max, memory) => memory.id > max ? memory.id : max, 0) : 0,
     maxMutationId: getMaxM0MutationId(db, state.sessionId) ?? 0,
-    maxMemoryMutationId: getMaxMemoryMutationId(db, state.projectIdentity) ?? 0,
+    maxMemoryMutationId: memPath ? getMaxMemoryMutationId(db, memPath) ?? 0 : 0,
     projectMemoryEpoch: projectState?.projectMemoryEpoch ?? 0,
     projectUserProfileVersion: globalState?.projectUserProfileVersion ?? 0,
     projectDocsHash: projectDocsHash ?? readProjectDocsCanonical(state.projectDirectory).canonicalHash,
@@ -171280,7 +171545,8 @@ ${memories.map((memory) => `- ${escapeXmlContent(memory.content)}`).join(`
 </${wrapper}>`;
 }
 function renderM0Pi(state, db, projectDocs = readProjectDocsCanonical(state.projectDirectory).renderedBlock, decayPressureMultiplier = 1, memoriesOverride, compartmentsOverride, userProfileOverride) {
-  const allMemories = memoriesOverride ?? getMemoriesByProject(db, state.projectIdentity, ["active", "permanent"]);
+  const memPath = memoryProjectPath(state);
+  const allMemories = memoriesOverride ?? (memPath ? getMemoriesByProject(db, memPath, ["active", "permanent"]) : []);
   const memories = allMemories.length > 0 ? trimMemoriesToBudgetV2(state.sessionId, allMemories, state.injectionBudgetTokens ?? DEFAULT_MEMORY_BUDGET_TOKENS).renderOrder : allMemories;
   const memoryBlock = memories.length > 0 ? renderMemoryBlockV2(memories) : undefined;
   const baseHistoryBudget = state.historyBudgetTokens ?? DEFAULT_HISTORY_BUDGET_TOKENS;
@@ -171330,17 +171596,18 @@ class PiMaterializeContentionError extends Error {
   }
 }
 function readFrozenM0InputsPi(state, db, docs = readProjectDocsCanonical(state.projectDirectory), memoryCutoff) {
+  const memPath = memoryProjectPath(state);
   const read = db.transaction(() => {
     const compartments = getCompartments(db, state.sessionId);
-    const memories = getMemoriesByProject(db, state.projectIdentity, ["active", "permanent"], memoryCutoff);
+    const memories = memPath ? getMemoriesByProject(db, memPath, ["active", "permanent"], memoryCutoff) : [];
     const userProfile = safeGetActiveUserMemoriesPi(db);
-    const projectState = getProjectState(db, state.projectIdentity);
+    const projectState = memPath ? getProjectState(db, memPath) : undefined;
     const globalState = getProjectState(db, GLOBAL_USER_PROFILE_PROJECT_PATH);
     const markers = {
       maxCompartmentSeq: compartments.reduce((max, compartment) => compartment.sequence > max ? compartment.sequence : max, EMPTY_MAX_COMPARTMENT_SEQ),
       maxMemoryId: memories.reduce((max, memory) => memory.id > max ? memory.id : max, 0),
       maxMutationId: getMaxM0MutationId(db, state.sessionId) ?? 0,
-      maxMemoryMutationId: getMaxMemoryMutationId(db, state.projectIdentity) ?? 0,
+      maxMemoryMutationId: memPath ? getMaxMemoryMutationId(db, memPath) ?? 0 : 0,
       projectMemoryEpoch: projectState?.projectMemoryEpoch ?? 0,
       projectUserProfileVersion: globalState?.projectUserProfileVersion ?? 0,
       projectDocsHash: docs.canonicalHash,
@@ -171511,20 +171778,21 @@ ${lines.join(`
     count: mutations.length
   };
 }
-function renderM1PiWithMetadata(state, db, markers, renderedMemoryIds, preRenderedKeyFilesBlock) {
+function renderM1PiWithMetadata(state, db, markers, renderedMemoryIds, preRenderedKeyFilesBlock, compartmentsOverride) {
   const sections = [];
   const keyFiles = renderedKeyFilesBlockPi(state, db, preRenderedKeyFilesBlock);
   if (keyFiles)
     sections.push(keyFiles);
-  const memoryUpdates = renderMemoryUpdatesBlockPi({
+  const memPath = memoryProjectPath(state);
+  const memoryUpdates = memPath ? renderMemoryUpdatesBlockPi({
     db,
-    projectPath: state.projectIdentity,
+    projectPath: memPath,
     afterId: markers.maxMemoryMutationId,
     renderedMemoryIds
-  });
+  }) : { block: undefined, count: 0 };
   if (memoryUpdates.block)
     sections.push(memoryUpdates.block);
-  const newCompartments = getCompartments(db, state.sessionId).filter((compartment) => compartment.sequence > markers.maxCompartmentSeq);
+  const newCompartments = (compartmentsOverride ?? getCompartments(db, state.sessionId)).filter((compartment) => compartment.sequence > markers.maxCompartmentSeq);
   if (newCompartments.length > 0) {
     const body = newCompartments.map((compartment) => renderCompartmentAtTier(compartment, 1)).join(`
 
@@ -171533,7 +171801,7 @@ function renderM1PiWithMetadata(state, db, markers, renderedMemoryIds, preRender
 ${body}
 </new-compartments>`);
   }
-  const newMemories = getMemoriesByProject(db, state.projectIdentity, ["active", "permanent"], markers.materializedAt).filter((memory) => memory.id > markers.maxMemoryId);
+  const newMemories = memPath ? getMemoriesByProject(db, memPath, ["active", "permanent"], markers.materializedAt).filter((memory) => memory.id > markers.maxMemoryId) : [];
   if (newMemories.length > 0) {
     const memoryBudget = state.injectionBudgetTokens ?? DEFAULT_MEMORY_BUDGET_TOKENS;
     const trimmedNewMemories = trimMemoriesToBudgetV2(state.sessionId, newMemories, Math.max(1, Math.floor(memoryBudget * 0.25))).renderOrder;
@@ -171703,7 +171971,7 @@ function softRefreshCachedM1Pi(args) {
     if (!markers) {
       throw new PiMaterializeContentionError(`invalid cached m[0] markers for ${args.state.sessionId}`);
     }
-    const rendered = renderM1PiWithMetadata(args.state, args.db, markers, parseMemoryBlockIds(row.memory_block_ids), preRenderedKeyFilesBlock);
+    const rendered = renderM1PiWithMetadata(args.state, args.db, markers, parseMemoryBlockIds(row.memory_block_ids), preRenderedKeyFilesBlock, args.compartmentsForNormalization);
     const m1Bytes = Buffer.from(rendered.text, "utf8");
     const latestCompartment = args.compartmentsForNormalization.at(-1);
     const advancedBoundary = latestCompartment?.endMessageId && latestCompartment.endMessageId.length > 0 ? latestCompartment.endMessageId : markers.lastBaselineEndMessageId;
@@ -171831,11 +172099,15 @@ function injectM0M1Pi(state, db, piMessages, entryIds, recomputeM1ThisPass = fal
     m1 = replayed.m1;
     markers = replayed.markers;
   }
-  const M0_DRIFT_RATIO_FLOOR = 2000;
+  const M0_DRIFT_RATIO_FLOOR_TOKENS = 500;
+  const M1_DRIFT_RATIO = 0.15;
   const M1_ABSOLUTE_CAP_RATIO = 0.2;
   const m1AbsoluteBudget = (state.historyBudgetTokens ?? DEFAULT_HISTORY_BUDGET_TOKENS) * M1_ABSOLUTE_CAP_RATIO;
-  const m1OverAbsoluteCap = m1 !== PI_M1_PLACEHOLDER && estimateTokens(m1) > m1AbsoluteBudget;
-  if (!materialized && !contentionExhausted && m1Recomputed && recomputeM1ThisPass && (memoryUpdateCount > 40 || m1OverAbsoluteCap || m1 !== PI_M1_PLACEHOLDER && m0.length >= M0_DRIFT_RATIO_FLOOR && m1.length > m0.length * 0.15)) {
+  const m1HasContent = m1 !== PI_M1_PLACEHOLDER;
+  const m1Tokens = m1HasContent ? estimateTokens(m1) : 0;
+  const m0Tokens = estimateTokens(m0);
+  const m1OverAbsoluteCap = m1HasContent && m1Tokens > m1AbsoluteBudget;
+  if (!materialized && !contentionExhausted && m1Recomputed && recomputeM1ThisPass && (memoryUpdateCount > 40 || m1OverAbsoluteCap || m1HasContent && m0Tokens >= M0_DRIFT_RATIO_FLOOR_TOKENS && m1Tokens > m0Tokens * M1_DRIFT_RATIO)) {
     decision = { value: true, reason: "drift" };
     try {
       const result = materializeM0PiWithRetry(state, db);
@@ -171856,10 +172128,10 @@ function injectM0M1Pi(state, db, piMessages, entryIds, recomputeM1ThisPass = fal
     injected: true,
     compartmentCount: getCompartments(db, state.sessionId).length,
     factCount: 0,
-    memoryCount: getMemoriesByProject(db, state.projectIdentity, [
+    memoryCount: memoryProjectPath(state) ? getMemoriesByProject(db, memoryProjectPath(state), [
       "active",
       "permanent"
-    ]).length,
+    ]).length : 0,
     skippedVisibleMessages,
     m0Materialized: materialized,
     m0Reason: decision.reason,
@@ -173155,6 +173427,27 @@ function validateHistorianOutput(text, _sessionId, chunk, _priorCompartments, se
     events: parsed.events.length > 0 ? parsed.events : undefined
   };
 }
+var HISTORIAN_PERSISTENT_FAILURE_THRESHOLD = 3;
+function buildHistorianFailureNotice(failureCount, lastError) {
+  if (failureCount >= HISTORIAN_PERSISTENT_FAILURE_THRESHOLD) {
+    return [
+      "## Magic Context — history comparting needs attention",
+      "",
+      `Magic Context has been unable to compart this session's history ${failureCount} times in a row. This usually means the configured historian model is misconfigured or unreachable (Magic Context already retried every fallback model automatically).`,
+      "",
+      `Last error: ${lastError}`,
+      "",
+      "Check your historian model in magic-context.jsonc, then restart. Your conversation keeps working normally in the meantime — this only affects how older history is summarized."
+    ].join(`
+`);
+  }
+  return [
+    "## Magic Context",
+    "",
+    "Hit a transient issue comparting history this turn — Magic Context will retry automatically on the next turn. Nothing is lost and your conversation continues normally. You'll only be alerted again if this keeps happening."
+  ].join(`
+`);
+}
 function buildHistorianRepairPrompt(originalPrompt, previousOutput, validationError) {
   return [
     originalPrompt,
@@ -174993,7 +175286,7 @@ ${body}
 function renderSessionRefCompartment(c) {
   const importance = c.importance ?? 50;
   const attrs = `start="${c.startMessage}" end="${c.endMessage}" title="${escapeXmlAttr(c.title)}"` + (c.episodeType ? ` episode_type="${escapeXmlAttr(c.episodeType)}"` : "") + ` importance="${importance}"`;
-  if (c.p1 != null) {
+  if (typeof c.p1 === "string" && c.p1.length > 0) {
     const p4 = c.p4 && c.p4.length > 0 ? `<p4>
 ${escapeXmlContent(c.p4)}
 </p4>` : "<p4/>";
@@ -175094,8 +175387,10 @@ async function runPiHistorian(deps) {
       const existingValidationError = validateStoredCompartments(priorCompartments);
       if (existingValidationError) {
         sessionLog(sessionId, `historian failure: source=existing-validation reason="${existingValidationError}"`);
-        incrementHistorianFailure(db, sessionId, existingValidationError);
-        await notify(`Historian skipped: existing stored compartments are invalid: ${existingValidationError}`);
+        {
+          const failCount = incrementHistorianFailure(db, sessionId, existingValidationError);
+          await notify(buildHistorianFailureNotice(failCount, existingValidationError));
+        }
         return;
       }
       const offset = priorCompartments.length > 0 ? priorCompartments[priorCompartments.length - 1].endMessage + 1 : 1;
@@ -175114,8 +175409,10 @@ async function runPiHistorian(deps) {
       const chunkCoverageError = validateChunkCoverage(chunk);
       if (chunkCoverageError) {
         sessionLog(sessionId, `historian failure: source=chunk-coverage reason="${chunkCoverageError}" chunkRange=${chunk.startIndex}-${chunk.endIndex}`);
-        incrementHistorianFailure(db, sessionId, chunkCoverageError);
-        await notify(`Historian skipped: raw chunk could not be safely chunked: ${chunkCoverageError}`);
+        {
+          const failCount = incrementHistorianFailure(db, sessionId, chunkCoverageError);
+          await notify(buildHistorianFailureNotice(failCount, chunkCoverageError));
+        }
         return;
       }
       const projectPath = resolveProjectIdentity(directory);
@@ -175244,8 +175541,10 @@ ${chunk.text}`,
       if (validatedPass.kind !== "ok") {
         const errorMsg = validatedPass.kind === "validation-failed" ? validatedPass.error : validatedPass.kind === "spawn-failed" ? `subagent run failed (${validatedPass.reason}): ${validatedPass.error}` : "historian returned no usable text";
         sessionLog(sessionId, `historian failure: ${errorMsg}`);
-        incrementHistorianFailure(db, sessionId, errorMsg);
-        await notify(`Historian failed: ${errorMsg}`);
+        {
+          const failCount = incrementHistorianFailure(db, sessionId, errorMsg);
+          await notify(buildHistorianFailureNotice(failCount, errorMsg));
+        }
         return;
       }
       if (twoPass && validatedPass.kind === "ok") {
@@ -175290,8 +175589,10 @@ ${chunk.text}`,
       if (lastNewEnd + 1 <= offset) {
         const errorMsg = `historian returned compartments that did not advance past raw message ${offset - 1}`;
         sessionLog(sessionId, `historian failure: source=no-progress newCompartmentCount=${newCompartments.length} lastNewEnd=${lastNewEnd} priorEnd=${offset - 1}`);
-        incrementHistorianFailure(db, sessionId, errorMsg);
-        await notify(`Historian failed: ${errorMsg}`);
+        {
+          const failCount = incrementHistorianFailure(db, sessionId, errorMsg);
+          await notify(buildHistorianFailureNotice(failCount, errorMsg));
+        }
         return;
       }
       const markerSummary = buildPiCompactionSummary(newCompartments);
@@ -175405,8 +175706,10 @@ ${chunk.text}`,
     const desc = describeError(error51);
     telemetry.failureReason = `exception: ${desc.brief}`;
     sessionLog(sessionId, `historian failure: source=exception ${desc.brief}${desc.stackHead ? ` stackHead="${desc.stackHead}"` : ""}`);
-    incrementHistorianFailure(db, sessionId, desc.brief);
-    await notify(`Historian failed unexpectedly: ${desc.brief}`);
+    {
+      const failCount = incrementHistorianFailure(db, sessionId, desc.brief);
+      await notify(buildHistorianFailureNotice(failCount, desc.brief));
+    }
   } finally {
     updateSessionMeta(db, sessionId, { compartmentInProgress: false });
     try {
@@ -175870,6 +176173,7 @@ function stripPiDroppedPlaceholderMessages(args) {
   };
   const canPrune = (isCacheBusting || args.forceDiscovery === true) && !!stableIdByRef;
   const presentIds = canPrune ? new Set : null;
+  const discoveredIds = [];
   if (isCacheBusting || args.forceDiscovery) {
     for (let i = 0;i < messages.length; i++) {
       const id = idOf(messages[i], i);
@@ -175880,6 +176184,7 @@ function stripPiDroppedPlaceholderMessages(args) {
         continue;
       if (!idsToStrip.has(id)) {
         idsToStrip.add(id);
+        discoveredIds.push(id);
         discovered++;
       }
     }
@@ -175894,17 +176199,20 @@ function stripPiDroppedPlaceholderMessages(args) {
   }
   let pruned = 0;
   if (presentIds) {
-    const finalIds = new Set;
-    for (const id of idsToStrip) {
-      if (presentIds.has(id))
-        finalIds.add(id);
-    }
-    pruned = idsToStrip.size - finalIds.size;
-    if (discovered > 0 || pruned > 0) {
-      setStrippedPlaceholderIds(db, sessionId, finalIds);
+    const removedIds = [];
+    for (const id of persistedIds) {
+      if (!presentIds.has(id))
+        removedIds.push(id);
+    }
+    pruned = removedIds.length;
+    if (discoveredIds.length > 0 || removedIds.length > 0) {
+      applyStrippedPlaceholderDelta(db, sessionId, {
+        add: discoveredIds,
+        remove: removedIds
+      });
     }
-  } else if (discovered > 0) {
-    setStrippedPlaceholderIds(db, sessionId, idsToStrip);
+  } else if (discoveredIds.length > 0) {
+    applyStrippedPlaceholderDelta(db, sessionId, { add: discoveredIds });
   }
   if (removed > 0 || discovered > 0 || pruned > 0) {
     sessionLog(sessionId, `placeholder strip: removed=${removed} discovered=${discovered} pruned=${pruned}`);
@@ -175929,6 +176237,7 @@ var PARTNER_FRAME_CLOSER_REDUCE = `
 Reduction prompts are routine housekeeping to keep the session fast and cheap — act on them as light maintenance, never as scarcity warnings. Keep individual operations efficient, but never let context size change *what* work you take on or *how thoroughly* you do it.`;
 var PARTNER_FRAME_CLOSER_NO_REDUCE = `
 Context is managed for you entirely automatically — there's nothing to prune and no warnings to act on. Stay reasonably concise per operation, and never let context size change *what* work you take on or *how thoroughly* you do it.`;
+var CTX_NOTE_GUIDANCE = `Use \`ctx_note\` ONLY for genuinely future concerns — something to revisit much later, not work coming up in the next few turns (that's already in your active context) and not active multi-step work (use todos for that). Magic Context preserves your full context across both compaction and restarts, so an upcoming restart or "let's come back to this later" is never a reason to take a note — nothing is lost either way. Notes you do take survive compression and resurface at natural work boundaries (after commits, historian runs, todo completion).`;
 function getToolHistoryGuidance(dropToolStructure) {
   if (dropToolStructure) {
     return `Compressed history intentionally omits tool calls and their outputs — summaries like "I edited file X" are historian records, not patterns to replicate. In the live conversation, older tool calls and their results are cleaned up to save context — you may see your own past messages referencing actions without the corresponding tool call or result visible. This is normal context management. ALWAYS use real tool calls; never simulate, fabricate, or inline tool outputs in your text. If there is no tool result message, the action did not happen. NEVER simulate, hallucinate or claim tool calls, command output, search results, file edits, or diffs in plain text as if they actually occurred.`;
@@ -175939,7 +176248,8 @@ var BASE_INTRO = (protectedTags, dropToolStructure) => `Messages and tool output
 Use \`ctx_reduce\` to manage context size. It supports one operation:
 - \`drop\`: Remove entirely (best for tool outputs you already acted on).
 Syntax: "3-5", "1,2,9", or "1-5,8,12-15". Last ${protectedTags} tags are protected.
-Use \`ctx_note\` for deferred intentions — things to tackle later, not right now. NOT for task tracking (use todos). Notes survive context compression and you'll be reminded at natural work boundaries (after commits, historian runs, todo completion).
+Do not announce or narrate \`ctx_reduce\` drops — just call the tool silently. Saying "I'll drop these outputs" wastes tokens the user does not care about.
+${CTX_NOTE_GUIDANCE}
 Use \`ctx_memory\` to manage cross-session project memories. Write new memories or delete stale ones. Memories persist across sessions and are automatically injected into new sessions.
 **Save to memory proactively**: If you spent multiple turns finding something (a file path, a DB location, a config pattern, a workaround), save it with \`ctx_memory\` so future sessions don't repeat the search. Examples:
 - Found a project's source code path after searching → \`ctx_memory(action="write", category="ENVIRONMENT", content="OpenCode source is at ~/Work/OSS/opencode")\`
@@ -175959,7 +176269,7 @@ NEVER drop large ranges blindly (e.g., "1-50"). Review each tag before deciding.
 NEVER drop user messages — they are short and will be summarized by compartmentalization automatically. Dropping them loses context the historian needs.
 NEVER drop assistant text messages unless they are exceptionally large. Your conversation messages are lightweight; only large tool outputs are worth dropping.
 Before your turn finishes, consider using \`ctx_reduce\` to drop large tool outputs you no longer need.`;
-var BASE_INTRO_NO_REDUCE = (dropToolStructure) => `Use \`ctx_note\` for deferred intentions — things to tackle later, not right now. NOT for task tracking (use todos). Notes survive context compression and you'll be reminded at natural work boundaries (after commits, historian runs, todo completion).
+var BASE_INTRO_NO_REDUCE = (dropToolStructure) => `${CTX_NOTE_GUIDANCE}
 Use \`ctx_memory\` to manage cross-session project memories. Write new memories or delete stale ones. Memories persist across sessions and are automatically injected into new sessions.
 **Save to memory proactively**: If you spent multiple turns finding something (a file path, a DB location, a config pattern, a workaround), save it with \`ctx_memory\` so future sessions don't repeat the search. Examples:
 - Found a project's source code path after searching → \`ctx_memory(action="write", category="ENVIRONMENT", content="OpenCode source is at ~/Work/OSS/opencode")\`
@@ -176749,7 +177059,9 @@ function consumeDeferredMaterialization(sessionId) {
   deferredMaterializationSessions.delete(sessionId);
   return wasSet;
 }
+var MAX_TRACKED_SESSIONS = 100;
 function trackSessionForProject(projectIdentity, sessionId) {
+  activeContextHandlerSessions.delete(sessionId);
   activeContextHandlerSessions.add(sessionId);
   let sessions = sessionsByProject.get(projectIdentity);
   if (!sessions) {
@@ -176757,6 +177069,12 @@ function trackSessionForProject(projectIdentity, sessionId) {
     sessionsByProject.set(projectIdentity, sessions);
   }
   sessions.add(sessionId);
+  while (activeContextHandlerSessions.size > MAX_TRACKED_SESSIONS) {
+    const oldest = activeContextHandlerSessions.values().next().value;
+    if (oldest === undefined || oldest === sessionId)
+      break;
+    clearContextHandlerSession(oldest);
+  }
 }
 function isContextHandlerSessionActive(sessionId) {
   return activeContextHandlerSessions.has(sessionId);
@@ -177140,24 +177458,26 @@ function registerPiContextHandler(pi, options) {
       }
       let usagePercentage = 0;
       let usageInputTokens = 0;
+      let usedPersistedUsage = false;
       if (sessionMetaForUsage.lastContextPercentage > 0 && sessionMetaForUsage.lastInputTokens > 0) {
         usagePercentage = sessionMetaForUsage.lastContextPercentage;
         usageInputTokens = sessionMetaForUsage.lastInputTokens;
+        usedPersistedUsage = true;
       } else {
         usagePercentage = typeof piUsage?.percent === "number" ? piUsage.percent : 0;
         usageInputTokens = typeof piUsage?.tokens === "number" ? piUsage.tokens : 0;
       }
-      let usageContextLimit = typeof piUsage?.contextWindow === "number" && piUsage.contextWindow > 0 ? piUsage.contextWindow : undefined;
+      let usageContextLimit = isSaneLimit(piUsage?.contextWindow) ? piUsage.contextWindow : undefined;
       const tEmergencyRecovery = performance.now();
+      let needsEmergencyBump = false;
+      let emergencyRecoveryArmed = false;
       try {
         const overflowState = getOverflowState(options.db, sessionId);
         if (overflowState.detectedContextLimit > 0) {
           usageContextLimit = Math.min(usageContextLimit ?? overflowState.detectedContextLimit, overflowState.detectedContextLimit);
         }
-        if (overflowState.needsEmergencyRecovery && usagePercentage < 95) {
-          sessionLog(sessionId, `transform: overflow recovery flag set — bumping percentage from ${usagePercentage.toFixed(1)}% to 95% (detectedLimit=${overflowState.detectedContextLimit || "unknown"})`);
-          usagePercentage = 95;
-        }
+        emergencyRecoveryArmed = overflowState.needsEmergencyRecovery;
+        needsEmergencyBump = overflowState.needsEmergencyRecovery && usagePercentage < 95;
       } catch (err) {
         sessionLog(sessionId, `transform: overflow state read failed: ${err instanceof Error ? err.message : String(err)}`);
       }
@@ -177169,6 +177489,13 @@ function registerPiContextHandler(pi, options) {
           usageContextLimit = modelWindow;
         }
       }
+      if (!usedPersistedUsage && isSaneLimit(usageContextLimit) && usageInputTokens > 0) {
+        usagePercentage = usageInputTokens / usageContextLimit * 100;
+      }
+      if (needsEmergencyBump) {
+        sessionLog(sessionId, `transform: overflow recovery flag set — bumping percentage to 95% (detectedLimit=${usageContextLimit ?? "unknown"})`);
+        usagePercentage = 95;
+      }
       let schedulerDecision;
       const tScheduler = performance.now();
       try {
@@ -177218,10 +177545,6 @@ function registerPiContextHandler(pi, options) {
         setDeferredExecutePendingIfAbsent(options.db, sessionId, flagPayload);
       }
       schedulerDecision = midTurnAdjustedSchedulerDecision;
-      const deferredExecutePending = peekDeferredExecutePending(options.db, sessionId);
-      if (deferredExecutePending !== null && schedulerDecision === "defer" && !midTurn) {
-        schedulerDecision = "execute";
-      }
       sessionLog(sessionId, `[boundary-exec] base=${schedulerDecisionEarly} bypass=${bypassReason} midTurn=${midTurn} effective=${midTurnAdjustedSchedulerDecision} sideEffect=${sideEffect}`);
       const forceMaterialization = usagePercentage >= FORCE_MATERIALIZATION_PERCENTAGE;
       const isEmergency = usagePercentage >= EMERGENCY_BLOCK_PERCENTAGE;
@@ -177239,6 +177562,14 @@ function registerPiContextHandler(pi, options) {
             sessionLog(sessionId, "EMERGENCY: historian wait completed (or timed out)");
           } catch {}
         }
+        if (emergencyRecoveryArmed && !inFlightHistorian.has(sessionId) && !hasEligiblePiCompartmentHistory(options.db, sessionId)) {
+          try {
+            clearEmergencyRecovery(options.db, sessionId);
+            sessionLog(sessionId, "EMERGENCY: disarming recovery — no eligible pre-tail history to compact (would otherwise loop at 95%)");
+          } catch (err) {
+            sessionLog(sessionId, `EMERGENCY: clearEmergencyRecovery failed: ${err instanceof Error ? err.message : String(err)}`);
+          }
+        }
       }
       const isCacheBusting = historyRefreshSessions.has(sessionId);
       sessionLog(sessionId, `transform: usage=${usagePercentage.toFixed(1)}% (${usageInputTokens} tokens, limit=${usageContextLimit ?? "?"}) decision=${schedulerDecision}${forceMaterialization ? " force=true" : ""}${isEmergency ? " EMERGENCY=true" : ""}${isCacheBusting ? " busting=true" : ""}`);
@@ -177256,6 +177587,7 @@ function registerPiContextHandler(pi, options) {
         heuristics: options.heuristics,
         injection: options.injection ? {
           ...options.injection,
+          memoryEnabled: options.injection.memoryEnabled,
           historyBudgetTokens: resolveHistoryBudgetTokensForPi({
             historyBudgetPercentage: options.historian?.historyBudgetPercentage,
             usagePercentage,
@@ -177573,7 +177905,16 @@ function maybeFireHistorian(args) {
   let usageContextLimit;
   try {
     const piUsage = ctx.getContextUsage?.();
-    usageContextLimit = typeof piUsage?.contextWindow === "number" && piUsage.contextWindow > 0 ? piUsage.contextWindow : undefined;
+    usageContextLimit = isSaneLimit(piUsage?.contextWindow) ? piUsage.contextWindow : undefined;
+    if (usageContextLimit === undefined && isSaneLimit(ctx.model?.contextWindow)) {
+      usageContextLimit = ctx.model.contextWindow;
+    }
+    try {
+      const overflowState = getOverflowState(db, sessionId);
+      if (overflowState.detectedContextLimit > 0) {
+        usageContextLimit = Math.min(usageContextLimit ?? overflowState.detectedContextLimit, overflowState.detectedContextLimit);
+      }
+    } catch {}
     const sessionMetaForUsage = getOrCreateSessionMeta(db, sessionId);
     if (sessionMetaForUsage.lastContextPercentage > 0 && sessionMetaForUsage.lastInputTokens > 0) {
       usage = {
@@ -177586,8 +177927,9 @@ function maybeFireHistorian(args) {
         sessionLog(sessionId, `historian trigger eval: no usage info yet (tokens=${piUsage?.tokens ?? "<no piUsage>"}, percent=${piUsage?.percent ?? "<no piUsage>"}, contextWindow=${piUsage?.contextWindow ?? "<no piUsage>"})`);
         return;
       }
+      const fallbackPercentage = isSaneLimit(usageContextLimit) && piUsage.tokens > 0 ? piUsage.tokens / usageContextLimit * 100 : piUsage.percent;
       usage = {
-        percentage: piUsage.percent,
+        percentage: fallbackPercentage,
         inputTokens: piUsage.tokens
       };
       sessionLog(sessionId, `historian trigger eval: usage=${usage.percentage.toFixed(1)}% (${usage.inputTokens} tokens) [piUsage fallback], checking trigger...`);
@@ -177663,6 +178005,7 @@ async function runPipeline(args) {
   let executedWorkThisPass = false;
   let historyWasConsumedThisPass = false;
   let materializationSatisfiedThisPass = false;
+  let pendingOpsAppliedThisPass = false;
   let suppressDeferredHistoryDrain = false;
   let casLost = false;
   const deferredHistoryWasPendingAtPassStart = deferredHistoryRefreshSessions.has(args.sessionId);
@@ -177686,7 +178029,9 @@ async function runPipeline(args) {
     return findLatestUserMessageIdPi(args.messages, ids)?.messageId ?? null;
   })();
   const alreadyRanHeuristicsThisTurn = currentTurnId !== null && lastHeuristicsTurnIdBySession.get(args.sessionId) === currentTurnId;
-  const shouldRunHeuristics = args.heuristics !== undefined && (args.forceMaterialization === true || hasPendingMaterialization(args.sessionId) || deferredMaterializationSessions.has(args.sessionId) || args.schedulerDecision === "execute" && !alreadyRanHeuristicsThisTurn);
+  const canConsumeDeferredLate = args.schedulerDecision === "execute" || args.forceMaterialization === true || args.contextUsage.percentage >= FORCE_MATERIALIZATION_PERCENTAGE;
+  const deferredMaterializeEligible = canConsumeDeferredLate && deferredMaterializationSessions.has(args.sessionId);
+  const shouldRunHeuristics = args.heuristics !== undefined && (args.forceMaterialization === true || hasPendingMaterialization(args.sessionId) || deferredMaterializeEligible || args.schedulerDecision === "execute" && !alreadyRanHeuristicsThisTurn);
   const entryFingerprintByMessageId = buildEntryFingerprintMap(args.messages, stableIdResolver);
   adoptPiFallbackTags(args.db, args.sessionId, args.tagger, entryFingerprintByMessageId);
   const tTag = performance.now();
@@ -177712,15 +178057,13 @@ async function runPipeline(args) {
   const hasPendingMaterializeSignal = hasPendingMaterialization(args.sessionId);
   const deferredMaterializationWasPending = deferredMaterializationSessions.has(args.sessionId);
   const deferredHistoryRefreshWasPending = deferredHistoryWasPendingAtPassStart;
-  const deferredExecuteWasPending = peekDeferredExecutePending(args.db, args.sessionId) !== null;
   const pendingOps = getPendingOps(args.db, args.sessionId);
-  const baseShouldApplyPendingOps = args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || deferredExecuteWasPending;
-  const canConsumeDeferredLate = baseShouldApplyPendingOps || shouldRunHeuristics;
+  const baseShouldApplyPendingOps = args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal;
   const deferredMaterialize = canConsumeDeferredLate && deferredMaterializationWasPending;
   const deferredHistoryRefresh = canConsumeDeferredLate && deferredHistoryRefreshWasPending;
   const shouldApplyPendingOps = baseShouldApplyPendingOps || deferredMaterialize;
   if (shouldApplyPendingOps) {
-    const applyReason = hasPendingMaterializeSignal ? "explicit_flush" : deferredExecuteWasPending ? "deferred_boundary_execute" : deferredMaterialize ? "deferred_publication" : args.forceMaterialization ? "force_materialization" : `scheduler_execute (scheduler=${args.schedulerDecision})`;
+    const applyReason = hasPendingMaterializeSignal ? "explicit_flush" : deferredMaterialize ? "deferred_publication" : args.forceMaterialization ? "force_materialization" : `scheduler_execute (scheduler=${args.schedulerDecision})`;
     sessionLog(args.sessionId, `pending ops WILL APPLY — reason=${applyReason}, pendingOps=${pendingOps.length}, context=${args.contextUsage.percentage.toFixed(1)}%`);
     try {
       const tApplyPending = performance.now();
@@ -177728,14 +178071,12 @@ async function runPipeline(args) {
       logTransformTiming(args.sessionId, "applyPendingOperations", tApplyPending);
       executedWorkThisPass = true;
       materializationSatisfiedThisPass = true;
+      pendingOpsAppliedThisPass = true;
       if (hasPendingMaterializeSignal) {
         if (args.heuristics === undefined) {
           consumePendingMaterialization(args.sessionId);
         }
       }
-      if (deferredMaterialize) {
-        consumeDeferredMaterialization(args.sessionId);
-      }
     } catch (err) {
       sessionLog(args.sessionId, `pending operations failed: ${err instanceof Error ? err.message : String(err)}`);
       throw err;
@@ -177822,6 +178163,12 @@ async function runPipeline(args) {
       sessionLog(args.sessionId, `heuristic cleanup failed (continuing): ${err instanceof Error ? err.message : String(err)}`);
     }
   }
+  if (deferredMaterialize && pendingOpsAppliedThisPass) {
+    const fullPassSucceeded = shouldRunHeuristics ? heuristicsExecuted : true;
+    if (fullPassSucceeded) {
+      consumeDeferredMaterialization(args.sessionId);
+    }
+  }
   if (args.reasoningClearing && shouldRunHeuristics) {
     try {
       const tClearReasoning = performance.now();
@@ -177890,6 +178237,7 @@ async function runPipeline(args) {
         sessionId: args.sessionId,
         projectIdentity: args.projectIdentity,
         projectDirectory: args.projectDirectory,
+        memoryEnabled: args.injection.memoryEnabled,
         injectionBudgetTokens: args.injection.injectionBudgetTokens,
         historyBudgetTokens: args.injection.historyBudgetTokens,
         keyFilesEnabled: args.injection.keyFilesEnabled,
@@ -178417,15 +178765,15 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
   const existing = getPersistedCompactionMarkerState(db, sessionId);
   if (existing) {
     if (existing.boundaryOrdinal === lastCompartmentEnd) {
-      return;
+      return true;
     }
-    try {
-      removeCompactionMarker(existing);
-      setPersistedCompactionMarkerState(db, sessionId, null);
-      sessionLog(sessionId, `compaction-marker: removed old boundary at ordinal ${existing.boundaryOrdinal}, moving to ${lastCompartmentEnd}`);
-    } catch (error51) {
-      sessionLog(sessionId, `compaction-marker: failed to remove old boundary at ordinal ${existing.boundaryOrdinal}, proceeding with new injection:`, error51);
+    const removed = removeCompactionMarker(existing);
+    if (!removed) {
+      sessionLog(sessionId, `compaction-marker: failed to remove old boundary at ordinal ${existing.boundaryOrdinal}; preserving persisted state for retry (not injecting new marker this pass)`);
+      return false;
     }
+    setPersistedCompactionMarkerState(db, sessionId, null);
+    sessionLog(sessionId, `compaction-marker: removed old boundary at ordinal ${existing.boundaryOrdinal}, moving to ${lastCompartmentEnd}`);
   }
   const result = injectCompactionMarker({
     sessionId,
@@ -178439,7 +178787,9 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
       boundaryOrdinal: lastCompartmentEnd
     });
     sessionLog(sessionId, `compaction-marker: injected at ordinal ${lastCompartmentEnd}, boundary user msg ${result.boundaryMessageId}`);
+    return true;
   }
+  return false;
 }
 
 // ../plugin/src/hooks/magic-context/compartment-runner-historian.ts
@@ -178991,7 +179341,6 @@ Found ${existingStaging.compartments.length} staged compartment(s) from ${existi
       if (deps.preserveInjectionCacheUntilConsumed !== true) {
         clearInjectionCache(sessionId);
       }
-      deps.onCompartmentStatePublished?.(sessionId);
       promoted2.facts;
       if (deps.memoryEnabled !== false) {
         const projectIdentity = resolveProjectIdentity(sessionDirectory);
@@ -179004,11 +179353,14 @@ Found ${existingStaging.compartments.length} staged compartment(s) from ${existi
       if (lastCompartmentEnd2 > 0) {
         queueDropsForCompartmentalizedMessages(db, sessionId, lastCompartmentEnd2);
       }
+      deps.onCompartmentStatePublished?.(sessionId);
       if (lastCompartmentEnd2 > 0) {
-        updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd2, deps.directory);
-        const stalePending = getPendingCompactionMarkerState(db, sessionId);
-        if (stalePending) {
-          clearPendingCompactionMarkerStateIf(db, sessionId, stalePending);
+        const markerUpdated = updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd2, deps.directory);
+        if (markerUpdated) {
+          const stalePending = getPendingCompactionMarkerState(db, sessionId);
+          if (stalePending) {
+            clearPendingCompactionMarkerStateIf(db, sessionId, stalePending);
+          }
         }
       }
       return [
@@ -179197,13 +179549,13 @@ Another process acquired the compartment-state lease before recomp could publish
     if (deps.preserveInjectionCacheUntilConsumed !== true) {
       clearInjectionCache(sessionId);
     }
-    deps.onCompartmentStatePublished?.(sessionId);
     const finalCompartments = promoted?.compartments ?? candidateCompartments;
     const finalFacts = promoted?.facts ?? candidateFacts;
     const lastCompartmentEnd = finalCompartments[finalCompartments.length - 1]?.endMessage ?? 0;
     if (lastCompartmentEnd > 0) {
       queueDropsForCompartmentalizedMessages(db, sessionId, lastCompartmentEnd);
     }
+    deps.onCompartmentStatePublished?.(sessionId);
     if (deps.memoryEnabled !== false) {
       const projectIdentity = resolveProjectIdentity(sessionDirectory);
       await deps.ensureProjectRegistered?.(sessionDirectory, db);
@@ -179212,10 +179564,12 @@ Another process acquired the compartment-state lease before recomp could publish
       embedAndStoreCompartments(db, sessionId, projectIdentity, toEmbed);
     }
     if (lastCompartmentEnd > 0) {
-      updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, deps.directory);
-      const stalePending = getPendingCompactionMarkerState(db, sessionId);
-      if (stalePending) {
-        clearPendingCompactionMarkerStateIf(db, sessionId, stalePending);
+      const markerUpdated = updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, deps.directory);
+      if (markerUpdated) {
+        const stalePending = getPendingCompactionMarkerState(db, sessionId);
+        if (stalePending) {
+          clearPendingCompactionMarkerStateIf(db, sessionId, stalePending);
+        }
       }
     }
     return [
@@ -179349,7 +179703,7 @@ Could not acquire the compartment-state lease for this session.`;
         log(`[magic-context] partial recomp merged validation failed: ${mergedError}`);
         return null;
       }
-      saveRecompStagingPass(db, sessionId, passCount + 1, merged, currentFacts);
+      saveRecompStagingPass(db, sessionId, passCount + 1, merged, stagedFacts);
       const promoted = promoteRecompStagingWithM0Mutation(db, sessionId, leaseHolderId);
       if (!promoted) {
         log("[magic-context] partial recomp promote returned null");
@@ -179369,10 +179723,12 @@ Could not acquire the compartment-state lease for this session.`;
       }
       const lastEnd = merged[merged.length - 1]?.endMessage ?? snapEnd;
       if (lastEnd > 0) {
-        updateCompactionMarkerAfterPublication(db, sessionId, lastEnd, deps.directory);
-        const stalePending = getPendingCompactionMarkerState(db, sessionId);
-        if (stalePending) {
-          clearPendingCompactionMarkerStateIf(db, sessionId, stalePending);
+        const markerUpdated = updateCompactionMarkerAfterPublication(db, sessionId, lastEnd, deps.directory);
+        if (markerUpdated) {
+          const stalePending = getPendingCompactionMarkerState(db, sessionId);
+          if (stalePending) {
+            clearPendingCompactionMarkerStateIf(db, sessionId, stalePending);
+          }
         }
       }
       return { compartmentCount: merged.length, lastEndMessage: lastEnd };
@@ -179414,10 +179770,7 @@ Snapped range ${snapStart}-${snapEnd} would cross into the protected tail (start
       ].join(`
 `);
     }
-    const currentFacts = getSessionFacts(db, sessionId).map((f) => ({
-      category: f.category,
-      content: f.content
-    }));
+    const stagedFacts = [];
     const parentSessionResponse = await client.session.get({ path: { id: sessionId } }).catch(() => null);
     const parentSession = normalizeSDKResponse(parentSessionResponse, null, { preferResponseOnMissingData: true });
     const sessionDirectory = parentSession?.directory ?? directory;
@@ -179434,7 +179787,7 @@ Snapped range ${snapStart}-${snapEnd} would cross into the protected tail (start
       candidateCompartments = priorCompartments.map((c, idx) => compartmentToInput(c, idx));
       passCount = 0;
       offset = snapStart;
-      saveRecompStagingPass(db, sessionId, 0, candidateCompartments, currentFacts);
+      saveRecompStagingPass(db, sessionId, 0, candidateCompartments, stagedFacts);
       setRecompPartialRange(db, sessionId, { start: snapStart, end: snapEnd });
     }
     let currentTokenBudget = historianChunkTokens;
@@ -179527,7 +179880,7 @@ Original state preserved (staging kept for retry).`;
       passCount += 1;
       currentTokenBudget = historianChunkTokens;
       passAttempt = 1;
-      saveRecompStagingPass(db, sessionId, passCount, candidateCompartments, currentFacts);
+      saveRecompStagingPass(db, sessionId, passCount, candidateCompartments, stagedFacts);
       const nextOffset = (validatedPass.compartments?.[validatedPass.compartments.length - 1]?.endMessage ?? chunk.endIndex) + 1;
       if (nextOffset <= offset) {
         return `## Magic Recomp — Failed
@@ -179548,7 +179901,6 @@ Partial recomp completed historian passes but the final compartment set failed v
       ...resumed ? ["Resumed from previous interrupted partial run."] : [],
       `Rebuilt compartments covering messages ${snapStart}-${snapEnd} using ${passCount} historian pass${passCount === 1 ? "" : "es"}.`,
       `Preserved ${priorCompartments.length} prior compartment(s) and ${tailCompartments.length} tail compartment(s) unchanged.`,
-      `Facts unchanged (${currentFacts.length} entr${currentFacts.length === 1 ? "y" : "ies"}).`,
       `Total compartments: ${finalResult.compartmentCount}.`
     ].join(`
 `);
@@ -180646,7 +180998,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.22.4",
+  version: "0.22.5",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -185528,7 +185880,6 @@ function createCtxMemoryTool(deps) {
           sourceType: dreamerAllowed ? "dreamer" : "agent"
         });
         queueEmbedding({ deps, projectIdentity, memoryId: memory2.id, content });
-        invalidateAllMemoryBlockCaches(deps.db);
         return ok2(`Saved memory [ID: ${memory2.id}] in ${rawCategory}.`);
       }
       if (params.action === "delete") {
@@ -185536,7 +185887,7 @@ function createCtxMemoryTool(deps) {
           return err2("Error: 'id' is required when action is 'delete'.");
         }
         const memory2 = getMemoryById(deps.db, params.id);
-        if (!memory2 || memory2.projectPath !== projectIdentity) {
+        if (!memory2 || !storedPathBelongsToIdentity(memory2.projectPath, projectIdentity)) {
           return err2(`Error: Memory with ID ${params.id} was not found.`);
         }
         deps.db.transaction(() => {
@@ -185565,7 +185916,7 @@ function createCtxMemoryTool(deps) {
           return err2("Error: 'content' is required when action is 'update'.");
         }
         const memory2 = getMemoryById(deps.db, params.id);
-        if (!memory2 || memory2.projectPath !== projectIdentity) {
+        if (!memory2 || !storedPathBelongsToIdentity(memory2.projectPath, projectIdentity)) {
           return err2(`Error: Memory with ID ${params.id} was not found.`);
         }
         const normalizedHash = computeNormalizedHash(content);
@@ -185599,9 +185950,6 @@ function createCtxMemoryTool(deps) {
         if (sourceMemories.length !== ids.length) {
           return err2("Error: One or more source memories were not found.");
         }
-        if (sourceMemories.some((memory2) => memory2.projectPath !== projectIdentity)) {
-          return err2("Error: All memories to merge must belong to the current project.");
-        }
         const requestedCategory = params.category?.trim();
         if (requestedCategory && !isMemoryCategory2(requestedCategory)) {
           return err2(`Error: Unknown memory category '${requestedCategory}'. Valid: ${CATEGORY_PRIORITY.join(", ")}`);
@@ -185660,7 +186008,7 @@ function createCtxMemoryTool(deps) {
             }
             supersededMemory(deps.db, memory2.id, canonicalMemory.id);
             queueMemoryMutation(deps.db, {
-              projectPath: memory2.projectPath,
+              projectPath: normalizeStoredProjectPath(memory2.projectPath),
               mutationType: "superseded",
               targetMemoryId: memory2.id,
               supersededById: canonicalMemory.id
@@ -185668,7 +186016,7 @@ function createCtxMemoryTool(deps) {
           }
           if (canonicalExisting && canonicalContentChanged) {
             queueMemoryMutation(deps.db, {
-              projectPath: canonicalMemory.projectPath,
+              projectPath: normalizeStoredProjectPath(canonicalMemory.projectPath),
               mutationType: "update",
               targetMemoryId: canonicalMemory.id,
               category,
@@ -185690,7 +186038,7 @@ function createCtxMemoryTool(deps) {
           return err2("Error: 'id' is required when action is 'archive'.");
         }
         const memory2 = getMemoryById(deps.db, params.id);
-        if (!memory2 || memory2.projectPath !== projectIdentity) {
+        if (!memory2 || !storedPathBelongsToIdentity(memory2.projectPath, projectIdentity)) {
           return err2(`Error: Memory with ID ${params.id} was not found.`);
         }
         deps.db.transaction(() => {
@@ -185952,7 +186300,7 @@ ${smartNotes.map(formatNoteLine).join(`
 // ../plugin/src/features/magic-context/range-parser.ts
 function parseRangeString(input) {
   const maxRangeElements = 1000;
-  const trimmed = input.trim();
+  const trimmed = input.replace(/§/g, "").trim();
   if (trimmed === "") {
     throw new Error("Range string must not be empty");
   }
@@ -186213,6 +186561,7 @@ function createCtxSearchTool(deps) {
       const embeddingEnabled = snapshot ? snapshot.enabled || snapshot.gitCommitEnabled : deps.embeddingEnabled;
       const gitCommitsEnabled = snapshot?.gitCommitEnabled ?? deps.gitCommitsEnabled ?? false;
       const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, sessionId);
+      const messageOrdinalCutoff = lastCompartmentEnd >= 0 ? lastCompartmentEnd : 0;
       const visibleMemoryIds = getVisibleMemoryIds(deps.db, sessionId);
       const results = await unifiedSearch(deps.db, sessionId, projectIdentity, query, {
         limit: normalizeLimit3(params.limit),
@@ -186223,7 +186572,7 @@ function createCtxSearchTool(deps) {
           return result?.vector ?? null;
         },
         isEmbeddingRuntimeEnabled: () => embeddingEnabled === true,
-        maxMessageOrdinal: lastCompartmentEnd >= 0 ? lastCompartmentEnd : undefined,
+        maxMessageOrdinal: messageOrdinalCutoff,
         gitCommitsEnabled,
         sources: params.sources,
         visibleMemoryIds,
@@ -186592,6 +186941,7 @@ async function src_default2(pi) {
       clearReasoningAge: config2.clear_reasoning_age
     },
     injection: {
+      memoryEnabled: config2.memory.enabled,
       injectionBudgetTokens: config2.memory.injection_budget_tokens,
       temporalAwareness: config2.temporal_awareness === true,
       keyFilesEnabled: config2.dreamer?.pin_key_files?.enabled ?? false,
@@ -186703,6 +187053,33 @@ async function src_default2(pi) {
     try {
       const currentProject = resolveCurrentProject(ctx);
       seenDreamerProjectIdentities.add(currentProject.projectIdentity);
+      const switchedProject = currentProject.projectDir !== projectDir;
+      const effectiveConfig = switchedProject ? loadPiConfig({ cwd: currentProject.projectDir }).config : config2;
+      const effectiveDreamerConfig = switchedProject ? resolveDreamerFromConfig(effectiveConfig) : dreamerConfig;
+      if (effectiveDreamerConfig) {
+        try {
+          registerPiDreamerProject({
+            db,
+            projectDir: currentProject.projectDir,
+            projectIdentity: currentProject.projectIdentity,
+            config: effectiveDreamerConfig,
+            embeddingConfig: effectiveConfig.embedding,
+            memoryEnabled: effectiveConfig.memory.enabled,
+            gitCommitIndexing: effectiveConfig.memory.git_commit_indexing,
+            onAdjunctsRefreshNeeded: signalPiSystemPromptRefreshForProject
+          });
+        } catch (err5) {
+          warn("before_agent_start: registerPiDreamerProject threw:", err5);
+        }
+      } else if (switchedProject) {
+        try {
+          unregisterPiDreamerProject({
+            projectIdentity: currentProject.projectIdentity
+          });
+        } catch (err5) {
+          warn("before_agent_start: unregisterPiDreamerProject threw:", err5);
+        }
+      }
       const sm = ctx.sessionManager;
       let sessionId;
       if (sm !== undefined) {