@wolfx/pi-magic-context 0.22.3 → 0.23.0

package/dist/subagent-entry.js

@@ -151,62 +151,6 @@ var init_logger = __esm(() => {
   }
 });
 
-// ../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 {}
-}
-
 // ../../node_modules/.bun/esprima@4.0.1/node_modules/esprima/dist/esprima.js
 var require_esprima = __commonJS((exports, module) => {
   (function webpackUniversalModuleDefinition(root, factory) {
@@ -7964,53 +7908,6 @@ var require_src2 = __commonJS((exports, module) => {
   };
 });
 
-// ../plugin/src/hooks/magic-context/read-session-db.ts
-import { existsSync as existsSync6 } from "node:fs";
-import { join as join7 } from "node:path";
-function getOpenCodeDbPath() {
-  return join7(getDataDir(), "opencode", "opencode.db");
-}
-function openCodeDbExists() {
-  return existsSync6(getOpenCodeDbPath());
-}
-function closeCachedReadOnlyDb() {
-  if (!cachedReadOnlyDb) {
-    return;
-  }
-  try {
-    closeQuietly(cachedReadOnlyDb.db);
-  } catch (error51) {
-    log("[magic-context] failed to close cached OpenCode read-only DB:", error51);
-  } 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();
-});
-
 // ../plugin/src/features/magic-context/storage-db.ts
 init_data_path();
 import { copyFileSync, cpSync, existsSync as existsSync3, mkdirSync as mkdirSync2 } from "node:fs";
@@ -8094,7 +7991,59 @@ function safeString(value) {
 
 // ../plugin/src/features/magic-context/storage-db.ts
 init_logger();
-await init_sqlite();
+
+// ../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/features/magic-context/key-files/project-key-files.ts
 init_logger();
@@ -8948,6 +8897,72 @@ var MIGRATIONS = [
         db.exec("ALTER TABLE notes ADD COLUMN anchor_ordinal INTEGER");
       }
     }
+  },
+  {
+    version: 30,
+    description: "HARD-bust m[0] markers: cached system/tool-set/model identity",
+    up: (db) => {
+      const hasSessionMeta = db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='session_meta' LIMIT 1").get();
+      if (!hasSessionMeta)
+        return;
+      ensureColumn(db, "session_meta", "cached_m0_system_hash", "TEXT");
+      ensureColumn(db, "session_meta", "cached_m0_tool_set_hash", "TEXT");
+      ensureColumn(db, "session_meta", "cached_m0_model_key", "TEXT");
+      const columns = new Set(db.prepare("PRAGMA table_info(session_meta)").all().map((column) => column.name));
+      if (columns.has("cached_m0_bytes")) {
+        db.prepare(`UPDATE session_meta SET
+                        cached_m0_bytes = NULL,
+                        cached_m1_bytes = NULL,
+                        cached_m0_materialized_at = NULL,
+                        cached_m0_system_hash = NULL,
+                        cached_m0_tool_set_hash = NULL,
+                        cached_m0_model_key = NULL`).run();
+      }
+    }
+  },
+  {
+    version: 31,
+    description: "Nudge redesign: Channel 1 cadence (last_nudge_undropped) + Channel 2 ceiling lease " + "(channel2_nudge_state); zero legacy ctx_reduce-nudge sticky/anchor state (startup heal)",
+    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", "last_nudge_undropped", "INTEGER DEFAULT 0");
+      ensureColumn(db, "session_meta", "channel2_nudge_state", "TEXT DEFAULT ''");
+      const columns = new Set(db.prepare("PRAGMA table_info(session_meta)").all().map((column) => column.name));
+      if (columns.has("sticky_turn_reminder_text")) {
+        db.prepare(`UPDATE session_meta SET
+                        sticky_turn_reminder_text = '',
+                        sticky_turn_reminder_message_id = '',
+                        nudge_anchor_message_id = '',
+                        nudge_anchor_text = ''`).run();
+      }
+    }
+  },
+  {
+    version: 32,
+    description: "Protected tail boundary state, usage resolver fields, recovery escape, and drain quota",
+    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", "prior_boundary_ordinal", "INTEGER NOT NULL DEFAULT 1");
+      ensureColumn(db, "session_meta", "protected_tail_policy_version", "INTEGER NOT NULL DEFAULT 0");
+      ensureColumn(db, "session_meta", "protected_tail_drain_window_started_at", "INTEGER NOT NULL DEFAULT 0");
+      ensureColumn(db, "session_meta", "protected_tail_drain_tokens", "INTEGER NOT NULL DEFAULT 0");
+      ensureColumn(db, "session_meta", "recovery_no_eligible_head_count", "INTEGER NOT NULL DEFAULT 0");
+      ensureColumn(db, "session_meta", "force_emergency_bypass_window_start", "INTEGER NOT NULL DEFAULT 0");
+      ensureColumn(db, "session_meta", "force_emergency_bypass_used", "INTEGER NOT NULL DEFAULT 0");
+      ensureColumn(db, "session_meta", "last_usage_context_limit", "INTEGER NOT NULL DEFAULT 0");
+      db.prepare("UPDATE session_meta SET prior_boundary_ordinal = 1 WHERE prior_boundary_ordinal IS NULL OR prior_boundary_ordinal < 1").run();
+      db.prepare("UPDATE session_meta SET protected_tail_policy_version = 0 WHERE protected_tail_policy_version IS NULL").run();
+      db.prepare("UPDATE session_meta SET protected_tail_drain_window_started_at = 0 WHERE protected_tail_drain_window_started_at IS NULL").run();
+      db.prepare("UPDATE session_meta SET protected_tail_drain_tokens = 0 WHERE protected_tail_drain_tokens IS NULL").run();
+      db.prepare("UPDATE session_meta SET recovery_no_eligible_head_count = 0 WHERE recovery_no_eligible_head_count IS NULL").run();
+      db.prepare("UPDATE session_meta SET force_emergency_bypass_window_start = 0 WHERE force_emergency_bypass_window_start IS NULL").run();
+      db.prepare("UPDATE session_meta SET force_emergency_bypass_used = 0 WHERE force_emergency_bypass_used IS NULL").run();
+      db.prepare("UPDATE session_meta SET last_usage_context_limit = 0 WHERE last_usage_context_limit IS NULL").run();
+    }
   }
 ];
 var LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
@@ -141553,7 +141568,7 @@ var tokenizer = new src_default(exports_claude);
 function estimateTokens(text) {
   if (!text)
     return 0;
-  return tokenizer.count(text);
+  return tokenizer.encode(text, "all").length;
 }
 function normalizeText(text) {
   return text.replace(/\s+/g, " ").trim();
@@ -141780,6 +141795,11 @@ function markSessionCompleted(db, sessionId, now) {
          SET status = 'completed', completed_at = ?, lease_expires_at = NULL, last_error = NULL
          WHERE session_id = ?`).run(now, sessionId);
 }
+function markSessionPendingRetry(db, sessionId) {
+  db.prepare(`UPDATE tool_owner_backfill_state
+         SET status = 'pending', completed_at = NULL, lease_expires_at = NULL, last_error = NULL
+         WHERE session_id = ?`).run(sessionId);
+}
 function markSessionSkipped(db, sessionId, now, reason) {
   db.prepare(`INSERT INTO tool_owner_backfill_state(session_id, status, completed_at, last_error)
          VALUES (?, 'skipped', ?, ?)
@@ -141856,12 +141876,18 @@ function applyOwnersForSession(db, sessionId, ownersByCallId) {
   const updateRowStmt = db.prepare(`UPDATE tags
          SET tool_owner_message_id = ?
          WHERE id = ? AND tool_owner_message_id IS NULL`);
+  const existingOwnerStmt = db.prepare(`SELECT 1 AS hit FROM tags
+         WHERE session_id = ? AND message_id = ? AND type = 'tool'
+           AND tool_owner_message_id = ?
+         LIMIT 1`);
   let rowsUpdated = 0;
   db.transaction(() => {
     for (const [callId, ownerId] of ownersByCallId) {
       const orphan = findOrphanStmt.get(sessionId, callId);
       if (!orphan)
         continue;
+      if (existingOwnerStmt.get(sessionId, callId, ownerId))
+        continue;
       const result = updateRowStmt.run(ownerId, orphan.id);
       rowsUpdated += result.changes ?? 0;
     }
@@ -141890,6 +141916,8 @@ function backfillToolOwnersInChunks(db, result) {
       if (owners.size === 0) {
         markSessionSkipped(db, sessionId, Date.now(), "no_oc_matches");
         result.sessionsSkippedNoMatches += 1;
+      } else if (rowsLeftNull > 0) {
+        markSessionPendingRetry(db, sessionId);
       } else {
         markSessionCompleted(db, sessionId, Date.now());
         result.sessionsCompleted += 1;
@@ -141912,7 +141940,7 @@ var databases = new Map;
 var persistenceByDatabase = new WeakMap;
 var persistenceErrorByDatabase = new WeakMap;
 var lastSchemaFenceRejection = null;
-var LATEST_SUPPORTED_VERSION = 29;
+var LATEST_SUPPORTED_VERSION = 32;
 function resolveDatabasePath(dbPathOverride) {
   if (dbPathOverride) {
     return { dbDir: dirname2(dbPathOverride), dbPath: dbPathOverride };
@@ -142014,9 +142042,9 @@ function runSqliteOptimize(db) {
   } catch {}
 }
 function initializeDatabase(db) {
+  db.exec("PRAGMA busy_timeout=5000");
   db.exec("PRAGMA foreign_keys=ON");
   db.exec("PRAGMA journal_mode=WAL");
-  db.exec("PRAGMA busy_timeout=5000");
   applySqliteTuningPragmas(db);
   db.exec(`
     CREATE TABLE IF NOT EXISTS tags (
@@ -142029,6 +142057,9 @@ function initializeDatabase(db) {
       tag_number INTEGER,
       harness TEXT NOT NULL DEFAULT 'opencode',
       entry_fingerprint TEXT,
+      token_count INTEGER,
+      input_token_count INTEGER,
+      reasoning_token_count INTEGER,
       UNIQUE(session_id, tag_number)
     );
 
@@ -142318,6 +142349,11 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       counter INTEGER DEFAULT 0,
       last_nudge_tokens INTEGER DEFAULT 0,
       last_nudge_band TEXT DEFAULT '',
+      last_nudge_undropped INTEGER DEFAULT 0,
+      last_nudge_level TEXT DEFAULT '',
+      channel2_nudge_state TEXT DEFAULT '',
+      channel2_nudge_claimed_at INTEGER DEFAULT 0,
+      last_emergency_input_sample INTEGER DEFAULT 0,
       last_transform_error TEXT DEFAULT '',
       nudge_anchor_message_id TEXT DEFAULT '',
       nudge_anchor_text TEXT DEFAULT '',
@@ -142374,9 +142410,20 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       cached_m0_project_docs_hash TEXT,
       cached_m1_bytes BLOB,
       last_observed_model_key TEXT,
+      last_usage_context_limit INTEGER NOT NULL DEFAULT 0,
+      prior_boundary_ordinal INTEGER NOT NULL DEFAULT 1,
+      protected_tail_policy_version INTEGER NOT NULL DEFAULT 0,
+      protected_tail_drain_window_started_at INTEGER NOT NULL DEFAULT 0,
+      protected_tail_drain_tokens INTEGER NOT NULL DEFAULT 0,
+      recovery_no_eligible_head_count INTEGER NOT NULL DEFAULT 0,
+      force_emergency_bypass_window_start INTEGER NOT NULL DEFAULT 0,
+      force_emergency_bypass_used INTEGER NOT NULL DEFAULT 0,
       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
@@ -142481,6 +142528,11 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
     CREATE INDEX IF NOT EXISTS idx_message_history_index_updated_at ON message_history_index(updated_at);
   `);
   ensureColumn(db, "session_meta", "last_nudge_band", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "last_nudge_undropped", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "last_nudge_level", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "channel2_nudge_state", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "channel2_nudge_claimed_at", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "last_emergency_input_sample", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "last_transform_error", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "nudge_anchor_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "nudge_anchor_text", "TEXT DEFAULT ''");
@@ -142507,6 +142559,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "system_prompt_hash", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "cleared_reasoning_through_tag", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "stripped_placeholder_ids", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "stale_reduce_stripped_ids", "TEXT DEFAULT ''");
   ensureColumn(db, "compartments", "start_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "compartments", "end_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "memory_embeddings", "model_id", "TEXT");
@@ -142525,6 +142578,9 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   db.exec(`CREATE INDEX IF NOT EXISTS idx_tags_pi_adopt
             ON tags(session_id, entry_fingerprint)
             WHERE type='message' AND entry_fingerprint IS NOT NULL`);
+  ensureColumn(db, "tags", "token_count", "INTEGER");
+  ensureColumn(db, "tags", "input_token_count", "INTEGER");
+  ensureColumn(db, "tags", "reasoning_token_count", "INTEGER");
   ensureColumn(db, "session_meta", "system_prompt_tokens", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "compaction_marker_state", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "key_files", "TEXT DEFAULT ''");
@@ -142565,9 +142621,20 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "cached_m0_project_docs_hash", "TEXT");
   ensureColumn(db, "session_meta", "cached_m1_bytes", "BLOB");
   ensureColumn(db, "session_meta", "last_observed_model_key", "TEXT");
+  ensureColumn(db, "session_meta", "last_usage_context_limit", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "prior_boundary_ordinal", "INTEGER NOT NULL DEFAULT 1");
+  ensureColumn(db, "session_meta", "protected_tail_policy_version", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "protected_tail_drain_window_started_at", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "protected_tail_drain_tokens", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "recovery_no_eligible_head_count", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "force_emergency_bypass_window_start", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "force_emergency_bypass_used", "INTEGER NOT NULL DEFAULT 0");
   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(`
@@ -142631,6 +142698,13 @@ function healAllNullColumns(db) {
   healNullIntegerColumns(db);
   healMissingMemoryBlockIds(db);
 }
+var CHANNEL2_CLAIM_TTL_MS = 120000;
+function healWedgedChannel2Claims(db) {
+  try {
+    const staleBefore = Date.now() - CHANNEL2_CLAIM_TTL_MS;
+    db.prepare("UPDATE session_meta SET channel2_nudge_state = 'pending', channel2_nudge_claimed_at = 0 WHERE channel2_nudge_state = 'claimed' AND (channel2_nudge_claimed_at IS NULL OR channel2_nudge_claimed_at = 0 OR channel2_nudge_claimed_at <= ?)").run(staleBefore);
+  } catch {}
+}
 function healMissingMemoryBlockIds(db) {
   try {
     db.prepare("UPDATE session_meta SET memory_block_cache = '' WHERE memory_block_cache != '' AND (memory_block_ids IS NULL OR memory_block_ids = '') AND memory_block_count > 0").run();
@@ -142640,6 +142714,7 @@ function healNullTextColumns(db) {
   const columns = [
     ["cache_ttl", ""],
     ["last_nudge_band", ""],
+    ["last_nudge_level", ""],
     ["last_transform_error", ""],
     ["nudge_anchor_message_id", ""],
     ["nudge_anchor_text", ""],
@@ -142654,6 +142729,7 @@ function healNullTextColumns(db) {
     ["todo_synthetic_state_json", ""],
     ["system_prompt_hash", ""],
     ["stripped_placeholder_ids", ""],
+    ["stale_reduce_stripped_ids", ""],
     ["memory_block_cache", ""],
     ["memory_block_ids", ""],
     ["compaction_marker_state", ""],
@@ -142679,7 +142755,17 @@ function healNullIntegerColumns(db) {
     ["observed_safe_input_tokens", 0],
     ["cache_alert_sent", 0],
     ["new_work_tokens", 0],
-    ["total_input_tokens", 0]
+    ["total_input_tokens", 0],
+    ["last_emergency_input_sample", 0],
+    ["channel2_nudge_claimed_at", 0],
+    ["last_usage_context_limit", 0],
+    ["prior_boundary_ordinal", 1],
+    ["protected_tail_policy_version", 0],
+    ["protected_tail_drain_window_started_at", 0],
+    ["protected_tail_drain_tokens", 0],
+    ["recovery_no_eligible_head_count", 0],
+    ["force_emergency_bypass_window_start", 0],
+    ["force_emergency_bypass_used", 0]
   ];
   for (const [column, fallback] of columns) {
     try {
@@ -142718,6 +142804,7 @@ function openDatabase(dbPathOrOptions) {
     if (!persistenceByDatabase.has(existing)) {
       persistenceByDatabase.set(existing, true);
     }
+    healWedgedChannel2Claims(existing);
     return existing;
   }
   try {
@@ -142743,6 +142830,7 @@ function openDatabase(dbPathOrOptions) {
         log(`[magic-context] key-files orphan GC failed: ${getErrorMessage(error)}`);
       }
     }
+    healWedgedChannel2Claims(db);
     if (!explicitDbPath) {
       try {
         runToolOwnerBackfill(db);
@@ -142766,6 +142854,31 @@ function openDatabase(dbPathOrOptions) {
 // src/subagent-entry.ts
 init_logger();
 
+// ../plugin/src/config/prune-config-leaf.ts
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function pruneNestedConfigLeaf(block, relativePath) {
+  if (relativePath.length === 0)
+    return null;
+  const result = { ...block };
+  let cursor = result;
+  for (let i = 0;i < relativePath.length - 1; i++) {
+    const seg = String(relativePath[i]);
+    const child = cursor[seg];
+    if (!isPlainObject(child))
+      return null;
+    const clonedChild = { ...child };
+    cursor[seg] = clonedChild;
+    cursor = clonedChild;
+  }
+  const leaf = String(relativePath[relativePath.length - 1]);
+  if (!(leaf in cursor))
+    return null;
+  delete cursor[leaf];
+  return { block: result, removed: relativePath.map(String).join(".") };
+}
+
 // src/config/index.ts
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
@@ -142911,6 +143024,74 @@ function migrateLegacyExperimental(rawConfig, warnings) {
   return patched;
 }
 
+// ../plugin/src/config/project-security.ts
+var HIDDEN_AGENT_KEYS = ["historian", "dreamer", "sidekick"];
+var AGENT_ESCALATION_FIELDS = ["prompt", "permission", "tools", "system_prompt"];
+function isPlainObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function stripUnsafeProjectConfigFields(projectRaw) {
+  const warnings = [];
+  if ("auto_update" in projectRaw) {
+    delete projectRaw.auto_update;
+    warnings.push("Ignoring auto_update from project config (security: this setting only honors user-level config).");
+  }
+  if ("sqlite" in projectRaw) {
+    delete projectRaw.sqlite;
+    warnings.push("Ignoring sqlite.* from project config (security: SQLite cache/mmap PRAGMAs apply to the " + "process-global shared database handle; only user-level config may set them).");
+  }
+  for (const agentKey of HIDDEN_AGENT_KEYS) {
+    const block = projectRaw[agentKey];
+    if (!isPlainObject2(block))
+      continue;
+    const removed = [];
+    for (const field of AGENT_ESCALATION_FIELDS) {
+      if (field in block) {
+        delete block[field];
+        removed.push(field);
+      }
+    }
+    if (removed.length > 0) {
+      warnings.push(`Ignoring ${agentKey}.${removed.join("/")} from project config ` + "(security: a repository cannot reprogram or re-permission hidden agents).");
+    }
+  }
+  return warnings;
+}
+function normalizeEndpoint(value) {
+  if (typeof value !== "string")
+    return;
+  const trimmed = value.trim().replace(/\/+$/, "");
+  return trimmed.length > 0 ? trimmed.toLowerCase() : undefined;
+}
+function dropInheritedEmbeddingKeyOnRedirect(projectRaw, mergedRaw, userRaw) {
+  const projectEmbedding = projectRaw.embedding;
+  if (!isPlainObject2(projectEmbedding))
+    return [];
+  const redirectsEndpoint = "endpoint" in projectEmbedding;
+  if (!redirectsEndpoint)
+    return [];
+  const userEmbedding = userRaw?.embedding;
+  if (isPlainObject2(userEmbedding)) {
+    const projectEndpoint = normalizeEndpoint(projectEmbedding.endpoint);
+    const userEndpoint = normalizeEndpoint(userEmbedding.endpoint);
+    if (projectEndpoint !== undefined && projectEndpoint === userEndpoint) {
+      return [];
+    }
+  }
+  const providesOwnKey = typeof projectEmbedding.api_key === "string" && projectEmbedding.api_key.length > 0;
+  if (providesOwnKey)
+    return [];
+  const mergedEmbedding = mergedRaw.embedding;
+  if (!isPlainObject2(mergedEmbedding))
+    return [];
+  if (!("api_key" in mergedEmbedding))
+    return [];
+  delete mergedEmbedding.api_key;
+  return [
+    "Dropped inherited user embedding api_key because project config redirected " + "embedding.endpoint without supplying its own key (security: prevents key " + "exfiltration to a repository-chosen endpoint)."
+  ];
+}
+
 // ../../node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
 var exports_external = {};
 __export(exports_external, {
@@ -143542,7 +143723,7 @@ __export(exports_util, {
   jsonStringifyReplacer: () => jsonStringifyReplacer,
   joinValues: () => joinValues,
   issue: () => issue,
-  isPlainObject: () => isPlainObject,
+  isPlainObject: () => isPlainObject3,
   isObject: () => isObject,
   hexToUint8Array: () => hexToUint8Array,
   getSizableOrigin: () => getSizableOrigin,
@@ -143724,7 +143905,7 @@ var allowsEval = /* @__PURE__ */ cached(() => {
     return false;
   }
 });
-function isPlainObject(o) {
+function isPlainObject3(o) {
   if (isObject(o) === false)
     return false;
   const ctor = o.constructor;
@@ -143741,7 +143922,7 @@ function isPlainObject(o) {
   return true;
 }
 function shallowClone(o) {
-  if (isPlainObject(o))
+  if (isPlainObject3(o))
     return { ...o };
   if (Array.isArray(o))
     return [...o];
@@ -143945,7 +144126,7 @@ function omit(schema, mask) {
   return clone(schema, def);
 }
 function extend(schema, shape) {
-  if (!isPlainObject(shape)) {
+  if (!isPlainObject3(shape)) {
     throw new Error("Invalid input to extend: expected a plain object");
   }
   const checks = schema._zod.def.checks;
@@ -143968,7 +144149,7 @@ function extend(schema, shape) {
   return clone(schema, def);
 }
 function safeExtend(schema, shape) {
-  if (!isPlainObject(shape)) {
+  if (!isPlainObject3(shape)) {
     throw new Error("Invalid input to safeExtend: expected a plain object");
   }
   const def = mergeDefs(schema._zod.def, {
@@ -146311,7 +146492,7 @@ function mergeValues(a, b) {
   if (a instanceof Date && b instanceof Date && +a === +b) {
     return { valid: true, data: a };
   }
-  if (isPlainObject(a) && isPlainObject(b)) {
+  if (isPlainObject3(a) && isPlainObject3(b)) {
     const bKeys = Object.keys(b);
     const sharedKeys = Object.keys(a).filter((key) => bKeys.indexOf(key) !== -1);
     const newObj = { ...a, ...b };
@@ -146497,7 +146678,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, ctx) => {
     const input = payload.value;
-    if (!isPlainObject(input)) {
+    if (!isPlainObject3(input)) {
       payload.issues.push({
         expected: "record",
         code: "invalid_type",
@@ -157217,7 +157398,6 @@ var AgentOverrideConfigSchema = exports_external.object({
 });
 
 // ../plugin/src/config/schema/magic-context.ts
-var DEFAULT_NUDGE_INTERVAL_TOKENS = 1e4;
 var DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE = 65;
 var EXECUTE_THRESHOLD_CAP_MESSAGE = "execute_threshold is capped at 80% for cache safety: a single large agent step can overflow the context window before Magic Context can compact between turns, forcing OpenCode's native compaction (hard to recover from). 80% also leaves headroom below the 85%/95% emergency bands. Use a value between 20 and 80.";
 var DEFAULT_HISTORIAN_TIMEOUT_MS = 300000;
@@ -157315,7 +157495,6 @@ var MagicContextConfigSchema = exports_external.object({
   historian: HistorianConfigSchema.describe("Historian agent configuration (model, fallback_models, variant, temperature, maxTokens, permission, two_pass, etc.)"),
   dreamer: DreamerConfigSchema.optional().describe("Dreamer agent + scheduling configuration (model, fallback_models, disable, schedule, tasks, etc.)"),
   cache_ttl: exports_external.union([exports_external.string(), exports_external.object({ default: exports_external.string() }).catchall(exports_external.string())]).default("5m").describe('Cache TTL: string (e.g. "5m") or per-model object ({ default: "5m", "model-id": "10m" })'),
-  nudge_interval_tokens: exports_external.number().min(1000).default(DEFAULT_NUDGE_INTERVAL_TOKENS).describe("Minimum token growth between low-priority rolling nudges (default: DEFAULT_NUDGE_INTERVAL_TOKENS)"),
   execute_threshold_percentage: exports_external.union([
     exports_external.number().min(20).max(80, EXECUTE_THRESHOLD_CAP_MESSAGE),
     exports_external.object({ default: exports_external.number().min(20).max(80, EXECUTE_THRESHOLD_CAP_MESSAGE) }).catchall(exports_external.number().min(20).max(80, EXECUTE_THRESHOLD_CAP_MESSAGE))
@@ -157324,10 +157503,7 @@ var MagicContextConfigSchema = exports_external.object({
     default: exports_external.number().min(5000).max(2000000).optional()
   }).catchall(exports_external.number().min(5000).max(2000000)).optional().describe("Absolute token thresholds per model. When matched, overrides execute_threshold_percentage for that model. Accepts `default` for all models or per-model keys. Values above 80% × context_limit are clamped with a warning log. Min 5_000, max 2_000_000."),
   protected_tags: exports_external.number().min(1).max(100).optional().describe("Number of recent tags to protect from dropping (min: 1, max: 100, default: 20)"),
-  auto_drop_tool_age: exports_external.number().min(10).default(100).describe("Auto-drop tool outputs older than N tags during queue execution (default: 100)"),
-  drop_tool_structure: exports_external.boolean().default(true).describe("When true, dropped tool parts are fully removed instead of truncated in place (default: true)"),
   clear_reasoning_age: exports_external.number().min(10).default(50).describe("Clear reasoning/thinking blocks older than N tags (default: 50)"),
-  iteration_nudge_threshold: exports_external.number().min(5).default(15).describe("Number of consecutive assistant messages without user input to trigger iteration nudge (default: 15)"),
   history_budget_percentage: exports_external.number().min(0.05).max(0.5).default(DEFAULT_HISTORY_BUDGET_PERCENTAGE).describe("Fraction of usable context (context_limit × execute_threshold) reserved for the session history block (default: 0.15)"),
   historian_timeout_ms: exports_external.number().min(60000).default(DEFAULT_HISTORIAN_TIMEOUT_MS).describe("Timeout for each historian prompt call in milliseconds (default: 300000)"),
   commit_cluster_trigger: exports_external.object({
@@ -157350,6 +157526,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.")
@@ -157453,6 +157630,21 @@ function stripJsonComments(content) {
 // ../plugin/src/config/variable.ts
 var ENV_PATTERN = /\{env:([^}]+)\}/g;
 var FILE_PATTERN = /\{file:([^}]+)\}/g;
+function sensitiveFilePathReason(resolvedPath) {
+  const home = homedir2();
+  const sensitiveDirs = [
+    { dir: resolve2(home, ".ssh"), label: "SSH keys" },
+    { dir: resolve2(home, ".aws"), label: "AWS credentials" },
+    { dir: resolve2(home, ".gnupg"), label: "GnuPG keyring" },
+    { dir: resolve2(home, ".config", "gh"), label: "GitHub CLI auth" }
+  ];
+  for (const { dir, label } of sensitiveDirs) {
+    if (resolvedPath === dir || resolvedPath.startsWith(`${dir}/`)) {
+      return label;
+    }
+  }
+  return null;
+}
 function substituteConfigVariables(input) {
   const warnings = [];
   let text = input.text;
@@ -157506,6 +157698,10 @@ function substituteConfigVariables(input) {
     } else if (!isAbsolute(filePath)) {
       filePath = resolve2(configDir, filePath);
     }
+    const sensitiveReason = sensitiveFilePathReason(filePath);
+    if (sensitiveReason) {
+      warnings.push(`${token} resolves to a sensitive path (${sensitiveReason}: ${filePath}); ` + "inlining its contents into config — make sure this is intentional.");
+    }
     if (!existsSync4(filePath)) {
       warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
       continue;
@@ -157544,7 +157740,8 @@ function loadConfigFile(path3, scope) {
     const rawText = readFileSync3(path3, "utf-8");
     const substituted = substituteConfigVariables({
       text: rawText,
-      configPath: path3
+      configPath: path3,
+      isProjectConfig: scope === "project"
     });
     return {
       path: path3,
@@ -157586,14 +157783,14 @@ function redactConfigValue(value) {
   }
   return typeof value;
 }
-function isPlainObject2(value) {
+function isPlainObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function mergeRawConfigs(base, override) {
   const merged = { ...base };
   for (const [key, overrideValue] of Object.entries(override)) {
     const baseValue = merged[key];
-    merged[key] = isPlainObject2(baseValue) && isPlainObject2(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
+    merged[key] = isPlainObject4(baseValue) && isPlainObject4(overrideValue) ? mergeRawConfigs(baseValue, overrideValue) : overrideValue;
   }
   return merged;
 }
@@ -157607,10 +157804,15 @@ function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
   }
   const defaults = MagicContextConfigSchema.parse({});
   const errorPaths = new Set;
+  const issuePathsByKey = new Map;
   for (const issue2 of parsed.error.issues) {
     const topKey = issue2.path[0];
     if (topKey !== undefined) {
-      errorPaths.add(String(topKey));
+      const key = String(topKey);
+      errorPaths.add(key);
+      const paths = issuePathsByKey.get(key) ?? [];
+      paths.push([...issue2.path]);
+      issuePathsByKey.set(key, paths);
     }
   }
   const patched = { ...migrated };
@@ -157618,11 +157820,32 @@ function parsePiConfig(rawConfig, recoveredTopLevelKeys = []) {
   for (const key of errorPaths) {
     recoveredTopLevelKeys.push(key);
     const isAgentConfig = key === "historian" || key === "dreamer" || key === "sidekick";
-    delete patched[key];
     if (isAgentConfig) {
+      delete patched[key];
       warnings.push(`"${key}": invalid agent configuration, ignoring. Check your magic-context.jsonc.`);
       continue;
     }
+    const issuePaths = issuePathsByKey.get(key) ?? [];
+    const rawValue = migrated[key];
+    const allNested = issuePaths.length > 0 && issuePaths.every((p) => p.length >= 2) && typeof rawValue === "object" && rawValue !== null && !Array.isArray(rawValue);
+    if (allNested) {
+      let prunedBlock = {
+        ...rawValue
+      };
+      const prunedLeaves = [];
+      for (const p of issuePaths) {
+        const relative = p.slice(1);
+        const result = pruneNestedConfigLeaf(prunedBlock, relative);
+        if (result) {
+          prunedBlock = result.block;
+          prunedLeaves.push(result.removed);
+        }
+      }
+      patched[key] = prunedBlock;
+      warnings.push(`"${key}": invalid nested field(s) ${prunedLeaves.map((l) => `"${l}"`).join(", ")}, using defaults for those.`);
+      continue;
+    }
+    delete patched[key];
     const defaultValue = defaults[key];
     warnings.push(`"${key}": invalid value (${redactConfigValue(rawConfig[key])}), using default ${JSON.stringify(defaultValue)}.`);
   }
@@ -157655,10 +157878,22 @@ function loadPiConfig(opts = {}) {
       return 0;
     return a.scope === "user" ? -1 : 1;
   });
+  const userRaw = mergeFiles.find((f) => f.scope === "user")?.config;
   for (const loaded of mergeFiles) {
     const prefix = loaded.scope === "user" ? "[user config]" : "[project config]";
     warnings.push(...loaded.warnings.map((warning) => `${prefix} ${warning}`));
-    rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+    if (loaded.scope === "project") {
+      const projectRaw = { ...loaded.config };
+      for (const warning of stripUnsafeProjectConfigFields(projectRaw)) {
+        warnings.push(`${prefix} ${warning}`);
+      }
+      rawConfig = mergeRawConfigs(rawConfig, projectRaw);
+      for (const warning of dropInheritedEmbeddingKeyOnRedirect(projectRaw, rawConfig, userRaw)) {
+        warnings.push(`${prefix} ${warning}`);
+      }
+    } else {
+      rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+    }
   }
   const parsed = parsePiConfig(rawConfig);
   warnings.push(...parsed.warnings.map((warning) => `[merged config] ${warning}`));
@@ -157733,10 +157968,22 @@ function loadPiConfigDetailed(opts = {}) {
       return 0;
     return a.scope === "user" ? -1 : 1;
   });
+  const userRaw = mergeFiles.find((f) => f.scope === "user")?.config;
   for (const loaded of mergeFiles) {
     const prefix = loaded.scope === "user" ? "[user config]" : "[project config]";
     warnings.push(...loaded.warnings.map((warning) => `${prefix} ${warning}`));
-    rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+    if (loaded.scope === "project") {
+      const projectRaw = { ...loaded.config };
+      for (const warning of stripUnsafeProjectConfigFields(projectRaw)) {
+        warnings.push(`${prefix} ${warning}`);
+      }
+      rawConfig = mergeRawConfigs(rawConfig, projectRaw);
+      for (const warning of dropInheritedEmbeddingKeyOnRedirect(projectRaw, rawConfig, userRaw)) {
+        warnings.push(`${prefix} ${warning}`);
+      }
+    } else {
+      rawConfig = mergeRawConfigs(rawConfig, loaded.config);
+    }
   }
   const recoveredTopLevelKeys = [];
   const parsed = parsePiConfig(rawConfig, recoveredTopLevelKeys);
@@ -157794,7 +158041,7 @@ function computeNormalizedHash(content) {
 }
 
 // ../plugin/src/features/magic-context/memory/embedding-identity.ts
-function normalizeEndpoint(endpoint) {
+function normalizeEndpoint2(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
 function getEmbeddingProviderIdentity(config2) {
@@ -157804,7 +158051,7 @@ function getEmbeddingProviderIdentity(config2) {
   const identityInput = config2.provider === "openai-compatible" ? {
     provider: "openai-compatible",
     model: config2.model.trim(),
-    endpoint: normalizeEndpoint(config2.endpoint),
+    endpoint: normalizeEndpoint2(config2.endpoint),
     apiKeyPresent: Boolean(config2.api_key?.trim()),
     inputType: config2.input_type?.trim() || ""
   } : {
@@ -158159,7 +158406,62 @@ class LocalEmbeddingProvider {
 
 // ../plugin/src/features/magic-context/memory/embedding-openai.ts
 init_logger();
-function normalizeEndpoint2(endpoint) {
+
+// ../plugin/src/features/magic-context/memory/embedding-ssrf.ts
+var METADATA_HOSTNAMES = new Set(["metadata.google.internal", "metadata.goog"]);
+var IPV6_METADATA_HOSTS = new Set(["fd00:ec2::254"]);
+function isLinkLocalIpv4(host) {
+  return /^169\.254\.\d{1,3}\.\d{1,3}$/.test(host);
+}
+function ipv4FromMappedIpv6(host) {
+  const m = /^::ffff:(.+)$/.exec(host);
+  if (!m)
+    return null;
+  const tail = m[1];
+  if (/^\d{1,3}(\.\d{1,3}){3}$/.test(tail))
+    return tail;
+  const hex3 = /^([0-9a-f]{1,4}):([0-9a-f]{1,4})$/.exec(tail);
+  if (hex3) {
+    const hi = Number.parseInt(hex3[1], 16);
+    const lo = Number.parseInt(hex3[2], 16);
+    if (Number.isNaN(hi) || Number.isNaN(lo))
+      return null;
+    return `${hi >> 8 & 255}.${hi & 255}.${lo >> 8 & 255}.${lo & 255}`;
+  }
+  return null;
+}
+function blockedEmbeddingEndpointReason(endpoint) {
+  const trimmed = endpoint.trim();
+  if (trimmed.length === 0)
+    return null;
+  let url2;
+  try {
+    url2 = new URL(trimmed);
+  } catch {
+    return `embedding endpoint is not a valid URL: ${trimmed}`;
+  }
+  const host = url2.hostname.toLowerCase().replace(/^\[/, "").replace(/\]$/, "");
+  if (METADATA_HOSTNAMES.has(host)) {
+    return `embedding endpoint host ${host} is a cloud metadata service (blocked)`;
+  }
+  if (IPV6_METADATA_HOSTS.has(host)) {
+    return `embedding endpoint host ${host} is the AWS IPv6 metadata service (blocked)`;
+  }
+  if (isLinkLocalIpv4(host)) {
+    return `embedding endpoint host ${host} is link-local / cloud metadata (blocked)`;
+  }
+  const mappedV4 = ipv4FromMappedIpv6(host);
+  if (mappedV4 && isLinkLocalIpv4(mappedV4)) {
+    return `embedding endpoint host ${host} (IPv4-mapped ${mappedV4}) is link-local / cloud metadata (blocked)`;
+  }
+  if (host.startsWith("fe80:")) {
+    return `embedding endpoint host ${host} is link-local / cloud metadata (blocked)`;
+  }
+  return null;
+}
+
+// ../plugin/src/features/magic-context/memory/embedding-openai.ts
+function normalizeEndpoint3(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
 var FAILURE_THRESHOLD = 3;
@@ -158180,7 +158482,7 @@ class OpenAICompatibleEmbeddingProvider {
   openLogged = false;
   halfOpenProbeInFlight = false;
   constructor(options) {
-    this.endpoint = normalizeEndpoint2(options.endpoint);
+    this.endpoint = normalizeEndpoint3(options.endpoint);
     this.model = options.model?.trim() ?? "";
     this.apiKey = options.apiKey?.trim() ?? "";
     this.inputType = options.inputType?.trim() ?? "";
@@ -158200,6 +158502,12 @@ class OpenAICompatibleEmbeddingProvider {
       this.initialized = false;
       return false;
     }
+    const blockedReason = blockedEmbeddingEndpointReason(this.endpoint);
+    if (blockedReason) {
+      log(`[magic-context] embedding endpoint blocked: ${blockedReason}`);
+      this.initialized = false;
+      return false;
+    }
     this.initialized = true;
     return true;
   }
@@ -158245,6 +158553,7 @@ class OpenAICompatibleEmbeddingProvider {
           ...this.inputType ? { input_type: this.inputType } : {},
           ...this.truncate ? { truncate: this.truncate } : {}
         }),
+        redirect: "error",
         signal: internalController.signal
       });
       if (!response.ok) {
@@ -158725,11 +159034,15 @@ function resolveEmbeddingConfig(config2) {
   }
   if (config2.provider === "openai-compatible") {
     const apiKey = config2.api_key?.trim();
+    const inputType = config2.input_type?.trim();
+    const truncate = config2.truncate?.trim();
     return {
       provider: "openai-compatible",
       model: config2.model.trim(),
       endpoint: config2.endpoint.trim(),
-      ...apiKey ? { api_key: apiKey } : {}
+      ...apiKey ? { api_key: apiKey } : {},
+      ...inputType ? { input_type: inputType } : {},
+      ...truncate ? { truncate } : {}
     };
   }
   return { provider: "off" };
@@ -158745,7 +159058,9 @@ function createProvider(config2) {
     return new OpenAICompatibleEmbeddingProvider({
       endpoint: config2.endpoint,
       model: config2.model,
-      apiKey: config2.api_key
+      apiKey: config2.api_key,
+      inputType: config2.input_type,
+      truncate: config2.truncate
     });
   }
   return new LocalEmbeddingProvider(config2.model);
@@ -159184,6 +159499,19 @@ function hasGitDir(canonical) {
     return false;
   }
 }
+function normalizeStoredProjectPath(rawOrStored) {
+  if (rawOrStored.startsWith("git:") || rawOrStored.startsWith("dir:")) {
+    return rawOrStored;
+  }
+  try {
+    return resolveProjectIdentity(rawOrStored);
+  } catch {
+    return directoryFallback(rawOrStored);
+  }
+}
+function storedPathBelongsToIdentity(storedProjectPath, projectIdentity) {
+  return storedProjectPath === projectIdentity || normalizeStoredProjectPath(storedProjectPath) === projectIdentity;
+}
 
 // ../plugin/src/plugin/embedding-bootstrap-helpers.ts
 import { createHash as createHash5 } from "node:crypto";
@@ -159192,10 +159520,20 @@ var EMBEDDING_AFFECTING_KEYS = new Set([
   "embedding.api_key",
   "embedding.endpoint",
   "embedding.model",
-  "embedding.provider"
+  "embedding.provider",
+  "embedding.input_type",
+  "embedding.truncate"
 ]);
 var EMBEDDING_AFFECTING_TOP_LEVEL_KEYS = new Set(["embedding", "memory", "experimental"]);
-var EMBEDDING_WARNING_TERMS = ["api_key", "endpoint", "model", "provider", "embedding"];
+var EMBEDDING_WARNING_TERMS = [
+  "api_key",
+  "endpoint",
+  "model",
+  "provider",
+  "embedding",
+  "input_type",
+  "truncate"
+];
 var loggedFailureSignatures = new Map;
 function sha256Prefix2(value, length = 16) {
   return createHash5("sha256").update(value).digest("hex").slice(0, length);
@@ -159368,7 +159706,18 @@ 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",
+  "last_usage_context_limit",
+  "prior_boundary_ordinal",
+  "protected_tail_policy_version",
+  "protected_tail_drain_window_started_at",
+  "protected_tail_drain_tokens",
+  "recovery_no_eligible_head_count",
+  "force_emergency_bypass_window_start",
+  "force_emergency_bypass_used",
   "upgrade_reminded_at",
   "pi_stable_id_scheme"
 ];
@@ -159404,7 +159753,18 @@ 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",
+  lastUsageContextLimit: "last_usage_context_limit",
+  priorBoundaryOrdinal: "prior_boundary_ordinal",
+  protectedTailPolicyVersion: "protected_tail_policy_version",
+  protectedTailDrainWindowStartedAt: "protected_tail_drain_window_started_at",
+  protectedTailDrainTokens: "protected_tail_drain_tokens",
+  recoveryNoEligibleHeadCount: "recovery_no_eligible_head_count",
+  forceEmergencyBypassWindowStart: "force_emergency_bypass_window_start",
+  forceEmergencyBypassUsed: "force_emergency_bypass_used",
   upgradeRemindedAt: "upgrade_reminded_at",
   piStableIdScheme: "pi_stable_id_scheme"
 };
@@ -159446,7 +159806,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.last_usage_context_limit) && isNumberOrNull(r.prior_boundary_ordinal) && isNumberOrNull(r.protected_tail_policy_version) && isNumberOrNull(r.protected_tail_drain_window_started_at) && isNumberOrNull(r.protected_tail_drain_tokens) && isNumberOrNull(r.recovery_no_eligible_head_count) && isNumberOrNull(r.force_emergency_bypass_window_start) && isNumberOrNull(r.force_emergency_bypass_used) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.pi_stable_id_scheme);
 }
 function getDefaultSessionMeta(sessionId) {
   return {
@@ -159482,7 +159842,18 @@ function getDefaultSessionMeta(sessionId) {
     cachedM0MaterializedAt: null,
     cachedM0SessionFactsVersion: null,
     cachedM0UpgradeState: null,
+    cachedM0SystemHash: null,
+    cachedM0ToolSetHash: null,
+    cachedM0ModelKey: null,
     lastObservedModelKey: null,
+    lastUsageContextLimit: 0,
+    priorBoundaryOrdinal: 1,
+    protectedTailPolicyVersion: 0,
+    protectedTailDrainWindowStartedAt: 0,
+    protectedTailDrainTokens: 0,
+    recoveryNoEligibleHeadCount: 0,
+    forceEmergencyBypassWindowStart: 0,
+    forceEmergencyBypassUsed: 0,
     upgradeRemindedAt: null,
     piStableIdScheme: null
   };
@@ -159533,7 +159904,18 @@ 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),
+    lastUsageContextLimit: numOrZero(row.last_usage_context_limit),
+    priorBoundaryOrdinal: Math.max(1, numOrZero(row.prior_boundary_ordinal) || 1),
+    protectedTailPolicyVersion: numOrZero(row.protected_tail_policy_version),
+    protectedTailDrainWindowStartedAt: numOrZero(row.protected_tail_drain_window_started_at),
+    protectedTailDrainTokens: numOrZero(row.protected_tail_drain_tokens),
+    recoveryNoEligibleHeadCount: numOrZero(row.recovery_no_eligible_head_count),
+    forceEmergencyBypassWindowStart: numOrZero(row.force_emergency_bypass_window_start),
+    forceEmergencyBypassUsed: numOrZero(row.force_emergency_bypass_used),
     upgradeRemindedAt: numOrNull(row.upgrade_reminded_at),
     piStableIdScheme: numOrNull(row.pi_stable_id_scheme)
   };
@@ -159552,8 +159934,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);
@@ -159571,6 +159956,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],
@@ -159612,12 +160000,6 @@ function isCompartmentRow(row) {
   const candidate = row;
   return typeof candidate.id === "number" && typeof candidate.session_id === "string" && typeof candidate.sequence === "number" && typeof candidate.start_message === "number" && typeof candidate.end_message === "number" && typeof candidate.start_message_id === "string" && typeof candidate.end_message_id === "string" && typeof candidate.title === "string" && typeof candidate.content === "string" && isStringOrNullish(candidate.p1) && isStringOrNullish(candidate.p2) && isStringOrNullish(candidate.p3) && isStringOrNullish(candidate.p4) && isNumberOrNullish(candidate.importance) && isStringOrNullish(candidate.episode_type) && isNumberOrNullish(candidate.legacy) && typeof candidate.created_at === "number";
 }
-function isSessionFactRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const candidate = row;
-  return typeof candidate.id === "number" && typeof candidate.session_id === "string" && typeof candidate.category === "string" && typeof candidate.content === "string" && typeof candidate.created_at === "number" && typeof candidate.updated_at === "number";
-}
 function insertCompartmentRows(db, sessionId, compartments, now) {
   const stmt = getInsertCompartmentStatement(db);
   for (const compartment of compartments) {
@@ -159646,16 +160028,6 @@ function toCompartment(row) {
     createdAt: row.created_at
   };
 }
-function toSessionFact(row) {
-  return {
-    id: row.id,
-    sessionId: row.session_id,
-    category: row.category,
-    content: row.content,
-    createdAt: row.created_at,
-    updatedAt: row.updated_at
-  };
-}
 function getCompartments(db, sessionId) {
   const rows = db.prepare("SELECT * FROM compartments WHERE session_id = ? ORDER BY sequence ASC").all(sessionId).filter(isCompartmentRow);
   return rows.map(toCompartment);
@@ -159664,6 +160036,11 @@ function getLastCompartmentEndMessage(db, sessionId) {
   const row = db.prepare("SELECT MAX(end_message) as max_end FROM compartments WHERE session_id = ?").get(sessionId);
   return row?.max_end ?? -1;
 }
+function getLastCompartmentEndMessageId(db, sessionId) {
+  const row = db.prepare("SELECT end_message_id FROM compartments WHERE session_id = ? ORDER BY sequence DESC LIMIT 1").get(sessionId);
+  const id = row?.end_message_id;
+  return id && id.length > 0 ? id : null;
+}
 function getCompartmentsByEndMessageId(db, sessionId, endMessageId) {
   const rows = db.prepare("SELECT * FROM compartments WHERE session_id = ? AND end_message_id = ? ORDER BY sequence ASC").all(sessionId, endMessageId).filter(isCompartmentRow);
   return rows.map(toCompartment);
@@ -159676,10 +160053,6 @@ function appendCompartments(db, sessionId, compartments) {
     insertCompartmentRows(db, sessionId, compartments, now);
   })();
 }
-function getSessionFacts(db, sessionId) {
-  const rows = db.prepare("SELECT * FROM session_facts WHERE session_id = ? ORDER BY category ASC, id ASC").all(sessionId).filter(isSessionFactRow);
-  return rows.map(toSessionFact);
-}
 function saveRecompStagingPass(db, sessionId, passNumber, compartments, facts) {
   const now = Date.now();
   db.transaction(() => {
@@ -159723,14 +160096,6 @@ function getRecompStaging(db, sessionId) {
     lastEndMessage: lastEnd
   };
 }
-function invalidateAllMemoryBlockCaches(db) {
-  try {
-    const rows = db.prepare("SELECT session_id FROM session_meta").all();
-    for (const row of rows) {
-      clearCachedM0M1(db, row.session_id);
-    }
-  } catch {}
-}
 function clearRecompStaging(db, sessionId) {
   db.transaction(() => {
     db.prepare("DELETE FROM recomp_compartments WHERE session_id = ?").run(sessionId);
@@ -159777,8 +160142,49 @@ function escapeXmlContent(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 
-// ../plugin/src/hooks/magic-context/read-session-chunk.ts
-await init_read_session_db();
+// ../plugin/src/hooks/magic-context/read-session-db.ts
+init_data_path();
+init_logger();
+import { existsSync as existsSync6 } from "node:fs";
+import { join as join7 } from "node:path";
+function getOpenCodeDbPath() {
+  return join7(getDataDir(), "opencode", "opencode.db");
+}
+function openCodeDbExists() {
+  return existsSync6(getOpenCodeDbPath());
+}
+var cachedReadOnlyDb = null;
+function closeCachedReadOnlyDb() {
+  if (!cachedReadOnlyDb) {
+    return;
+  }
+  try {
+    closeQuietly(cachedReadOnlyDb.db);
+  } catch (error51) {
+    log("[magic-context] failed to close cached OpenCode read-only DB:", error51);
+  } 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;
+}
 
 // ../plugin/src/hooks/magic-context/read-session-raw.ts
 function isRawMessageRow(row) {
@@ -159811,13 +160217,27 @@ function parseJsonUnknown(value) {
     return null;
   }
 }
+function attachRawPartVersion(value, timeUpdated) {
+  if (value === null || typeof value !== "object" || Array.isArray(value))
+    return value;
+  if (typeof timeUpdated !== "number")
+    return value;
+  try {
+    Object.defineProperty(value, "__magicContextPartUpdatedAt", {
+      value: timeUpdated,
+      enumerable: false,
+      configurable: true
+    });
+  } catch {}
+  return value;
+}
 function readRawSessionMessagesFromDb(db, sessionId) {
-  const messageRows = db.prepare("SELECT id, data FROM message WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawMessageRow);
-  const partRows = db.prepare("SELECT message_id, data FROM part WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawPartRow);
+  const messageRows = db.prepare("SELECT id, data, time_updated FROM message WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawMessageRow);
+  const partRows = db.prepare("SELECT message_id, data, time_updated FROM part WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawPartRow);
   const partsByMessageId = new Map;
   for (const part of partRows) {
     const list = partsByMessageId.get(part.message_id) ?? [];
-    list.push(parseJsonUnknown(part.data));
+    list.push(attachRawPartVersion(parseJsonUnknown(part.data), part.time_updated));
     partsByMessageId.set(part.message_id, list);
   }
   const filtered = messageRows.filter((row) => {
@@ -159833,10 +160253,63 @@ function readRawSessionMessagesFromDb(db, sessionId) {
       ordinal: index + 1,
       id: row.id,
       role,
-      parts: partsByMessageId.get(row.id) ?? []
+      parts: partsByMessageId.get(row.id) ?? [],
+      version: row.time_updated ?? null
     };
   });
 }
+function isAnchorRow(row) {
+  return row !== null && typeof row === "object" && typeof row.time_created === "number" && typeof row.id === "string";
+}
+function readRawSessionTailFromDb(db, sessionId, baseOrdinal, anchorMessageId) {
+  const anchorRow = db.prepare("SELECT time_created, id, data FROM message WHERE id = ? AND session_id = ?").get(anchorMessageId, sessionId);
+  if (!isAnchorRow(anchorRow))
+    return null;
+  const anchorInfo = parseJsonRecord(anchorRow.data ?? "");
+  if (anchorInfo?.summary === true && anchorInfo?.finish === "stop")
+    return null;
+  const messageRows = db.prepare(`SELECT id, data, time_updated FROM message
+             WHERE session_id = ?
+               AND (time_created > ? OR (time_created = ? AND id >= ?))
+             ORDER BY time_created ASC, id ASC`).all(sessionId, anchorRow.time_created, anchorRow.time_created, anchorRow.id).filter(isRawMessageRow);
+  const filtered = messageRows.filter((row) => {
+    const info = parseJsonRecord(row.data);
+    return !(info?.summary === true && info?.finish === "stop");
+  });
+  const ids = filtered.map((row) => row.id);
+  const partsByMessageId = new Map;
+  if (ids.length > 0) {
+    const CHUNK = 800;
+    for (let i = 0;i < ids.length; i += CHUNK) {
+      const slice = ids.slice(i, i + CHUNK);
+      const placeholders = slice.map(() => "?").join(",");
+      const partRows = db.prepare(`SELECT message_id, data, time_updated FROM part WHERE session_id = ? AND message_id IN (${placeholders}) ORDER BY time_created ASC, id ASC`).all(sessionId, ...slice).filter(isRawPartRow);
+      for (const part of partRows) {
+        const list = partsByMessageId.get(part.message_id) ?? [];
+        list.push(attachRawPartVersion(parseJsonUnknown(part.data), part.time_updated));
+        partsByMessageId.set(part.message_id, list);
+      }
+    }
+  }
+  const messages = [];
+  let ord = baseOrdinal;
+  for (const row of filtered) {
+    const info = parseJsonRecord(row.data);
+    if (!info) {
+      ord += 1;
+      continue;
+    }
+    messages.push({
+      ordinal: ord,
+      id: row.id,
+      role: typeof info.role === "string" ? info.role : "unknown",
+      parts: partsByMessageId.get(row.id) ?? [],
+      version: row.time_updated ?? null
+    });
+    ord += 1;
+  }
+  return { messages, absoluteMessageCount: Math.max(0, ord - 1) };
+}
 
 // ../plugin/src/hooks/magic-context/tag-content-primitives.ts
 var encoder = new TextEncoder;
@@ -159981,6 +160454,7 @@ class ToolMutationBatch {
 
 // ../plugin/src/hooks/magic-context/read-session-chunk.ts
 var activeRawMessageCache = null;
+var activeAbsoluteCountCache = null;
 var sessionProviders = new Map;
 function setRawMessageProvider(sessionId, provider2) {
   sessionProviders.set(sessionId, provider2);
@@ -160012,12 +160486,14 @@ function withRawSessionMessageCache(fn) {
   const outerCache = activeRawMessageCache;
   if (!outerCache) {
     activeRawMessageCache = new Map;
+    activeAbsoluteCountCache = new Map;
   }
   try {
     return fn();
   } finally {
     if (!outerCache) {
       activeRawMessageCache = null;
+      activeAbsoluteCountCache = null;
     }
   }
 }
@@ -160033,6 +160509,40 @@ function readRawSessionMessages(sessionId) {
   }
   return readRawSessionMessagesFromSource(sessionId);
 }
+function primeTailRawMessageCache(args) {
+  const { sessionId, lastCompartmentEnd, anchorMessageId } = args;
+  if (!activeRawMessageCache)
+    return false;
+  if (activeRawMessageCache.has(sessionId))
+    return false;
+  if (sessionProviders.has(sessionId))
+    return false;
+  if (!openCodeDbExists())
+    return false;
+  if (lastCompartmentEnd < 1 || !anchorMessageId)
+    return false;
+  const result = withReadOnlySessionDb((db) => readRawSessionTailFromDb(db, sessionId, lastCompartmentEnd, anchorMessageId));
+  if (!result)
+    return false;
+  activeRawMessageCache.set(sessionId, result.messages);
+  activeAbsoluteCountCache?.set(sessionId, result.absoluteMessageCount);
+  return true;
+}
+function getCachedAbsoluteMessageCount(sessionId) {
+  return activeAbsoluteCountCache?.get(sessionId) ?? null;
+}
+function primeInMemoryTailRawMessageCache(args) {
+  const { sessionId, messages, absoluteMessageCount } = args;
+  if (!activeRawMessageCache)
+    return false;
+  if (activeRawMessageCache.has(sessionId))
+    return false;
+  if (sessionProviders.has(sessionId))
+    return false;
+  activeRawMessageCache.set(sessionId, messages);
+  activeAbsoluteCountCache?.set(sessionId, absoluteMessageCount);
+  return true;
+}
 function readRawSessionMessagesFromSource(sessionId) {
   const provider2 = sessionProviders.get(sessionId);
   if (provider2)
@@ -160097,7 +160607,7 @@ function getRawSessionTagKeysThrough(sessionId, upToMessageIndex) {
   return { messageFileKeys, toolObservations };
 }
 var PROTECTED_TAIL_USER_TURNS = 5;
-function getProtectedTailStartOrdinal(sessionId) {
+function getLegacyProtectedTailStartOrdinal(sessionId) {
   const messages = readRawSessionMessages(sessionId);
   const userOrdinals = messages.filter((m) => m.role === "user" && hasMeaningfulUserText(m.parts)).map((m) => m.ordinal);
   if (userOrdinals.length < PROTECTED_TAIL_USER_TURNS) {
@@ -160107,6 +160617,7 @@ function getProtectedTailStartOrdinal(sessionId) {
 }
 function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal) {
   const messages = readRawSessionMessages(sessionId);
+  const totalMessageCount = getCachedAbsoluteMessageCount(sessionId) ?? messages.length;
   const startOrdinal = Math.max(1, offset);
   const lines = [];
   const lineMeta = [];
@@ -160234,7 +160745,7 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     endMessageId: lastMessageId,
     messageCount: messagesProcessed,
     tokenEstimate: totalTokens,
-    hasMore: lastOrdinal < (eligibleEndOrdinal !== undefined ? Math.min(eligibleEndOrdinal - 1, messages.length) : messages.length),
+    hasMore: lastOrdinal < (eligibleEndOrdinal !== undefined ? Math.min(eligibleEndOrdinal - 1, totalMessageCount) : totalMessageCount),
     text: lines.join(`
 `),
     lines: lineMeta,
@@ -160244,7 +160755,13 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
 }
 
 // ../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.";
+var CTX_EXPAND_DESCRIPTION = `Recover the original conversation from your compacted history.
+
+Older parts of this session are summarized into <compartment> blocks inside <session-history> — e.g. <compartment start="120" end="245" title="Fixed tagger collision">. Each one replaces the raw messages in that ordinal range with a summary. When the summary isn't enough — you need exact wording, a specific value, an error message, or the reasoning behind a decision — expand the range:
+
+ctx_expand(start=120, end=245)  ← the compartment's own start/end attributes
+
+Returns the raw transcript as [N] U:/A: lines, capped at ~15K tokens; an oversized range returns the head and tells you where to continue. Also works with ordinals from ctx_search message results — expand a window around a hit (e.g. start=N-10, end=N+5). Ranges after the last compartment are your live tail — already visible in context, not expandable.`;
 var CTX_EXPAND_TOKEN_BUDGET = 15000;
 
 // ../../node_modules/.bun/typebox@1.1.38/node_modules/typebox/build/system/memory/memory.mjs
@@ -164413,11 +164930,31 @@ function findLastModelKeyFromBranch(entries) {
   }
   return;
 }
+function rawEntryVersion(entry) {
+  const record4 = entry;
+  const updated = record4.updatedAt ?? record4.updated_at ?? record4.timestamp;
+  return typeof updated === "string" || typeof updated === "number" ? updated : entry.id;
+}
+function attachPiPartVersion(parts, version2) {
+  return parts.map((part) => {
+    if (part === null || typeof part !== "object" || Array.isArray(part))
+      return part;
+    try {
+      Object.defineProperty(part, "__magicContextPartUpdatedAt", {
+        value: version2,
+        enumerable: false,
+        configurable: true
+      });
+    } catch {}
+    return part;
+  });
+}
 function convertEntriesToRawMessages(entries) {
   const result = [];
   let nextOrdinal = 1;
   let pendingToolParts = [];
   let pendingFirstRealId = "";
+  let pendingFirstRealVersion = "";
   for (const entry of entries) {
     if (!isMessageEntry(entry)) {
       continue;
@@ -164425,24 +164962,29 @@ function convertEntriesToRawMessages(entries) {
     const msg = entry.message;
     const role = msg.role;
     if (role === "toolResult") {
-      pendingToolParts.push(...synthesizeToolResultParts(msg));
+      const version2 = rawEntryVersion(entry);
+      pendingToolParts.push(...attachPiPartVersion(synthesizeToolResultParts(msg), version2));
       if (pendingFirstRealId === "") {
         pendingFirstRealId = entry.id;
+        pendingFirstRealVersion = version2;
       }
       continue;
     }
     if (role === "user") {
+      const version2 = rawEntryVersion(entry);
       const parts = [
         ...pendingToolParts,
-        ...synthesizeUserParts(msg)
+        ...attachPiPartVersion(synthesizeUserParts(msg), version2)
       ];
       pendingToolParts = [];
       pendingFirstRealId = "";
+      pendingFirstRealVersion = "";
       result.push({
         ordinal: nextOrdinal++,
         id: entry.id,
         role: "user",
-        parts
+        parts,
+        version: version2
       });
       continue;
     }
@@ -164452,16 +164994,20 @@ function convertEntriesToRawMessages(entries) {
           ordinal: nextOrdinal++,
           id: `${SYNTH_USER_ID_PREFIX}${pendingFirstRealId}`,
           role: "user",
-          parts: pendingToolParts
+          parts: pendingToolParts,
+          version: pendingFirstRealVersion
         });
         pendingToolParts = [];
         pendingFirstRealId = "";
+        pendingFirstRealVersion = "";
       }
+      const version2 = rawEntryVersion(entry);
       result.push({
         ordinal: nextOrdinal++,
         id: entry.id,
         role: "assistant",
-        parts: synthesizeAssistantParts(msg)
+        parts: attachPiPartVersion(synthesizeAssistantParts(msg), version2),
+        version: version2
       });
       continue;
     }
@@ -164469,7 +165015,8 @@ function convertEntriesToRawMessages(entries) {
       ordinal: nextOrdinal++,
       id: entry.id,
       role: typeof role === "string" ? role : "unknown",
-      parts: []
+      parts: [],
+      version: rawEntryVersion(entry)
     });
   }
   if (pendingToolParts.length > 0) {
@@ -164477,7 +165024,8 @@ function convertEntriesToRawMessages(entries) {
       ordinal: nextOrdinal,
       id: `${SYNTH_USER_ID_PREFIX}${pendingFirstRealId}`,
       role: "user",
-      parts: pendingToolParts
+      parts: pendingToolParts,
+      version: pendingFirstRealVersion
     });
   }
   return result;
@@ -164634,6 +165182,13 @@ function createCtxExpandTool(deps) {
 }
 
 // ../plugin/src/features/magic-context/memory/constants.ts
+var V2_MEMORY_CATEGORIES = [
+  "PROJECT_RULES",
+  "ARCHITECTURE",
+  "CONSTRAINTS",
+  "CONFIG_VALUES",
+  "NAMING"
+];
 var PROMOTABLE_CATEGORIES = [
   "PROJECT_RULES",
   "ARCHITECTURE",
@@ -165385,7 +165940,7 @@ function indexMessagesAfterOrdinal(db, sessionId, messages, lastIndexedOrdinal,
 }
 // ../plugin/src/features/magic-context/project-docs-hash.ts
 import { createHash as createHash6 } from "node:crypto";
-import { readFileSync as readFileSync4, statSync as statSync2 } from "node:fs";
+import { lstatSync, readFileSync as readFileSync4, statSync as statSync2 } from "node:fs";
 import path4 from "node:path";
 var PROJECT_DOC_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 var PROJECT_DOCS_DELIMITER = `
@@ -165393,6 +165948,7 @@ var PROJECT_DOCS_DELIMITER = `
 ---
 
 `;
+var MAX_PROJECT_DOC_BYTES = 256 * 1024;
 var docsCache = new Map;
 function canonicalizeDocContent(raw) {
   return raw.replace(/^\uFEFF/, "").replace(/\r\n/g, `
@@ -165402,9 +165958,10 @@ function canonicalizeDocContent(raw) {
 }
 function fingerprintFile(filePath) {
   try {
-    const stat2 = statSync2(filePath);
+    const stat2 = lstatSync(filePath);
+    const isReadableDoc = stat2.isFile() && stat2.size <= MAX_PROJECT_DOC_BYTES;
     return {
-      exists: stat2.isFile(),
+      exists: isReadableDoc,
       mtimeMs: stat2.mtimeMs,
       size: stat2.size
     };
@@ -165447,6 +166004,16 @@ function readCanonicalPieces(projectDirectory, files) {
     if (!fingerprint?.exists) {
       continue;
     }
+    let safeToRead = false;
+    try {
+      const st = lstatSync(filePath);
+      safeToRead = st.isFile() && st.size <= MAX_PROJECT_DOC_BYTES;
+    } catch {
+      safeToRead = false;
+    }
+    if (!safeToRead) {
+      continue;
+    }
     const canonicalContent = canonicalizeDocContent(readFileSync4(filePath, "utf8"));
     hashPieces.push(`file:${filename}
 ${canonicalContent}`);
@@ -165623,12 +166190,6 @@ var AUTO_SEARCH_NO_HINT_REASONS = new Set([
   "stacked",
   "too-short"
 ]);
-function isPersistedStickyTurnReminderRow(row) {
-  if (row === null || typeof row !== "object")
-    return false;
-  const r = row;
-  return typeof r.sticky_turn_reminder_text === "string" && typeof r.sticky_turn_reminder_message_id === "string";
-}
 function isPersistedNoteNudgeRow(row) {
   if (row === null || typeof row !== "object")
     return false;
@@ -165694,6 +166255,139 @@ function getDefaultHistorianFailureState() {
     lastFailureAt: null
   };
 }
+var DEFAULT_PROTECTED_TAIL_META = {
+  priorBoundaryOrdinal: 1,
+  protectedTailPolicyVersion: 0,
+  protectedTailDrainWindowStartedAt: 0,
+  protectedTailDrainTokens: 0,
+  recoveryNoEligibleHeadCount: 0,
+  forceEmergencyBypassWindowStart: 0,
+  forceEmergencyBypassUsed: 0
+};
+function toProtectedTailMeta(row) {
+  if (row === null || typeof row !== "object")
+    return { ...DEFAULT_PROTECTED_TAIL_META };
+  const r = row;
+  const numberOr = (value, fallback) => typeof value === "number" && Number.isFinite(value) ? value : fallback;
+  return {
+    priorBoundaryOrdinal: Math.max(1, numberOr(r.prior_boundary_ordinal, 1)),
+    protectedTailPolicyVersion: numberOr(r.protected_tail_policy_version, 0),
+    protectedTailDrainWindowStartedAt: numberOr(r.protected_tail_drain_window_started_at, 0),
+    protectedTailDrainTokens: numberOr(r.protected_tail_drain_tokens, 0),
+    recoveryNoEligibleHeadCount: numberOr(r.recovery_no_eligible_head_count, 0),
+    forceEmergencyBypassWindowStart: numberOr(r.force_emergency_bypass_window_start, 0),
+    forceEmergencyBypassUsed: numberOr(r.force_emergency_bypass_used, 0)
+  };
+}
+function loadProtectedTailMeta(db, sessionId) {
+  ensureSessionMetaRow(db, sessionId);
+  const row = db.prepare(`SELECT prior_boundary_ordinal, protected_tail_policy_version,
+                    protected_tail_drain_window_started_at, protected_tail_drain_tokens,
+                    recovery_no_eligible_head_count, force_emergency_bypass_window_start,
+                    force_emergency_bypass_used
+             FROM session_meta WHERE session_id = ?`).get(sessionId);
+  return toProtectedTailMeta(row);
+}
+function markProtectedTailPolicyV3Seeded(db, sessionId, priorBoundaryOrdinal) {
+  let seeded = false;
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    const existing = loadProtectedTailMeta(db, sessionId);
+    if (existing.protectedTailPolicyVersion < 3) {
+      db.prepare(`UPDATE session_meta
+                 SET prior_boundary_ordinal = ?, protected_tail_policy_version = 3
+                 WHERE session_id = ? AND protected_tail_policy_version < 3`).run(Math.max(1, Math.floor(priorBoundaryOrdinal)), sessionId);
+      seeded = true;
+    }
+  })();
+  return { ...loadProtectedTailMeta(db, sessionId), seeded };
+}
+function recordProtectedTailPublicationFloor(db, sessionId, floorOrdinal) {
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare(`UPDATE session_meta
+             SET prior_boundary_ordinal = MAX(COALESCE(prior_boundary_ordinal, 1), ?),
+                 recovery_no_eligible_head_count = 0
+             WHERE session_id = ?`).run(Math.max(1, Math.floor(floorOrdinal)), sessionId);
+  })();
+}
+function recordProtectedTailNoEligibleHead(db, sessionId) {
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare(`UPDATE session_meta
+             SET recovery_no_eligible_head_count = COALESCE(recovery_no_eligible_head_count, 0) + 1
+             WHERE session_id = ?`).run(sessionId);
+  })();
+  return loadProtectedTailMeta(db, sessionId).recoveryNoEligibleHeadCount;
+}
+var DRAIN_WINDOW_MS = 10 * 60 * 1000;
+function protectedTailWindowBudget(usagePercentage, usable, perRunCap) {
+  if (usagePercentage >= 95)
+    return Math.min(1e6, Math.max(4 * perRunCap, Math.round(0.5 * usable)));
+  if (usagePercentage >= 80)
+    return Math.min(750000, Math.max(3 * perRunCap, Math.round(0.35 * usable)));
+  return Math.min(500000, Math.max(perRunCap, Math.round(0.2 * usable)));
+}
+function reserveProtectedTailDrainTokens(args) {
+  const now = args.now ?? Date.now();
+  const requested = Math.max(0, Math.floor(args.trueRawTokens));
+  if (requested === 0) {
+    return { ok: true, reservedTokens: 0, overQuotaBypass: false, reservation: null };
+  }
+  let result = {
+    ok: false,
+    reservedTokens: 0,
+    overQuotaBypass: false,
+    reservation: null,
+    skippedReason: "quota exhausted"
+  };
+  args.db.transaction(() => {
+    ensureSessionMetaRow(args.db, args.sessionId);
+    let meta3 = loadProtectedTailMeta(args.db, args.sessionId);
+    if (now - meta3.protectedTailDrainWindowStartedAt > DRAIN_WINDOW_MS) {
+      args.db.prepare(`UPDATE session_meta
+                     SET protected_tail_drain_window_started_at = ?, protected_tail_drain_tokens = 0,
+                         force_emergency_bypass_window_start = ?, force_emergency_bypass_used = 0
+                     WHERE session_id = ?`).run(now, now, args.sessionId);
+      meta3 = loadProtectedTailMeta(args.db, args.sessionId);
+    }
+    const budget = protectedTailWindowBudget(args.usagePercentage, args.usable, args.perRunCap);
+    const remaining = Math.max(0, budget - meta3.protectedTailDrainTokens);
+    let reserved = Math.min(requested, args.perRunCap, remaining);
+    let bypass = false;
+    const bypassWindowExpired = now - meta3.forceEmergencyBypassWindowStart > DRAIN_WINDOW_MS;
+    const bypassUsed = bypassWindowExpired ? 0 : meta3.forceEmergencyBypassUsed;
+    if (reserved <= 0 && args.usagePercentage >= 95 && bypassUsed === 0) {
+      reserved = Math.min(requested, args.perRunCap);
+      bypass = true;
+    }
+    if (reserved <= 0)
+      return;
+    args.db.prepare(`UPDATE session_meta
+                 SET protected_tail_drain_window_started_at = CASE WHEN protected_tail_drain_window_started_at = 0 THEN ? ELSE protected_tail_drain_window_started_at END,
+                     protected_tail_drain_tokens = COALESCE(protected_tail_drain_tokens, 0) + ?,
+                     force_emergency_bypass_window_start = CASE WHEN ? THEN ? ELSE force_emergency_bypass_window_start END,
+                     force_emergency_bypass_used = CASE WHEN ? THEN 1 ELSE force_emergency_bypass_used END
+                 WHERE session_id = ?`).run(now, reserved, bypass ? 1 : 0, now, bypass ? 1 : 0, args.sessionId);
+    result = {
+      ok: true,
+      reservedTokens: reserved,
+      overQuotaBypass: bypass,
+      reservation: { sessionId: args.sessionId, runId: args.runId, tokens: reserved }
+    };
+  })();
+  return result;
+}
+function rollbackProtectedTailDrainReservation(db, reservation) {
+  if (!reservation || reservation.tokens <= 0)
+    return;
+  db.transaction(() => {
+    ensureSessionMetaRow(db, reservation.sessionId);
+    db.prepare(`UPDATE session_meta
+             SET protected_tail_drain_tokens = MAX(0, COALESCE(protected_tail_drain_tokens, 0) - ?)
+             WHERE session_id = ?`).run(reservation.tokens, reservation.sessionId);
+  })();
+}
 function setPersistedReasoningWatermark(db, sessionId, tagNumber) {
   ensureSessionMetaRow(db, sessionId);
   db.prepare("UPDATE session_meta SET cleared_reasoning_through_tag = ? WHERE session_id = ?").run(tagNumber, sessionId);
@@ -165701,27 +166395,95 @@ function setPersistedReasoningWatermark(db, sessionId, tagNumber) {
 function clearPersistedReasoningWatermark(db, sessionId) {
   setPersistedReasoningWatermark(db, sessionId, 0);
 }
-function getPersistedStickyTurnReminder(db, sessionId) {
-  const result = db.prepare("SELECT sticky_turn_reminder_text, sticky_turn_reminder_message_id FROM session_meta WHERE session_id = ?").get(sessionId);
-  if (!isPersistedStickyTurnReminderRow(result)) {
-    return null;
-  }
-  if (result.sticky_turn_reminder_text.length === 0) {
-    return null;
-  }
-  return {
-    text: result.sticky_turn_reminder_text,
-    messageId: result.sticky_turn_reminder_message_id.length > 0 ? result.sticky_turn_reminder_message_id : null
-  };
+function isEmergencyInputSampleRow(row) {
+  return typeof row === "object" && row !== null && typeof row.last_emergency_input_sample === "number";
+}
+function getEmergencyInputSample(db, sessionId) {
+  const result = db.prepare("SELECT last_emergency_input_sample FROM session_meta WHERE session_id = ?").get(sessionId);
+  return isEmergencyInputSampleRow(result) ? result.last_emergency_input_sample : 0;
+}
+function setEmergencyDropSample(db, sessionId, inputSample) {
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare("UPDATE session_meta SET last_emergency_input_sample = ? WHERE session_id = ?").run(Math.max(0, Math.round(inputSample)), sessionId);
+  })();
 }
-function setPersistedStickyTurnReminder(db, sessionId, text, messageId = "") {
+function clearEmergencyDropSample(db, sessionId) {
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
-    db.prepare("UPDATE session_meta SET sticky_turn_reminder_text = ?, sticky_turn_reminder_message_id = ? WHERE session_id = ?").run(text, messageId, sessionId);
+    db.prepare("UPDATE session_meta SET last_emergency_input_sample = 0 WHERE session_id = ?").run(sessionId);
   })();
 }
-function clearPersistedStickyTurnReminder(db, sessionId) {
-  db.prepare("UPDATE session_meta SET sticky_turn_reminder_text = '', sticky_turn_reminder_message_id = '' WHERE session_id = ?").run(sessionId);
+function isLastNudgeUndroppedRow(row) {
+  return typeof row === "object" && row !== null && typeof row.last_nudge_undropped === "number";
+}
+function isLastNudgeLevelRow(row) {
+  return typeof row === "object" && row !== null && typeof row.last_nudge_level === "string";
+}
+function normalizeLastNudgeLevel(value) {
+  return value === "gentle" || value === "firm" || value === "urgent" ? value : "";
+}
+function getLastNudgeUndropped(db, sessionId) {
+  const result = db.prepare("SELECT last_nudge_undropped FROM session_meta WHERE session_id = ?").get(sessionId);
+  return isLastNudgeUndroppedRow(result) ? result.last_nudge_undropped : 0;
+}
+function setLastNudgeUndropped(db, sessionId, value) {
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare("UPDATE session_meta SET last_nudge_undropped = ? WHERE session_id = ?").run(Math.max(0, Math.round(value)), sessionId);
+  })();
+}
+function getLastNudgeLevel(db, sessionId) {
+  const result = db.prepare("SELECT last_nudge_level FROM session_meta WHERE session_id = ?").get(sessionId);
+  return isLastNudgeLevelRow(result) ? normalizeLastNudgeLevel(result.last_nudge_level) : "";
+}
+function setLastNudgeLevel(db, sessionId, value) {
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare("UPDATE session_meta SET last_nudge_level = ? WHERE session_id = ?").run(normalizeLastNudgeLevel(value), sessionId);
+  })();
+}
+function resetLastNudgeCycle(db, sessionId) {
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    db.prepare("UPDATE session_meta SET last_nudge_undropped = 0, last_nudge_level = '' WHERE session_id = ?").run(sessionId);
+  })();
+}
+function resetLastNudgeCycleIfTailShrank(db, sessionId, measuredUndropped) {
+  let changed = false;
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    const result = db.prepare("UPDATE session_meta SET last_nudge_undropped = 0, last_nudge_level = '' WHERE session_id = ? AND last_nudge_undropped > ?").run(sessionId, Math.max(0, Math.round(measuredUndropped)));
+    changed = (result.changes ?? 0) > 0;
+  })();
+  return changed;
+}
+function isChannel2StateRow(row) {
+  return typeof row === "object" && row !== null && typeof row.channel2_nudge_state === "string";
+}
+function getChannel2NudgeState(db, sessionId) {
+  const result = db.prepare("SELECT channel2_nudge_state FROM session_meta WHERE session_id = ?").get(sessionId);
+  if (!isChannel2StateRow(result))
+    return "";
+  const raw = result.channel2_nudge_state;
+  return raw === "pending" || raw === "claimed" || raw === "delivered" ? raw : "";
+}
+function setChannel2NudgeState(db, sessionId, state) {
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    const claimedAt = state === "claimed" ? Date.now() : 0;
+    db.prepare("UPDATE session_meta SET channel2_nudge_state = ?, channel2_nudge_claimed_at = ? WHERE session_id = ?").run(state, claimedAt, sessionId);
+  })();
+}
+function casChannel2NudgeState(db, sessionId, from, to) {
+  let changed = false;
+  db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    const claimedAt = to === "claimed" ? Date.now() : 0;
+    const result = db.prepare("UPDATE session_meta SET channel2_nudge_state = ?, channel2_nudge_claimed_at = ? WHERE session_id = ? AND channel2_nudge_state = ?").run(to, claimedAt, sessionId, from);
+    changed = (result.changes ?? 0) > 0;
+  })();
+  return changed;
 }
 function getPersistedNoteNudge(db, sessionId) {
   const result = db.prepare("SELECT note_nudge_trigger_pending, note_nudge_trigger_message_id, note_nudge_sticky_text, note_nudge_sticky_message_id FROM session_meta WHERE session_id = ?").get(sessionId);
@@ -165768,7 +166530,8 @@ function casUpdateJsonArrayColumn(db, sessionId, column, validator, mutate, opti
   }
   for (let attempt = 0;attempt < CAS_RETRY_LIMIT; attempt += 1) {
     const row = db.prepare(`SELECT ${column} FROM session_meta WHERE session_id = ?`).get(sessionId);
-    const currentBlob = row?.[column] ?? "[]";
+    const rawCurrent = row?.[column] ?? null;
+    const currentBlob = rawCurrent ?? "[]";
     const current = parseJsonArray(currentBlob, validator);
     const next = mutate(current);
     if (next === null)
@@ -165776,7 +166539,7 @@ function casUpdateJsonArrayColumn(db, sessionId, column, validator, mutate, opti
     const nextBlob = stableStringify(next);
     if (nextBlob === currentBlob)
       return true;
-    const result = db.prepare(`UPDATE session_meta SET ${column} = ? WHERE session_id = ? AND ${column} = ?`).run(nextBlob, sessionId, currentBlob);
+    const result = db.prepare(`UPDATE session_meta SET ${column} = ? WHERE session_id = ? AND ${column} IS ?`).run(nextBlob, sessionId, rawCurrent);
     if (result.changes > 0)
       return true;
   }
@@ -165905,14 +166668,16 @@ function getHistorianFailureState(db, sessionId) {
   };
 }
 function incrementHistorianFailure(db, sessionId, error51) {
+  let nextCount = 1;
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
     const current = getHistorianFailureState(db, sessionId);
-    const nextCount = current.failureCount + 1;
+    nextCount = current.failureCount + 1;
     db.prepare("UPDATE session_meta SET historian_failure_count = ?, historian_last_error = ?, historian_last_failure_at = ? WHERE session_id = ?").run(nextCount, error51, Date.now(), sessionId);
     const reason = error51.replace(/\s+/g, " ").trim().slice(0, 300);
     sessionLog(sessionId, `historian failure recorded: count=${nextCount} reason="${reason}"`);
   })();
+  return nextCount;
 }
 function clearHistorianFailureState(db, sessionId) {
   db.transaction(() => {
@@ -165942,7 +166707,11 @@ function recordOverflowDetected(db, sessionId, reportedLimit) {
 function clearEmergencyRecovery(db, sessionId) {
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
-    db.prepare("UPDATE session_meta SET needs_emergency_recovery = 0 WHERE session_id = ?").run(sessionId);
+    try {
+      db.prepare("UPDATE session_meta SET needs_emergency_recovery = 0, recovery_no_eligible_head_count = 0 WHERE session_id = ?").run(sessionId);
+    } catch {
+      db.prepare("UPDATE session_meta SET needs_emergency_recovery = 0 WHERE session_id = ?").run(sessionId);
+    }
   })();
 }
 function clearDetectedContextLimit(db, sessionId) {
@@ -165981,10 +166750,39 @@ function getStrippedPlaceholderIds(db, sessionId) {
   } catch {}
   return new Set;
 }
-function setStrippedPlaceholderIds(db, sessionId, ids) {
+function applyStrippedPlaceholderDelta(db, sessionId, delta) {
+  const add = delta.add ? [...delta.add] : [];
+  const remove = delta.remove ? [...delta.remove] : [];
+  if (add.length === 0 && remove.length === 0)
+    return true;
   ensureSessionMetaRow(db, sessionId);
-  const json2 = ids.size > 0 ? JSON.stringify([...ids]) : "";
-  db.prepare("UPDATE session_meta SET stripped_placeholder_ids = ? WHERE session_id = ?").run(json2, sessionId);
+  for (let attempt = 0;attempt < CAS_RETRY_LIMIT; attempt += 1) {
+    const row = db.prepare("SELECT stripped_placeholder_ids FROM session_meta WHERE session_id = ?").get(sessionId);
+    const rawStored = row ? row.stripped_placeholder_ids ?? null : null;
+    const current = new Set(parseStrippedBlob(rawStored));
+    for (const id of add)
+      current.add(id);
+    for (const id of remove)
+      current.delete(id);
+    const nextBlob = current.size > 0 ? JSON.stringify([...current]) : "";
+    if (nextBlob === (rawStored ?? ""))
+      return true;
+    const result = db.prepare("UPDATE session_meta SET stripped_placeholder_ids = ? WHERE session_id = ? AND stripped_placeholder_ids IS ?").run(nextBlob, sessionId, rawStored);
+    if (result.changes > 0)
+      return true;
+  }
+  sessionLog(sessionId, `stripped_placeholder_ids CAS: ${CAS_RETRY_LIMIT} retries exhausted`);
+  return false;
+}
+function parseStrippedBlob(raw) {
+  if (!raw || raw.length === 0)
+    return [];
+  try {
+    const parsed = JSON.parse(raw);
+    if (Array.isArray(parsed))
+      return parsed.filter((v) => typeof v === "string");
+  } catch {}
+  return [];
 }
 function isPendingCompactionMarker(value) {
   return typeof value === "object" && value !== null && typeof value.ordinal === "number" && typeof value.endMessageId === "string" && typeof value.publishedAt === "number";
@@ -166077,7 +166875,6 @@ 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) => {
@@ -166111,6 +166908,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"
 };
@@ -166293,7 +167093,8 @@ function updateNote(db, noteId, updates, scope) {
     sets.push("session_id = ?");
     params.push(updates.sessionId);
   }
-  if (updates.status !== undefined) {
+  const smartConditionChanged = existing.type === "smart" && updates.surfaceCondition !== undefined && updates.surfaceCondition !== existing.surfaceCondition;
+  if (updates.status !== undefined && !smartConditionChanged) {
     sets.push("status = ?");
     params.push(updates.status);
   }
@@ -166306,17 +167107,21 @@ function updateNote(db, noteId, updates, scope) {
       sets.push("surface_condition = ?");
       params.push(updates.surfaceCondition);
     }
-    if (updates.lastCheckedAt !== undefined) {
-      sets.push("last_checked_at = ?");
-      params.push(updates.lastCheckedAt);
-    }
-    if (updates.readyAt !== undefined) {
-      sets.push("ready_at = ?");
-      params.push(updates.readyAt);
-    }
-    if (updates.readyReason !== undefined) {
-      sets.push("ready_reason = ?");
-      params.push(updates.readyReason);
+    if (smartConditionChanged) {
+      sets.push("status = 'pending'", "last_checked_at = NULL", "ready_at = NULL", "ready_reason = NULL");
+    } else {
+      if (updates.lastCheckedAt !== undefined) {
+        sets.push("last_checked_at = ?");
+        params.push(updates.lastCheckedAt);
+      }
+      if (updates.readyAt !== undefined) {
+        sets.push("ready_at = ?");
+        params.push(updates.readyAt);
+      }
+      if (updates.readyReason !== undefined) {
+        sets.push("ready_reason = ?");
+        params.push(updates.readyReason);
+      }
     }
   }
   if (sets.length === 1) {
@@ -166506,7 +167311,7 @@ var getTagNumberByMessageIdStatements = new WeakMap;
 function getInsertTagStatement(db) {
   let stmt = insertTagStatements.get(db);
   if (!stmt) {
-    stmt = db.prepare("INSERT INTO tags (session_id, message_id, type, byte_size, reasoning_byte_size, tag_number, tool_name, input_byte_size, harness, tool_owner_message_id, entry_fingerprint) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+    stmt = db.prepare("INSERT INTO tags (session_id, message_id, type, byte_size, reasoning_byte_size, tag_number, tool_name, input_byte_size, harness, tool_owner_message_id, entry_fingerprint, token_count, input_token_count, reasoning_token_count) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
     insertTagStatements.set(db, stmt);
   }
   return stmt;
@@ -166548,9 +167353,95 @@ function getUpdateTagInputByteSizeStatement(db) {
 function updateTagByteSize(db, sessionId, tagNumber, newByteSize) {
   getUpdateTagByteSizeStatement(db).run(newByteSize, sessionId, tagNumber);
 }
+var CONTENT_ID_SUFFIX = /:(?:p|file)\d+$/;
+function ownerMessageIdForTagRow(row) {
+  if (row.type === "tool") {
+    return row.tool_owner_message_id ?? row.message_id;
+  }
+  return row.message_id.replace(CONTENT_ID_SUFFIX, "");
+}
+function getActiveTagTokenAggregate(db, sessionId) {
+  const row = db.prepare(`SELECT
+                COALESCE(SUM(CASE WHEN type != 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0)
+                    + COALESCE(SUM(COALESCE(reasoning_token_count, 0)), 0) AS conversation,
+                COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) + COALESCE(input_token_count, 0) ELSE 0 END), 0) AS tool_call,
+                COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0) AS tool_output,
+                COALESCE(SUM(CASE WHEN token_count IS NULL THEN 1 ELSE 0 END), 0) AS null_count
+             FROM tags
+             WHERE session_id = ? AND status = 'active'`).get(sessionId);
+  return {
+    conversation: row?.conversation ?? 0,
+    toolCall: row?.tool_call ?? 0,
+    toolOutput: row?.tool_output ?? 0,
+    nullCount: row?.null_count ?? 0
+  };
+}
+function getTriggerTagTokenUpperBound(db, sessionId) {
+  const row = db.prepare(`SELECT
+                COALESCE(SUM(COALESCE(token_count, 0) + COALESCE(input_token_count, 0) + COALESCE(reasoning_token_count, 0)), 0) AS bound,
+                COALESCE(SUM(CASE WHEN token_count IS NULL THEN 1 ELSE 0 END), 0) AS null_count
+             FROM tags
+             WHERE session_id = ? AND status IN ('active', 'dropped')`).get(sessionId);
+  return { bound: row?.bound ?? 0, nullCount: row?.null_count ?? 0 };
+}
 function updateTagInputByteSize(db, sessionId, tagNumber, newInputByteSize) {
   getUpdateTagInputByteSizeStatement(db).run(newInputByteSize, sessionId, tagNumber);
 }
+var updateTagTokenCountStatements = new WeakMap;
+var updateTagInputTokenCountStatements = new WeakMap;
+function getUpdateTagTokenCountStatement(db) {
+  let stmt = updateTagTokenCountStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("UPDATE tags SET token_count = ? WHERE session_id = ? AND tag_number = ?");
+    updateTagTokenCountStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getUpdateTagInputTokenCountStatement(db) {
+  let stmt = updateTagInputTokenCountStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("UPDATE tags SET input_token_count = ? WHERE session_id = ? AND tag_number = ?");
+    updateTagInputTokenCountStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function updateTagTokenCount(db, sessionId, tagNumber, newTokenCount) {
+  getUpdateTagTokenCountStatement(db).run(newTokenCount, sessionId, tagNumber);
+}
+function getAllStatusTagTokenTotalsFlat(db, sessionId) {
+  const rows = db.prepare(`SELECT type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count
+             FROM tags
+             WHERE session_id = ?`).all(sessionId);
+  const totals = new Map;
+  const nullMessageIds = new Set;
+  for (const row of rows) {
+    if (row.type === "tool" && row.tool_owner_message_id === null)
+      continue;
+    const owner = ownerMessageIdForTagRow(row);
+    if (row.token_count === null) {
+      nullMessageIds.add(owner);
+      totals.delete(owner);
+      continue;
+    }
+    if (nullMessageIds.has(owner))
+      continue;
+    const weight = (row.token_count ?? 0) + (row.input_token_count ?? 0) + (row.reasoning_token_count ?? 0);
+    totals.set(owner, (totals.get(owner) ?? 0) + weight);
+  }
+  return { totals, nullMessageIds };
+}
+function updateTagInputTokenCount(db, sessionId, tagNumber, newInputTokenCount) {
+  getUpdateTagInputTokenCountStatement(db).run(newInputTokenCount, sessionId, tagNumber);
+}
+function tagTokenCountIsNull(db, sessionId, tagNumber) {
+  const row = db.prepare("SELECT token_count FROM tags WHERE session_id = ? AND tag_number = ?").get(sessionId, tagNumber);
+  return row !== undefined && row.token_count === null;
+}
+function backfillTagTokenCounts(db, sessionId, tagNumber, counts) {
+  db.prepare(`UPDATE tags
+            SET token_count = ?, input_token_count = ?, reasoning_token_count = ?
+            WHERE session_id = ? AND tag_number = ? AND token_count IS NULL`).run(counts.tokenCount ?? null, counts.inputTokenCount ?? null, counts.reasoningTokenCount ?? null, sessionId, tagNumber);
+}
 function getMaxTagNumberBySessionStatement(db) {
   let stmt = getMaxTagNumberBySessionStatements.get(db);
   if (!stmt) {
@@ -166603,8 +167494,8 @@ function isMaxTagNumberRow(row) {
   const r = row;
   return typeof r.max_tag_number === "number";
 }
-function insertTag(db, sessionId, messageId, type, byteSize2, tagNumber, reasoningByteSize = 0, toolName = null, inputByteSize = 0, toolOwnerMessageId = null, entryFingerprint = null) {
-  getInsertTagStatement(db).run(sessionId, messageId, type, byteSize2, reasoningByteSize, tagNumber, toolName, inputByteSize, getHarness(), toolOwnerMessageId, entryFingerprint);
+function insertTag(db, sessionId, messageId, type, byteSize2, tagNumber, reasoningByteSize = 0, toolName = null, inputByteSize = 0, toolOwnerMessageId = null, entryFingerprint = null, tokenCounts = null) {
+  getInsertTagStatement(db).run(sessionId, messageId, type, byteSize2, reasoningByteSize, tagNumber, toolName, inputByteSize, getHarness(), toolOwnerMessageId, entryFingerprint, tokenCounts?.tokenCount ?? null, tokenCounts?.inputTokenCount ?? null, tokenCounts?.reasoningTokenCount ?? null);
   return tagNumber;
 }
 function updateTagStatus(db, sessionId, tagId, status) {
@@ -166672,13 +167563,6 @@ function getTagsByNumbers(db, sessionId, tagNumbers) {
   const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND tag_number IN (${placeholders}) ORDER BY tag_number ASC, id ASC`).all(sessionId, ...tagNumbers).filter(isTagRow);
   return rows.map(toTagEntry);
 }
-function getTopNBySize(db, sessionId, n) {
-  if (n <= 0) {
-    return [];
-  }
-  const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND status = 'active' ORDER BY byte_size DESC, tag_number ASC LIMIT ?`).all(sessionId, n).filter(isTagRow);
-  return rows.map(toTagEntry);
-}
 var getToolTagNumberByOwnerStatements = new WeakMap;
 var getNullOwnerToolTagStatements = new WeakMap;
 var adoptNullOwnerToolTagStatements = new WeakMap;
@@ -166746,43 +167630,41 @@ var ERROR_CLASSES = new Set([
 ]);
 // src/tools/ctx-memory.ts
 init_logger();
+
+// ../plugin/src/tools/ctx-memory/constants.ts
+var CTX_MEMORY_DESCRIPTION = `Durable project knowledge shared across every session on this project.
+
+Your active memories are already visible in <project-memory> (each with its id), and every future session starts with them — write one when you learn something future sessions must know: a project rule, an architectural fact, a hard-won constraint, a config value, or a naming convention. Keep each memory one standalone fact, phrased to make sense without this session's context.
+
+Actions:
+- write: save a new memory (content + category).
+- update: rewrite one memory whose fact changed (ids: [one], content).
+- archive: retire wrong or obsolete memories (ids: [one or more], optional reason).
+- merge: collapse duplicates into one memory (ids: [two or more], content).
+
+Example: ctx_memory(action="write", category="CONSTRAINTS", content="Pi stores sessions as JSONL under ~/.pi/agent/sessions/, not SQLite")`;
+
+// src/tools/ctx-memory.ts
 var DEFAULT_LIST_LIMIT = 10;
-var VALID_CATEGORIES = new Set(CATEGORY_PRIORITY);
-function isMemoryCategory2(value) {
-  return VALID_CATEGORIES.has(value);
-}
-var ALL_ACTIONS = [
-  "write",
-  "delete",
-  "list",
-  "update",
-  "merge",
-  "archive"
-];
-var DREAMER_ONLY_ACTIONS = new Set([
-  "list",
-  "update",
-  "merge",
-  "archive"
-]);
+var ALL_ACTIONS = ["write", "archive", "update", "merge", "list"];
+var DREAMER_ONLY_ACTIONS = new Set(["list"]);
 var ParamsSchema2 = exports_typebox.Object({
-  action: exports_typebox.Union(ALL_ACTIONS.map((a) => exports_typebox.Literal(a)), { description: "Action to perform on memories" }),
+  action: exports_typebox.Union(ALL_ACTIONS.map((a) => exports_typebox.Literal(a)), { description: "What to do: write, update, archive, or merge" }),
   content: exports_typebox.Optional(exports_typebox.String({
-    description: "Memory content (required for write, update, merge)"
-  })),
-  category: exports_typebox.Optional(exports_typebox.String({
-    description: "Memory category (required for write, optional filter for list, optional override for merge). One of: " + CATEGORY_PRIORITY.join(", ")
+    description: "The memory text — one standalone fact (required for write, update, merge)"
   })),
-  id: exports_typebox.Optional(exports_typebox.Number({
-    description: "Memory ID (required for delete, update, archive)"
+  category: exports_typebox.Optional(exports_typebox.Union(V2_MEMORY_CATEGORIES.map((c) => exports_typebox.Literal(c)), {
+    description: "What kind of fact this is (required for write; optional merge override)"
   })),
   ids: exports_typebox.Optional(exports_typebox.Array(exports_typebox.Number(), {
-    description: "Memory IDs to merge (required for merge)"
+    description: "Target memory id(s) from <project-memory>: update takes exactly one, archive one or more, merge two or more"
   })),
   limit: exports_typebox.Optional(exports_typebox.Number({
-    description: "Maximum results to return for list (default: 10)"
+    description: "Max results for list (default: 10)"
   })),
-  reason: exports_typebox.Optional(exports_typebox.String({ description: "Archive reason (optional for archive)" }))
+  reason: exports_typebox.Optional(exports_typebox.String({
+    description: "Why the memory is being archived (optional, recommended)"
+  }))
 });
 function ok2(text) {
   return { content: [{ type: "text", text }], details: undefined };
@@ -166829,6 +167711,12 @@ function formatMemoryList(memories) {
   ].join(`
 `);
 }
+function isPrimaryMutableMemory(memory2) {
+  return (memory2.status === "active" || memory2.status === "permanent") && memory2.supersededByMemoryId === null;
+}
+function inactiveMemoryError(id, action2) {
+  return `Error: Memory with ID ${id} is archived or superseded; restore it before ${action2}.`;
+}
 function queueEmbedding(args) {
   const snapshot = getProjectEmbeddingSnapshot(args.projectIdentity);
   if (!snapshot?.enabled)
@@ -166849,7 +167737,8 @@ function queueEmbedding(args) {
 }
 function createCtxMemoryTool(deps) {
   const dreamerAllowed = deps.allowDreamerActions === true;
-  const description = dreamerAllowed ? "Manage cross-session project memories. Memories persist across sessions and are " + "shared with OpenCode sessions on the same project. " + "Supported actions: write, delete, list, update, merge, archive." : "Manage cross-session project memories. Memories persist across sessions and are " + "shared with OpenCode sessions on the same project. " + "Supported actions: write, delete.";
+  const description = dreamerAllowed ? `${CTX_MEMORY_DESCRIPTION}
+- list: enumerate stored memories (maintenance sessions).` : CTX_MEMORY_DESCRIPTION;
   return {
     name: "ctx_memory",
     label: "Magic Context: Memory",
@@ -166870,13 +167759,10 @@ function createCtxMemoryTool(deps) {
         const content = params.content?.trim();
         if (!content)
           return err2("Error: 'content' is required when action is 'write'.");
-        const rawCategory = params.category?.trim();
+        const rawCategory = params.category;
         if (!rawCategory) {
           return err2("Error: 'category' is required when action is 'write'.");
         }
-        if (!isMemoryCategory2(rawCategory)) {
-          return err2(`Error: Unknown memory category '${rawCategory}'. Valid: ${CATEGORY_PRIORITY.join(", ")}`);
-        }
         const existing = getMemoryByHash(deps.db, projectIdentity, rawCategory, computeNormalizedHash(content));
         if (existing) {
           updateMemorySeenCount(deps.db, existing.id);
@@ -166890,45 +167776,31 @@ function createCtxMemoryTool(deps) {
           sourceType: dreamerAllowed ? "dreamer" : "agent"
         });
         queueEmbedding({ deps, projectIdentity, memoryId: memory2.id, content });
-        invalidateAllMemoryBlockCaches(deps.db);
         return ok2(`Saved memory [ID: ${memory2.id}] in ${rawCategory}.`);
       }
-      if (params.action === "delete") {
-        if (typeof params.id !== "number" || !Number.isInteger(params.id)) {
-          return err2("Error: 'id' is required when action is 'delete'.");
-        }
-        const memory2 = getMemoryById(deps.db, params.id);
-        if (!memory2 || memory2.projectPath !== projectIdentity) {
-          return err2(`Error: Memory with ID ${params.id} was not found.`);
-        }
-        deps.db.transaction(() => {
-          archiveMemory(deps.db, params.id);
-          queueMemoryMutation(deps.db, {
-            projectPath: projectIdentity,
-            mutationType: "delete",
-            targetMemoryId: params.id
-          });
-        })();
-        return ok2(`Archived memory [ID: ${params.id}].`);
-      }
       if (params.action === "list") {
         const limit = normalizeLimit(params.limit);
         const filtered = getMemoriesByProject(deps.db, projectIdentity);
-        const category = params.category?.trim();
+        const category = params.category;
         const filtered2 = category ? filtered.filter((m) => m.category === category) : filtered;
         return ok2(formatMemoryList(filtered2.slice(0, limit)));
       }
       if (params.action === "update") {
-        if (typeof params.id !== "number" || !Number.isInteger(params.id)) {
-          return err2("Error: 'id' is required when action is 'update'.");
+        const updateIds = params.ids;
+        if (!updateIds || updateIds.length !== 1 || !updateIds.every(Number.isInteger)) {
+          return err2("Error: 'ids' must contain exactly one integer memory ID when action is 'update'.");
         }
+        const updateId = updateIds[0];
         const content = params.content?.trim();
         if (!content) {
           return err2("Error: 'content' is required when action is 'update'.");
         }
-        const memory2 = getMemoryById(deps.db, params.id);
-        if (!memory2 || memory2.projectPath !== projectIdentity) {
-          return err2(`Error: Memory with ID ${params.id} was not found.`);
+        const memory2 = getMemoryById(deps.db, updateId);
+        if (!memory2 || !storedPathBelongsToIdentity(memory2.projectPath, projectIdentity)) {
+          return err2(`Error: Memory with ID ${updateId} was not found.`);
+        }
+        if (!dreamerAllowed && !isPrimaryMutableMemory(memory2)) {
+          return err2(inactiveMemoryError(updateId, "updating"));
         }
         const normalizedHash = computeNormalizedHash(content);
         const duplicate = getMemoryByHash(deps.db, projectIdentity, memory2.category, normalizedHash);
@@ -166949,9 +167821,12 @@ function createCtxMemoryTool(deps) {
         return ok2(`Updated memory [ID: ${memory2.id}] in ${memory2.category}.`);
       }
       if (params.action === "merge") {
-        const ids = params.ids?.filter((id) => Number.isInteger(id));
-        if (!ids || ids.length < 2) {
-          return err2("Error: 'ids' must include at least two memory IDs when action is 'merge'.");
+        const ids = params.ids;
+        if (!ids || ids.length < 2 || !ids.every(Number.isInteger)) {
+          return err2("Error: 'ids' must include at least two integer memory IDs when action is 'merge'.");
+        }
+        if (new Set(ids).size !== ids.length) {
+          return err2("Error: 'ids' must include at least two distinct memory IDs when action is 'merge'.");
         }
         const content = params.content?.trim();
         if (!content) {
@@ -166961,14 +167836,17 @@ function createCtxMemoryTool(deps) {
         if (sourceMemories.length !== ids.length) {
           return err2("Error: One or more source memories were not found.");
         }
-        if (sourceMemories.some((memory2) => memory2.projectPath !== projectIdentity)) {
-          return err2("Error: All memories to merge must belong to the current project.");
-        }
-        const requestedCategory = params.category?.trim();
-        if (requestedCategory && !isMemoryCategory2(requestedCategory)) {
-          return err2(`Error: Unknown memory category '${requestedCategory}'. Valid: ${CATEGORY_PRIORITY.join(", ")}`);
+        if (!dreamerAllowed) {
+          const foreign = sourceMemories.find((memory2) => !storedPathBelongsToIdentity(memory2.projectPath, projectIdentity));
+          if (foreign) {
+            return err2(`Error: Memory with ID ${foreign.id} was not found.`);
+          }
+          const inactive = sourceMemories.find((memory2) => !isPrimaryMutableMemory(memory2));
+          if (inactive) {
+            return err2(inactiveMemoryError(inactive.id, "merging"));
+          }
         }
-        const requestedCategoryTyped = requestedCategory && isMemoryCategory2(requestedCategory) ? requestedCategory : undefined;
+        const requestedCategoryTyped = params.category;
         const fallbackCategory = sourceMemories[0]?.category;
         const category = requestedCategoryTyped ?? fallbackCategory;
         if (!category) {
@@ -167022,7 +167900,7 @@ function createCtxMemoryTool(deps) {
             }
             supersededMemory(deps.db, memory2.id, canonicalMemory.id);
             queueMemoryMutation(deps.db, {
-              projectPath: memory2.projectPath,
+              projectPath: normalizeStoredProjectPath(memory2.projectPath),
               mutationType: "superseded",
               targetMemoryId: memory2.id,
               supersededById: canonicalMemory.id
@@ -167030,7 +167908,7 @@ function createCtxMemoryTool(deps) {
           }
           if (canonicalExisting && canonicalContentChanged) {
             queueMemoryMutation(deps.db, {
-              projectPath: canonicalMemory.projectPath,
+              projectPath: normalizeStoredProjectPath(canonicalMemory.projectPath),
               mutationType: "update",
               targetMemoryId: canonicalMemory.id,
               category,
@@ -167048,29 +167926,57 @@ function createCtxMemoryTool(deps) {
         return ok2(`Merged memories [${ids.join(", ")}] into canonical memory [ID: ${canonicalMemory.id}] in ${category}; superseded [${supersededIds.join(", ")}].`);
       }
       if (params.action === "archive") {
-        if (typeof params.id !== "number" || !Number.isInteger(params.id)) {
-          return err2("Error: 'id' is required when action is 'archive'.");
+        const archiveIds = params.ids;
+        if (!archiveIds || archiveIds.length === 0 || !archiveIds.every(Number.isInteger)) {
+          return err2("Error: 'ids' must contain at least one integer memory ID when action is 'archive'.");
         }
-        const memory2 = getMemoryById(deps.db, params.id);
-        if (!memory2 || memory2.projectPath !== projectIdentity) {
-          return err2(`Error: Memory with ID ${params.id} was not found.`);
+        for (const memoryId of archiveIds) {
+          const memory2 = getMemoryById(deps.db, memoryId);
+          if (!memory2 || !storedPathBelongsToIdentity(memory2.projectPath, projectIdentity)) {
+            return err2(`Error: Memory with ID ${memoryId} was not found.`);
+          }
+          if (!dreamerAllowed && !isPrimaryMutableMemory(memory2)) {
+            return err2(inactiveMemoryError(memoryId, "archiving"));
+          }
         }
         deps.db.transaction(() => {
-          archiveMemory(deps.db, params.id, params.reason);
-          queueMemoryMutation(deps.db, {
-            projectPath: projectIdentity,
-            mutationType: "archive",
-            targetMemoryId: params.id
-          });
+          for (const memoryId of archiveIds) {
+            archiveMemory(deps.db, memoryId, params.reason);
+            queueMemoryMutation(deps.db, {
+              projectPath: projectIdentity,
+              mutationType: "archive",
+              targetMemoryId: memoryId
+            });
+          }
         })();
         const reasonSuffix = params.reason ? ` (${params.reason})` : "";
-        return ok2(`Archived memory [ID: ${params.id}]${reasonSuffix}.`);
+        const idList = archiveIds.join(", ");
+        const plural = archiveIds.length > 1 ? "memories" : "memory";
+        return ok2(`Archived ${plural} [ID: ${idList}]${reasonSuffix}.`);
       }
       return err2("Error: Unknown action.");
     }
   };
 }
 
+// ../plugin/src/tools/ctx-note/constants.ts
+var CTX_NOTE_DESCRIPTION = `Working notes for this session's future — reminders, follow-ups, and things to revisit later.
+
+Use a note when something matters LATER but not in the next few steps: "revisit the retry logic after the release", "user wants the dashboard polish batched", "flaky test to investigate when touching CI". Don't use notes for active multi-step work (use todos) or for durable project knowledge that should outlive this session (use ctx_memory). Notes resurface automatically at natural work boundaries and whenever you read them.
+
+Actions:
+- write: save a note (content). Add surface_condition to make it a smart note (below).
+- read: list notes, newest first. Default: latest active session notes + ready smart notes; page older ones with limit/offset, or inspect other states with filter.
+- update / dismiss: change or retire a note by note_id.
+
+Smart notes: pass surface_condition and the note stays hidden until a background checker confirms the condition — using ONLY externally verifiable signals (GitHub state via gh, files on disk, git history, web pages). It cannot see this conversation, so the condition must be checkable from outside:
+✓ "When PR #42 in cortexkit/magic-context is merged"
+✓ "When the latest release tag is >= v0.22.0"
+✓ "When packages/plugin/src/foo.ts contains a function named bar"
+✗ "When the user mentions X" / "when we revisit Y" / "after we finish this refactor" — no external signal; write a regular note instead.
+
+Example: ctx_note(action="write", content="Re-run the perf benchmark once the boundary rework ships", surface_condition="When the latest release tag is >= v0.23.0")`;
+
 // src/tools/ctx-note.ts
 var FILTER_VALUES = [
   "active",
@@ -167090,13 +167996,19 @@ var ParamsSchema3 = exports_typebox.Object({
   })),
   content: exports_typebox.Optional(exports_typebox.String({ description: "Note text to store when action is 'write'." })),
   surface_condition: exports_typebox.Optional(exports_typebox.String({
-    description: "Open-ended condition for smart notes. When provided, creates a project-scoped smart note that the dreamer evaluates nightly. The note surfaces when the condition is met."
+    description: "Externally verifiable condition for smart notes. A background checker verifies it using ONLY outside signals (GitHub state via gh, files on disk, git history, web) — it cannot see this conversation. Use for PR/issue state, release tags, file contents, workflow runs. NOT for 'when the user mentions X' / 'when we revisit Y' — write a regular note instead."
   })),
   note_id: exports_typebox.Optional(exports_typebox.Number({
     description: "Note ID (required for 'dismiss' and 'update' actions)."
   })),
   filter: exports_typebox.Optional(exports_typebox.Union(FILTER_VALUES.map((value) => exports_typebox.Literal(value)), {
     description: "Optional read filter. Defaults to active session notes + ready smart notes. Use 'all' to inspect every status or 'pending' to inspect unsurfaced smart notes."
+  })),
+  limit: exports_typebox.Optional(exports_typebox.Number({
+    description: "Max notes per section for read, newest first (default: 25)"
+  })),
+  offset: exports_typebox.Optional(exports_typebox.Number({
+    description: "Skip this many newest notes for read — page older ones (default: 0)"
   }))
 });
 function ok3(text) {
@@ -167133,15 +168045,20 @@ function formatNoteLine(note) {
 var DISMISS_FOOTER = `
 
 To dismiss a stale note: ctx_note(action="dismiss", note_id=N)`;
+var DEFAULT_READ_LIMIT = 25;
+function paginateNewestFirst(notes, limit, offset) {
+  const total = notes.length;
+  const newestFirst = [...notes].reverse();
+  const page = newestFirst.slice(offset, offset + limit);
+  const remaining = total - offset - page.length;
+  const footer = remaining > 0 ? `Showing ${page.length} of ${total} (newest first) — ${remaining} older: ctx_note(action="read", offset=${offset + page.length})` : null;
+  return { page, total, footer };
+}
 function createCtxNoteTool(deps) {
   return {
     name: "ctx_note",
     label: "Magic Context: Notes",
-    description: `Save or inspect durable session notes that persist for this session.
-` + `Use this for short goals, constraints, decisions, or reminders worth carrying forward.
-
-` + `Actions:
-` + "- `write`: Append one note. Optionally provide `surface_condition` to create a smart note.\n" + "- `read`: Show current notes. Defaults to active session notes + ready smart notes; use `filter` to inspect all, pending, ready, active, or dismissed notes.\n" + "- `dismiss`: Dismiss a note by `note_id`.\n" + "- `update`: Update a note by `note_id`.\n\n" + "**Smart Notes**: When `surface_condition` is provided with `write`, the note becomes a project-scoped smart note. " + "The dreamer evaluates smart note conditions during nightly runs and surfaces them when conditions are met. " + 'Example: `ctx_note(action="write", content="Implement X because Y", surface_condition="When PR #42 is merged in this repo")`',
+    description: CTX_NOTE_DESCRIPTION,
     parameters: ParamsSchema3,
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       const sessionId = ctx.sessionManager.getSessionId();
@@ -167223,11 +168140,15 @@ function createCtxNoteTool(deps) {
 - ${parts.join(`
 - `)}`);
       }
+      const limit = typeof params.limit === "number" && params.limit > 0 ? Math.floor(params.limit) : DEFAULT_READ_LIMIT;
+      const offset = typeof params.offset === "number" && params.offset > 0 ? Math.floor(params.offset) : 0;
       const sections = readNotes({
         db: deps.db,
         sessionId,
         cwd: ctx.cwd,
-        filter: params.filter
+        filter: params.filter,
+        limit,
+        offset
       });
       try {
         setNoteLastReadAt(deps.db, sessionId);
@@ -167235,7 +168156,7 @@ function createCtxNoteTool(deps) {
       if (sections.length === 0) {
         return ok3(`## Notes
 
-No notes for the current filter.`);
+No session notes or smart notes.`);
       }
       const body = sections.join(`
 
@@ -167262,10 +168183,14 @@ function readNotes(args) {
     }) : [];
     const sections2 = [];
     if (sessionNotes2.length > 0) {
+      const { page, footer } = paginateNewestFirst(sessionNotes2, args.limit, args.offset);
+      const lines = page.map(formatNoteLine).join(`
+`);
       sections2.push(`## Session Notes
 
-${sessionNotes2.map(formatNoteLine).join(`
-`)}`);
+${lines}${footer ? `
+
+${footer}` : ""}`);
     }
     if (readySmartNotes.length > 0) {
       sections2.push(`## \uD83D\uDD14 Ready Smart Notes
@@ -167296,17 +168221,25 @@ ${readySmartNotes.map(formatNoteLine).join(`
   }) : [];
   const sections = [];
   if (sessionNotes.length > 0) {
+    const { page, footer } = paginateNewestFirst(sessionNotes, args.limit, args.offset);
+    const lines = page.map(formatNoteLine).join(`
+`);
     sections.push(`## Session Notes
 
-${sessionNotes.map(formatNoteLine).join(`
-`)}`);
+${lines}${footer ? `
+
+${footer}` : ""}`);
   }
   if (smartNotes.length > 0) {
+    const { page, footer } = paginateNewestFirst(smartNotes, args.limit, args.offset);
+    const lines = page.map(formatNoteLine).join(`
+
+`);
     sections.push(`## Smart Notes
 
-${smartNotes.map(formatNoteLine).join(`
+${lines}${footer ? `
 
-`)}`);
+${footer}` : ""}`);
   }
   return sections;
 }
@@ -167314,7 +168247,7 @@ ${smartNotes.map(formatNoteLine).join(`
 // ../plugin/src/features/magic-context/range-parser.ts
 function parseRangeString(input) {
   const maxRangeElements = 1000;
-  const trimmed = input.trim();
+  const trimmed = input.replace(/§/g, "").trim();
   if (trimmed === "") {
     throw new Error("Range string must not be empty");
   }
@@ -168504,6 +169437,9 @@ function escapeXmlAttr2(s) {
 function escapeXmlContent2(s) {
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
+function isTieredRow(c) {
+  return typeof c.p1 === "string" && c.p1.length > 0;
+}
 function tierBody(c, tier2) {
   const tiers = [c.p1, c.p2, c.p3, c.p4];
   const requested = tiers[tier2 - 1];
@@ -168533,12 +169469,13 @@ function renderOneCompartment(c, tier2) {
   const baseAttrs = `start="${c.startMessage}" end="${c.endMessage}" title="${escapeXmlAttr2(c.title)}"`;
   if (tier2 >= 5)
     return "";
-  if (c.legacy === 1) {
-    if (tier2 >= 4)
+  if (c.legacy === 1 || !isTieredRow(c)) {
+    const flat = (c.content ?? "").trim();
+    if (tier2 >= 4 || flat.length === 0)
       return `<compartment ${baseAttrs} />`;
     return [
       `<compartment ${baseAttrs}>`,
-      escapeXmlContent2(legacyBodyForTier(c.content, tier2)),
+      escapeXmlContent2(legacyBodyForTier(flat, tier2)),
       "</compartment>"
     ].join(`
 `);
@@ -168615,26 +169552,58 @@ import { join as join9, sep as sep2 } from "node:path";
 var import_comment_json2 = __toESM(require_src2(), 1);
 import { existsSync as existsSync7, readFileSync as readFileSync5 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { join as join8 } from "node:path";
+import { isAbsolute as isAbsolute2, join as join8, resolve as resolve3 } from "node:path";
+import { fileURLToPath } from "node:url";
 var overrideAvailability = null;
 function parseConfig(path5) {
   if (!existsSync7(path5))
     return null;
   return import_comment_json2.parse(readFileSync5(path5, "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 = fileURLToPath(value);
+    } catch {
+      return null;
+    }
+  } else if (value.startsWith("~/")) {
+    dir = join8(homedir4(), value.slice(2));
+  } else if (value.startsWith("/") || value.startsWith("./") || value.startsWith("../")) {
+    dir = isAbsolute2(value) ? value : resolve3(configDir, value);
+  } else {
+    return null;
+  }
+  try {
+    const pkg = JSON.parse(readFileSync5(join8(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, keys2) {
+function hasAftAtKeys(value, keys2, configDir) {
   if (!value || typeof value !== "object")
     return false;
   const record4 = value;
   for (const key of keys2) {
-    if (hasAftInArray(record4[key]))
+    if (hasAftInArray(record4[key], configDir))
       return true;
   }
   return false;
@@ -168651,7 +169620,8 @@ function getAftAvailability() {
   for (const path5 of opencodePaths) {
     try {
       const config2 = parseConfig(path5);
-      if (hasAftAtKeys(config2, ["plugin", "plugins", "mcp", "mcp_servers"])) {
+      const configDir = join8(path5, "..");
+      if (hasAftAtKeys(config2, ["plugin", "plugins", "mcp", "mcp_servers"], configDir)) {
         opencode = true;
         break;
       }
@@ -168661,12 +169631,13 @@ function getAftAvailability() {
   for (const path5 of piPaths) {
     try {
       const config2 = parseConfig(path5);
-      if (hasAftAtKeys(config2, ["packages", "extensions"])) {
+      const configDir = join8(path5, "..");
+      if (hasAftAtKeys(config2, ["packages", "extensions"], configDir)) {
         pi = true;
         break;
       }
       const agent = config2?.agent;
-      if (hasAftAtKeys(agent, ["packages", "extensions"])) {
+      if (hasAftAtKeys(agent, ["packages", "extensions"], configDir)) {
         pi = true;
         break;
       }
@@ -168783,9 +169754,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;
@@ -168942,6 +169910,21 @@ function renderMemoryBlockV2(memories, wrapper = "project-memory") {
 `);
 }
 
+// ../plugin/src/tools/ctx-search/constants.ts
+var CTX_SEARCH_DESCRIPTION = `Your long-term recall for this project — search everything that ever happened here, not just what's currently visible.
+
+Reach for it when something feels familiar but isn't in view: "did we solve this before?", "what did we decide about X?", "when did this break?", "where does Y live?". Results only contain things you CANNOT currently see — memories already shown in <project-memory> and the live conversation tail are filtered out.
+
+Sources (omit for a broad search across all):
+- memory: curated cross-session project knowledge — rules, constraints, conventions.
+- message: the raw conversation behind your compacted history. Hits include message ordinals — expand the surrounding exchange with ctx_expand(start=N-10, end=N+5).
+- git_commit: this repository's commit history.
+
+Picking sources:
+- "when did this change / was this working before" → ["git_commit", "message"]
+- "did we discuss this earlier" → ["message"]
+- "what's our convention / rule for X" → ["memory"]`;
+
 // src/tools/ctx-search.ts
 var DEFAULT_LIMIT = 10;
 var ParamsSchema5 = exports_typebox.Object({
@@ -169025,18 +170008,7 @@ function createCtxSearchTool(deps) {
   return {
     name: "ctx_search",
     label: "Magic Context: Search",
-    description: `Search across project memories, indexed git commits, and raw conversation history.
-
-` + `Sources:
-` + `- memory: curated cross-session knowledge for this project
-` + `- message: raw user/assistant messages from older compartmentalized history
-` + `- git_commit: HEAD git commits (when git commit indexing is enabled)
-
-` + "Narrow via the `sources` param when the question maps to a specific channel:\n" + `- "was this working before / when did this break" → ["git_commit", "message"]
-` + `- "when did we change this" → ["git_commit"]
-` + `- "what is our naming convention" → ["memory"]
-` + `- "did we discuss this earlier" → ["message"]
-` + "Omit sources for a broad search across all enabled channels.",
+    description: CTX_SEARCH_DESCRIPTION,
     parameters: ParamsSchema5,
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       const query = params.query?.trim();
@@ -169055,6 +170027,7 @@ function createCtxSearchTool(deps) {
       const embeddingEnabled = snapshot ? snapshot.enabled || snapshot.gitCommitEnabled : deps.embeddingEnabled;
       const gitCommitsEnabled = snapshot?.gitCommitEnabled ?? deps.gitCommitsEnabled ?? false;
       const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, sessionId);
+      const messageOrdinalCutoff = lastCompartmentEnd >= 0 ? lastCompartmentEnd : 0;
       const visibleMemoryIds = getVisibleMemoryIds(deps.db, sessionId);
       const results = await unifiedSearch(deps.db, sessionId, projectIdentity, query, {
         limit: normalizeLimit3(params.limit),
@@ -169065,7 +170038,7 @@ function createCtxSearchTool(deps) {
           return result?.vector ?? null;
         },
         isEmbeddingRuntimeEnabled: () => embeddingEnabled === true,
-        maxMessageOrdinal: lastCompartmentEnd >= 0 ? lastCompartmentEnd : undefined,
+        maxMessageOrdinal: messageOrdinalCutoff,
         gitCommitsEnabled,
         sources: params.sources,
         visibleMemoryIds,
@@ -169152,13 +170125,15 @@ function registerMagicContextTools(pi, opts) {
     embeddingEnabled: opts.embeddingEnabled,
     gitCommitsEnabled: opts.gitCommitsEnabled
   }));
-  pi.registerTool(createCtxMemoryTool({
-    db: opts.db,
-    ensureProjectRegistered: opts.ensureProjectRegistered,
-    memoryEnabled: opts.memoryEnabled,
-    embeddingEnabled: opts.embeddingEnabled,
-    allowDreamerActions: opts.allowDreamerActions ?? false
-  }));
+  if (opts.memoryToolEnabled !== false) {
+    pi.registerTool(createCtxMemoryTool({
+      db: opts.db,
+      ensureProjectRegistered: opts.ensureProjectRegistered,
+      memoryEnabled: opts.memoryEnabled,
+      embeddingEnabled: opts.embeddingEnabled,
+      allowDreamerActions: opts.allowDreamerActions ?? false
+    }));
+  }
   if (!opts.sessionScopedToolsDisabled) {
     pi.registerTool(createCtxNoteTool({
       db: opts.db,
@@ -169181,7 +170156,7 @@ var openedDb;
 function magicContextSubagentExtension(pi) {
   setHarness("pi");
   pi.registerFlag(SUBAGENT_DREAMER_ACTIONS_FLAG, {
-    description: "Enable dreamer-only ctx_memory actions (update, merge, archive).",
+    description: "Register ctx_memory with dreamer actions for Magic Context subagents.",
     type: "boolean",
     default: false
   });
@@ -169199,10 +170174,11 @@ function magicContextSubagentExtension(pi) {
       registerMagicContextTools(pi, {
         db,
         ensureProjectRegistered: ensureProjectRegisteredFromPiDirectory,
+        memoryToolEnabled: dreamerActionsEnabled,
         allowDreamerActions: dreamerActionsEnabled,
         sessionScopedToolsDisabled: true
       });
-      log(`[pi-subagent] registered tools: ctx_search, ctx_memory` + ` (ctx_note/ctx_expand omitted: --no-session child;` + ` memory=${cfg.memory.enabled}, embedding=${cfg.embedding.provider !== "off"},` + ` git_commits=${cfg.memory.git_commit_indexing.enabled}, dreamer_actions=${dreamerActionsEnabled})`);
+      log(`[pi-subagent] registered tools: ctx_search${dreamerActionsEnabled ? ", ctx_memory" : ""}` + ` (ctx_note/ctx_expand omitted: --no-session child;` + ` memory=${cfg.memory.enabled}, embedding=${cfg.embedding.provider !== "off"},` + ` git_commits=${cfg.memory.git_commit_indexing.enabled}, dreamer_actions=${dreamerActionsEnabled})`);
     } catch (err5) {
       const message = err5 instanceof Error ? err5.message : String(err5);
       log(`[pi-subagent] startup failed: ${message}`);