@wolfx/pi-magic-context 0.22.1-patch.0 → 0.22.4

package/dist/index.js

@@ -46,217 +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");
-}
-function getCacheDir() {
-  return process.env.XDG_CACHE_HOME ?? path2.join(os.homedir(), ".cache");
-}
-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) {
@@ -8285,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 -->";
@@ -8300,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) {
@@ -140945,14 +140935,48 @@ function readRawSessionMessagesFromDb(db, sessionId) {
 var encoder = new TextEncoder;
 var TAG_PREFIX_REGEX = /^(?:§\d+§\s*)+/;
 var MALFORMED_TAG_PREFIX_REGEX = /^(?:§\d+">§(?:\d+§)?\s*)+/;
+var COMPLETE_TAG_PAIR_GLOBAL_REGEX = /\u00a7\d+\u00a7/g;
+var MALFORMED_TAG_GLOBAL_REGEX = /\u00a7\d+">(?:\u00a7(?:\d+\u00a7)?)?/g;
+var STRAY_SECTION_CHAR_REGEX = /\u00a7/g;
+function stripWellFormedLeadingTagPrefix(value) {
+  return value.replace(/^(\u00a7\d+\u00a7\s*)+/, "");
+}
+function stripCompleteTagPairsGlobally(value) {
+  return value.replace(COMPLETE_TAG_PAIR_GLOBAL_REGEX, "");
+}
+function stripMalformedTagNotationGlobally(value) {
+  return value.replace(MALFORMED_TAG_GLOBAL_REGEX, "");
+}
+function stripTagSectionCharacters(value) {
+  return value.replace(STRAY_SECTION_CHAR_REGEX, "");
+}
+function stripPersistedAssistantText(value) {
+  let text = stripWellFormedLeadingTagPrefix(value);
+  text = stripCompleteTagPairsGlobally(text);
+  text = stripMalformedTagNotationGlobally(text);
+  text = stripTagSectionCharacters(text);
+  return text.trim();
+}
 function byteSize(value) {
   return encoder.encode(value).length;
 }
 function stripTagPrefix(value) {
-  let stripped = value.replace(MALFORMED_TAG_PREFIX_REGEX, "");
-  stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+  let stripped = value;
+  for (let pass = 0;pass < 8; pass++) {
+    const prev = stripped;
+    stripped = stripped.replace(MALFORMED_TAG_PREFIX_REGEX, "");
+    stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+    if (stripped === prev)
+      break;
+  }
   return stripped;
 }
+function peelLeadingMcTagNotation(value) {
+  const body = stripTagPrefix(value);
+  if (body === value)
+    return { tagPrefix: "", body };
+  return { tagPrefix: value.slice(0, value.length - body.length), body };
+}
 function prependTag(tagId, value) {
   const stripped = stripTagPrefix(value);
   return `§${tagId}§ ${stripped}`;
@@ -140994,7 +141018,9 @@ function hasMeaningfulPart(part) {
     return false;
   const type = part.type;
   if (type === "text") {
-    return typeof part.text === "string" && part.text.trim().length > 0;
+    if (typeof part.text !== "string")
+      return false;
+    return stripTagPrefix(part.text).trim().length > 0;
   }
   if (typeof type !== "string")
     return false;
@@ -141309,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;
@@ -141712,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;
@@ -141782,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"
@@ -141818,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"
@@ -141860,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 {
@@ -141896,6 +141930,9 @@ function getDefaultSessionMeta(sessionId) {
     cachedM0MaterializedAt: null,
     cachedM0SessionFactsVersion: null,
     cachedM0UpgradeState: null,
+    cachedM0SystemHash: null,
+    cachedM0ToolSetHash: null,
+    cachedM0ModelKey: null,
     lastObservedModelKey: null,
     upgradeRemindedAt: null,
     piStableIdScheme: null
@@ -141947,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)
@@ -141966,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);
@@ -141985,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],
@@ -142190,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";
 
@@ -142274,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";
@@ -142449,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;
@@ -142698,7 +142733,7 @@ var databases = new Map;
 var persistenceByDatabase = new WeakMap;
 var persistenceErrorByDatabase = new WeakMap;
 var lastSchemaFenceRejection = null;
-var LATEST_SUPPORTED_VERSION = 27;
+var LATEST_SUPPORTED_VERSION = 30;
 function resolveDatabasePath(dbPathOverride) {
   if (dbPathOverride) {
     return { dbDir: dirname2(dbPathOverride), dbPath: dbPathOverride };
@@ -143018,6 +143053,17 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       updated_at INTEGER NOT NULL DEFAULT 0
     );
 
+    CREATE TABLE IF NOT EXISTS git_sweep_coordinator (
+      project_path TEXT PRIMARY KEY,
+      lease_holder TEXT,
+      lease_expires_at INTEGER,
+      last_swept_at INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_lease_expires
+      ON git_sweep_coordinator(lease_expires_at);
+    CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_last_swept
+      ON git_sweep_coordinator(last_swept_at);
+
     CREATE TABLE IF NOT EXISTS m0_mutation_log (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
       session_id TEXT NOT NULL,
@@ -143152,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
@@ -143343,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(`
@@ -144240,6 +144292,60 @@ var MIGRATIONS = [
                     ON tags(session_id, entry_fingerprint)
                     WHERE type='message' AND entry_fingerprint IS NOT NULL`);
     }
+  },
+  {
+    version: 28,
+    description: "Add git commit sweep coordinator lease/cooldown table",
+    up: (db) => {
+      db.exec(`
+                CREATE TABLE IF NOT EXISTS git_sweep_coordinator (
+                    project_path TEXT PRIMARY KEY,
+                    lease_holder TEXT,
+                    lease_expires_at INTEGER,
+                    last_swept_at INTEGER
+                );
+                CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_lease_expires
+                    ON git_sweep_coordinator(lease_expires_at);
+                CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_last_swept
+                    ON git_sweep_coordinator(last_swept_at);
+            `);
+    }
+  },
+  {
+    version: 29,
+    description: "Add anchor_ordinal to notes (traceback to the conversation tail)",
+    up: (db) => {
+      const notesExists = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='notes'").get();
+      if (!notesExists) {
+        return;
+      }
+      const columns = db.prepare("PRAGMA table_info(notes)").all();
+      if (!columns.some((column) => column.name === "anchor_ordinal")) {
+        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);
@@ -144538,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",
@@ -145001,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) => {
@@ -145036,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"
 };
@@ -145127,7 +145233,8 @@ function toNote(row) {
     updatedAt: row.updated_at,
     lastCheckedAt: toNullableNumber(row.last_checked_at),
     readyAt: toNullableNumber(row.ready_at),
-    readyReason: toNullableString(row.ready_reason)
+    readyReason: toNullableString(row.ready_reason),
+    anchorOrdinal: toNullableNumber(row.anchor_ordinal)
   };
 }
 function getNoteById(db, noteId) {
@@ -145179,7 +145286,7 @@ function getNotes(db, options = {}) {
 }
 function addNote(db, type, options) {
   const now = Date.now();
-  const result = type === "session" ? db.prepare("INSERT INTO notes (type, status, content, session_id, created_at, updated_at, harness) VALUES ('session', 'active', ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId, now, now, getHarness()) : db.prepare("INSERT INTO notes (type, status, content, session_id, project_path, surface_condition, created_at, updated_at, harness) VALUES ('smart', 'pending', ?, ?, ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId ?? null, options.projectPath, options.surfaceCondition, now, now, getHarness());
+  const result = type === "session" ? db.prepare("INSERT INTO notes (type, status, content, session_id, created_at, updated_at, harness, anchor_ordinal) VALUES ('session', 'active', ?, ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId, now, now, getHarness(), options.anchorOrdinal ?? null) : db.prepare("INSERT INTO notes (type, status, content, session_id, project_path, surface_condition, created_at, updated_at, harness, anchor_ordinal) VALUES ('smart', 'pending', ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId ?? null, options.projectPath, options.surfaceCondition, now, now, getHarness(), options.anchorOrdinal ?? null);
   if (!isNoteRow(result)) {
     throw new Error("[notes] failed to insert note");
   }
@@ -145267,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;
@@ -145669,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";
@@ -145948,213 +146053,40 @@ function getAgentFallbackModels(agent) {
 }
 
 // ../plugin/src/shared/models-dev-cache.ts
-init_data_path();
-import { createHash as createHash5 } from "node:crypto";
-import { existsSync as existsSync5, readFileSync as readFileSync3 } from "node:fs";
-import { homedir as homedir2, platform } from "node:os";
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync3, renameSync, writeFileSync } from "node:fs";
 import { join as join6 } from "node:path";
-
-// ../plugin/src/shared/jsonc-parser.ts
-function stripJsonComments(content) {
-  let result = "";
-  let inString = false;
-  let escaped = false;
-  let inLineComment = false;
-  let inBlockComment = false;
-  for (let index = 0;index < content.length; index += 1) {
-    const char = content[index];
-    const next = content[index + 1];
-    if (inLineComment) {
-      if (char === `
-`) {
-        inLineComment = false;
-        result += char;
-      }
-      continue;
-    }
-    if (inBlockComment) {
-      if (char === "*" && next === "/") {
-        inBlockComment = false;
-        index += 1;
-      }
-      continue;
-    }
-    if (inString) {
-      result += char;
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-      result += char;
-      continue;
-    }
-    if (char === "/" && next === "/") {
-      inLineComment = true;
-      index += 1;
-      continue;
-    }
-    if (char === "/" && next === "*") {
-      inBlockComment = true;
-      index += 1;
-      continue;
-    }
-    result += char;
-  }
-  return result;
-}
-function stripTrailingCommas(content) {
-  let result = "";
-  let inString = false;
-  let escaped = false;
-  for (let index = 0;index < content.length; index += 1) {
-    const char = content[index];
-    if (inString) {
-      result += char;
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-      result += char;
-      continue;
-    }
-    if (char === ",") {
-      let lookahead = index + 1;
-      while (lookahead < content.length && /\s/.test(content[lookahead] ?? "")) {
-        lookahead += 1;
-      }
-      const next = content[lookahead];
-      if (next === "}" || next === "]") {
-        continue;
-      }
-    }
-    result += char;
-  }
-  return result;
-}
-function parseJsonc(content) {
-  const normalized = stripTrailingCommas(stripJsonComments(content));
-  return JSON.parse(normalized);
+var MIN_SANE_LIMIT = 20000;
+var MAX_SANE_LIMIT = 3000000;
+function isSaneLimit(limit) {
+  return typeof limit === "number" && limit >= MIN_SANE_LIMIT && limit <= MAX_SANE_LIMIT;
 }
-
-// ../plugin/src/shared/models-dev-cache.ts
-init_logger();
-var RELOAD_INTERVAL_MS = 5 * 60 * 1000;
 var apiCache = null;
-var apiLoadedAt = 0;
-var fileCache = null;
-var fileLastAttempt = 0;
-function hashFast(input) {
-  return createHash5("sha1").update(input).digest("hex");
-}
-function getModelsJsonPath() {
-  const explicit = process.env.OPENCODE_MODELS_PATH?.trim();
-  if (explicit)
-    return explicit;
-  const cacheBase = getCacheDir();
-  const source = process.env.OPENCODE_MODELS_URL?.trim();
-  const filename = source && source !== "https://models.dev" ? `models-${hashFast(source)}.json` : "models.json";
-  return join6(cacheBase, "opencode", filename);
-}
-function getOpencodeConfigPath() {
-  const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
-  const configDir = envDir ? envDir : platform() === "win32" ? join6(homedir2(), ".config", "opencode") : join6(process.env.XDG_CONFIG_HOME || join6(homedir2(), ".config"), "opencode");
-  const jsonc = join6(configDir, "opencode.jsonc");
-  if (existsSync5(jsonc))
-    return jsonc;
-  const json = join6(configDir, "opencode.json");
-  if (existsSync5(json))
-    return json;
-  return null;
-}
-function resolveLimit(limit) {
-  if (!limit)
-    return;
-  if (typeof limit.input === "number" && limit.input > 0)
-    return limit.input;
-  if (typeof limit.context === "number" && limit.context > 0)
-    return limit.context;
-  return;
+var persistSeedLoaded = false;
+function persistFilePath() {
+  return join6(getMagicContextStorageDir(), `model-context-limits-${getHarness()}.json`);
 }
-function setCachedModelMetadata(cache, key, model) {
-  const limit = resolveLimit(model?.limit);
-  if (limit === undefined) {
+function loadPersistedApiCacheOnce() {
+  if (persistSeedLoaded || apiCache !== null)
     return;
-  }
-  const value = { limit };
-  cache.set(key, value);
-  const modes = model?.experimental?.modes;
-  if (modes && typeof modes === "object") {
-    for (const mode of Object.keys(modes)) {
-      cache.set(`${key}-${mode}`, value);
-    }
-  }
-}
-function loadModelsDevMetadataFromFile() {
-  const metadata = new Map;
-  const modelsJsonPath = getModelsJsonPath();
-  let fileFound = false;
+  persistSeedLoaded = true;
   try {
-    if (existsSync5(modelsJsonPath)) {
-      fileFound = true;
-      const raw = readFileSync3(modelsJsonPath, "utf-8");
-      const data = JSON.parse(raw);
-      for (const [providerId, provider] of Object.entries(data)) {
-        if (!provider?.models || typeof provider.models !== "object")
-          continue;
-        for (const [modelId, model] of Object.entries(provider.models)) {
-          setCachedModelMetadata(metadata, `${providerId}/${modelId}`, model);
-        }
-      }
+    const raw = readFileSync3(persistFilePath(), "utf-8");
+    const obj = JSON.parse(raw);
+    const map = new Map;
+    for (const [key, limit] of Object.entries(obj)) {
+      if (isSaneLimit(limit))
+        map.set(key, { limit });
     }
-  } catch (error) {
-    sessionLog("global", `models-dev-cache: failed to read models.json at ${modelsJsonPath}:`, error instanceof Error ? error.message : String(error));
-  }
-  try {
-    const configPath = getOpencodeConfigPath();
-    if (configPath && existsSync5(configPath)) {
-      const config = parseJsonc(readFileSync3(configPath, "utf-8"));
-      if (config.provider && typeof config.provider === "object") {
-        for (const [providerId, provider] of Object.entries(config.provider)) {
-          if (!provider?.models || typeof provider.models !== "object")
-            continue;
-          for (const [modelId, model] of Object.entries(provider.models)) {
-            setCachedModelMetadata(metadata, `${providerId}/${modelId}`, model);
-          }
-        }
-      }
+    if (map.size > 0) {
+      apiCache = map;
+      sessionLog("global", `models-dev-cache: seeded ${map.size} entries from persisted cache (cold start)`);
     }
-  } catch (error) {
-    sessionLog("global", "models-dev-cache: failed to read opencode config for custom models:", error instanceof Error ? error.message : String(error));
-  }
-  sessionLog("global", `models-dev-cache: file-layer loaded ${metadata.size} model metadata entries (modelsJsonPath=${modelsJsonPath}, found=${fileFound})`);
-  return metadata;
+  } catch {}
 }
-function getModelsDevContextLimit(providerID, modelID) {
-  const now = Date.now();
-  if (!fileCache || now - fileLastAttempt > RELOAD_INTERVAL_MS) {
-    fileLastAttempt = now;
-    fileCache = loadModelsDevMetadataFromFile();
-  }
+function getSdkContextLimit(providerID, modelID) {
+  loadPersistedApiCacheOnce();
   const fromApi = lookupLimitWithTagFallback(apiCache, providerID, modelID);
-  const fromFile = lookupLimitWithTagFallback(fileCache, providerID, modelID);
-  if (typeof fromApi === "number" && typeof fromFile === "number") {
-    return Math.max(fromApi, fromFile);
-  }
-  return fromApi ?? fromFile;
+  return isSaneLimit(fromApi) ? fromApi : undefined;
 }
 function lookupLimitWithTagFallback(cache, providerID, modelID) {
   if (!cache)
@@ -146171,12 +146103,6 @@ function lookupLimitWithTagFallback(cache, providerID, modelID) {
   }
   return;
 }
-function clearModelsDevCache() {
-  apiCache = null;
-  apiLoadedAt = 0;
-  fileCache = null;
-  fileLastAttempt = 0;
-}
 
 // ../plugin/src/hooks/magic-context/derive-budgets.ts
 var TRIGGER_BUDGET_PERCENTAGE = 0.05;
@@ -146207,7 +146133,7 @@ function resolveHistorianContextLimit(historianModelOverride) {
     const [providerID, ...rest] = historianModelOverride.split("/");
     const modelID = rest.join("/");
     if (providerID && modelID) {
-      const limit = getModelsDevContextLimit(providerID, modelID);
+      const limit = getSdkContextLimit(providerID, modelID);
       if (typeof limit === "number" && limit > 0)
         return limit;
     }
@@ -146226,7 +146152,7 @@ function resolveHistorianContextLimit(historianModelOverride) {
     const modelID = rest.join("/");
     if (!providerID || !modelID)
       continue;
-    const limit = getModelsDevContextLimit(providerID, modelID);
+    const limit = getSdkContextLimit(providerID, modelID);
     if (typeof limit !== "number" || limit <= 0)
       continue;
     if (minLimit === undefined || limit < minLimit)
@@ -146236,40 +146162,8 @@ function resolveHistorianContextLimit(historianModelOverride) {
 }
 
 // ../plugin/src/hooks/magic-context/event-resolvers.ts
-init_logger();
 var DEFAULT_CONTEXT_LIMIT = 128000;
 var MAX_EXECUTE_THRESHOLD = 80;
-function resolveContextLimit(providerID, modelID, ctx) {
-  const fromModelsDev = providerID && modelID ? getModelsDevContextLimit(providerID, modelID) : undefined;
-  const baseline = fromModelsDev ?? DEFAULT_CONTEXT_LIMIT;
-  if (ctx?.db && ctx.sessionID) {
-    try {
-      const overflow = getOverflowState(ctx.db, ctx.sessionID);
-      if (overflow.detectedContextLimit > 0 && overflow.detectedContextLimit < baseline) {
-        return overflow.detectedContextLimit;
-      }
-    } catch {}
-  }
-  return baseline;
-}
-function resolveTrustedContextLimit(providerID, modelID, ctx) {
-  const fromModelsDev = providerID && modelID ? getModelsDevContextLimit(providerID, modelID) : undefined;
-  let detected;
-  if (ctx?.db && ctx.sessionID) {
-    try {
-      const overflow = getOverflowState(ctx.db, ctx.sessionID);
-      if (overflow.detectedContextLimit > 0) {
-        detected = overflow.detectedContextLimit;
-      }
-    } catch {}
-  }
-  if (typeof fromModelsDev === "number" && fromModelsDev > 0) {
-    if (detected !== undefined && detected < fromModelsDev)
-      return detected;
-    return fromModelsDev;
-  }
-  return detected;
-}
 function resolveCacheTtl(cacheTtl, modelKey) {
   if (typeof cacheTtl === "string") {
     return cacheTtl;
@@ -146400,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) {
@@ -146490,7 +146383,7 @@ function clearNoteNudgeTriggerOnly(db, sessionId) {
 }
 
 // ../plugin/src/hooks/magic-context/todo-view.ts
-import { createHash as createHash6 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 var TERMINAL_STATUSES = new Set(["completed", "cancelled"]);
 var TITLE_DONE_STATUSES = new Set(["completed"]);
 var SYNTHETIC_CALL_ID_PREFIX = "mc_synthetic_todo_";
@@ -146535,7 +146428,7 @@ function buildSyntheticTodoPart(stateJson) {
   };
 }
 function computeSyntheticCallId(stateJson) {
-  const hash = createHash6("sha256").update(stateJson).digest("hex").slice(0, 16);
+  const hash = createHash5("sha256").update(stateJson).digest("hex").slice(0, 16);
   return `${SYNTHETIC_CALL_ID_PREFIX}${hash}`;
 }
 function parseTodoState(stateJson) {
@@ -146568,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!",
@@ -146669,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";
@@ -146715,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) {
@@ -146784,19 +146680,15 @@ 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 existsSync7 } from "node:fs";
+import { existsSync as existsSync6 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 import { dirname as dirname3, join as join8, resolve as resolvePath } from "node:path";
 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;
 }
@@ -146887,13 +146779,12 @@ function recordChildInvocation(input) {
 }
 
 // src/subagent-runner.ts
-init_logger();
 function resolveBundledPiCli() {
   try {
     const require_ = createRequire2(import.meta.url);
     const pkgJson = require_.resolve("@earendil-works/pi-coding-agent/package.json");
     const cliPath = join8(dirname3(pkgJson), "dist/cli.js");
-    if (existsSync7(cliPath))
+    if (existsSync6(cliPath))
       return cliPath;
     return null;
   } catch {
@@ -146904,7 +146795,7 @@ function resolveSubagentEntryPath() {
   try {
     const here = dirname3(fileURLToPath(import.meta.url));
     const candidate = resolvePath(here, "subagent-entry.js");
-    if (existsSync7(candidate))
+    if (existsSync6(candidate))
       return candidate;
     return;
   } catch {
@@ -147660,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 existsSync9 } from "node:fs";
+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;
@@ -147906,46 +147789,72 @@ 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 existsSync8, readFileSync as readFileSync5 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
-import { join as join9 } from "node:path";
+import { existsSync as existsSync7, readFileSync as readFileSync5 } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+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 (!existsSync8(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;
 }
 function getAftAvailability() {
-  const home = process.env.HOME || homedir3();
+  const home = process.env.HOME || homedir2();
   const opencodePaths = [
     join9(home, ".config", "opencode", "opencode.jsonc"),
     join9(home, ".config", "opencode", "opencode.json")
@@ -147956,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;
       }
@@ -147966,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;
       }
@@ -147991,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;
@@ -148028,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);
@@ -148171,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 {
@@ -148393,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) {
@@ -148443,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,
@@ -148453,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;
     }
@@ -148589,13 +148519,13 @@ function invalidateMemory(projectPath, memoryId) {
 }
 
 // ../plugin/src/features/magic-context/memory/normalize-hash.ts
-import { createHash as createHash7 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 function normalizeMemoryContent(content) {
   return content.toLowerCase().replace(/\s+/g, " ").trim();
 }
 function computeNormalizedHash(content) {
   const normalized = normalizeMemoryContent(content);
-  return createHash7("md5").update(normalized).digest("hex");
+  return createHash6("md5").update(normalized).digest("hex");
 }
 
 // ../plugin/src/features/magic-context/memory/storage-memory.ts
@@ -149048,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.
@@ -149553,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,
@@ -149677,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 }
@@ -149746,7 +149674,7 @@ function getOpenCodeDbPath2() {
 }
 function openOpenCodeDb() {
   const dbPath = getOpenCodeDbPath2();
-  if (!existsSync9(dbPath)) {
+  if (!existsSync8(dbPath)) {
     log(`[key-files] OpenCode DB not found at ${dbPath} — skipping`);
     return null;
   }
@@ -149896,8 +149824,8 @@ async function runDream(args) {
       try {
         const docsDir = args.sessionDirectory ?? args.projectIdentity;
         const existingDocs = taskName === "maintain-docs" ? {
-          architecture: existsSync9(join11(docsDir, "ARCHITECTURE.md")),
-          structure: existsSync9(join11(docsDir, "STRUCTURE.md"))
+          architecture: existsSync8(join11(docsDir, "ARCHITECTURE.md")),
+          structure: existsSync8(join11(docsDir, "STRUCTURE.md"))
         } : undefined;
         const userMemories = taskName === "archive-stale" ? getActiveUserMemories(args.db).map((um) => ({
           id: um.id,
@@ -150001,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) {
@@ -150293,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"
@@ -150369,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(() => {});
@@ -150380,14 +150308,14 @@ 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) {
     return null;
   }
   const projectDirectory = args.sessionDirectoryOverride ?? resolveDreamSessionDirectory(entry.projectIdentity);
-  log(`[dreamer] dequeued project ${entry.projectIdentity} (dir=${projectDirectory}), starting dream run`);
+  log(`[dreamer] dequeued project ${entry.projectIdentity}, starting dream run`);
   let result;
   try {
     result = await runDream({
@@ -150423,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)
@@ -150498,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);
@@ -150511,6 +150437,7 @@ async function readGitCommits(directory, options = {}) {
   if (revision.startsWith("-")) {
     throw new Error(`readGitCommits: refusing revision that looks like an option: "${revision}"`);
   }
+  const projectLabel = options.projectIdentity ?? "<project>";
   const args = [
     "log",
     revision,
@@ -150533,11 +150460,11 @@ async function readGitCommits(directory, options = {}) {
     stdout = result.stdout;
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    log(`[git-commits] readGitCommits failed at cwd=${directory}: ${message.slice(0, 500)}`);
+    log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
     return [];
   }
   if (stdout.trim().length === 0) {
-    log(`[git-commits] readGitCommits returned empty stdout at cwd=${directory} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
+    log(`[git-commits] readGitCommits returned empty stdout for ${projectLabel} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
   }
   return parseGitLogOutput(stdout);
 }
@@ -150581,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, {
@@ -165023,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.")
@@ -165062,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) {
@@ -165106,12 +165028,10 @@ function getEmbeddingProviderIdentity(config2) {
 }
 
 // ../plugin/src/features/magic-context/memory/embedding-local.ts
-import { mkdirSync as mkdirSync4 } from "node:fs";
+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;
@@ -165150,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));
     }
   }
 }
@@ -165287,7 +165207,7 @@ class LocalEmbeddingProvider {
         }
         const modelCacheDir = join12(getMagicContextStorageDir(), "models");
         try {
-          mkdirSync4(modelCacheDir, { recursive: true });
+          mkdirSync5(modelCacheDir, { recursive: true });
           env.cacheDir = modelCacheDir;
         } catch {
           log("[magic-context] could not create model cache dir, using library default");
@@ -165319,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) {
@@ -165347,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() {
@@ -165447,7 +165367,6 @@ class LocalEmbeddingProvider {
 }
 
 // ../plugin/src/features/magic-context/memory/embedding-openai.ts
-init_logger();
 function normalizeEndpoint2(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
@@ -165662,8 +165581,7 @@ class OpenAICompatibleEmbeddingProvider {
 }
 
 // ../plugin/src/features/magic-context/project-embedding-registry.ts
-import { createHash as createHash8 } from "node:crypto";
-init_logger();
+import { createHash as createHash7, randomUUID } from "node:crypto";
 
 // ../plugin/src/features/magic-context/git-commits/storage-git-commit-embeddings.ts
 var saveStatements = new WeakMap;
@@ -165766,6 +165684,125 @@ function getDistinctCommitEmbeddingModelIds(db, projectPath) {
   return new Set(rows.map((row) => typeof row.modelId === "string" ? row.modelId : null));
 }
 
+// ../plugin/src/features/magic-context/git-commits/sweep-coordinator.ts
+var GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
+var GIT_SWEEP_LEASE_TTL_MS = 5 * 60 * 1000;
+var GIT_SWEEP_LEASE_RENEWAL_MS = 60 * 1000;
+function runImmediate2(db, body) {
+  db.exec("BEGIN IMMEDIATE");
+  let committed = false;
+  try {
+    const result = body();
+    db.exec("COMMIT");
+    committed = true;
+    return result;
+  } finally {
+    if (!committed) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
+  }
+}
+function rowToState(row) {
+  return {
+    projectPath: row.project_path,
+    leaseHolder: row.lease_holder,
+    leaseExpiresAt: row.lease_expires_at,
+    lastSweptAt: row.last_swept_at
+  };
+}
+function getGitSweepCoordinatorState(db, projectPath) {
+  const row = db.prepare(`SELECT project_path, lease_holder, lease_expires_at, last_swept_at
+             FROM git_sweep_coordinator
+             WHERE project_path = ?`).get(projectPath);
+  return row ? rowToState(row) : null;
+}
+function acquireGitSweepLease(db, projectPath, holderId, options = {}) {
+  const cooldownMs = options.cooldownMs ?? GIT_SWEEP_COOLDOWN_MS;
+  const leaseTtlMs = options.leaseTtlMs ?? GIT_SWEEP_LEASE_TTL_MS;
+  return runImmediate2(db, () => {
+    const now = Date.now();
+    const row = getGitSweepCoordinatorState(db, projectPath);
+    if (row?.leaseHolder && row.leaseExpiresAt !== null && row.leaseExpiresAt > now) {
+      return {
+        acquired: false,
+        projectPath,
+        reason: "lease_active",
+        leaseHolder: row.leaseHolder,
+        leaseExpiresAt: row.leaseExpiresAt,
+        lastSweptAt: row.lastSweptAt,
+        nextAllowedAt: null
+      };
+    }
+    if (!options.ignoreCooldown && row?.lastSweptAt !== null && row?.lastSweptAt !== undefined) {
+      const nextAllowedAt = row.lastSweptAt + cooldownMs;
+      if (nextAllowedAt > now) {
+        return {
+          acquired: false,
+          projectPath,
+          reason: "cooldown_active",
+          leaseHolder: row.leaseHolder,
+          leaseExpiresAt: row.leaseExpiresAt,
+          lastSweptAt: row.lastSweptAt,
+          nextAllowedAt
+        };
+      }
+    }
+    const leaseExpiresAt = now + leaseTtlMs;
+    db.prepare(`INSERT INTO git_sweep_coordinator (
+                 project_path,
+                 lease_holder,
+                 lease_expires_at,
+                 last_swept_at
+             ) VALUES (?, ?, ?, NULL)
+             ON CONFLICT(project_path) DO UPDATE SET
+                 lease_holder = excluded.lease_holder,
+                 lease_expires_at = excluded.lease_expires_at`).run(projectPath, holderId, leaseExpiresAt);
+    return {
+      acquired: true,
+      projectPath,
+      holderId,
+      acquiredAt: now,
+      leaseExpiresAt
+    };
+  });
+}
+function renewGitSweepLease(db, projectPath, holderId, leaseTtlMs = GIT_SWEEP_LEASE_TTL_MS) {
+  return runImmediate2(db, () => {
+    const now = Date.now();
+    const leaseExpiresAt = now + leaseTtlMs;
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_expires_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(leaseExpiresAt, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function markGitSweepSuccessAndRelease(db, projectPath, holderId) {
+  return runImmediate2(db, () => {
+    const now = Date.now();
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_holder = NULL,
+                     lease_expires_at = NULL,
+                     last_swept_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(now, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function releaseGitSweepLease(db, projectPath, holderId) {
+  runImmediate2(db, () => {
+    db.prepare(`UPDATE git_sweep_coordinator
+             SET lease_holder = NULL,
+                 lease_expires_at = NULL
+             WHERE project_path = ?
+               AND lease_holder = ?`).run(projectPath, holderId);
+  });
+}
+
 // ../plugin/src/features/magic-context/project-embedding-registry.ts
 var OFF_PROVIDER_IDENTITY = "embedding-provider:off";
 var SWEEP_MAX_WALL_CLOCK_MS = 10 * 60 * 1000;
@@ -165818,7 +165855,7 @@ function stableStringify2(value) {
   return JSON.stringify(value);
 }
 function sha256Prefix(value, length = 16) {
-  return createHash8("sha256").update(value).digest("hex").slice(0, length);
+  return createHash7("sha256").update(value).digest("hex").slice(0, length);
 }
 function getRuntimeFingerprint(config2) {
   if (config2.provider === "off") {
@@ -166078,11 +166115,11 @@ 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;
 var evictStatements = new WeakMap;
+var evictOverflowStatements = new WeakMap;
 var latestCommitTimeStatements = new WeakMap;
 function getInsertStatement(db) {
   let stmt = insertStatements.get(db);
@@ -166125,17 +166162,17 @@ function getLatestCommitTimeStatement(db) {
   }
   return stmt;
 }
-function getEvictStatement(db) {
-  let stmt = evictStatements.get(db);
+function getEvictOverflowStatement(db) {
+  let stmt = evictOverflowStatements.get(db);
   if (!stmt) {
     stmt = db.prepare(`DELETE FROM git_commits
-             WHERE sha IN (
-                 SELECT sha FROM git_commits
+             WHERE rowid IN (
+                 SELECT rowid FROM git_commits
                  WHERE project_path = ?
-                 ORDER BY committed_at ASC
-                 LIMIT ?
+                 ORDER BY committed_at DESC, sha DESC
+                 LIMIT -1 OFFSET ?
              )`);
-    evictStatements.set(db, stmt);
+    evictOverflowStatements.set(db, stmt);
   }
   return stmt;
 }
@@ -166173,22 +166210,15 @@ function getLatestIndexedCommitTimeMs(db, projectPath) {
   const row = getLatestCommitTimeStatement(db).get(projectPath);
   return row?.latest ?? null;
 }
-function evictOldestCommits(db, projectPath, excess) {
-  if (excess <= 0)
-    return 0;
-  const before = getCommitCount(db, projectPath);
-  getEvictStatement(db).run(projectPath, excess);
-  const after = getCommitCount(db, projectPath);
-  return Math.max(0, before - after);
-}
 function enforceProjectCap(db, projectPath, maxCommits) {
   if (maxCommits <= 0)
     return 0;
   const count = getCommitCount(db, projectPath);
   if (count <= maxCommits)
     return 0;
-  const excess = count - maxCommits;
-  const evicted = evictOldestCommits(db, projectPath, excess);
+  getEvictOverflowStatement(db).run(projectPath, maxCommits);
+  const after = getCommitCount(db, projectPath);
+  const evicted = Math.max(0, count - after);
   if (evicted > 0) {
     log(`[git-commits] evicted ${evicted} oldest commits for project ${projectPath} (cap=${maxCommits}, was=${count})`);
   }
@@ -166220,7 +166250,8 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
     const sinceMs = latestIndexed !== null ? Math.max(latestIndexed - 60000, Date.now() - options.sinceDays * MS_PER_DAY) : Date.now() - options.sinceDays * MS_PER_DAY;
     const commits = await readGitCommits(directory, {
       sinceMs,
-      maxCommits: options.maxCommits
+      maxCommits: options.maxCommits,
+      projectIdentity: projectPath
     });
     result.scanned = commits.length;
     if (commits.length === 0) {
@@ -166295,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;
@@ -166460,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) {
@@ -166487,7 +166514,7 @@ async function startDreamScheduleTimer(args) {
   const isNewRegistration = !registeredProjects.has(args.directory);
   registeredProjects.set(args.directory, args);
   if (isNewRegistration) {
-    log(`[dreamer] registered project ${args.directory} (dreaming=${dreamingEnabled} embeddings=${embeddingSweepEnabled} commits=${commitIndexingEnabled}; total=${registeredProjects.size})`);
+    log(`[dreamer] registered project ${args.projectIdentity} (dreaming=${dreamingEnabled} embeddings=${embeddingSweepEnabled} commits=${commitIndexingEnabled}; total=${registeredProjects.size})`);
   }
   if (!activeTimer) {
     log(`[dreamer] started independent schedule timer (every ${DREAM_TIMER_INTERVAL_MS / 60000}m)`);
@@ -166502,7 +166529,7 @@ async function startDreamScheduleTimer(args) {
   }
   return () => {
     registeredProjects.delete(args.directory);
-    log(`[dreamer] unregistered project ${args.directory} (remaining=${registeredProjects.size})`);
+    log(`[dreamer] unregistered project ${args.projectIdentity} (remaining=${registeredProjects.size})`);
     if (registeredProjects.size === 0 && activeTimer) {
       clearInterval(activeTimer);
       activeTimer = null;
@@ -166550,7 +166577,7 @@ async function sweepProject(reg, origin, db, gitCommitEnabled = getProjectEmbedd
     return;
   }
   try {
-    log(`[dreamer] timer tick (${origin}) ${reg.directory} — checking schedule window "${reg.dreamerConfig.schedule}"`);
+    log(`[dreamer] timer tick (${origin}) ${reg.projectIdentity} — checking schedule window "${reg.dreamerConfig.schedule}"`);
     checkScheduleAndEnqueue(db, reg.dreamerConfig.schedule, reg.projectIdentity);
     await processDreamQueue({
       db,
@@ -166565,13 +166592,34 @@ async function sweepProject(reg, origin, db, gitCommitEnabled = getProjectEmbedd
       fallbackModels: resolveFallbackChain(DREAMER_AGENT, reg.dreamerConfig.fallback_models)
     });
   } catch (error51) {
-    log(`[dreamer] timer-triggered queue processing failed for ${reg.directory}:`, error51);
+    log(`[dreamer] timer-triggered queue processing failed for ${reg.projectIdentity}:`, error51);
   }
 }
+function startGitSweepLeaseRenewal(db, projectIdentity, holderId) {
+  const timer = setInterval(() => {
+    try {
+      if (!renewGitSweepLease(db, projectIdentity, holderId)) {
+        log(`[git-commits] sweep lease renewal failed for ${projectIdentity}`);
+      }
+    } catch (error51) {
+      log(`[git-commits] sweep lease renewal errored for ${projectIdentity}: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    }
+  }, GIT_SWEEP_LEASE_RENEWAL_MS);
+  timer.unref?.();
+  return () => clearInterval(timer);
+}
 async function sweepGitCommits(args) {
   const { directory, projectIdentity, db, gitCommitIndexing } = args;
+  const holderId = crypto.randomUUID();
+  const lease2 = acquireGitSweepLease(db, projectIdentity, holderId);
+  if (!lease2.acquired) {
+    const reason = lease2.reason === "cooldown_active" ? `cooldown active until ${lease2.nextAllowedAt}` : `lease held by ${lease2.leaseHolder ?? "another holder"} until ${lease2.leaseExpiresAt ?? "unknown"}`;
+    log(`[git-commits] sweep skipped for ${projectIdentity}: ${reason}`);
+    return;
+  }
   const startedAt = Date.now();
-  log(`[git-commits] sweep starting for ${directory} (sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
+  const stopRenewal = startGitSweepLeaseRenewal(db, projectIdentity, holderId);
+  log(`[git-commits] sweep starting for ${projectIdentity} (sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
   try {
     const result = await indexCommitsForProject(db, projectIdentity, directory, {
       sinceDays: gitCommitIndexing.since_days,
@@ -166581,17 +166629,24 @@ async function sweepGitCommits(args) {
     if (result.embedded > 0) {
       drainedEmbeddings = await embedUnembeddedCommits(db, projectIdentity);
     }
+    const cooldownMarked = markGitSweepSuccessAndRelease(db, projectIdentity, holderId);
+    if (!cooldownMarked) {
+      releaseGitSweepLease(db, projectIdentity, holderId);
+      log(`[git-commits] sweep finished for ${projectIdentity}, but lease was no longer active; cooldown not advanced`);
+    }
     const elapsedMs = Date.now() - startedAt;
     log(`[git-commits] sweep finished for ${projectIdentity} in ${elapsedMs}ms: scanned=${result.scanned} inserted=${result.inserted} updated=${result.updated} evicted=${result.evicted} embedded=${result.embedded} drained=${drainedEmbeddings}`);
   } catch (error51) {
+    releaseGitSweepLease(db, projectIdentity, holderId);
     const elapsedMs = Date.now() - startedAt;
-    log(`[git-commits] sweep failed for ${directory} after ${elapsedMs}ms: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    log(`[git-commits] sweep failed for ${projectIdentity} after ${elapsedMs}ms: ${error51 instanceof Error ? error51.message : String(error51)}`);
+  } finally {
+    stopRenewal();
   }
 }
 
 // ../plugin/src/plugin/embedding-bootstrap-helpers.ts
-import { createHash as createHash9 } from "node:crypto";
-init_logger();
+import { createHash as createHash8 } from "node:crypto";
 var EMBEDDING_AFFECTING_KEYS = new Set([
   "embedding.api_key",
   "embedding.endpoint",
@@ -166602,7 +166657,7 @@ var EMBEDDING_AFFECTING_TOP_LEVEL_KEYS = new Set(["embedding", "memory", "experi
 var EMBEDDING_WARNING_TERMS = ["api_key", "endpoint", "model", "provider", "embedding"];
 var loggedFailureSignatures = new Map;
 function sha256Prefix2(value, length = 16) {
-  return createHash9("sha256").update(value).digest("hex").slice(0, length);
+  return createHash8("sha256").update(value).digest("hex").slice(0, length);
 }
 function warningLooksEmbeddingRelated(message) {
   const lower = message.toLowerCase();
@@ -166666,8 +166721,8 @@ function handleUntrustedLoad(db, projectIdentity, directory, detailed) {
 }
 
 // src/config/index.ts
-import { existsSync as existsSync11, readFileSync as readFileSync8 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
+import { existsSync as existsSync10, readFileSync as readFileSync8 } from "node:fs";
+import { homedir as homedir4 } from "node:os";
 import { join as join13 } from "node:path";
 
 // ../plugin/src/config/migrate-experimental.ts
@@ -166761,9 +166816,67 @@ function migrateLegacyExperimental(rawConfig, warnings) {
 }
 
 // ../plugin/src/config/variable.ts
-import { existsSync as existsSync10, readFileSync as readFileSync7 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
-import { dirname as dirname5, isAbsolute as isAbsolute2, resolve as resolve3 } from "node:path";
+import { existsSync as existsSync9, readFileSync as readFileSync7 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
+import { dirname as dirname5, isAbsolute as isAbsolute3, resolve as resolve4 } from "node:path";
+
+// ../plugin/src/shared/jsonc-parser.ts
+function stripJsonComments(content) {
+  let result = "";
+  let inString = false;
+  let escaped = false;
+  let inLineComment = false;
+  let inBlockComment = false;
+  for (let index = 0;index < content.length; index += 1) {
+    const char = content[index];
+    const next = content[index + 1];
+    if (inLineComment) {
+      if (char === `
+`) {
+        inLineComment = false;
+        result += char;
+      }
+      continue;
+    }
+    if (inBlockComment) {
+      if (char === "*" && next === "/") {
+        inBlockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (inString) {
+      result += char;
+      if (escaped) {
+        escaped = false;
+      } else if (char === "\\") {
+        escaped = true;
+      } else if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      result += char;
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      inLineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      inBlockComment = true;
+      index += 1;
+      continue;
+    }
+    result += char;
+  }
+  return result;
+}
+
+// ../plugin/src/config/variable.ts
 var ENV_PATTERN = /\{env:([^}]+)\}/g;
 var FILE_PATTERN = /\{file:([^}]+)\}/g;
 function substituteConfigVariables(input) {
@@ -166815,11 +166928,11 @@ function substituteConfigVariables(input) {
     }
     let filePath = rawPath.trim();
     if (filePath.startsWith("~/")) {
-      filePath = resolve3(homedir4(), 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 (!existsSync10(filePath)) {
+    if (!existsSync9(filePath)) {
       warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
       continue;
     }
@@ -166845,12 +166958,12 @@ function getProjectConfigPaths(cwd) {
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function getUserConfigPaths() {
-  const home = process.env.HOME ?? homedir5();
+  const home = process.env.HOME ?? homedir4();
   const basePath = join13(home, ".pi", "agent", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function resolveFirstExisting(paths) {
-  return paths.find((path7) => existsSync11(path7));
+  return paths.find((path7) => existsSync10(path7));
 }
 function loadConfigFile(path7, scope) {
   try {
@@ -167432,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);
@@ -167464,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 = {
@@ -167519,6 +167630,7 @@ function createScheduler(config2) {
     }
   };
 }
+
 // ../plugin/src/features/magic-context/tagger.ts
 var TOOL_COMPOSITE_KEY_SEP = "\x00";
 function makeToolCompositeKey(ownerMsgId, callId) {
@@ -168278,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;
@@ -168515,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;
@@ -168687,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) {
@@ -168785,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;
@@ -168944,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)
@@ -169148,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;
@@ -169452,10 +169550,62 @@ 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;
+var SLASH_COMMAND_RE = /\/[a-z][a-z0-9]*(?:-[a-z0-9]+)+/gi;
+var KEBAB_SNAKE_RE = /[a-z][a-z0-9]*(?:[-_][a-z0-9]+)+/gi;
+var DOTTED_RE = /[a-z0-9][a-z0-9_-]*(?:\.[a-z0-9_-]+)+/gi;
+var CAMEL_RE = /\b[a-zA-Z][a-z0-9]*(?:[A-Z][a-z0-9]*)+\b/g;
+var SHA_RE = /\b[0-9a-f]{7,40}\b/gi;
+var ERROR_CODE_RE = /\b(?:TS\d{4,}|ERR_[A-Z][A-Z0-9_]*)\b/g;
+var QUOTED_RE = /["`]([^"`]{3,80})["`]/g;
+function looksLikeSha(token) {
+  return /[0-9]/.test(token) && /^[0-9a-f]{7,40}$/i.test(token);
+}
+function extractLiteralProbes(query) {
+  const trimmed = query.trim();
+  if (trimmed.length === 0)
+    return [];
+  const ordered = [];
+  const seen = new Set;
+  const add = (raw) => {
+    if (!raw)
+      return;
+    const probe = raw.trim();
+    if (probe.length < MIN_PROBE_LENGTH)
+      return;
+    const key = probe.toLowerCase();
+    if (seen.has(key))
+      return;
+    seen.add(key);
+    ordered.push(probe);
+  };
+  for (const m of trimmed.matchAll(QUOTED_RE))
+    add(m[1]);
+  for (const m of trimmed.matchAll(SLASH_COMMAND_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(ERROR_CODE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(DOTTED_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(KEBAB_SNAKE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(CAMEL_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(SHA_RE)) {
+    if (looksLikeSha(m[0]))
+      add(m[0]);
+  }
+  return ordered.slice(0, MAX_PROBES);
+}
+function containsProbeVerbatim(text, probes) {
+  if (probes.length === 0)
+    return false;
+  const haystack = text.toLowerCase();
+  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) {
@@ -169494,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);
 }
@@ -169716,36 +169865,82 @@ function linearDecayScore(rank, total) {
     return 0;
   return Math.max(0, 1 - rank / total);
 }
-function searchMessages(args) {
-  const sanitizedQuery = sanitizeFtsQuery(args.query.trim());
-  if (sanitizedQuery.length === 0) {
+function runMessageFtsQuery(db, sessionId, ftsQuery, fetchLimit, cutoff) {
+  if (ftsQuery.length === 0)
     return [];
-  }
-  const fetchLimit = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.limit * 3 : args.limit;
-  const rows = getMessageSearchStatement(args.db).all(args.sessionId, sanitizedQuery, fetchLimit).map((row) => row);
-  const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
-  const filtered = rows.map((row) => {
+  const rows = getMessageSearchStatement(db).all(sessionId, ftsQuery, fetchLimit).map((row) => row);
+  const result = [];
+  for (const row of rows) {
     const messageOrdinal = getMessageOrdinal(row.messageOrdinal);
     if (messageOrdinal === null || typeof row.messageId !== "string" || typeof row.role !== "string" || typeof row.content !== "string") {
-      return null;
+      continue;
     }
     if (cutoff !== null && messageOrdinal > cutoff) {
-      return null;
+      continue;
     }
-    return {
+    result.push({
       messageOrdinal,
       messageId: row.messageId,
       role: row.role,
       content: row.content
-    };
-  }).filter((result) => result !== null).slice(0, args.limit);
-  return filtered.map((row, rank) => ({
+    });
+  }
+  return result;
+}
+var RRF_K = 60;
+var VERBATIM_PROBE_BONUS = 0.5;
+function searchMessages(args) {
+  const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
+  const fetchLimit = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.limit * 3 : args.limit;
+  const baseQuery = sanitizeFtsQuery(args.query.trim());
+  const probes = args.probes ?? [];
+  if (probes.length === 0) {
+    const filtered = runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff).slice(0, args.limit);
+    return filtered.map((row, rank) => ({
+      source: "message",
+      content: previewText(row.content),
+      score: linearDecayScore(rank, filtered.length),
+      messageOrdinal: row.messageOrdinal,
+      messageId: row.messageId,
+      role: row.role
+    }));
+  }
+  const queryLists = [];
+  if (baseQuery.length > 0) {
+    queryLists.push(runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff));
+  }
+  for (const probe of probes) {
+    const probeQuery = sanitizeFtsQuery(probe);
+    if (probeQuery.length === 0)
+      continue;
+    queryLists.push(runMessageFtsQuery(args.db, args.sessionId, probeQuery, fetchLimit, cutoff));
+  }
+  const fused = new Map;
+  for (const list of queryLists) {
+    list.forEach((row, rank) => {
+      const rrf = 1 / (RRF_K + rank);
+      const existing = fused.get(row.messageId);
+      if (existing) {
+        existing.score += rrf;
+      } else {
+        fused.set(row.messageId, { row, score: rrf });
+      }
+    });
+  }
+  for (const entry of fused.values()) {
+    if (containsProbeVerbatim(entry.row.content, probes)) {
+      entry.score += VERBATIM_PROBE_BONUS;
+    }
+  }
+  const ranked = [...fused.values()].sort((a, b) => b.score !== a.score ? b.score - a.score : a.row.messageOrdinal - b.row.messageOrdinal).slice(0, args.limit);
+  const maxScore = ranked.length > 0 ? ranked[0].score : 1;
+  return ranked.map((entry) => ({
     source: "message",
-    content: previewText(row.content),
-    score: linearDecayScore(rank, filtered.length),
-    messageOrdinal: row.messageOrdinal,
-    messageId: row.messageId,
-    role: row.role
+    content: previewText(entry.row.content),
+    score: maxScore > 0 ? entry.score / maxScore : 0,
+    messageOrdinal: entry.row.messageOrdinal,
+    messageId: entry.row.messageId,
+    role: entry.row.role
   }));
 }
 function getSourceBoost(result) {
@@ -169829,12 +170024,14 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
     return null;
   }) : Promise.resolve(null);
   await Promise.resolve();
+  const messageProbes = options.explicitSearch ? extractLiteralProbes(trimmedQuery) : [];
   const messageResults = runMessages ? searchMessages({
     db,
     sessionId,
     query: trimmedQuery,
     limit: tierLimit,
-    maxOrdinal: options.maxMessageOrdinal
+    maxOrdinal: options.maxMessageOrdinal,
+    probes: messageProbes
   }) : [];
   const queryEmbedding = await queryEmbeddingPromise;
   const [memoryResults, gitCommitResults] = await Promise.all([
@@ -169948,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 {
@@ -170178,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);
@@ -170320,7 +170515,6 @@ function stripSystemInjection(text) {
 }
 
 // src/heuristic-cleanup-pi.ts
-init_logger();
 var DEDUP_SAFE_TOOLS = new Set([
   "mcp_grep",
   "mcp_read",
@@ -170570,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) {
@@ -170955,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;
@@ -171001,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) {
@@ -171029,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) {
@@ -171046,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" };
   }
@@ -171056,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) {
@@ -171144,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 };
   });
@@ -171220,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);
@@ -171386,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
@@ -171423,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) {
@@ -171490,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
     };
@@ -171615,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);
@@ -171798,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;
@@ -172695,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);
@@ -174819,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;
@@ -175602,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();
@@ -175697,7 +175920,7 @@ function stripPiDroppedPlaceholderMessages(args) {
 }
 
 // src/system-prompt.ts
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 
 // ../plugin/src/agents/magic-context-prompt.ts
 var LONG_TERM_PARTNER_FRAME = `### You are the user's long-term partner on this project — not a one-off hire
@@ -175806,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) {
@@ -175842,7 +176064,7 @@ function processSystemPromptForCache(args) {
       sessionLog(sessionId, `system prompt date frozen: real=${liveDate}, using=${stickyDate} (cache-stable pass)`);
     }
   }
-  const currentHash = createHash10("md5").update(frozenPrompt).digest("hex");
+  const currentHash = createHash9("md5").update(frozenPrompt).digest("hex");
   const hashChanged = !isFirstHash && currentHash !== previousHash;
   if (hashChanged) {
     sessionLog(sessionId, `system prompt hash changed: ${previousHash} → ${currentHash} (len=${frozenPrompt.length})`);
@@ -175887,10 +176109,8 @@ function injectPiTemporalMarkers(messages) {
       if (prefix !== null) {
         const userMsg = msg;
         if (typeof userMsg.content === "string") {
-          if (!TEMPORAL_MARKER_PATTERN.test(stripTagPrefix2(userMsg.content))) {
-            const tagMatch = userMsg.content.match(/^(?:§\d+§\s*)+/);
-            const tagPrefix = tagMatch ? tagMatch[0] : "";
-            const body = userMsg.content.slice(tagPrefix.length);
+          if (!TEMPORAL_MARKER_PATTERN.test(stripTagPrefix(userMsg.content))) {
+            const { tagPrefix, body } = peelLeadingMcTagNotation(userMsg.content);
             messages[i] = {
               ...userMsg,
               content: tagPrefix + prefix + body
@@ -175901,9 +176121,7 @@ function injectPiTemporalMarkers(messages) {
           const firstTextIndex = userMsg.content.findIndex((p) => p && typeof p === "object" && p.type === "text");
           if (firstTextIndex >= 0) {
             const existing = userMsg.content[firstTextIndex];
-            const tagMatch = existing.text.match(/^(?:§\d+§\s*)+/);
-            const tagPrefix = tagMatch ? tagMatch[0] : "";
-            const body = existing.text.slice(tagPrefix.length);
+            const { tagPrefix, body } = peelLeadingMcTagNotation(existing.text);
             if (!TEMPORAL_MARKER_PATTERN.test(body)) {
               const newContent = userMsg.content.slice();
               newContent[firstTextIndex] = {
@@ -175926,18 +176144,12 @@ function injectPiTemporalMarkers(messages) {
   }
   return injected;
 }
-function stripTagPrefix2(text) {
-  const match = text.match(/^(?:§\d+§\s*)+/);
-  if (!match)
-    return text;
-  return text.slice(match[0].length);
-}
 
 // 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(() => {
@@ -176958,14 +177170,10 @@ function registerPiContextHandler(pi, options) {
       }
       const sessionMeta = sessionMetaForUsage;
       const modelKey = liveModelBySession.get(sessionId);
-      if (usageContextLimit === undefined && modelKey) {
-        const { providerID, modelID } = splitModelKeyForPi(modelKey);
-        const trusted = resolveTrustedContextLimit(providerID, modelID, {
-          db: options.db,
-          sessionID: sessionId
-        });
-        if (trusted !== undefined && trusted > 0) {
-          usageContextLimit = trusted;
+      if (usageContextLimit === undefined) {
+        const modelWindow = ctx.model?.contextWindow;
+        if (isSaneLimit(modelWindow)) {
+          usageContextLimit = modelWindow;
         }
       }
       let schedulerDecision;
@@ -177218,27 +177426,8 @@ async function awaitInFlightHistorians() {
     return;
   await Promise.allSettled(Array.from(inFlightHistorian.values()));
 }
-function splitModelKeyForPi(modelKey) {
-  if (!modelKey)
-    return { providerID: undefined, modelID: undefined };
-  const slash = modelKey.indexOf("/");
-  if (slash <= 0 || slash === modelKey.length - 1) {
-    return { providerID: undefined, modelID: undefined };
-  }
-  return {
-    providerID: modelKey.slice(0, slash),
-    modelID: modelKey.slice(slash + 1)
-  };
-}
 function resolvePiHistorianTriggerInputs(args) {
-  const { providerID, modelID } = splitModelKeyForPi(args.modelKey);
-  let contextLimit = resolveContextLimit(providerID, modelID, {
-    db: args.db,
-    sessionID: args.sessionId
-  });
-  if ((providerID === undefined || modelID === undefined) && typeof args.usageContextLimit === "number" && Number.isFinite(args.usageContextLimit) && args.usageContextLimit > 0) {
-    contextLimit = args.usageContextLimit;
-  }
+  const contextLimit = typeof args.usageContextLimit === "number" && Number.isFinite(args.usageContextLimit) && args.usageContextLimit > 0 ? args.usageContextLimit : DEFAULT_CONTEXT_LIMIT;
   const executeThresholdPercentage = resolveExecuteThreshold(args.historian.executeThresholdPercentage ?? 65, args.modelKey, 65, {
     tokensConfig: args.historian.executeThresholdTokens,
     contextLimit,
@@ -177692,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,
@@ -177702,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;
@@ -178056,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 mkdirSync5, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
-init_data_path();
+import { mkdirSync as mkdirSync6, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
 function cleanupHistorianStateFile(path7) {
   if (!path7)
     return;
@@ -178069,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) {
@@ -178230,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);
@@ -178264,9 +178450,8 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
 }
 
 // ../plugin/src/hooks/magic-context/compartment-runner-historian.ts
-import { mkdirSync as mkdirSync6, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "node:fs";
+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);
 }
@@ -178466,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`);
     }
   }
 }
@@ -178550,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) {
@@ -178569,11 +178754,11 @@ function cleanupHistorianDump(sessionId, dumpPath) {
 function dumpHistorianResponse(sessionId, directory, label, text) {
   try {
     const dumpDir = historianResponseDumpDir(directory);
-    mkdirSync6(dumpDir, { recursive: true });
+    mkdirSync7(dumpDir, { recursive: true });
     const safeSessionId = sanitizeDumpName(sessionId);
     const safeLabel = sanitizeDumpName(label);
     const dumpPath = join16(dumpDir, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
-    writeFileSync3(dumpPath, text, "utf8");
+    writeFileSync4(dumpPath, text, "utf8");
     sessionLog(sessionId, "compartment agent: historian response dumped", {
       label,
       dumpPath
@@ -178592,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;
@@ -178691,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) {
@@ -179464,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;
@@ -179598,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;
@@ -179929,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}`;
 }
@@ -180039,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);
@@ -180318,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);
@@ -180485,7 +180653,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@wolfx/pi-magic-context",
-  version: "0.22.1-patch.0",
+  version: "0.22.4",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -181070,10 +181238,6 @@ function computePiPressure(usage, contextLimit) {
 }
 
 // src/strip-tag-prefix.ts
-var DEFAULT_PATTERNS = [
-  /^(\u00a7\d+\u00a7\s*)+/,
-  /\u00a7/g
-];
 function parseRegex(src) {
   if (src.startsWith("/")) {
     const lastSlash = src.lastIndexOf("/");
@@ -181085,43 +181249,42 @@ function parseRegex(src) {
   }
   return new RegExp(src);
 }
-function resolveStripPatterns(stripConfig) {
+function stripTagPrefixFromAssistantMessage(message, stripConfig) {
+  if (message.role !== "assistant")
+    return false;
+  if (!Array.isArray(message.content))
+    return false;
   const isEnabled = stripConfig?.enabled ?? true;
   if (!isEnabled)
-    return [];
+    return false;
+  let patterns = null;
   if (stripConfig?.patterns && stripConfig.patterns.length > 0) {
-    return stripConfig.patterns.map(parseRegex);
+    patterns = stripConfig.patterns.map(parseRegex);
   }
-  return DEFAULT_PATTERNS;
-}
-function createStripTagPrefixHandler(stripConfig) {
-  const patterns = resolveStripPatterns(stripConfig);
-  return function stripTagPrefixFromAssistantMessage(message) {
-    if (message.role !== "assistant")
-      return false;
-    if (!Array.isArray(message.content))
-      return false;
-    let mutated = false;
-    for (const part of message.content) {
-      if (part === null || typeof part !== "object" || part.type !== "text") {
-        continue;
-      }
-      const textPart = part;
-      if (typeof textPart.text !== "string")
-        continue;
-      let stripped = textPart.text;
+  let mutated = false;
+  for (const part of message.content) {
+    if (part === null || typeof part !== "object" || part.type !== "text") {
+      continue;
+    }
+    const textPart = part;
+    if (typeof textPart.text !== "string")
+      continue;
+    let stripped;
+    if (patterns) {
+      stripped = textPart.text;
       for (const regex of patterns) {
         stripped = stripped.replace(regex, "");
       }
-      if (stripped !== textPart.text) {
-        textPart.text = stripped;
-        mutated = true;
-      }
+    } else {
+      stripped = stripPersistedAssistantText(textPart.text);
     }
-    return mutated;
-  };
+    if (stripped !== textPart.text) {
+      textPart.text = stripped;
+      mutated = true;
+    }
+  }
+  return mutated;
 }
-var defaultHandler = createStripTagPrefixHandler();
 
 // ../plugin/src/tools/ctx-expand/constants.ts
 var CTX_EXPAND_DESCRIPTION = "Decompress a compartment range to see the original conversation transcript. " + 'Use start/end from <compartment start="N" end="M"> attributes. ' + "Returns the compacted U:/A: transcript for that message range, capped at ~15K tokens.";
@@ -185254,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) {
@@ -185618,15 +185780,26 @@ function err3(text) {
     isError: true
   };
 }
+function captureAnchorOrdinal(db, sessionId) {
+  try {
+    const ordinal = getLastIndexedOrdinal(db, sessionId);
+    return ordinal > 0 ? ordinal : null;
+  } catch {
+    return null;
+  }
+}
+function anchorSuffix(note) {
+  return note.anchorOrdinal !== null ? ` ↳ @msg ${note.anchorOrdinal}` : "";
+}
 function formatNoteLine(note) {
   if (note.type === "smart") {
     const conditionLine = note.status === "ready" ? note.readyReason ?? note.surfaceCondition ?? "Condition satisfied" : note.surfaceCondition ?? "No condition recorded";
     const statusSuffix2 = note.status === "active" ? "" : ` (${note.status})`;
-    return `- **#${note.id}**${statusSuffix2}: ${note.content}
+    return `- **#${note.id}**${statusSuffix2}: ${note.content}${anchorSuffix(note)}
   *Condition*: ${conditionLine}`;
   }
   const statusSuffix = note.status === "active" ? "" : ` (${note.status})`;
-  return `- **#${note.id}**${statusSuffix}: ${note.content}`;
+  return `- **#${note.id}**${statusSuffix}: ${note.content}${anchorSuffix(note)}`;
 }
 var DISMISS_FOOTER = `
 
@@ -185648,6 +185821,7 @@ function createCtxNoteTool(deps) {
         const content = params.content?.trim();
         if (!content)
           return err3("Error: 'content' is required when action is 'write'.");
+        const anchorOrdinal = captureAnchorOrdinal(deps.db, sessionId);
         const surfaceCondition = params.surface_condition?.trim();
         if (surfaceCondition) {
           if (deps.dreamerEnabled !== true) {
@@ -185660,13 +185834,18 @@ function createCtxNoteTool(deps) {
           const note2 = addNote(deps.db, "smart", {
             content,
             projectPath: projectIdentity,
-            surfaceCondition
+            surfaceCondition,
+            anchorOrdinal
           });
           return ok3(`Created smart note #${note2.id}. Dreamer will evaluate the condition during nightly runs:
 - Content: ${content}
 - Condition: ${surfaceCondition}`);
         }
-        const note = addNote(deps.db, "session", { sessionId, content });
+        const note = addNote(deps.db, "session", {
+          sessionId,
+          content,
+          anchorOrdinal
+        });
         return ok3(`Saved session note #${note.id}.`);
       }
       if (action2 === "dismiss") {
@@ -185729,9 +185908,13 @@ function createCtxNoteTool(deps) {
 
 No notes for the current filter.`);
       }
-      return ok3(`${sections.join(`
+      const body = sections.join(`
+
+`);
+      const anchorHint = body.includes("↳ @msg ") ? `
 
-`)}${DISMISS_FOOTER}`);
+↳ @msg N marks the conversation tail when a note was written. To see what led to it: ctx_expand(start=N-x, end=N) (pick x for how far back to look).` : "";
+      return ok3(`${body}${anchorHint}${DISMISS_FOOTER}`);
     }
   };
 }
@@ -186076,7 +186259,8 @@ function createCtxSearchTool(deps) {
         maxMessageOrdinal: lastCompartmentEnd >= 0 ? lastCompartmentEnd : undefined,
         gitCommitsEnabled,
         sources: params.sources,
-        visibleMemoryIds
+        visibleMemoryIds,
+        explicitSearch: true
       });
       return {
         content: [{ type: "text", text: formatSearchResults(query, results) }],
@@ -186224,8 +186408,7 @@ function getPiMessageModel(message) {
   };
 }
 function resolvePiPressureContextLimit(args) {
-  const cachedLimit = args.provider && args.model ? getModelsDevContextLimit(args.provider, args.model) : undefined;
-  let effectiveContextLimit = cachedLimit ?? args.piContextWindow;
+  let effectiveContextLimit = isSaneLimit(args.piContextWindow) ? args.piContextWindow : 0;
   try {
     const overflowState = getOverflowState(args.db, args.sessionId);
     if (overflowState.detectedContextLimit > 0) {
@@ -186241,8 +186424,6 @@ async function persistPiPressureFromMessageEnd(args) {
   const effectiveContextLimit = resolvePiPressureContextLimit({
     db: args.db,
     sessionId: args.sessionId,
-    provider: provider2,
-    model,
     piContextWindow: args.piContextWindow
   });
   const usage = extractAssistantUsage(args.message);
@@ -186251,28 +186432,16 @@ async function persistPiPressureFromMessageEnd(args) {
   const messageHadOverflowError = typeof msg?.errorMessage === "string" && detectOverflow(msg.errorMessage).isOverflow;
   const updates = { lastResponseTime: Date.now() };
   if (pressure) {
-    let percentage = pressure.percentage;
-    let contextLimit = effectiveContextLimit;
+    const percentage = pressure.percentage;
+    const contextLimit = effectiveContextLimit;
     const meta3 = getOrCreateSessionMeta(args.db, args.sessionId);
     const observedSafeInputTokens = meta3.observedSafeInputTokens ?? 0;
     if (percentage > 100 && observedSafeInputTokens > 0 && pressure.inputTokens <= observedSafeInputTokens * 2) {
-      const oldLimit = contextLimit;
-      clearModelsDevCache();
-      contextLimit = resolvePiPressureContextLimit({
-        db: args.db,
-        sessionId: args.sessionId,
-        provider: provider2,
-        model,
-        piContextWindow: args.piContextWindow
-      });
-      if (contextLimit >= pressure.inputTokens) {
-        percentage = pressure.inputTokens / contextLimit * 100;
-        log(`${PREFIX} models-dev-cache: regression recovered for ${provider2}/${model} via Pi cache reload (was=${oldLimit}, now=${contextLimit})`);
-      } else if (!meta3.cacheAlertSent) {
+      if (!meta3.cacheAlertSent) {
         updates.cacheAlertSent = true;
         const safeTokens = Math.max(observedSafeInputTokens, pressure.inputTokens);
         const modelLabel = provider2 && model ? `${provider2}/${model}` : "the active model";
-        await args.notifyIssue?.(`⚠️ Magic Context: Pi reports a context limit of ${formatTokens(contextLimit)} tokens for ${modelLabel} but you've successfully sent ${formatTokens(safeTokens)} tokens in this session — the cached limit looks wrong. Restart Pi if you suspect this is incorrect.`);
+        await args.notifyIssue?.(`⚠️ Magic Context: Pi reports a context limit of ${formatTokens(contextLimit)} tokens for ${modelLabel} but you've successfully sent ${formatTokens(safeTokens)} tokens in this session — the reported limit looks wrong. Restart Pi if you suspect this is incorrect.`);
       }
     }
     updates.lastContextPercentage = percentage;
@@ -186415,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;
@@ -186710,15 +186880,14 @@ ${block}` : event.systemPrompt;
     info("session_before_compact: cancelling — magic-context owns compaction");
     return { cancel: true };
   });
-  const stripTagPrefix3 = createStripTagPrefixHandler(config2.text_complete_strip);
   pi.on("message_end", async (event, ctx) => {
     try {
       const msg = event.message;
       if (msg !== null && typeof msg === "object") {
-        stripTagPrefix3(msg);
+        stripTagPrefixFromAssistantMessage(msg, config2.text_complete_strip);
       }
     } catch (err5) {
-      warn("message_end: stripTagPrefix threw:", err5);
+      warn("message_end: stripTagPrefixFromAssistantMessage threw:", err5);
     }
     try {
       const sm = ctx.sessionManager;
@@ -186740,7 +186909,7 @@ ${block}` : event.systemPrompt;
         cacheTtlConfig: config2.cache_ttl
       });
       const piUsage = ctx.getContextUsage?.();
-      const piContextWindow = piUsage && typeof piUsage.contextWindow === "number" ? piUsage.contextWindow : 0;
+      const piContextWindow = piUsage && typeof piUsage.contextWindow === "number" && piUsage.contextWindow > 0 ? piUsage.contextWindow : ctx.model?.contextWindow ?? 0;
       await persistPiPressureFromMessageEnd({
         db,
         sessionId,