@cortexkit/pi-magic-context 0.22.3 → 0.22.5

package/dist/index.js

@@ -46,214 +46,6 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-// ../plugin/src/shared/harness.ts
-function setHarness(value) {
-  if (harnessLocked && currentHarness !== value) {
-    throw new Error(`Magic Context: harness already locked to "${currentHarness}"; cannot change to "${value}"`);
-  }
-  currentHarness = value;
-  harnessLocked = true;
-}
-function getHarness() {
-  return currentHarness;
-}
-var currentHarness = "opencode", harnessLocked = false;
-
-// ../plugin/src/shared/data-path.ts
-import * as os from "node:os";
-import * as path2 from "node:path";
-function getDataDir() {
-  return process.env.XDG_DATA_HOME ?? path2.join(os.homedir(), ".local", "share");
-}
-function getMagicContextTempDir(harness = getHarness()) {
-  return path2.join(os.tmpdir(), harness, "magic-context");
-}
-function getMagicContextLogPath(harness = getHarness()) {
-  return path2.join(getMagicContextTempDir(harness), "magic-context.log");
-}
-function getProjectMagicContextDir(directory) {
-  return path2.join(directory, ".opencode", "magic-context");
-}
-function getProjectMagicContextHistorianDir(directory) {
-  return path2.join(getProjectMagicContextDir(directory), "historian");
-}
-function getOpenCodeStorageDir() {
-  return path2.join(getDataDir(), "opencode", "storage");
-}
-function getMagicContextStorageDir() {
-  return path2.join(getDataDir(), "cortexkit", "magic-context");
-}
-function getLegacyOpenCodeMagicContextStorageDir() {
-  return path2.join(getOpenCodeStorageDir(), "plugin", "magic-context");
-}
-var init_data_path = () => {};
-
-// ../plugin/src/shared/logger.ts
-import * as fs from "node:fs";
-import * as path3 from "node:path";
-function ensureDir(filePath) {
-  const dir = path3.dirname(filePath);
-  if (dir === lastEnsuredDir)
-    return;
-  try {
-    fs.mkdirSync(dir, { recursive: true });
-    lastEnsuredDir = dir;
-  } catch {}
-}
-function flush() {
-  if (flushTimer) {
-    clearTimeout(flushTimer);
-    flushTimer = null;
-  }
-  if (buffer.length === 0)
-    return;
-  const data = buffer.join("");
-  buffer = [];
-  try {
-    const logFile = getMagicContextLogPath();
-    ensureDir(logFile);
-    fs.appendFileSync(logFile, data);
-  } catch {}
-}
-function scheduleFlush() {
-  if (flushTimer)
-    return;
-  flushTimer = setTimeout(() => {
-    flushTimer = null;
-    flush();
-  }, FLUSH_INTERVAL_MS);
-}
-function log(message, data) {
-  if (isTestEnv)
-    return;
-  try {
-    const timestamp = new Date().toISOString();
-    const serialized = data === undefined ? "" : data instanceof Error ? ` ${data.message}${data.stack ? `
-${data.stack}` : ""}` : ` ${JSON.stringify(data)}`;
-    buffer.push(`[${timestamp}] ${message}${serialized}
-`);
-    if (buffer.length >= BUFFER_SIZE_LIMIT) {
-      flush();
-    } else {
-      scheduleFlush();
-    }
-  } catch {}
-}
-function sessionLog(sessionId, message, data) {
-  log(`[magic-context][${sessionId}] ${message}`, data);
-}
-var isTestEnv = false, buffer, flushTimer = null, FLUSH_INTERVAL_MS = 500, BUFFER_SIZE_LIMIT = 50, lastEnsuredDir = null;
-var init_logger = __esm(() => {
-  init_data_path();
-  buffer = [];
-  if (!isTestEnv) {
-    process.on("exit", flush);
-  }
-});
-
-// ../plugin/src/shared/sqlite.ts
-function buildNodeSqliteDatabaseClass(DatabaseSync) {
-  const SAVEPOINT = "mc_tx_sp";
-
-  class NodeSqliteDatabase extends DatabaseSync {
-    constructor(filename, options) {
-      const translated = { ...options };
-      if (options && "readonly" in options) {
-        translated.readOnly = options.readonly;
-        delete translated.readonly;
-      }
-      super(typeof filename === "string" ? filename : ":memory:", translated);
-    }
-    transaction(fn) {
-      const self = this;
-      const wrapped = function(...args) {
-        const nested = self.isTransaction === true;
-        self.exec(nested ? `SAVEPOINT ${SAVEPOINT}` : "BEGIN");
-        try {
-          const result = fn.apply(this, args);
-          self.exec(nested ? `RELEASE ${SAVEPOINT}` : "COMMIT");
-          return result;
-        } catch (error) {
-          if (nested) {
-            self.exec(`ROLLBACK TO ${SAVEPOINT}`);
-            self.exec(`RELEASE ${SAVEPOINT}`);
-          } else {
-            self.exec("ROLLBACK");
-          }
-          throw error;
-        }
-      };
-      return wrapped;
-    }
-  }
-  return NodeSqliteDatabase;
-}
-var isBun, bunSpec, nodeSpec, sqliteModule, DatabaseImpl, Database;
-var init_sqlite = __esm(async () => {
-  isBun = typeof process !== "undefined" && typeof process.versions?.bun === "string";
-  bunSpec = "bun:" + "sqlite";
-  nodeSpec = "node:" + "sqlite";
-  sqliteModule = isBun ? await import(bunSpec) : await import(nodeSpec);
-  DatabaseImpl = isBun ? sqliteModule.Database : buildNodeSqliteDatabaseClass(sqliteModule.DatabaseSync);
-  Database = DatabaseImpl;
-});
-
-// ../plugin/src/shared/sqlite-helpers.ts
-function closeQuietly(db) {
-  if (!db)
-    return;
-  try {
-    db.close();
-  } catch {}
-}
-
-// ../plugin/src/hooks/magic-context/read-session-db.ts
-import { existsSync } from "node:fs";
-import { join as join2 } from "node:path";
-function getOpenCodeDbPath() {
-  return join2(getDataDir(), "opencode", "opencode.db");
-}
-function openCodeDbExists() {
-  return existsSync(getOpenCodeDbPath());
-}
-function closeCachedReadOnlyDb() {
-  if (!cachedReadOnlyDb) {
-    return;
-  }
-  try {
-    closeQuietly(cachedReadOnlyDb.db);
-  } catch (error) {
-    log("[magic-context] failed to close cached OpenCode read-only DB:", error);
-  } finally {
-    cachedReadOnlyDb = null;
-  }
-}
-function getReadOnlySessionDb() {
-  const dbPath = getOpenCodeDbPath();
-  if (cachedReadOnlyDb?.path === dbPath) {
-    return cachedReadOnlyDb.db;
-  }
-  closeCachedReadOnlyDb();
-  const db = new Database(dbPath, { readonly: true });
-  cachedReadOnlyDb = { path: dbPath, db };
-  return db;
-}
-function withReadOnlySessionDb(fn) {
-  return fn(getReadOnlySessionDb());
-}
-function getRawSessionMessageCountFromDb(db, sessionId) {
-  const row = db.prepare(`SELECT COUNT(*) as count FROM message WHERE session_id = ?
-             AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
-                      AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')`).get(sessionId);
-  return typeof row?.count === "number" ? row.count : 0;
-}
-var cachedReadOnlyDb = null;
-var init_read_session_db = __esm(async () => {
-  init_data_path();
-  init_logger();
-  await init_sqlite();
-});
-
 // ../../node_modules/.bun/esprima@4.0.1/node_modules/esprima/dist/esprima.js
 var require_esprima = __commonJS((exports, module) => {
   (function webpackUniversalModuleDefinition(root, factory) {
@@ -8281,9 +8073,129 @@ 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/features/magic-context/message-index-async.ts
-init_logger();
+// ../plugin/src/shared/logger.ts
+import * as fs from "node:fs";
+import * as path3 from "node:path";
+
+// ../plugin/src/shared/data-path.ts
+import * as os from "node:os";
+import * as path2 from "node:path";
+
+// ../plugin/src/shared/harness.ts
+var currentHarness = "opencode";
+var harnessLocked = false;
+function setHarness(value) {
+  if (harnessLocked && currentHarness !== value) {
+    throw new Error(`Magic Context: harness already locked to "${currentHarness}"; cannot change to "${value}"`);
+  }
+  currentHarness = value;
+  harnessLocked = true;
+}
+function getHarness() {
+  return currentHarness;
+}
+
+// ../plugin/src/shared/data-path.ts
+function getDataDir() {
+  return process.env.XDG_DATA_HOME ?? path2.join(os.homedir(), ".local", "share");
+}
+function getMagicContextTempDir(harness = getHarness()) {
+  return path2.join(os.tmpdir(), harness, "magic-context");
+}
+function getMagicContextLogPath(harness = getHarness()) {
+  return path2.join(getMagicContextTempDir(harness), "magic-context.log");
+}
+function getProjectMagicContextDir(directory) {
+  return path2.join(directory, ".opencode", "magic-context");
+}
+function getProjectMagicContextHistorianDir(directory) {
+  return path2.join(getProjectMagicContextDir(directory), "historian");
+}
+function getOpenCodeStorageDir() {
+  return path2.join(getDataDir(), "opencode", "storage");
+}
+function getMagicContextStorageDir() {
+  return path2.join(getDataDir(), "cortexkit", "magic-context");
+}
+function getLegacyOpenCodeMagicContextStorageDir() {
+  return path2.join(getOpenCodeStorageDir(), "plugin", "magic-context");
+}
+
+// ../plugin/src/shared/logger.ts
+var isTestEnv = false;
+var buffer = [];
+var flushTimer = null;
+var FLUSH_INTERVAL_MS = 500;
+var BUFFER_SIZE_LIMIT = 50;
+var lastEnsuredDir = null;
+function ensureDir(filePath) {
+  const dir = path3.dirname(filePath);
+  if (dir === lastEnsuredDir)
+    return;
+  try {
+    fs.mkdirSync(dir, { recursive: true });
+    lastEnsuredDir = dir;
+  } catch {}
+}
+function flush() {
+  if (flushTimer) {
+    clearTimeout(flushTimer);
+    flushTimer = null;
+  }
+  if (buffer.length === 0)
+    return;
+  const data = buffer.join("");
+  buffer = [];
+  try {
+    const logFile = getMagicContextLogPath();
+    ensureDir(logFile);
+    fs.appendFileSync(logFile, data);
+  } catch {}
+}
+function scheduleFlush() {
+  if (flushTimer)
+    return;
+  flushTimer = setTimeout(() => {
+    flushTimer = null;
+    flush();
+  }, FLUSH_INTERVAL_MS);
+}
+function log(message, data) {
+  if (isTestEnv)
+    return;
+  try {
+    const timestamp = new Date().toISOString();
+    const serialized = data === undefined ? "" : data instanceof Error ? ` ${data.message}${data.stack ? `
+${data.stack}` : ""}` : ` ${JSON.stringify(data)}`;
+    buffer.push(`[${timestamp}] ${message}${serialized}
+`);
+    if (buffer.length >= BUFFER_SIZE_LIMIT) {
+      flush();
+    } else {
+      scheduleFlush();
+    }
+  } catch {}
+}
+function sessionLog(sessionId, message, data) {
+  log(`[magic-context][${sessionId}] ${message}`, data);
+}
+if (!isTestEnv) {
+  process.on("exit", flush);
+}
 
 // ../plugin/src/shared/internal-initiator-marker.ts
 var OMO_INTERNAL_INITIATOR_MARKER = "<!-- OMO_INTERNAL_INITIATOR -->";
@@ -8297,8 +8209,102 @@ function removeSystemReminders(text) {
   return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
 }
 
-// ../plugin/src/hooks/magic-context/read-session-chunk.ts
-await init_read_session_db();
+// ../plugin/src/hooks/magic-context/read-session-db.ts
+import { existsSync } from "node:fs";
+import { join as join2 } from "node:path";
+
+// ../plugin/src/shared/sqlite.ts
+var isBun = typeof process !== "undefined" && typeof process.versions?.bun === "string";
+var bunSpec = "bun:" + "sqlite";
+var nodeSpec = "node:" + "sqlite";
+var sqliteModule = isBun ? await import(bunSpec) : await import(nodeSpec);
+var DatabaseImpl = isBun ? sqliteModule.Database : buildNodeSqliteDatabaseClass(sqliteModule.DatabaseSync);
+function buildNodeSqliteDatabaseClass(DatabaseSync) {
+  const SAVEPOINT = "mc_tx_sp";
+
+  class NodeSqliteDatabase extends DatabaseSync {
+    constructor(filename, options) {
+      const translated = { ...options };
+      if (options && "readonly" in options) {
+        translated.readOnly = options.readonly;
+        delete translated.readonly;
+      }
+      super(typeof filename === "string" ? filename : ":memory:", translated);
+    }
+    transaction(fn) {
+      const self = this;
+      const wrapped = function(...args) {
+        const nested = self.isTransaction === true;
+        self.exec(nested ? `SAVEPOINT ${SAVEPOINT}` : "BEGIN");
+        try {
+          const result = fn.apply(this, args);
+          self.exec(nested ? `RELEASE ${SAVEPOINT}` : "COMMIT");
+          return result;
+        } catch (error) {
+          if (nested) {
+            self.exec(`ROLLBACK TO ${SAVEPOINT}`);
+            self.exec(`RELEASE ${SAVEPOINT}`);
+          } else {
+            self.exec("ROLLBACK");
+          }
+          throw error;
+        }
+      };
+      return wrapped;
+    }
+  }
+  return NodeSqliteDatabase;
+}
+var Database = DatabaseImpl;
+
+// ../plugin/src/shared/sqlite-helpers.ts
+function closeQuietly(db) {
+  if (!db)
+    return;
+  try {
+    db.close();
+  } catch {}
+}
+
+// ../plugin/src/hooks/magic-context/read-session-db.ts
+function getOpenCodeDbPath() {
+  return join2(getDataDir(), "opencode", "opencode.db");
+}
+function openCodeDbExists() {
+  return existsSync(getOpenCodeDbPath());
+}
+var cachedReadOnlyDb = null;
+function closeCachedReadOnlyDb() {
+  if (!cachedReadOnlyDb) {
+    return;
+  }
+  try {
+    closeQuietly(cachedReadOnlyDb.db);
+  } catch (error) {
+    log("[magic-context] failed to close cached OpenCode read-only DB:", error);
+  } finally {
+    cachedReadOnlyDb = null;
+  }
+}
+function getReadOnlySessionDb() {
+  const dbPath = getOpenCodeDbPath();
+  if (cachedReadOnlyDb?.path === dbPath) {
+    return cachedReadOnlyDb.db;
+  }
+  closeCachedReadOnlyDb();
+  const db = new Database(dbPath, { readonly: true });
+  cachedReadOnlyDb = { path: dbPath, db };
+  return db;
+}
+function withReadOnlySessionDb(fn) {
+  return fn(getReadOnlySessionDb());
+}
+function getRawSessionMessageCountFromDb(db, sessionId) {
+  const row = db.prepare(`SELECT COUNT(*) as count FROM message WHERE session_id = ?
+             AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
+                      AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')`).get(sessionId);
+  return typeof row?.count === "number" ? row.count : 0;
+}
 
 // ../../node_modules/.bun/ai-tokenizer@1.0.6/node_modules/ai-tokenizer/dist/index.js
 function _typeof(o) {
@@ -141342,6 +141348,7 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     toolOnlyRanges
   };
 }
+
 // ../plugin/src/features/magic-context/compression-depth-storage.ts
 var incrementDepthStatements = new WeakMap;
 var totalDepthStatements = new WeakMap;
@@ -141745,6 +141752,7 @@ function parseReportedLimit(message) {
   }
   return;
 }
+
 // ../plugin/src/features/magic-context/compartment-lease.ts
 var COMPARTMENT_LEASE_TTL_MS = 5 * 60 * 1000;
 var COMPARTMENT_LEASE_RENEWAL_MS = 60 * 1000;
@@ -141815,6 +141823,9 @@ var SESSION_META_SELECT_COLUMNS = [
   "cached_m0_materialized_at",
   "cached_m0_session_facts_version",
   "cached_m0_upgrade_state",
+  "cached_m0_system_hash",
+  "cached_m0_tool_set_hash",
+  "cached_m0_model_key",
   "last_observed_model_key",
   "upgrade_reminded_at",
   "pi_stable_id_scheme"
@@ -141851,6 +141862,9 @@ var META_COLUMNS = {
   cachedM0MaterializedAt: "cached_m0_materialized_at",
   cachedM0SessionFactsVersion: "cached_m0_session_facts_version",
   cachedM0UpgradeState: "cached_m0_upgrade_state",
+  cachedM0SystemHash: "cached_m0_system_hash",
+  cachedM0ToolSetHash: "cached_m0_tool_set_hash",
+  cachedM0ModelKey: "cached_m0_model_key",
   lastObservedModelKey: "last_observed_model_key",
   upgradeRemindedAt: "upgrade_reminded_at",
   piStableIdScheme: "pi_stable_id_scheme"
@@ -141893,7 +141907,7 @@ function isSessionMetaRow(row) {
   if (row === null || typeof row !== "object")
     return false;
   const r = row;
-  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.pi_stable_id_scheme);
+  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.cached_m0_system_hash) && isStringOrNull(r.cached_m0_tool_set_hash) && isStringOrNull(r.cached_m0_model_key) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.pi_stable_id_scheme);
 }
 function getDefaultSessionMeta(sessionId) {
   return {
@@ -141929,6 +141943,9 @@ function getDefaultSessionMeta(sessionId) {
     cachedM0MaterializedAt: null,
     cachedM0SessionFactsVersion: null,
     cachedM0UpgradeState: null,
+    cachedM0SystemHash: null,
+    cachedM0ToolSetHash: null,
+    cachedM0ModelKey: null,
     lastObservedModelKey: null,
     upgradeRemindedAt: null,
     piStableIdScheme: null
@@ -141980,6 +141997,9 @@ function toSessionMeta(row) {
     cachedM0MaterializedAt: numOrNull(row.cached_m0_materialized_at),
     cachedM0SessionFactsVersion: numOrNull(row.cached_m0_session_facts_version),
     cachedM0UpgradeState: stringOrNull(row.cached_m0_upgrade_state),
+    cachedM0SystemHash: stringOrNull(row.cached_m0_system_hash),
+    cachedM0ToolSetHash: stringOrNull(row.cached_m0_tool_set_hash),
+    cachedM0ModelKey: stringOrNull(row.cached_m0_model_key),
     lastObservedModelKey: stringOrNull(row.last_observed_model_key),
     upgradeRemindedAt: numOrNull(row.upgrade_reminded_at),
     piStableIdScheme: numOrNull(row.pi_stable_id_scheme)
@@ -141999,8 +142019,11 @@ function persistCachedM0(db, sessionId, payload) {
             cached_m0_project_docs_hash = ?,
             cached_m0_materialized_at = ?,
             cached_m0_session_facts_version = ?,
-            cached_m0_upgrade_state = ?
-         WHERE session_id = ?`).run(Buffer2.from(payload.m0Bytes), payload.projectMemoryEpoch, 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, sessionId);
+            cached_m0_upgrade_state = ?,
+            cached_m0_system_hash = ?,
+            cached_m0_tool_set_hash = ?,
+            cached_m0_model_key = ?
+         WHERE session_id = ?`).run(Buffer2.from(payload.m0Bytes), payload.projectMemoryEpoch, 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.toolSetHash ?? "", payload.modelKey ?? "", sessionId);
 }
 function clearCachedM0M1(db, sessionId) {
   ensureSessionMetaRow(db, sessionId);
@@ -142018,6 +142041,9 @@ function clearCachedM0M1(db, sessionId) {
     ["cached_m0_materialized_at", null],
     ["cached_m0_session_facts_version", null],
     ["cached_m0_upgrade_state", null],
+    ["cached_m0_system_hash", null],
+    ["cached_m0_tool_set_hash", null],
+    ["cached_m0_model_key", null],
     ["cached_m0_last_baseline_end_message_id", null],
     ["memory_block_cache", ""],
     ["memory_block_count", 0],
@@ -142059,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) {
@@ -142093,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);
@@ -142123,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(() => {
@@ -142170,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);
@@ -142223,11 +142221,7 @@ function escapeXmlAttr(s) {
 function escapeXmlContent(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-// ../plugin/src/features/magic-context/migrations.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/storage-db.ts
-init_data_path();
 import { copyFileSync, cpSync, existsSync as existsSync4, mkdirSync as mkdirSync2 } from "node:fs";
 import { dirname as dirname2, join as join5 } from "node:path";
 
@@ -142307,12 +142301,7 @@ function safeString(value) {
   }
 }
 
-// ../plugin/src/features/magic-context/storage-db.ts
-init_logger();
-await init_sqlite();
-
 // ../plugin/src/features/magic-context/key-files/project-key-files.ts
-init_logger();
 import { createHash as createHash2 } from "node:crypto";
 import { existsSync as existsSync2, readFileSync, realpathSync } from "node:fs";
 import { join as join3, resolve, sep } from "node:path";
@@ -142482,8 +142471,6 @@ function loadToolDefinitionMeasurements(db) {
 }
 
 // ../plugin/src/features/magic-context/tool-owner-backfill.ts
-init_data_path();
-init_logger();
 import { existsSync as existsSync3 } from "node:fs";
 import { join as join4 } from "node:path";
 var LEASE_DURATION_MS = 5 * 60 * 1000;
@@ -142731,7 +142718,7 @@ var databases = new Map;
 var persistenceByDatabase = new WeakMap;
 var persistenceErrorByDatabase = new WeakMap;
 var lastSchemaFenceRejection = null;
-var LATEST_SUPPORTED_VERSION = 29;
+var LATEST_SUPPORTED_VERSION = 30;
 function resolveDatabasePath(dbPathOverride) {
   if (dbPathOverride) {
     return { dbDir: dirname2(dbPathOverride), dbPath: dbPathOverride };
@@ -143196,6 +143183,9 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       cached_m0_materialized_at INTEGER,
       cached_m0_session_facts_version INTEGER,
       cached_m0_upgrade_state TEXT,
+      cached_m0_system_hash TEXT,
+      cached_m0_tool_set_hash TEXT,
+      cached_m0_model_key TEXT,
       cached_m0_last_baseline_end_message_id TEXT,
       upgrade_reminded_at INTEGER,
       pi_stable_id_scheme INTEGER
@@ -143326,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");
@@ -143387,6 +143378,9 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "cached_m0_materialized_at", "INTEGER");
   ensureColumn(db, "session_meta", "cached_m0_session_facts_version", "INTEGER");
   ensureColumn(db, "session_meta", "cached_m0_upgrade_state", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_system_hash", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_tool_set_hash", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_model_key", "TEXT");
   ensureColumn(db, "session_meta", "cached_m0_last_baseline_end_message_id", "TEXT");
   ensureColumn(db, "session_meta", "upgrade_reminded_at", "INTEGER");
   db.exec(`
@@ -143473,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", ""],
@@ -144316,6 +144311,28 @@ var MIGRATIONS = [
         db.exec("ALTER TABLE notes ADD COLUMN anchor_ordinal INTEGER");
       }
     }
+  },
+  {
+    version: 30,
+    description: "HARD-bust m[0] markers: cached system/tool-set/model identity",
+    up: (db) => {
+      const hasSessionMeta = db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='session_meta' LIMIT 1").get();
+      if (!hasSessionMeta)
+        return;
+      ensureColumn(db, "session_meta", "cached_m0_system_hash", "TEXT");
+      ensureColumn(db, "session_meta", "cached_m0_tool_set_hash", "TEXT");
+      ensureColumn(db, "session_meta", "cached_m0_model_key", "TEXT");
+      const columns = new Set(db.prepare("PRAGMA table_info(session_meta)").all().map((column) => column.name));
+      if (columns.has("cached_m0_bytes")) {
+        db.prepare(`UPDATE session_meta SET
+                        cached_m0_bytes = NULL,
+                        cached_m1_bytes = NULL,
+                        cached_m0_materialized_at = NULL,
+                        cached_m0_system_hash = NULL,
+                        cached_m0_tool_set_hash = NULL,
+                        cached_m0_model_key = NULL`).run();
+      }
+    }
   }
 ];
 var LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
@@ -144386,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 = `
@@ -144394,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, `
@@ -144403,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
     };
@@ -144448,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}`);
@@ -144614,7 +144643,6 @@ function getMaxMemoryMutationId(db, projectPath) {
   return row?.max_id ?? null;
 }
 // ../plugin/src/features/magic-context/storage-meta-persisted.ts
-init_logger();
 var CAS_RETRY_LIMIT = 5;
 var AUTO_SEARCH_NO_HINT_REASONS = new Set([
   "below-threshold",
@@ -144769,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)
@@ -144777,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;
   }
@@ -144906,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(() => {
@@ -144982,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";
@@ -145077,8 +145137,6 @@ function setSessionWorkMetrics(db, sessionId, newWorkTokens, totalInputTokens) {
 import { Buffer as Buffer3 } from "node:buffer";
 
 // ../plugin/src/features/magic-context/resolve-subagent-fallback.ts
-init_logger();
-await init_read_session_db();
 function resolveIsSubagentFromOpenCodeDb(sessionId) {
   try {
     return withReadOnlySessionDb((openCodeDb) => {
@@ -145112,6 +145170,9 @@ var SESSION_META_FALLBACK_SELECTS = {
   cached_m0_materialized_at: "NULL AS cached_m0_materialized_at",
   cached_m0_session_facts_version: "NULL AS cached_m0_session_facts_version",
   cached_m0_upgrade_state: "NULL AS cached_m0_upgrade_state",
+  cached_m0_system_hash: "NULL AS cached_m0_system_hash",
+  cached_m0_tool_set_hash: "NULL AS cached_m0_tool_set_hash",
+  cached_m0_model_key: "NULL AS cached_m0_model_key",
   last_observed_model_key: "NULL AS last_observed_model_key",
   upgrade_reminded_at: "NULL AS upgrade_reminded_at"
 };
@@ -145344,7 +145405,6 @@ function markNoteChecked(db, noteId) {
   db.prepare("UPDATE notes SET last_checked_at = ?, updated_at = ? WHERE id = ? AND type = 'smart'").run(now, now, noteId);
 }
 // ../plugin/src/features/magic-context/storage-ops.ts
-init_logger();
 var queuePendingOpStatements = new WeakMap;
 var getPendingOpsStatements = new WeakMap;
 var clearPendingOpsStatements = new WeakMap;
@@ -145746,7 +145806,6 @@ var ERROR_CLASSES = new Set([
   "unknown"
 ]);
 // ../plugin/src/features/magic-context/v22-deferred-backfill.ts
-init_logger();
 import { createHash as createHash4 } from "node:crypto";
 import { realpathSync as realpathSync2 } from "node:fs";
 import path5 from "node:path";
@@ -146025,8 +146084,6 @@ function getAgentFallbackModels(agent) {
 }
 
 // ../plugin/src/shared/models-dev-cache.ts
-init_data_path();
-init_logger();
 import { mkdirSync as mkdirSync3, readFileSync as readFileSync3, renameSync, writeFileSync } from "node:fs";
 import { join as join6 } from "node:path";
 var MIN_SANE_LIMIT = 20000;
@@ -146136,7 +146193,6 @@ function resolveHistorianContextLimit(historianModelOverride) {
 }
 
 // ../plugin/src/hooks/magic-context/event-resolvers.ts
-init_logger();
 var DEFAULT_CONTEXT_LIMIT = 128000;
 var MAX_EXECUTE_THRESHOLD = 80;
 function resolveCacheTtl(cacheTtl, modelKey) {
@@ -146269,7 +146325,6 @@ function resolveTokensMatchWithKey(tokensConfig, modelKey) {
 }
 
 // ../plugin/src/hooks/magic-context/note-nudger.ts
-init_logger();
 var NOTE_NUDGE_COOLDOWN_MS = 15 * 60 * 1000;
 var lastDeliveredAt = new Map;
 function getPersistedNoteNudgeDeliveredAt(_db, sessionId) {
@@ -146437,7 +146492,6 @@ function isTodoItem(value) {
 }
 
 // ../plugin/src/hooks/magic-context/upgrade-reminder.ts
-init_logger();
 var remindedThisProcess = new Set;
 var UPGRADE_REMINDER_TEXT = [
   "\uD83C\uDF86 Historian V2 is released!",
@@ -146538,7 +146592,6 @@ async function maybeSendUpgradeReminder(deps, sessionId) {
 }
 
 // ../plugin/src/shared/announcement.ts
-init_data_path();
 import * as fs2 from "node:fs";
 import * as path6 from "node:path";
 var ANNOUNCEMENT_VERSION = "0.22.0";
@@ -146584,9 +146637,14 @@ function shouldShowAnnouncement() {
   return lastVersion !== ANNOUNCEMENT_VERSION;
 }
 
-// src/index.ts
-init_data_path();
-init_logger();
+// ../plugin/src/shared/keep-subagents.ts
+var keepSubagents = false;
+function setKeepSubagents(value) {
+  keepSubagents = value === true;
+}
+function shouldKeepSubagents() {
+  return keepSubagents;
+}
 
 // ../plugin/src/shared/resolve-fallbacks.ts
 function resolveFallbackChain(agentName, userFallbacks) {
@@ -146653,9 +146711,6 @@ function isEmptySidekickResult(text) {
   return trimmed.length === 0 || trimmed === "no relevant memories found";
 }
 
-// src/commands/ctx-aug.ts
-init_logger();
-
 // src/subagent-runner.ts
 import * as childProcess from "node:child_process";
 import { existsSync as existsSync6 } from "node:fs";
@@ -146665,7 +146720,6 @@ import { createInterface } from "node:readline";
 import { fileURLToPath } from "node:url";
 
 // ../plugin/src/features/magic-context/subagent-token-capture.ts
-init_logger();
 function asNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
@@ -146756,7 +146810,6 @@ function recordChildInvocation(input) {
 }
 
 // src/subagent-runner.ts
-init_logger();
 function resolveBundledPiCli() {
   try {
     const require_ = createRequire2(import.meta.url);
@@ -147529,18 +147582,10 @@ function clearStaleEntries(db, maxAgeMs, projectIdentity) {
   const result = projectIdentity ? db.prepare("DELETE FROM dream_queue WHERE project_path = ? AND started_at IS NOT NULL AND started_at < ?").run(projectIdentity, cutoff) : db.prepare("DELETE FROM dream_queue WHERE started_at IS NOT NULL AND started_at < ?").run(cutoff);
   return result.changes;
 }
-
-// src/commands/ctx-dream.ts
-init_logger();
 // ../plugin/src/features/magic-context/dreamer/runner.ts
 import { existsSync as existsSync8 } from "node:fs";
 import { join as join11 } from "node:path";
-
-// ../plugin/src/shared/index.ts
-init_logger();
-
 // ../plugin/src/shared/model-suggestion-retry.ts
-init_logger();
 function extractMessage(error) {
   if (typeof error === "string")
     return error;
@@ -147775,40 +147820,66 @@ function extractLatestAssistantText(messages) {
 `) || null;
 }
 
-// ../plugin/src/features/magic-context/dreamer/runner.ts
-init_data_path();
-init_logger();
-await init_sqlite();
-
 // ../plugin/src/features/magic-context/key-files/identify-key-files.ts
 import { readFileSync as readFileSync6 } from "node:fs";
-import { isAbsolute, join as join10, relative as relative2 } from "node:path";
-init_logger();
+import { isAbsolute as isAbsolute2, join as join10, relative as relative2 } from "node:path";
 
 // ../plugin/src/features/magic-context/key-files/aft-availability.ts
 var import_comment_json = __toESM(require_src2(), 1);
 import { existsSync as existsSync7, readFileSync as readFileSync5 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { join as join9 } from "node:path";
+import { isAbsolute, join as join9, resolve as resolve2 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
 var overrideAvailability = null;
 function parseConfig(path7) {
   if (!existsSync7(path7))
     return null;
   return import_comment_json.parse(readFileSync5(path7, "utf-8"));
 }
-function entryMatchesAft(entry) {
+var AFT_NAME_NEEDLES = ["@cortexkit/aft", "aft-opencode", "aft-pi"];
+function stringMentionsAft(value) {
+  return AFT_NAME_NEEDLES.some((needle) => value.includes(needle));
+}
+function resolveLocalEntryPackageName(value, configDir) {
+  let dir = null;
+  if (value.startsWith("file://")) {
+    try {
+      dir = fileURLToPath2(value);
+    } catch {
+      return null;
+    }
+  } else if (value.startsWith("~/")) {
+    dir = join9(homedir2(), value.slice(2));
+  } else if (value.startsWith("/") || value.startsWith("./") || value.startsWith("../")) {
+    dir = isAbsolute(value) ? value : resolve2(configDir, value);
+  } else {
+    return null;
+  }
+  try {
+    const pkg = JSON.parse(readFileSync5(join9(dir, "package.json"), "utf-8"));
+    return typeof pkg.name === "string" ? pkg.name : null;
+  } catch {
+    return null;
+  }
+}
+function entryMatchesAft(entry, configDir) {
   const value = Array.isArray(entry) ? entry[0] : entry;
-  return typeof value === "string" && (value.includes("@cortexkit/aft") || value.includes("aft-opencode") || value.includes("aft-pi"));
+  if (typeof value !== "string")
+    return false;
+  if (stringMentionsAft(value))
+    return true;
+  const name2 = resolveLocalEntryPackageName(value, configDir);
+  return name2 != null && stringMentionsAft(name2);
 }
-function hasAftInArray(value) {
-  return Array.isArray(value) && value.some(entryMatchesAft);
+function hasAftInArray(value, configDir) {
+  return Array.isArray(value) && value.some((entry) => entryMatchesAft(entry, configDir));
 }
-function hasAftAtKeys(value, keys) {
+function hasAftAtKeys(value, keys, configDir) {
   if (!value || typeof value !== "object")
     return false;
   const record = value;
   for (const key of keys) {
-    if (hasAftInArray(record[key]))
+    if (hasAftInArray(record[key], configDir))
       return true;
   }
   return false;
@@ -147825,7 +147896,8 @@ function getAftAvailability() {
   for (const path7 of opencodePaths) {
     try {
       const config = parseConfig(path7);
-      if (hasAftAtKeys(config, ["plugin", "plugins", "mcp", "mcp_servers"])) {
+      const configDir = join9(path7, "..");
+      if (hasAftAtKeys(config, ["plugin", "plugins", "mcp", "mcp_servers"], configDir)) {
         opencode = true;
         break;
       }
@@ -147835,12 +147907,13 @@ function getAftAvailability() {
   for (const path7 of piPaths) {
     try {
       const config = parseConfig(path7);
-      if (hasAftAtKeys(config, ["packages", "extensions"])) {
+      const configDir = join9(path7, "..");
+      if (hasAftAtKeys(config, ["packages", "extensions"], configDir)) {
         pi = true;
         break;
       }
       const agent = config?.agent;
-      if (hasAftAtKeys(agent, ["packages", "extensions"])) {
+      if (hasAftAtKeys(agent, ["packages", "extensions"], configDir)) {
         pi = true;
         break;
       }
@@ -147860,7 +147933,7 @@ function isAftAvailable() {
 
 // ../plugin/src/features/magic-context/key-files/read-history.ts
 import { realpathSync as realpathSync3 } from "node:fs";
-import { relative, resolve as resolve2 } from "node:path";
+import { relative, resolve as resolve3 } from "node:path";
 function toMs(value) {
   if (typeof value === "number" && Number.isFinite(value))
     return value;
@@ -147897,7 +147970,7 @@ function coalesceRanges(ranges) {
 }
 function normalizeProjectRelativePath(projectPath, filePath) {
   const root = realpathSync3(projectPath);
-  const abs = filePath.startsWith("/") ? resolve2(filePath) : resolve2(root, filePath);
+  const abs = filePath.startsWith("/") ? resolve3(filePath) : resolve3(root, filePath);
   let real = abs;
   try {
     real = realpathSync3(abs);
@@ -148040,9 +148113,6 @@ function collectKeyFileCandidates(args) {
   })).sort((a, b) => b.totalReads - a.totalReads || b.lastReadAt - a.lastReadAt).slice(0, 200);
 }
 
-// ../plugin/src/features/magic-context/key-files/storage-key-files.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/key-files/identify-key-files.ts
 var KEY_FILES_SYSTEM_PROMPT = "You are a file importance evaluator. Given read statistics about files in a coding session, identify which are core orientation files worth pinning in context. Return a JSON array.";
 class KeyFilesValidationError extends Error {
@@ -148262,11 +148332,13 @@ async function runKeyFilesLlm(args) {
     const text = extractLatestAssistantText(messages);
     if (!text)
       throw new Error("Dreamer returned no key-files output.");
-    return text;
+    return { text, messages };
   } finally {
-    await args.client.session.delete({ path: { id: agentSessionId } }).catch(() => {
-      return;
-    });
+    if (!shouldKeepSubagents()) {
+      await args.client.session.delete({ path: { id: agentSessionId } }).catch(() => {
+        return;
+      });
+    }
   }
 }
 async function runKeyFilesTask(args) {
@@ -148312,9 +148384,27 @@ async function runKeyFilesTask(args) {
       log(`[key-files] lease renewal threw: ${getErrorMessage(error)}`);
     }
   }, 60000);
+  let invocationRecorded = false;
+  const llmStartedAt = Date.now();
+  const recordKeyFilesInvocation = (params) => {
+    if (!args.parentSessionId || invocationRecorded)
+      return;
+    invocationRecorded = true;
+    recordChildInvocation({
+      db: args.db,
+      parentSessionId: args.parentSessionId,
+      harness: getHarness(),
+      subagent: "dreamer",
+      task: "key files",
+      startedAt: llmStartedAt,
+      status: params.status,
+      messages: params.messages,
+      error: params.error
+    });
+  };
   try {
     try {
-      const raw = await runKeyFilesLlm({
+      const { text: raw, messages: llmMessages } = await runKeyFilesLlm({
         client: args.client,
         parentSessionId: args.parentSessionId,
         projectPath,
@@ -148322,8 +148412,10 @@ async function runKeyFilesTask(args) {
         deadline: args.deadline,
         fallbackModels: args.fallbackModels
       });
+      recordKeyFilesInvocation({ status: "completed", messages: llmMessages });
       validated = validateLlmOutput(raw, args.config, projectPath, new Set(candidates.map((candidate) => candidate.path)));
     } catch (error) {
+      recordKeyFilesInvocation({ status: "failed", error });
       log(`[key-files] LLM validation failed: ${getErrorMessage(error)}`);
       throw error;
     }
@@ -148917,9 +149009,6 @@ function getMemoryCountsByStatus(db, projectPath) {
   return counts;
 }
 
-// ../plugin/src/features/magic-context/user-memory/review-user-memories.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/dreamer/task-prompts.ts
 var DREAMER_SYSTEM_PROMPT = `You are a memory maintenance agent for the magic-context system.
 You run during scheduled dream windows to maintain a project's cross-session memory store and codebase documentation.
@@ -149422,7 +149511,8 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
       db: args.db,
       parentSessionId: args.parentSessionId,
       harness: "opencode",
-      subagent: "user_memory_review",
+      subagent: "dreamer",
+      task: "user memories",
       startedAt,
       status: params.status,
       messages: params.messages,
@@ -149546,7 +149636,7 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
     return result;
   } finally {
     clearInterval(leaseInterval);
-    if (agentSessionId) {
+    if (agentSessionId && !shouldKeepSubagents()) {
       await args.client.session.delete({
         path: { id: agentSessionId },
         query: { directory: args.sessionDirectory }
@@ -149673,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;
@@ -149870,14 +149960,14 @@ async function runDream(args) {
         }
       } finally {
         clearInterval(leaseRenewalInterval);
-        if (agentSessionId && !taskFailed) {
+        if (agentSessionId && !taskFailed && !shouldKeepSubagents()) {
           await args.client.session.delete({
             path: { id: agentSessionId }
           }).catch((error) => {
             log("[dreamer] failed to delete child session:", error);
           });
-        } else if (agentSessionId && taskFailed) {
-          log(`[dreamer] KEEPING failed child session ${agentSessionId} for task ${taskName} (debugging)`);
+        } else if (agentSessionId && (taskFailed || shouldKeepSubagents())) {
+          log(`[dreamer] KEEPING child session ${agentSessionId} for task ${taskName} (${taskFailed ? "failed" : "keep_subagents"})`);
         }
       }
       if (lostLease) {
@@ -150055,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;
@@ -150162,7 +150251,7 @@ Only include notes whose conditions you could definitively evaluate against exte
         parts: [{ type: "text", text: evaluationPrompt, synthetic: true }]
       }
     }, {
-      timeoutMs: Math.min(remainingMs, 300000),
+      timeoutMs: Math.min(remainingMs, 5 * 60 * 1000),
       signal: abortController.signal,
       fallbackModels: args.fallbackModels,
       callContext: "dreamer:smart-notes"
@@ -150238,7 +150327,7 @@ Only include notes whose conditions you could definitively evaluate against exte
     });
   } finally {
     clearInterval(leaseInterval);
-    if (agentSessionId) {
+    if (agentSessionId && !shouldKeepSubagents()) {
       await args.client.session.delete({
         path: { id: agentSessionId }
       }).catch(() => {});
@@ -150249,7 +150338,7 @@ var MAX_LEASE_RETRIES = 3;
 async function processDreamQueue(args) {
   const maxRuntimeMs = args.maxRuntimeMinutes * 60 * 1000;
   if (!hasActiveDreamLease(args.db)) {
-    clearStaleEntries(args.db, maxRuntimeMs + 1800000, args.projectIdentity);
+    clearStaleEntries(args.db, maxRuntimeMs + 30 * 60 * 1000, args.projectIdentity);
   }
   const entry = dequeueNext(args.db, args.projectIdentity);
   if (!entry) {
@@ -150292,7 +150381,6 @@ async function processDreamQueue(args) {
   return result;
 }
 // ../plugin/src/features/magic-context/dreamer/scheduler.ts
-init_logger();
 function parseScheduleWindow(schedule) {
   const match = /^(\d{1,2}):(\d{2})-(\d{1,2}):(\d{2})$/.exec(schedule.trim());
   if (!match)
@@ -150332,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;
     }
@@ -150367,7 +150454,6 @@ function checkScheduleAndEnqueue(db, schedule, ownProjectIdentity) {
   return enqueued;
 }
 // ../plugin/src/features/magic-context/git-commits/git-log-reader.ts
-init_logger();
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
@@ -150451,9 +150537,6 @@ ${body}` : subject;
   }
   return commits;
 }
-// ../plugin/src/features/magic-context/git-commits/indexer.ts
-init_logger();
-
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var exports_external = {};
 __export(exports_external, {
@@ -164894,6 +164977,7 @@ var MagicContextConfigSchema = exports_external.object({
     model: DEFAULT_LOCAL_EMBEDDING_MODEL
   }).describe("Embedding provider configuration"),
   temporal_awareness: exports_external.boolean().default(true).describe('Inject wall-clock gap markers (<!-- +Xm -->) between user messages where > 5 min elapsed since the previous message, and add start/end date attributes on compartments. Gives the agent a sense of session pacing and "how long ago" across multi-day sessions. Graduated from experimental.temporal_awareness; default: true (set false to opt out).'),
+  keep_subagents: exports_external.boolean().default(false).describe("Debug: keep the child sessions Magic Context spawns for its own subagents (historian, dreamer, sidekick, memory-migration) instead of deleting them on success. Useful for short-term inspection/data collection — their full transcript (prompt, tool calls, token usage, output) stays in the host session store. Kept sessions accumulate until manually cleared; leave false for normal use. Requires a restart to take effect."),
   caveman_text_compression: exports_external.object({
     enabled: exports_external.boolean().default(false).describe("Apply deterministic caveman-style text compression to old conversation text. Only active when ctx_reduce_enabled=false. Compresses user/assistant text in oldest-first tiers: ultra (oldest 20%), full, lite, untouched (newest 40%)."),
     min_chars: exports_external.number().min(100).max(1e4).default(500).describe("Text parts shorter than this (characters) stay untouched. Min 100, max 10000. Default: 500.")
@@ -164929,9 +165013,6 @@ var MagicContextConfigSchema = exports_external.object({
   };
 });
 
-// ../plugin/src/features/magic-context/memory/embedding.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/memory/cosine-similarity.ts
 function cosineSimilarity(a, b) {
   if (a.length !== b.length) {
@@ -164977,8 +165058,6 @@ import { mkdirSync as mkdirSync5 } from "node:fs";
 import { open, stat, unlink, writeFile } from "node:fs/promises";
 import { dirname as dirname4, join as join12 } from "node:path";
 import { pathToFileURL } from "node:url";
-init_data_path();
-init_logger();
 var LOCK_POLL_MS = 150;
 var STALE_LOCK_MS = 3 * 60000;
 var MAX_LOCK_WAIT_MS = 5 * 60000;
@@ -165017,7 +165096,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));
     }
   }
 }
@@ -165186,7 +165265,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) {
@@ -165214,8 +165293,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() {
@@ -165313,8 +165392,60 @@ 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
-init_logger();
 function normalizeEndpoint2(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
@@ -165356,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;
   }
@@ -165401,6 +165538,7 @@ class OpenAICompatibleEmbeddingProvider {
           ...this.inputType ? { input_type: this.inputType } : {},
           ...this.truncate ? { truncate: this.truncate } : {}
         }),
+        redirect: "error",
         signal: internalController.signal
       });
       if (!response.ok) {
@@ -165530,7 +165668,6 @@ class OpenAICompatibleEmbeddingProvider {
 
 // ../plugin/src/features/magic-context/project-embedding-registry.ts
 import { createHash as createHash7, randomUUID } from "node:crypto";
-init_logger();
 
 // ../plugin/src/features/magic-context/git-commits/storage-git-commit-embeddings.ts
 var saveStatements = new WeakMap;
@@ -165768,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" };
@@ -165788,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);
@@ -166064,7 +166207,6 @@ async function embedText(text, signal) {
 var SWEEP_MAX_WALL_CLOCK_MS2 = 10 * 60 * 1000;
 
 // ../plugin/src/features/magic-context/git-commits/storage-git-commits.ts
-init_logger();
 var insertStatements = new WeakMap;
 var existingShasStatements = new WeakMap;
 var projectCountStatements = new WeakMap;
@@ -166276,9 +166418,6 @@ async function embedUnembeddedCommits(db, projectPath) {
     embedInProgress.delete(projectPath);
   }
 }
-// ../plugin/src/features/magic-context/git-commits/search-git-commits.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/memory/storage-memory-fts.ts
 var DEFAULT_SEARCH_LIMIT = 10;
 var searchStatements = new WeakMap;
@@ -166441,7 +166580,6 @@ function searchGitCommitsSync(db, projectPath, query, options) {
   return results.slice(0, options.limit);
 }
 // ../plugin/src/plugin/dream-timer.ts
-init_logger();
 var DREAM_TIMER_INTERVAL_MS = 15 * 60 * 1000;
 var activeTimer = null;
 function openTimerDatabaseOrNull(context) {
@@ -166601,15 +166739,24 @@ async function sweepGitCommits(args) {
 
 // ../plugin/src/plugin/embedding-bootstrap-helpers.ts
 import { createHash as createHash8 } from "node:crypto";
-init_logger();
 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);
@@ -166675,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";
@@ -166766,10 +166938,74 @@ 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";
-import { dirname as dirname5, isAbsolute as isAbsolute2, resolve as resolve3 } from "node:path";
+import { dirname as dirname5, isAbsolute as isAbsolute3, resolve as resolve4 } from "node:path";
 
 // ../plugin/src/shared/jsonc-parser.ts
 function stripJsonComments(content) {
@@ -166830,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;
@@ -166879,9 +167130,13 @@ function substituteConfigVariables(input) {
     }
     let filePath = rawPath.trim();
     if (filePath.startsWith("~/")) {
-      filePath = resolve3(homedir3(), filePath.slice(2));
-    } else if (!isAbsolute2(filePath)) {
-      filePath = resolve3(configDir, filePath);
+      filePath = resolve4(homedir3(), filePath.slice(2));
+    } 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`);
@@ -166921,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,
@@ -166963,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;
 }
@@ -166984,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 };
@@ -166995,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)}.`);
   }
@@ -167032,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}`));
@@ -167110,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);
@@ -167168,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);
@@ -167214,7 +167524,8 @@ function registerPiDreamerProject(opts) {
       cancelled = true;
       cleanup?.();
     },
-    runOnce
+    runOnce,
+    projectDir: opts.projectDir
   });
 }
 async function runPiDreamForProject(projectIdentity) {
@@ -167241,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}`;
@@ -167301,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) {
@@ -167496,7 +167798,6 @@ function registerCtxDreamCommand(pi, deps) {
 }
 
 // ../plugin/src/hooks/magic-context/execute-flush.ts
-init_logger();
 function executeFlush(db, sessionId) {
   try {
     const pendingOps = getPendingOps(db, sessionId);
@@ -167528,7 +167829,6 @@ function executeFlush(db, sessionId) {
 import * as crypto2 from "node:crypto";
 
 // ../plugin/src/features/magic-context/scheduler.ts
-init_logger();
 var TTL_PATTERN = /^(\d+)([smh])$/;
 var NUMERIC_PATTERN = /^\d+$/;
 var UNIT_TO_MS = {
@@ -167583,6 +167883,7 @@ function createScheduler(config2) {
     }
   };
 }
+
 // ../plugin/src/features/magic-context/tagger.ts
 var TOOL_COMPOSITE_KEY_SEP = "\x00";
 function makeToolCompositeKey(ownerMsgId, callId) {
@@ -168342,7 +168643,6 @@ function replayCavemanCompression(sessionId, db, targets, tags) {
 }
 
 // ../plugin/src/hooks/magic-context/compartment-trigger.ts
-init_logger();
 var PROACTIVE_TRIGGER_OFFSET_PERCENTAGE = 2;
 var POST_DROP_TARGET_RATIO = 0.75;
 var MIN_PROACTIVE_TAIL_TOKEN_ESTIMATE = 6000;
@@ -168579,9 +168879,6 @@ class BoundedSessionMap {
   }
 }
 
-// ../plugin/src/hooks/magic-context/inject-compartments.ts
-init_logger();
-
 // ../plugin/src/hooks/magic-context/decay-curve.ts
 var H50 = 24;
 var D = 25;
@@ -168645,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];
@@ -168674,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(`
 `);
@@ -168751,7 +169052,6 @@ function extractM0Block(m0Text, tag) {
 // ../plugin/src/hooks/magic-context/key-files-block.ts
 import { readFileSync as readFileSync9, realpathSync as realpathSync4 } from "node:fs";
 import { join as join14, sep as sep2 } from "node:path";
-init_logger();
 var cachedKeyFilesBySession = new Map;
 var staleUpdates = new Map;
 function staleKey(update) {
@@ -168849,9 +169149,6 @@ ${blocks.join(`
   return rendered;
 }
 
-// ../plugin/src/hooks/magic-context/inject-compartments.ts
-await init_read_session_db();
-
 // ../plugin/src/hooks/magic-context/temporal-awareness.ts
 var TEMPORAL_AWARENESS_THRESHOLD_SECONDS = 300;
 var SECONDS_PER_MINUTE = 60;
@@ -169008,9 +169305,6 @@ function renderMemoryBlockV2(memories, wrapper = "project-memory") {
 `);
 }
 
-// ../plugin/src/hooks/magic-context/nudger.ts
-init_logger();
-
 // ../plugin/src/shared/format-bytes.ts
 function formatBytes(bytes) {
   if (bytes < 1024)
@@ -169212,9 +169506,6 @@ function estimateProjectedPercentage(db, sessionId, contextUsage, preloadedTags)
   return contextUsage.percentage * (1 - dropRatio);
 }
 
-// src/context-handler.ts
-init_logger();
-
 // ../plugin/src/shared/tag-transcript.ts
 function tagTranscript(sessionId, transcript, tagger, db, options = {}) {
   const skipPrefixInjection = options.skipPrefixInjection === true;
@@ -169516,9 +169807,6 @@ function buildToolTarget(part, message) {
   };
 }
 
-// ../plugin/src/features/magic-context/search.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/literal-probes.ts
 var MAX_PROBES = 5;
 var MIN_PROBE_LENGTH = 3;
@@ -169575,7 +169863,6 @@ function containsProbeVerbatim(text, probes) {
   return probes.some((probe) => haystack.includes(probe.toLowerCase()));
 }
 // ../plugin/src/features/magic-context/memory/embedding-backfill.ts
-init_logger();
 async function ensureMemoryEmbeddings(args) {
   const snapshot = getProjectEmbeddingSnapshot(args.projectIdentity);
   if (!snapshot?.enabled) {
@@ -169614,7 +169901,6 @@ async function ensureMemoryEmbeddings(args) {
   return args.existingEmbeddings;
 }
 // ../plugin/src/features/magic-context/memory/promotion.ts
-init_logger();
 function isPromotableCategory(category) {
   return PROMOTABLE_CATEGORIES.some((promotableCategory) => promotableCategory === category);
 }
@@ -170116,17 +170402,16 @@ ${trimmedBody}…
 }
 
 // src/auto-search-pi.ts
-init_logger();
 var AUTO_SEARCH_TIMEOUT_MS = 3000;
 var DEFAULT_SCORE_THRESHOLD = 0.55;
 var DEFAULT_MIN_PROMPT_CHARS = 20;
 async function unifiedSearchWithTimeout(db, sessionId, projectPath, prompt, options, timeoutMs) {
   const controller = new AbortController;
   let timer;
-  const timeoutPromise = new Promise((resolve4) => {
+  const timeoutPromise = new Promise((resolve5) => {
     timer = setTimeout(() => {
       controller.abort();
-      resolve4(null);
+      resolve5(null);
     }, timeoutMs);
   });
   try {
@@ -170346,7 +170631,6 @@ ${hintText}`;
 function clearAutoSearchForPiSession(_sessionId) {}
 
 // src/compaction-marker-manager-pi.ts
-init_logger();
 function applyDeferredPiCompactionMarker(deps, sessionId, pending) {
   try {
     const matches = getCompartmentsByEndMessageId(deps.db, sessionId, pending.endMessageId);
@@ -170488,7 +170772,6 @@ function stripSystemInjection(text) {
 }
 
 // src/heuristic-cleanup-pi.ts
-init_logger();
 var DEDUP_SAFE_TOOLS = new Set([
   "mcp_grep",
   "mcp_read",
@@ -170738,9 +171021,6 @@ function buildMessageIdToMaxTagFromTargets(targets) {
   return byMessage;
 }
 
-// src/inject-compartments-pi.ts
-init_logger();
-
 // src/read-session-pi.ts
 var SYNTH_USER_ID_PREFIX = "synth-user-";
 function resolvePiStableId(msg, index, entryIds, entryIdByRef) {
@@ -171123,6 +171403,16 @@ function safeGetActiveUserMemoriesPi(db) {
     throw error51;
   }
 }
+function memoryProjectPath(state) {
+  return state.memoryEnabled === false ? undefined : state.projectIdentity;
+}
+var EMPTY_PI_HARD_SIGNALS = {
+  systemHash: "",
+  toolSetHash: "",
+  modelKey: "",
+  cacheExpired: false,
+  lastResponseTime: 0
+};
 function decodeCachedM0(value) {
   if (!value)
     return null;
@@ -171169,7 +171459,10 @@ function getCachedMarkers(db, state, compartmentsForNormalization) {
     sessionFactsVersion: meta3.cachedM0SessionFactsVersion,
     materializedAt: meta3.cachedM0MaterializedAt,
     upgradeState: meta3.cachedM0UpgradeState,
-    lastBaselineEndMessageId: cachedBoundary
+    lastBaselineEndMessageId: cachedBoundary,
+    systemHash: meta3.cachedM0SystemHash ?? "",
+    toolSetHash: meta3.cachedM0ToolSetHash ?? "",
+    modelKey: meta3.cachedM0ModelKey ?? ""
   };
 }
 function lastBaselineEndMessageId(compartments) {
@@ -171180,24 +171473,25 @@ 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,
     sessionFactsVersion: getSessionFactsVersion(db, state.sessionId),
     materializedAt: Date.now(),
     upgradeState: `${PI_M0_UPGRADE_STATE}:${compartments.some((c) => c.legacy === 1) ? "legacy" : "ready"}`,
-    lastBaselineEndMessageId: lastBaselineEndMessageId(compartments)
+    lastBaselineEndMessageId: lastBaselineEndMessageId(compartments),
+    systemHash: (state.hardSignals ?? EMPTY_PI_HARD_SIGNALS).systemHash,
+    toolSetHash: (state.hardSignals ?? EMPTY_PI_HARD_SIGNALS).toolSetHash,
+    modelKey: (state.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey
   };
 }
 function mustMaterializePi(state, db, currentCompartmentsOverride) {
@@ -171214,7 +171508,19 @@ function mustMaterializePi(state, db, currentCompartmentsOverride) {
   if (getCachedMarkers(db, state, currentCompartments) === null) {
     return { value: true, reason: "cache_invalid" };
   }
-  const cachedMaxCompartmentSeq = normalizeCachedMaxCompartmentSeq(meta3.cachedM0MaxCompartmentSeq ?? EMPTY_MAX_COMPARTMENT_SEQ, currentCompartments);
+  const hard = state.hardSignals ?? EMPTY_PI_HARD_SIGNALS;
+  if (hard.modelKey !== "" && hard.modelKey !== (meta3.cachedM0ModelKey ?? "")) {
+    return { value: true, reason: "model_change" };
+  }
+  if (hard.systemHash !== "" && hard.systemHash !== (meta3.cachedM0SystemHash ?? "")) {
+    return { value: true, reason: "system_hash" };
+  }
+  if (hard.toolSetHash !== "" && hard.toolSetHash !== (meta3.cachedM0ToolSetHash ?? "")) {
+    return { value: true, reason: "tool_set_hash" };
+  }
+  if (hard.cacheExpired && hard.lastResponseTime > 0 && hard.lastResponseTime > (meta3.cachedM0MaterializedAt ?? 0)) {
+    return { value: true, reason: "ttl_idle" };
+  }
   if (meta3.cachedM0UpgradeState !== current.upgradeState) {
     return { value: true, reason: "renderer_upgrade" };
   }
@@ -171224,15 +171530,9 @@ function mustMaterializePi(state, db, currentCompartmentsOverride) {
   if (current.projectMemoryEpoch !== (meta3.cachedM0ProjectMemoryEpoch ?? 0)) {
     return { value: true, reason: "project_memory_change" };
   }
-  if (current.projectUserProfileVersion !== (meta3.cachedM0ProjectUserProfileVersion ?? 0)) {
-    return { value: true, reason: "user_profile_change" };
-  }
   if (current.maxMutationId !== (meta3.cachedM0MaxMutationId ?? 0)) {
     return { value: true, reason: "pending_mutations" };
   }
-  if (current.maxCompartmentSeq !== cachedMaxCompartmentSeq) {
-    return { value: true, reason: "new_compartment" };
-  }
   return { value: false, reason: null };
 }
 function renderUserProfileBlock(db, wrapper = "user-profile", memoriesOverride) {
@@ -171245,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;
@@ -171295,24 +171596,28 @@ 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,
       sessionFactsVersion: getSessionFactsVersion(db, state.sessionId),
       materializedAt: Date.now(),
       upgradeState: `${PI_M0_UPGRADE_STATE}:${compartments.some((c) => c.legacy === 1) ? "legacy" : "ready"}`,
-      lastBaselineEndMessageId: lastBaselineEndMessageId(compartments)
+      lastBaselineEndMessageId: lastBaselineEndMessageId(compartments),
+      systemHash: (state.hardSignals ?? EMPTY_PI_HARD_SIGNALS).systemHash,
+      toolSetHash: (state.hardSignals ?? EMPTY_PI_HARD_SIGNALS).toolSetHash,
+      modelKey: (state.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey
     };
     return { docs, markers, compartments, memories, userProfile };
   });
@@ -171388,7 +171693,10 @@ function materializeM0Pi(state, db) {
       projectDocsHash: snapshotMarkers.projectDocsHash,
       materializedAt: snapshotMarkers.materializedAt,
       sessionFactsVersion: snapshotMarkers.sessionFactsVersion,
-      upgradeState: snapshotMarkers.upgradeState
+      upgradeState: snapshotMarkers.upgradeState,
+      systemHash: snapshotMarkers.systemHash,
+      toolSetHash: snapshotMarkers.toolSetHash,
+      modelKey: snapshotMarkers.modelKey
     });
     db.prepare("UPDATE session_meta SET memory_block_count = ?, memory_block_ids = ? WHERE session_id = ?").run(renderedMemoryIds.length, JSON.stringify(renderedMemoryIds), state.sessionId);
     setCachedBoundary(db, state.sessionId, snapshotMarkers.lastBaselineEndMessageId);
@@ -171470,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(`
 
@@ -171492,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;
@@ -171554,6 +171863,9 @@ function readCachedPiM0M1Row(db, sessionId) {
 					cached_m0_materialized_at,
 					cached_m0_session_facts_version,
 					cached_m0_upgrade_state,
+					cached_m0_system_hash,
+					cached_m0_tool_set_hash,
+					cached_m0_model_key,
 					cached_m0_last_baseline_end_message_id,
 					memory_block_ids
 			   FROM session_meta
@@ -171591,14 +171903,17 @@ function markersFromCachedPiRow(row, compartmentsForNormalization) {
     materializedAt: row.cached_m0_materialized_at,
     sessionFactsVersion: row.cached_m0_session_facts_version,
     upgradeState: row.cached_m0_upgrade_state,
-    lastBaselineEndMessageId: typeof row.cached_m0_last_baseline_end_message_id === "string" && row.cached_m0_last_baseline_end_message_id.length > 0 ? row.cached_m0_last_baseline_end_message_id : null
+    lastBaselineEndMessageId: typeof row.cached_m0_last_baseline_end_message_id === "string" && row.cached_m0_last_baseline_end_message_id.length > 0 ? row.cached_m0_last_baseline_end_message_id : null,
+    systemHash: row.cached_m0_system_hash ?? "",
+    toolSetHash: row.cached_m0_tool_set_hash ?? "",
+    modelKey: row.cached_m0_model_key ?? ""
   };
 }
 function cachedPiRowMatchesSnapshot(args) {
   const rowMarkers = markersFromCachedPiRow(args.row, args.compartmentsForNormalization);
   if (!rowMarkers)
     return false;
-  return bufferEqualsNullable(args.row.cached_m0_bytes, args.m0Bytes) && rowMarkers.projectMemoryEpoch === args.markers.projectMemoryEpoch && rowMarkers.projectUserProfileVersion === args.markers.projectUserProfileVersion && rowMarkers.maxCompartmentSeq === args.markers.maxCompartmentSeq && rowMarkers.maxMemoryId === args.markers.maxMemoryId && rowMarkers.maxMutationId === args.markers.maxMutationId && rowMarkers.maxMemoryMutationId === args.markers.maxMemoryMutationId && (rowMarkers.projectDocsHash ?? "") === (args.markers.projectDocsHash ?? "") && rowMarkers.materializedAt === args.markers.materializedAt && rowMarkers.sessionFactsVersion === args.markers.sessionFactsVersion && (rowMarkers.upgradeState ?? null) === (args.markers.upgradeState ?? null);
+  return bufferEqualsNullable(args.row.cached_m0_bytes, args.m0Bytes) && rowMarkers.projectMemoryEpoch === args.markers.projectMemoryEpoch && rowMarkers.projectUserProfileVersion === args.markers.projectUserProfileVersion && rowMarkers.maxCompartmentSeq === args.markers.maxCompartmentSeq && rowMarkers.maxMemoryId === args.markers.maxMemoryId && rowMarkers.maxMutationId === args.markers.maxMutationId && rowMarkers.maxMemoryMutationId === args.markers.maxMemoryMutationId && (rowMarkers.projectDocsHash ?? "") === (args.markers.projectDocsHash ?? "") && rowMarkers.materializedAt === args.markers.materializedAt && rowMarkers.sessionFactsVersion === args.markers.sessionFactsVersion && (rowMarkers.upgradeState ?? null) === (args.markers.upgradeState ?? null) && (rowMarkers.systemHash ?? "") === (args.markers.systemHash ?? "") && (rowMarkers.toolSetHash ?? "") === (args.markers.toolSetHash ?? "") && (rowMarkers.modelKey ?? "") === (args.markers.modelKey ?? "");
 }
 function decodeCachedM1(row, sessionId) {
   if (!row.cached_m1_bytes) {
@@ -171656,14 +171971,16 @@ 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");
-    args.db.prepare("UPDATE session_meta SET cached_m1_bytes = ? WHERE session_id = ?").run(m1Bytes, args.state.sessionId);
+    const latestCompartment = args.compartmentsForNormalization.at(-1);
+    const advancedBoundary = latestCompartment?.endMessageId && latestCompartment.endMessageId.length > 0 ? latestCompartment.endMessageId : markers.lastBaselineEndMessageId;
+    args.db.prepare("UPDATE session_meta SET cached_m1_bytes = ?, cached_m0_last_baseline_end_message_id = ? WHERE session_id = ?").run(m1Bytes, advancedBoundary, args.state.sessionId);
     args.db.exec("COMMIT");
     return {
       m0: decodeCachedM0(row.cached_m0_bytes) ?? "",
       m1: rendered.text,
-      markers,
+      markers: { ...markers, lastBaselineEndMessageId: advancedBoundary },
       memoryUpdateCount: rendered.memoryUpdateCount,
       recomputed: true
     };
@@ -171782,8 +172099,15 @@ function injectM0M1Pi(state, db, piMessages, entryIds, recomputeM1ThisPass = fal
     m1 = replayed.m1;
     markers = replayed.markers;
   }
-  const M0_DRIFT_RATIO_FLOOR = 2000;
-  if (!materialized && !contentionExhausted && m1Recomputed && recomputeM1ThisPass && (memoryUpdateCount > 40 || m1 !== PI_M1_PLACEHOLDER && m0.length >= M0_DRIFT_RATIO_FLOOR && m1.length > m0.length * 0.15)) {
+  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 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);
@@ -171804,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,
@@ -171966,7 +172290,6 @@ function isRecord3(value) {
 }
 
 // ../plugin/src/features/magic-context/compartment-embedding.ts
-init_logger();
 async function embedAndStoreCompartments(db, sessionId, projectPath, compartments) {
   if (compartments.length === 0)
     return;
@@ -172863,7 +173186,6 @@ Memory is disabled for this project: do NOT emit a <facts> block. Produce compar
 }
 
 // ../plugin/src/hooks/magic-context/compartment-runner-drop-queue.ts
-init_logger();
 function queueDropsForCompartmentalizedMessages(db, sessionId, upToMessageIndex) {
   const tags = getTagsBySession(db, sessionId);
   const { messageFileKeys, toolObservations } = getRawSessionTagKeysThrough(sessionId, upToMessageIndex);
@@ -173105,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,
@@ -174943,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/>";
@@ -174987,7 +175330,6 @@ function buildReferenceBlocks(args) {
 }
 
 // src/pi-historian-runner.ts
-init_logger();
 var HISTORIAN_AGENT_NAME = "magic-context-historian";
 var DEFAULT_HISTORIAN_TIMEOUT_MS2 = 120000;
 var HISTORIAN_ALERT_COOLDOWN_MS = 60 * 1000;
@@ -175045,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;
@@ -175065,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);
@@ -175195,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") {
@@ -175241,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);
@@ -175356,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 {
@@ -175770,7 +176122,6 @@ function replayStrippedInlineThinkingPi(args) {
 }
 
 // src/strip-placeholders-pi.ts
-init_logger();
 var DROPPED_SEGMENT_PATTERN = /^\[dropped(?: §[^§]+§)?\]$/;
 function isDroppedOnlyText(text) {
   const trimmed = text.trim();
@@ -175822,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);
@@ -175832,6 +176184,7 @@ function stripPiDroppedPlaceholderMessages(args) {
         continue;
       if (!idsToStrip.has(id)) {
         idsToStrip.add(id);
+        discoveredIds.push(id);
         discovered++;
       }
     }
@@ -175846,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}`);
@@ -175881,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.`;
@@ -175891,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")\`
@@ -175911,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")\`
@@ -175974,7 +176332,6 @@ Prefer many small targeted operations over one large blanket operation, and keep
 }
 
 // src/system-prompt.ts
-init_logger();
 var MAGIC_CONTEXT_MARKER = "## Magic Context";
 var stickyDateBySession = new Map;
 function buildMagicContextBlock(opts) {
@@ -176094,8 +176451,8 @@ function injectPiTemporalMarkers(messages) {
 // src/timeout.ts
 function withTimeout(p, ms) {
   let handle;
-  const timeout = new Promise((resolve4) => {
-    handle = setTimeout(() => resolve4(undefined), ms);
+  const timeout = new Promise((resolve5) => {
+    handle = setTimeout(() => resolve5(undefined), ms);
     handle.unref?.();
   });
   return Promise.race([p, timeout]).finally(() => {
@@ -176702,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) {
@@ -176710,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);
@@ -177093,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)}`);
       }
@@ -177122,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 {
@@ -177171,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;
@@ -177192,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" : ""}`);
@@ -177209,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,
@@ -177526,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 = {
@@ -177539,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...`);
@@ -177616,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);
@@ -177639,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();
@@ -177665,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();
@@ -177681,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;
@@ -177775,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();
@@ -177827,18 +178221,29 @@ async function runPipeline(args) {
   if (args.injection) {
     try {
       const tInjection = performance.now();
-      if (args.isCacheBusting || deferredHistoryRefresh) {
-        clearM0M1PiCache(args.db, args.sessionId, args.isCacheBusting ? "history refresh" : "deferred history refresh");
-      }
+      const hardMeta = getOrCreateSessionMeta(args.db, args.sessionId);
+      let piTtlMs = 5 * 60 * 1000;
+      try {
+        piTtlMs = parseCacheTtl(hardMeta.cacheTtl);
+      } catch {}
+      const piHardSignals = {
+        systemHash: typeof hardMeta.systemPromptHash === "string" ? hardMeta.systemPromptHash : "",
+        toolSetHash: "",
+        modelKey: liveModelBySession.get(args.sessionId) ?? "",
+        cacheExpired: hardMeta.lastResponseTime > 0 && Date.now() - hardMeta.lastResponseTime >= piTtlMs,
+        lastResponseTime: hardMeta.lastResponseTime
+      };
       injectionResult = injectM0M1Pi({
         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,
-        keyFilesTokenBudget: args.injection.keyFilesTokenBudget
-      }, args.db, args.messages, args.entryIds, executedWorkThisPass);
+        keyFilesTokenBudget: args.injection.keyFilesTokenBudget,
+        hardSignals: piHardSignals
+      }, args.db, args.messages, args.entryIds, args.isCacheBusting || deferredHistoryRefresh || executedWorkThisPass);
       if (args.isCacheBusting) {
         historyRefreshSessions.delete(args.sessionId);
         historyWasConsumedThisPass = true;
@@ -178191,12 +178596,8 @@ ${result}`;
   });
 }
 
-// ../plugin/src/hooks/magic-context/compartment-runner.ts
-init_logger();
-
 // ../plugin/src/hooks/magic-context/historian-state-file.ts
 import { mkdirSync as mkdirSync6, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
-init_data_path();
 function cleanupHistorianStateFile(path7) {
   if (!path7)
     return;
@@ -178204,13 +178605,7 @@ function cleanupHistorianStateFile(path7) {
     unlinkSync(path7);
   } catch {}
 }
-// ../plugin/src/hooks/magic-context/compartment-runner-incremental.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/compaction-marker.ts
-init_data_path();
-init_logger();
-await init_sqlite();
 import { join as join15 } from "node:path";
 var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 function randomBase62(length) {
@@ -178365,23 +178760,20 @@ function removeCompactionMarker(state) {
 }
 
 // ../plugin/src/hooks/magic-context/compaction-marker-manager.ts
-init_data_path();
-init_logger();
-await init_sqlite();
 var MARKER_SUMMARY_TEXT = "[Compacted by magic-context — session history is managed by the plugin]";
 function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, directory) {
   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,
@@ -178395,13 +178787,14 @@ 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
 import { mkdirSync as mkdirSync7, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "node:fs";
 import { join as join16 } from "node:path";
-init_data_path();
 function historianResponseDumpDir(directory) {
   return getProjectMagicContextHistorianDir(directory);
 }
@@ -178601,12 +178994,12 @@ async function runHistorianPrompt(args) {
       error: `Historian failed while processing this session: ${desc.brief}`
     };
   } finally {
-    if (agentSessionId && outcomeOk) {
+    if (agentSessionId && outcomeOk && !shouldKeepSubagents()) {
       await client.session.delete({ path: { id: agentSessionId } }).catch((e) => {
         sessionLog(parentSessionId, "compartment agent: session cleanup failed", getErrorMessage(e));
       });
-    } else if (agentSessionId && !outcomeOk) {
-      sessionLog(parentSessionId, `historian: KEEPING failed child session ${agentSessionId} for debugging (not deleted)`);
+    } else if (agentSessionId && (!outcomeOk || shouldKeepSubagents())) {
+      sessionLog(parentSessionId, `historian: KEEPING child session ${agentSessionId} (${outcomeOk ? "keep_subagents" : "failed"}) — not deleted`);
     }
   }
 }
@@ -178685,8 +179078,8 @@ function isTransientHistorianPromptError(message) {
   ].some((token) => normalized.includes(token));
 }
 function sleep(ms) {
-  return new Promise((resolve4) => {
-    setTimeout(resolve4, ms);
+  return new Promise((resolve5) => {
+    setTimeout(resolve5, ms);
   });
 }
 function cleanupHistorianDump(sessionId, dumpPath) {
@@ -178727,7 +179120,6 @@ function sanitizeDumpName(value) {
 }
 
 // ../plugin/src/hooks/magic-context/send-session-notification.ts
-init_logger();
 function hasNotificationSessionClient(client) {
   if (client === null || typeof client !== "object")
     return false;
@@ -178826,11 +179218,7 @@ async function sendIgnoredMessage(client, sessionId, text, params, forcePersist
 var HISTORIAN_ALERT_COOLDOWN_MS2 = 60 * 1000;
 var lastHistorianAlertBySession2 = new Map;
 
-// ../plugin/src/hooks/magic-context/compartment-runner-partial-recomp.ts
-init_logger();
-
 // ../plugin/src/hooks/magic-context/compartment-runner-recomp.ts
-init_logger();
 function insertRecompCompartmentRows(db, sessionId, compartments, now) {
   const stmt = db.prepare("INSERT INTO compartments (session_id, sequence, start_message, end_message, start_message_id, end_message_id, title, content, p1, p2, p3, p4, importance, episode_type, legacy, created_at, harness) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
   for (const c of compartments) {
@@ -178953,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);
@@ -178966,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 [
@@ -179159,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);
@@ -179174,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 [
@@ -179311,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");
@@ -179331,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 };
@@ -179376,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;
@@ -179396,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;
@@ -179489,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
@@ -179510,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(`
 `);
@@ -179599,9 +179989,6 @@ async function executeContextRecompWithResult(deps, options = {}) {
   }
 }
 
-// src/commands/ctx-recomp.ts
-init_logger();
-
 // src/pi-recomp-client-shared.ts
 function createPiHistorianClient(args) {
   const sessions = new Map;
@@ -179733,9 +180120,6 @@ function resolvePiReadBranchEntries2(ctx) {
   };
 }
 
-// src/pi-recomp-runner.ts
-init_logger();
-
 // src/status-line.ts
 var STATUS_KEY = "magic-context";
 var RECENT_FAILURE_MS = 60000;
@@ -180064,7 +180448,6 @@ function inferLevel(text) {
 }
 
 // ../plugin/src/features/magic-context/memory/memory-migration.ts
-init_logger();
 function memoryMigrationGuardKey(projectPath) {
   return `memory_migration_5cat:${projectPath}`;
 }
@@ -180174,11 +180557,7 @@ function contextualizeUpgradeReason(reason) {
   return rewritten;
 }
 
-// src/commands/ctx-session-upgrade.ts
-init_logger();
-
 // src/pi-memory-migration.ts
-init_logger();
 var MIGRATION_SYSTEM_PROMPT2 = "You re-organize a software project's long-term memory into a stricter taxonomy. " + "Follow the user instructions exactly. Output ONLY the requested XML blocks, nothing else.";
 async function runPiMemoryMigration(deps) {
   const projectPath = resolveProjectIdentity(deps.directory);
@@ -180453,7 +180832,6 @@ ${migrationSummary}` : "",
 }
 
 // ../plugin/src/hooks/magic-context/execute-status.ts
-init_logger();
 function formatExecuteThreshold(thresholdPercentage, mode, contextLimit) {
   if (mode === "tokens" && contextLimit > 0) {
     const tokens = Math.floor(thresholdPercentage / 100 * contextLimit);
@@ -180620,7 +180998,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.22.3",
+  version: "0.22.5",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -185358,7 +185736,6 @@ function createCtxExpandTool(deps) {
 }
 
 // src/tools/ctx-memory.ts
-init_logger();
 var DEFAULT_LIST_LIMIT = 10;
 var VALID_CATEGORIES = new Set(CATEGORY_PRIORITY);
 function isMemoryCategory2(value) {
@@ -185503,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") {
@@ -185511,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(() => {
@@ -185540,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);
@@ -185574,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(", ")}`);
@@ -185635,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
@@ -185643,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,
@@ -185665,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(() => {
@@ -185927,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");
   }
@@ -186188,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),
@@ -186198,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,
@@ -186526,6 +186900,7 @@ async function src_default2(pi) {
     mmapSizeMb: config2.sqlite.mmap_size_mb
   });
   applySqliteTuningPragmas(db);
+  setKeepSubagents(config2.keep_subagents === true);
   if (!config2.enabled) {
     info("plugin DISABLED via config (enabled: false) — skipping registration");
     return;
@@ -186566,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,
@@ -186677,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) {