@wolfx/pi-magic-context 0.22.3 → 0.22.4

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, ".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) {
@@ -8282,8 +8074,115 @@ function hasGitDir(canonical) {
   }
 }
 
-// ../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, ".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 +8196,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 +141335,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 +141739,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 +141810,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 +141849,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 +141894,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 +141930,9 @@ function getDefaultSessionMeta(sessionId) {
     cachedM0MaterializedAt: null,
     cachedM0SessionFactsVersion: null,
     cachedM0UpgradeState: null,
+    cachedM0SystemHash: null,
+    cachedM0ToolSetHash: null,
+    cachedM0ModelKey: null,
     lastObservedModelKey: null,
     upgradeRemindedAt: null,
     piStableIdScheme: null
@@ -141980,6 +141984,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 +142006,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 +142028,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],
@@ -142223,11 +142236,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 +142316,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 +142486,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 +142733,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 +143198,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
@@ -143387,6 +143392,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(`
@@ -144316,6 +144324,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);
@@ -144614,7 +144644,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",
@@ -145077,8 +145106,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 +145139,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 +145374,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 +145775,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 +146053,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 +146162,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 +146294,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 +146461,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 +146561,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 +146606,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 +146680,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 +146689,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 +146779,6 @@ function recordChildInvocation(input) {
 }
 
 // src/subagent-runner.ts
-init_logger();
 function resolveBundledPiCli() {
   try {
     const require_ = createRequire2(import.meta.url);
@@ -147529,18 +147551,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 +147789,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 +147865,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 +147876,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 +147902,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 +147939,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 +148082,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 +148301,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 +148353,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 +148381,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 +148978,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 +149480,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 +149605,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 }
@@ -149870,14 +149929,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) {
@@ -150162,7 +150221,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 +150297,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 +150308,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 +150351,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)
@@ -150367,7 +150425,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 +150508,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, {
@@ -164893,6 +164947,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.")
@@ -164932,9 +164987,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) {
@@ -164980,8 +165032,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;
@@ -165020,7 +165070,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));
     }
   }
 }
@@ -165189,7 +165239,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) {
@@ -165217,8 +165267,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() {
@@ -165317,7 +165367,6 @@ class LocalEmbeddingProvider {
 }
 
 // ../plugin/src/features/magic-context/memory/embedding-openai.ts
-init_logger();
 function normalizeEndpoint2(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
@@ -165533,7 +165582,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;
@@ -166067,7 +166115,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;
@@ -166279,9 +166326,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;
@@ -166444,7 +166488,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) {
@@ -166604,7 +166647,6 @@ 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",
@@ -166776,7 +166818,7 @@ function migrateLegacyExperimental(rawConfig, warnings) {
 // ../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) {
@@ -166886,9 +166928,9 @@ 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);
     }
     if (!existsSync9(filePath)) {
       warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
@@ -167503,7 +167545,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);
@@ -167535,7 +167576,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 = {
@@ -167590,6 +167630,7 @@ function createScheduler(config2) {
     }
   };
 }
+
 // ../plugin/src/features/magic-context/tagger.ts
 var TOOL_COMPOSITE_KEY_SEP = "\x00";
 function makeToolCompositeKey(ownerMsgId, callId) {
@@ -168349,7 +168390,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;
@@ -168586,9 +168626,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;
@@ -168758,7 +168795,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) {
@@ -168856,9 +168892,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;
@@ -169015,9 +169048,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)
@@ -169219,9 +169249,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;
@@ -169523,9 +169550,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;
@@ -169582,7 +169606,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) {
@@ -169621,7 +169644,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);
 }
@@ -170123,17 +170145,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 {
@@ -170353,7 +170374,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);
@@ -170495,7 +170515,6 @@ function stripSystemInjection(text) {
 }
 
 // src/heuristic-cleanup-pi.ts
-init_logger();
 var DEDUP_SAFE_TOOLS = new Set([
   "mcp_grep",
   "mcp_read",
@@ -170745,9 +170764,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) {
@@ -171130,6 +171146,13 @@ function safeGetActiveUserMemoriesPi(db) {
     throw error51;
   }
 }
+var EMPTY_PI_HARD_SIGNALS = {
+  systemHash: "",
+  toolSetHash: "",
+  modelKey: "",
+  cacheExpired: false,
+  lastResponseTime: 0
+};
 function decodeCachedM0(value) {
   if (!value)
     return null;
@@ -171176,7 +171199,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) {
@@ -171204,7 +171230,10 @@ function readCurrentMarkersFromCompartments(db, state, compartments, projectDocs
     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) {
@@ -171221,7 +171250,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" };
   }
@@ -171231,15 +171272,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) {
@@ -171319,7 +171354,10 @@ function readFrozenM0InputsPi(state, db, docs = readProjectDocsCanonical(state.p
       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 };
   });
@@ -171395,7 +171433,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);
@@ -171561,6 +171602,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
@@ -171598,14 +171642,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) {
@@ -171665,12 +171712,14 @@ function softRefreshCachedM1Pi(args) {
     }
     const rendered = renderM1PiWithMetadata(args.state, args.db, markers, parseMemoryBlockIds(row.memory_block_ids), preRenderedKeyFilesBlock);
     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
     };
@@ -171790,7 +171839,10 @@ function injectM0M1Pi(state, db, piMessages, entryIds, recomputeM1ThisPass = fal
     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 M1_ABSOLUTE_CAP_RATIO = 0.2;
+  const m1AbsoluteBudget = (state.historyBudgetTokens ?? DEFAULT_HISTORY_BUDGET_TOKENS) * M1_ABSOLUTE_CAP_RATIO;
+  const m1OverAbsoluteCap = m1 !== PI_M1_PLACEHOLDER && estimateTokens(m1) > m1AbsoluteBudget;
+  if (!materialized && !contentionExhausted && m1Recomputed && recomputeM1ThisPass && (memoryUpdateCount > 40 || m1OverAbsoluteCap || m1 !== PI_M1_PLACEHOLDER && m0.length >= M0_DRIFT_RATIO_FLOOR && m1.length > m0.length * 0.15)) {
     decision = { value: true, reason: "drift" };
     try {
       const result = materializeM0PiWithRetry(state, db);
@@ -171973,7 +172025,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;
@@ -172870,7 +172921,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);
@@ -174994,7 +175044,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;
@@ -175777,7 +175826,6 @@ function replayStrippedInlineThinkingPi(args) {
 }
 
 // src/strip-placeholders-pi.ts
-init_logger();
 var DROPPED_SEGMENT_PATTERN = /^\[dropped(?: §[^§]+§)?\]$/;
 function isDroppedOnlyText(text) {
   const trimmed = text.trim();
@@ -175981,7 +176029,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) {
@@ -176101,8 +176148,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(() => {
@@ -177834,9 +177881,18 @@ 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,
@@ -177844,8 +177900,9 @@ async function runPipeline(args) {
         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;
@@ -178198,12 +178255,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;
@@ -178211,13 +178264,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) {
@@ -178372,9 +178419,6 @@ 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);
@@ -178408,7 +178452,6 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
 // ../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);
 }
@@ -178608,12 +178651,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`);
     }
   }
 }
@@ -178692,8 +178735,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) {
@@ -178734,7 +178777,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;
@@ -178833,11 +178875,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) {
@@ -179606,9 +179644,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;
@@ -179740,9 +179775,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;
@@ -180071,7 +180103,6 @@ function inferLevel(text) {
 }
 
 // ../plugin/src/features/magic-context/memory/memory-migration.ts
-init_logger();
 function memoryMigrationGuardKey(projectPath) {
   return `memory_migration_5cat:${projectPath}`;
 }
@@ -180181,11 +180212,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);
@@ -180460,7 +180487,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);
@@ -180627,7 +180653,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@wolfx/pi-magic-context",
-  version: "0.22.3",
+  version: "0.22.4",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -185391,7 +185417,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) {
@@ -186559,6 +186584,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;