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

package/dist/subagent-entry.js

@@ -46,170 +46,6 @@ var __export = (target, all) => {
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-// ../plugin/src/shared/harness.ts
-function setHarness(value) {
-  if (harnessLocked && currentHarness !== value) {
-    throw new Error(`Magic Context: harness already locked to "${currentHarness}"; cannot change to "${value}"`);
-  }
-  currentHarness = value;
-  harnessLocked = true;
-}
-function getHarness() {
-  return currentHarness;
-}
-var currentHarness = "opencode", harnessLocked = false;
-
-// ../plugin/src/shared/data-path.ts
-import * as os from "node:os";
-import * as path from "node:path";
-function getDataDir() {
-  return process.env.XDG_DATA_HOME ?? path.join(os.homedir(), ".local", "share");
-}
-function getMagicContextTempDir(harness = getHarness()) {
-  return path.join(os.tmpdir(), harness, "magic-context");
-}
-function getMagicContextLogPath(harness = getHarness()) {
-  return path.join(getMagicContextTempDir(harness), "magic-context.log");
-}
-function getProjectMagicContextDir(directory) {
-  return path.join(directory, ".magic-context");
-}
-function getProjectMagicContextHistorianDir(directory) {
-  return path.join(getProjectMagicContextDir(directory), "historian");
-}
-function getOpenCodeStorageDir() {
-  return path.join(getDataDir(), "opencode", "storage");
-}
-function getMagicContextStorageDir() {
-  return path.join(getDataDir(), "cortexkit", "magic-context");
-}
-function getLegacyOpenCodeMagicContextStorageDir() {
-  return path.join(getOpenCodeStorageDir(), "plugin", "magic-context");
-}
-function getCacheDir() {
-  return process.env.XDG_CACHE_HOME ?? path.join(os.homedir(), ".cache");
-}
-var init_data_path = () => {};
-
-// ../plugin/src/shared/logger.ts
-import * as fs from "node:fs";
-import * as path2 from "node:path";
-function ensureDir(filePath) {
-  const dir = path2.dirname(filePath);
-  if (dir === lastEnsuredDir)
-    return;
-  try {
-    fs.mkdirSync(dir, { recursive: true });
-    lastEnsuredDir = dir;
-  } catch {}
-}
-function flush() {
-  if (flushTimer) {
-    clearTimeout(flushTimer);
-    flushTimer = null;
-  }
-  if (buffer.length === 0)
-    return;
-  const data = buffer.join("");
-  buffer = [];
-  try {
-    const logFile = getMagicContextLogPath();
-    ensureDir(logFile);
-    fs.appendFileSync(logFile, data);
-  } catch {}
-}
-function scheduleFlush() {
-  if (flushTimer)
-    return;
-  flushTimer = setTimeout(() => {
-    flushTimer = null;
-    flush();
-  }, FLUSH_INTERVAL_MS);
-}
-function log(message, data) {
-  if (isTestEnv)
-    return;
-  try {
-    const timestamp = new Date().toISOString();
-    const serialized = data === undefined ? "" : data instanceof Error ? ` ${data.message}${data.stack ? `
-${data.stack}` : ""}` : ` ${JSON.stringify(data)}`;
-    buffer.push(`[${timestamp}] ${message}${serialized}
-`);
-    if (buffer.length >= BUFFER_SIZE_LIMIT) {
-      flush();
-    } else {
-      scheduleFlush();
-    }
-  } catch {}
-}
-function sessionLog(sessionId, message, data) {
-  log(`[magic-context][${sessionId}] ${message}`, data);
-}
-var isTestEnv = false, buffer, flushTimer = null, FLUSH_INTERVAL_MS = 500, BUFFER_SIZE_LIMIT = 50, lastEnsuredDir = null;
-var init_logger = __esm(() => {
-  init_data_path();
-  buffer = [];
-  if (!isTestEnv) {
-    process.on("exit", flush);
-  }
-});
-
-// ../plugin/src/shared/sqlite.ts
-function buildNodeSqliteDatabaseClass(DatabaseSync) {
-  const SAVEPOINT = "mc_tx_sp";
-
-  class NodeSqliteDatabase extends DatabaseSync {
-    constructor(filename, options) {
-      const translated = { ...options };
-      if (options && "readonly" in options) {
-        translated.readOnly = options.readonly;
-        delete translated.readonly;
-      }
-      super(typeof filename === "string" ? filename : ":memory:", translated);
-    }
-    transaction(fn) {
-      const self = this;
-      const wrapped = function(...args) {
-        const nested = self.isTransaction === true;
-        self.exec(nested ? `SAVEPOINT ${SAVEPOINT}` : "BEGIN");
-        try {
-          const result = fn.apply(this, args);
-          self.exec(nested ? `RELEASE ${SAVEPOINT}` : "COMMIT");
-          return result;
-        } catch (error) {
-          if (nested) {
-            self.exec(`ROLLBACK TO ${SAVEPOINT}`);
-            self.exec(`RELEASE ${SAVEPOINT}`);
-          } else {
-            self.exec("ROLLBACK");
-          }
-          throw error;
-        }
-      };
-      return wrapped;
-    }
-  }
-  return NodeSqliteDatabase;
-}
-var isBun, bunSpec, nodeSpec, sqliteModule, DatabaseImpl, Database;
-var init_sqlite = __esm(async () => {
-  isBun = typeof process !== "undefined" && typeof process.versions?.bun === "string";
-  bunSpec = "bun:" + "sqlite";
-  nodeSpec = "node:" + "sqlite";
-  sqliteModule = isBun ? await import(bunSpec) : await import(nodeSpec);
-  DatabaseImpl = isBun ? sqliteModule.Database : buildNodeSqliteDatabaseClass(sqliteModule.DatabaseSync);
-  Database = DatabaseImpl;
-});
-
-// ../plugin/src/shared/sqlite-helpers.ts
-function closeQuietly(db) {
-  if (!db)
-    return;
-  try {
-    db.close();
-  } catch {}
-}
-
 // ../../node_modules/.bun/esprima@4.0.1/node_modules/esprima/dist/esprima.js
 var require_esprima = __commonJS((exports, module) => {
   (function webpackUniversalModuleDefinition(root, factory) {
@@ -7967,57 +7803,53 @@ 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");
+// ../plugin/src/features/magic-context/storage-db.ts
+import { copyFileSync, cpSync, existsSync as existsSync3, mkdirSync as mkdirSync2 } from "node:fs";
+import { dirname as dirname2, join as join4 } from "node:path";
+
+// ../plugin/src/shared/data-path.ts
+import * as os from "node:os";
+import * as path from "node:path";
+
+// ../plugin/src/shared/harness.ts
+var currentHarness = "opencode";
+var harnessLocked = false;
+function setHarness(value) {
+  if (harnessLocked && currentHarness !== value) {
+    throw new Error(`Magic Context: harness already locked to "${currentHarness}"; cannot change to "${value}"`);
+  }
+  currentHarness = value;
+  harnessLocked = true;
 }
-function openCodeDbExists() {
-  return existsSync6(getOpenCodeDbPath());
+function getHarness() {
+  return currentHarness;
 }
-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;
-  }
+
+// ../plugin/src/shared/data-path.ts
+function getDataDir() {
+  return process.env.XDG_DATA_HOME ?? path.join(os.homedir(), ".local", "share");
 }
-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 getMagicContextTempDir(harness = getHarness()) {
+  return path.join(os.tmpdir(), harness, "magic-context");
 }
-function withReadOnlySessionDb(fn) {
-  return fn(getReadOnlySessionDb());
+function getMagicContextLogPath(harness = getHarness()) {
+  return path.join(getMagicContextTempDir(harness), "magic-context.log");
 }
-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;
+function getProjectMagicContextDir(directory) {
+  return path.join(directory, ".magic-context");
+}
+function getProjectMagicContextHistorianDir(directory) {
+  return path.join(getProjectMagicContextDir(directory), "historian");
+}
+function getOpenCodeStorageDir() {
+  return path.join(getDataDir(), "opencode", "storage");
+}
+function getMagicContextStorageDir() {
+  return path.join(getDataDir(), "cortexkit", "magic-context");
+}
+function getLegacyOpenCodeMagicContextStorageDir() {
+  return path.join(getOpenCodeStorageDir(), "plugin", "magic-context");
 }
-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";
-import { dirname as dirname2, join as join4 } from "node:path";
 
 // ../plugin/src/shared/error-message.ts
 function getErrorMessage(error) {
@@ -8095,12 +7927,124 @@ function safeString(value) {
   }
 }
 
-// ../plugin/src/features/magic-context/storage-db.ts
-init_logger();
-await init_sqlite();
+// ../plugin/src/shared/logger.ts
+import * as fs from "node:fs";
+import * as path2 from "node:path";
+var isTestEnv = false;
+var buffer = [];
+var flushTimer = null;
+var FLUSH_INTERVAL_MS = 500;
+var BUFFER_SIZE_LIMIT = 50;
+var lastEnsuredDir = null;
+function ensureDir(filePath) {
+  const dir = path2.dirname(filePath);
+  if (dir === lastEnsuredDir)
+    return;
+  try {
+    fs.mkdirSync(dir, { recursive: true });
+    lastEnsuredDir = dir;
+  } catch {}
+}
+function flush() {
+  if (flushTimer) {
+    clearTimeout(flushTimer);
+    flushTimer = null;
+  }
+  if (buffer.length === 0)
+    return;
+  const data = buffer.join("");
+  buffer = [];
+  try {
+    const logFile = getMagicContextLogPath();
+    ensureDir(logFile);
+    fs.appendFileSync(logFile, data);
+  } catch {}
+}
+function scheduleFlush() {
+  if (flushTimer)
+    return;
+  flushTimer = setTimeout(() => {
+    flushTimer = null;
+    flush();
+  }, FLUSH_INTERVAL_MS);
+}
+function log(message, data) {
+  if (isTestEnv)
+    return;
+  try {
+    const timestamp = new Date().toISOString();
+    const serialized = data === undefined ? "" : data instanceof Error ? ` ${data.message}${data.stack ? `
+${data.stack}` : ""}` : ` ${JSON.stringify(data)}`;
+    buffer.push(`[${timestamp}] ${message}${serialized}
+`);
+    if (buffer.length >= BUFFER_SIZE_LIMIT) {
+      flush();
+    } else {
+      scheduleFlush();
+    }
+  } catch {}
+}
+function sessionLog(sessionId, message, data) {
+  log(`[magic-context][${sessionId}] ${message}`, data);
+}
+if (!isTestEnv) {
+  process.on("exit", flush);
+}
+
+// ../plugin/src/shared/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();
 import { createHash } from "node:crypto";
 import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { join as join2, resolve, sep } from "node:path";
@@ -8217,7 +8161,6 @@ function isRelativeProjectFile(projectPath, relativePath) {
 }
 
 // ../plugin/src/features/magic-context/migrations.ts
-init_logger();
 function tableExists(db, name) {
   return Boolean(db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name = ?").get(name));
 }
@@ -8919,6 +8862,60 @@ var MIGRATIONS = [
                     ON tags(session_id, entry_fingerprint)
                     WHERE type='message' AND entry_fingerprint IS NOT NULL`);
     }
+  },
+  {
+    version: 28,
+    description: "Add git commit sweep coordinator lease/cooldown table",
+    up: (db) => {
+      db.exec(`
+                CREATE TABLE IF NOT EXISTS git_sweep_coordinator (
+                    project_path TEXT PRIMARY KEY,
+                    lease_holder TEXT,
+                    lease_expires_at INTEGER,
+                    last_swept_at INTEGER
+                );
+                CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_lease_expires
+                    ON git_sweep_coordinator(lease_expires_at);
+                CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_last_swept
+                    ON git_sweep_coordinator(last_swept_at);
+            `);
+    }
+  },
+  {
+    version: 29,
+    description: "Add anchor_ordinal to notes (traceback to the conversation tail)",
+    up: (db) => {
+      const notesExists = db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name='notes'").get();
+      if (!notesExists) {
+        return;
+      }
+      const columns = db.prepare("PRAGMA table_info(notes)").all();
+      if (!columns.some((column) => column.name === "anchor_ordinal")) {
+        db.exec("ALTER TABLE notes ADD COLUMN anchor_ordinal INTEGER");
+      }
+    }
+  },
+  {
+    version: 30,
+    description: "HARD-bust m[0] markers: cached system/tool-set/model identity",
+    up: (db) => {
+      const hasSessionMeta = db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='session_meta' LIMIT 1").get();
+      if (!hasSessionMeta)
+        return;
+      ensureColumn(db, "session_meta", "cached_m0_system_hash", "TEXT");
+      ensureColumn(db, "session_meta", "cached_m0_tool_set_hash", "TEXT");
+      ensureColumn(db, "session_meta", "cached_m0_model_key", "TEXT");
+      const columns = new Set(db.prepare("PRAGMA table_info(session_meta)").all().map((column) => column.name));
+      if (columns.has("cached_m0_bytes")) {
+        db.prepare(`UPDATE session_meta SET
+                        cached_m0_bytes = NULL,
+                        cached_m1_bytes = NULL,
+                        cached_m0_materialized_at = NULL,
+                        cached_m0_system_hash = NULL,
+                        cached_m0_tool_set_hash = NULL,
+                        cached_m0_model_key = NULL`).run();
+      }
+    }
   }
 ];
 var LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
@@ -141634,8 +141631,6 @@ function loadToolDefinitionMeasurements(db) {
 }
 
 // ../plugin/src/features/magic-context/tool-owner-backfill.ts
-init_data_path();
-init_logger();
 import { existsSync as existsSync2 } from "node:fs";
 import { join as join3 } from "node:path";
 var LEASE_DURATION_MS = 5 * 60 * 1000;
@@ -141883,7 +141878,7 @@ var databases = new Map;
 var persistenceByDatabase = new WeakMap;
 var persistenceErrorByDatabase = new WeakMap;
 var lastSchemaFenceRejection = null;
-var LATEST_SUPPORTED_VERSION = 27;
+var LATEST_SUPPORTED_VERSION = 30;
 function resolveDatabasePath(dbPathOverride) {
   if (dbPathOverride) {
     return { dbDir: dirname2(dbPathOverride), dbPath: dbPathOverride };
@@ -142203,6 +142198,17 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       updated_at INTEGER NOT NULL DEFAULT 0
     );
 
+    CREATE TABLE IF NOT EXISTS git_sweep_coordinator (
+      project_path TEXT PRIMARY KEY,
+      lease_holder TEXT,
+      lease_expires_at INTEGER,
+      last_swept_at INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_lease_expires
+      ON git_sweep_coordinator(lease_expires_at);
+    CREATE INDEX IF NOT EXISTS idx_git_sweep_coordinator_last_swept
+      ON git_sweep_coordinator(last_swept_at);
+
     CREATE TABLE IF NOT EXISTS m0_mutation_log (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
       session_id TEXT NOT NULL,
@@ -142337,6 +142343,9 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       cached_m0_materialized_at INTEGER,
       cached_m0_session_facts_version INTEGER,
       cached_m0_upgrade_state TEXT,
+      cached_m0_system_hash TEXT,
+      cached_m0_tool_set_hash TEXT,
+      cached_m0_model_key TEXT,
       cached_m0_last_baseline_end_message_id TEXT,
       upgrade_reminded_at INTEGER,
       pi_stable_id_scheme INTEGER
@@ -142528,6 +142537,9 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "cached_m0_materialized_at", "INTEGER");
   ensureColumn(db, "session_meta", "cached_m0_session_facts_version", "INTEGER");
   ensureColumn(db, "session_meta", "cached_m0_upgrade_state", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_system_hash", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_tool_set_hash", "TEXT");
+  ensureColumn(db, "session_meta", "cached_m0_model_key", "TEXT");
   ensureColumn(db, "session_meta", "cached_m0_last_baseline_end_message_id", "TEXT");
   ensureColumn(db, "session_meta", "upgrade_reminded_at", "INTEGER");
   db.exec(`
@@ -142723,9 +142735,6 @@ function openDatabase(dbPathOrOptions) {
   }
 }
 
-// src/subagent-entry.ts
-init_logger();
-
 // src/config/index.ts
 import { existsSync as existsSync5, readFileSync as readFileSync3 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
@@ -157310,6 +157319,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.")
@@ -157409,46 +157419,6 @@ function stripJsonComments(content) {
   }
   return result;
 }
-function stripTrailingCommas(content) {
-  let result = "";
-  let inString = false;
-  let escaped = false;
-  for (let index = 0;index < content.length; index += 1) {
-    const char = content[index];
-    if (inString) {
-      result += char;
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-      result += char;
-      continue;
-    }
-    if (char === ",") {
-      let lookahead = index + 1;
-      while (lookahead < content.length && /\s/.test(content[lookahead] ?? "")) {
-        lookahead += 1;
-      }
-      const next = content[lookahead];
-      if (next === "}" || next === "]") {
-        continue;
-      }
-    }
-    result += char;
-  }
-  return result;
-}
-function parseJsonc(content) {
-  const normalized = stripTrailingCommas(stripJsonComments(content));
-  return JSON.parse(normalized);
-}
 
 // ../plugin/src/config/variable.ts
 var ENV_PATTERN = /\{env:([^}]+)\}/g;
@@ -157763,9 +157733,6 @@ function loadPiConfigDetailed(opts = {}) {
   };
 }
 
-// ../plugin/src/features/magic-context/memory/embedding.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/memory/cosine-similarity.ts
 function cosineSimilarity(a, b) {
   if (a.length !== b.length) {
@@ -157821,8 +157788,6 @@ import { mkdirSync as mkdirSync3 } from "node:fs";
 import { open, stat, unlink, writeFile } from "node:fs/promises";
 import { dirname as dirname4, join as join6 } from "node:path";
 import { pathToFileURL } from "node:url";
-init_data_path();
-init_logger();
 var LOCK_POLL_MS = 150;
 var STALE_LOCK_MS = 3 * 60000;
 var MAX_LOCK_WAIT_MS = 5 * 60000;
@@ -158158,7 +158123,6 @@ class LocalEmbeddingProvider {
 }
 
 // ../plugin/src/features/magic-context/memory/embedding-openai.ts
-init_logger();
 function normalizeEndpoint2(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
@@ -158448,8 +158412,7 @@ function getDistinctStoredModelIds(db, projectPath) {
 }
 
 // ../plugin/src/features/magic-context/project-embedding-registry.ts
-import { createHash as createHash3 } from "node:crypto";
-init_logger();
+import { createHash as createHash3, randomUUID } from "node:crypto";
 
 // ../plugin/src/features/magic-context/git-commits/storage-git-commit-embeddings.ts
 var saveStatements = new WeakMap;
@@ -158552,6 +158515,125 @@ function getDistinctCommitEmbeddingModelIds(db, projectPath) {
   return new Set(rows.map((row) => typeof row.modelId === "string" ? row.modelId : null));
 }
 
+// ../plugin/src/features/magic-context/git-commits/sweep-coordinator.ts
+var GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
+var GIT_SWEEP_LEASE_TTL_MS = 5 * 60 * 1000;
+var GIT_SWEEP_LEASE_RENEWAL_MS = 60 * 1000;
+function runImmediate(db, body) {
+  db.exec("BEGIN IMMEDIATE");
+  let committed = false;
+  try {
+    const result = body();
+    db.exec("COMMIT");
+    committed = true;
+    return result;
+  } finally {
+    if (!committed) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
+  }
+}
+function rowToState(row) {
+  return {
+    projectPath: row.project_path,
+    leaseHolder: row.lease_holder,
+    leaseExpiresAt: row.lease_expires_at,
+    lastSweptAt: row.last_swept_at
+  };
+}
+function getGitSweepCoordinatorState(db, projectPath) {
+  const row = db.prepare(`SELECT project_path, lease_holder, lease_expires_at, last_swept_at
+             FROM git_sweep_coordinator
+             WHERE project_path = ?`).get(projectPath);
+  return row ? rowToState(row) : null;
+}
+function acquireGitSweepLease(db, projectPath, holderId, options = {}) {
+  const cooldownMs = options.cooldownMs ?? GIT_SWEEP_COOLDOWN_MS;
+  const leaseTtlMs = options.leaseTtlMs ?? GIT_SWEEP_LEASE_TTL_MS;
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const row = getGitSweepCoordinatorState(db, projectPath);
+    if (row?.leaseHolder && row.leaseExpiresAt !== null && row.leaseExpiresAt > now) {
+      return {
+        acquired: false,
+        projectPath,
+        reason: "lease_active",
+        leaseHolder: row.leaseHolder,
+        leaseExpiresAt: row.leaseExpiresAt,
+        lastSweptAt: row.lastSweptAt,
+        nextAllowedAt: null
+      };
+    }
+    if (!options.ignoreCooldown && row?.lastSweptAt !== null && row?.lastSweptAt !== undefined) {
+      const nextAllowedAt = row.lastSweptAt + cooldownMs;
+      if (nextAllowedAt > now) {
+        return {
+          acquired: false,
+          projectPath,
+          reason: "cooldown_active",
+          leaseHolder: row.leaseHolder,
+          leaseExpiresAt: row.leaseExpiresAt,
+          lastSweptAt: row.lastSweptAt,
+          nextAllowedAt
+        };
+      }
+    }
+    const leaseExpiresAt = now + leaseTtlMs;
+    db.prepare(`INSERT INTO git_sweep_coordinator (
+                 project_path,
+                 lease_holder,
+                 lease_expires_at,
+                 last_swept_at
+             ) VALUES (?, ?, ?, NULL)
+             ON CONFLICT(project_path) DO UPDATE SET
+                 lease_holder = excluded.lease_holder,
+                 lease_expires_at = excluded.lease_expires_at`).run(projectPath, holderId, leaseExpiresAt);
+    return {
+      acquired: true,
+      projectPath,
+      holderId,
+      acquiredAt: now,
+      leaseExpiresAt
+    };
+  });
+}
+function renewGitSweepLease(db, projectPath, holderId, leaseTtlMs = GIT_SWEEP_LEASE_TTL_MS) {
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const leaseExpiresAt = now + leaseTtlMs;
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_expires_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(leaseExpiresAt, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function markGitSweepSuccessAndRelease(db, projectPath, holderId) {
+  return runImmediate(db, () => {
+    const now = Date.now();
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_holder = NULL,
+                     lease_expires_at = NULL,
+                     last_swept_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(now, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function releaseGitSweepLease(db, projectPath, holderId) {
+  runImmediate(db, () => {
+    db.prepare(`UPDATE git_sweep_coordinator
+             SET lease_holder = NULL,
+                 lease_expires_at = NULL
+             WHERE project_path = ?
+               AND lease_holder = ?`).run(projectPath, holderId);
+  });
+}
+
 // ../plugin/src/features/magic-context/memory/embedding-cache.ts
 var DEFAULT_EMBEDDING_CACHE_TTL_MS = 60000;
 var projectEmbeddingCache = new Map;
@@ -159068,7 +159150,6 @@ function hasGitDir(canonical) {
 
 // ../plugin/src/plugin/embedding-bootstrap-helpers.ts
 import { createHash as createHash5 } from "node:crypto";
-init_logger();
 var EMBEDDING_AFFECTING_KEYS = new Set([
   "embedding.api_key",
   "embedding.endpoint",
@@ -159156,6 +159237,7 @@ async function ensureProjectRegisteredFromPiDirectory(directory, db) {
   };
   registerProjectEmbeddingAndMaybeWipe(db, projectIdentity, detailed.config.embedding, features, directory);
 }
+
 // ../plugin/src/features/magic-context/compartment-lease.ts
 var COMPARTMENT_LEASE_TTL_MS = 5 * 60 * 1000;
 var COMPARTMENT_LEASE_RENEWAL_MS = 60 * 1000;
@@ -159249,6 +159331,9 @@ var SESSION_META_SELECT_COLUMNS = [
   "cached_m0_materialized_at",
   "cached_m0_session_facts_version",
   "cached_m0_upgrade_state",
+  "cached_m0_system_hash",
+  "cached_m0_tool_set_hash",
+  "cached_m0_model_key",
   "last_observed_model_key",
   "upgrade_reminded_at",
   "pi_stable_id_scheme"
@@ -159285,6 +159370,9 @@ var META_COLUMNS = {
   cachedM0MaterializedAt: "cached_m0_materialized_at",
   cachedM0SessionFactsVersion: "cached_m0_session_facts_version",
   cachedM0UpgradeState: "cached_m0_upgrade_state",
+  cachedM0SystemHash: "cached_m0_system_hash",
+  cachedM0ToolSetHash: "cached_m0_tool_set_hash",
+  cachedM0ModelKey: "cached_m0_model_key",
   lastObservedModelKey: "last_observed_model_key",
   upgradeRemindedAt: "upgrade_reminded_at",
   piStableIdScheme: "pi_stable_id_scheme"
@@ -159327,7 +159415,7 @@ function isSessionMetaRow(row) {
   if (row === null || typeof row !== "object")
     return false;
   const r = row;
-  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.pi_stable_id_scheme);
+  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.cached_m0_system_hash) && isStringOrNull(r.cached_m0_tool_set_hash) && isStringOrNull(r.cached_m0_model_key) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.pi_stable_id_scheme);
 }
 function getDefaultSessionMeta(sessionId) {
   return {
@@ -159363,6 +159451,9 @@ function getDefaultSessionMeta(sessionId) {
     cachedM0MaterializedAt: null,
     cachedM0SessionFactsVersion: null,
     cachedM0UpgradeState: null,
+    cachedM0SystemHash: null,
+    cachedM0ToolSetHash: null,
+    cachedM0ModelKey: null,
     lastObservedModelKey: null,
     upgradeRemindedAt: null,
     piStableIdScheme: null
@@ -159414,6 +159505,9 @@ function toSessionMeta(row) {
     cachedM0MaterializedAt: numOrNull(row.cached_m0_materialized_at),
     cachedM0SessionFactsVersion: numOrNull(row.cached_m0_session_facts_version),
     cachedM0UpgradeState: stringOrNull(row.cached_m0_upgrade_state),
+    cachedM0SystemHash: stringOrNull(row.cached_m0_system_hash),
+    cachedM0ToolSetHash: stringOrNull(row.cached_m0_tool_set_hash),
+    cachedM0ModelKey: stringOrNull(row.cached_m0_model_key),
     lastObservedModelKey: stringOrNull(row.last_observed_model_key),
     upgradeRemindedAt: numOrNull(row.upgrade_reminded_at),
     piStableIdScheme: numOrNull(row.pi_stable_id_scheme)
@@ -159433,8 +159527,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);
@@ -159452,6 +159549,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],
@@ -159658,8 +159758,47 @@ 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
+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) {
@@ -159723,14 +159862,48 @@ function readRawSessionMessagesFromDb(db, sessionId) {
 var encoder = new TextEncoder;
 var TAG_PREFIX_REGEX = /^(?:§\d+§\s*)+/;
 var MALFORMED_TAG_PREFIX_REGEX = /^(?:§\d+">§(?:\d+§)?\s*)+/;
+var COMPLETE_TAG_PAIR_GLOBAL_REGEX = /\u00a7\d+\u00a7/g;
+var MALFORMED_TAG_GLOBAL_REGEX = /\u00a7\d+">(?:\u00a7(?:\d+\u00a7)?)?/g;
+var STRAY_SECTION_CHAR_REGEX = /\u00a7/g;
+function stripWellFormedLeadingTagPrefix(value) {
+  return value.replace(/^(\u00a7\d+\u00a7\s*)+/, "");
+}
+function stripCompleteTagPairsGlobally(value) {
+  return value.replace(COMPLETE_TAG_PAIR_GLOBAL_REGEX, "");
+}
+function stripMalformedTagNotationGlobally(value) {
+  return value.replace(MALFORMED_TAG_GLOBAL_REGEX, "");
+}
+function stripTagSectionCharacters(value) {
+  return value.replace(STRAY_SECTION_CHAR_REGEX, "");
+}
+function stripPersistedAssistantText(value) {
+  let text = stripWellFormedLeadingTagPrefix(value);
+  text = stripCompleteTagPairsGlobally(text);
+  text = stripMalformedTagNotationGlobally(text);
+  text = stripTagSectionCharacters(text);
+  return text.trim();
+}
 function byteSize(value) {
   return encoder.encode(value).length;
 }
 function stripTagPrefix(value) {
-  let stripped = value.replace(MALFORMED_TAG_PREFIX_REGEX, "");
-  stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+  let stripped = value;
+  for (let pass = 0;pass < 8; pass++) {
+    const prev = stripped;
+    stripped = stripped.replace(MALFORMED_TAG_PREFIX_REGEX, "");
+    stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+    if (stripped === prev)
+      break;
+  }
   return stripped;
 }
+function peelLeadingMcTagNotation(value) {
+  const body = stripTagPrefix(value);
+  if (body === value)
+    return { tagPrefix: "", body };
+  return { tagPrefix: value.slice(0, value.length - body.length), body };
+}
 function prependTag(tagId, value) {
   const stripped = stripTagPrefix(value);
   return `§${tagId}§ ${stripped}`;
@@ -159772,7 +159945,9 @@ function hasMeaningfulPart(part) {
     return false;
   const type = part.type;
   if (type === "text") {
-    return typeof part.text === "string" && part.text.trim().length > 0;
+    if (typeof part.text !== "string")
+      return false;
+    return stripTagPrefix(part.text).trim().length > 0;
   }
   if (typeof type !== "string")
     return false;
@@ -164518,7 +164693,6 @@ var CATEGORY_DEFAULT_TTL = {
   KNOWN_ISSUES: 30 * 24 * 60 * 60 * 1000
 };
 // ../plugin/src/features/magic-context/memory/embedding-backfill.ts
-init_logger();
 async function ensureMemoryEmbeddings(args) {
   const snapshot = getProjectEmbeddingSnapshot(args.projectIdentity);
   if (!snapshot?.enabled) {
@@ -164556,9 +164730,6 @@ async function ensureMemoryEmbeddings(args) {
   }
   return args.existingEmbeddings;
 }
-// ../plugin/src/features/magic-context/memory/promotion.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/memory/storage-memory.ts
 var COLUMN_MAP = {
   id: "id",
@@ -165458,7 +165629,6 @@ function getMaxMemoryMutationId(db, projectPath) {
   return row?.max_id ?? null;
 }
 // ../plugin/src/features/magic-context/storage-meta-persisted.ts
-init_logger();
 var CAS_RETRY_LIMIT = 5;
 var AUTO_SEARCH_NO_HINT_REASONS = new Set([
   "below-threshold",
@@ -165921,8 +166091,6 @@ function setSessionWorkMetrics(db, sessionId, newWorkTokens, totalInputTokens) {
 import { Buffer as Buffer3 } from "node:buffer";
 
 // ../plugin/src/features/magic-context/resolve-subagent-fallback.ts
-init_logger();
-await init_read_session_db();
 function resolveIsSubagentFromOpenCodeDb(sessionId) {
   try {
     return withReadOnlySessionDb((openCodeDb) => {
@@ -165956,6 +166124,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"
 };
@@ -166047,7 +166218,8 @@ function toNote(row) {
     updatedAt: row.updated_at,
     lastCheckedAt: toNullableNumber(row.last_checked_at),
     readyAt: toNullableNumber(row.ready_at),
-    readyReason: toNullableString(row.ready_reason)
+    readyReason: toNullableString(row.ready_reason),
+    anchorOrdinal: toNullableNumber(row.anchor_ordinal)
   };
 }
 function getNoteById(db, noteId) {
@@ -166099,7 +166271,7 @@ function getNotes(db, options3 = {}) {
 }
 function addNote(db, type, options3) {
   const now = Date.now();
-  const result = type === "session" ? db.prepare("INSERT INTO notes (type, status, content, session_id, created_at, updated_at, harness) VALUES ('session', 'active', ?, ?, ?, ?, ?) RETURNING *").get(options3.content, options3.sessionId, now, now, getHarness()) : db.prepare("INSERT INTO notes (type, status, content, session_id, project_path, surface_condition, created_at, updated_at, harness) VALUES ('smart', 'pending', ?, ?, ?, ?, ?, ?, ?) RETURNING *").get(options3.content, options3.sessionId ?? null, options3.projectPath, options3.surfaceCondition, now, now, getHarness());
+  const result = type === "session" ? db.prepare("INSERT INTO notes (type, status, content, session_id, created_at, updated_at, harness, anchor_ordinal) VALUES ('session', 'active', ?, ?, ?, ?, ?, ?) RETURNING *").get(options3.content, options3.sessionId, now, now, getHarness(), options3.anchorOrdinal ?? null) : db.prepare("INSERT INTO notes (type, status, content, session_id, project_path, surface_condition, created_at, updated_at, harness, anchor_ordinal) VALUES ('smart', 'pending', ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *").get(options3.content, options3.sessionId ?? null, options3.projectPath, options3.surfaceCondition, now, now, getHarness(), options3.anchorOrdinal ?? null);
   if (!isNoteRow(result)) {
     throw new Error("[notes] failed to insert note");
   }
@@ -166187,7 +166359,6 @@ function markNoteChecked(db, noteId) {
   db.prepare("UPDATE notes SET last_checked_at = ?, updated_at = ? WHERE id = ? AND type = 'smart'").run(now, now, noteId);
 }
 // ../plugin/src/features/magic-context/storage-ops.ts
-init_logger();
 var queuePendingOpStatements = new WeakMap;
 var getPendingOpsStatements = new WeakMap;
 var clearPendingOpsStatements = new WeakMap;
@@ -166589,7 +166760,6 @@ var ERROR_CLASSES = new Set([
   "unknown"
 ]);
 // src/tools/ctx-memory.ts
-init_logger();
 var DEFAULT_LIST_LIMIT = 10;
 var VALID_CATEGORIES = new Set(CATEGORY_PRIORITY);
 function isMemoryCategory2(value) {
@@ -166953,15 +167123,26 @@ function err3(text) {
     isError: true
   };
 }
+function captureAnchorOrdinal(db, sessionId) {
+  try {
+    const ordinal = getLastIndexedOrdinal(db, sessionId);
+    return ordinal > 0 ? ordinal : null;
+  } catch {
+    return null;
+  }
+}
+function anchorSuffix(note) {
+  return note.anchorOrdinal !== null ? ` ↳ @msg ${note.anchorOrdinal}` : "";
+}
 function formatNoteLine(note) {
   if (note.type === "smart") {
     const conditionLine = note.status === "ready" ? note.readyReason ?? note.surfaceCondition ?? "Condition satisfied" : note.surfaceCondition ?? "No condition recorded";
     const statusSuffix2 = note.status === "active" ? "" : ` (${note.status})`;
-    return `- **#${note.id}**${statusSuffix2}: ${note.content}
+    return `- **#${note.id}**${statusSuffix2}: ${note.content}${anchorSuffix(note)}
   *Condition*: ${conditionLine}`;
   }
   const statusSuffix = note.status === "active" ? "" : ` (${note.status})`;
-  return `- **#${note.id}**${statusSuffix}: ${note.content}`;
+  return `- **#${note.id}**${statusSuffix}: ${note.content}${anchorSuffix(note)}`;
 }
 var DISMISS_FOOTER = `
 
@@ -166983,6 +167164,7 @@ function createCtxNoteTool(deps) {
         const content = params.content?.trim();
         if (!content)
           return err3("Error: 'content' is required when action is 'write'.");
+        const anchorOrdinal = captureAnchorOrdinal(deps.db, sessionId);
         const surfaceCondition = params.surface_condition?.trim();
         if (surfaceCondition) {
           if (deps.dreamerEnabled !== true) {
@@ -166995,13 +167177,18 @@ function createCtxNoteTool(deps) {
           const note2 = addNote(deps.db, "smart", {
             content,
             projectPath: projectIdentity,
-            surfaceCondition
+            surfaceCondition,
+            anchorOrdinal
           });
           return ok3(`Created smart note #${note2.id}. Dreamer will evaluate the condition during nightly runs:
 - Content: ${content}
 - Condition: ${surfaceCondition}`);
         }
-        const note = addNote(deps.db, "session", { sessionId, content });
+        const note = addNote(deps.db, "session", {
+          sessionId,
+          content,
+          anchorOrdinal
+        });
         return ok3(`Saved session note #${note.id}.`);
       }
       if (action2 === "dismiss") {
@@ -167064,9 +167251,13 @@ function createCtxNoteTool(deps) {
 
 No notes for the current filter.`);
       }
-      return ok3(`${sections.join(`
+      const body = sections.join(`
 
-`)}${DISMISS_FOOTER}`);
+`);
+      const anchorHint = body.includes("↳ @msg ") ? `
+
+↳ @msg N marks the conversation tail when a note was written. To see what led to it: ctx_expand(start=N-x, end=N) (pick x for how far back to look).` : "";
+      return ok3(`${body}${anchorHint}${DISMISS_FOOTER}`);
     }
   };
 }
@@ -167285,11 +167476,7 @@ function createCtxReduceTool(deps) {
   };
 }
 
-// ../plugin/src/features/magic-context/search.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/git-commits/git-log-reader.ts
-init_logger();
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
@@ -167302,6 +167489,7 @@ async function readGitCommits(directory, options3 = {}) {
   if (revision.startsWith("-")) {
     throw new Error(`readGitCommits: refusing revision that looks like an option: "${revision}"`);
   }
+  const projectLabel = options3.projectIdentity ?? "<project>";
   const args = [
     "log",
     revision,
@@ -167324,11 +167512,11 @@ async function readGitCommits(directory, options3 = {}) {
     stdout = result.stdout;
   } catch (error51) {
     const message = error51 instanceof Error ? error51.message : String(error51);
-    log(`[git-commits] readGitCommits failed at cwd=${directory}: ${message.slice(0, 500)}`);
+    log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
     return [];
   }
   if (stdout.trim().length === 0) {
-    log(`[git-commits] readGitCommits returned empty stdout at cwd=${directory} (sinceMs=${options3.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
+    log(`[git-commits] readGitCommits returned empty stdout for ${projectLabel} (sinceMs=${options3.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
   }
   return parseGitLogOutput(stdout);
 }
@@ -167372,15 +167560,12 @@ ${body}` : subject;
   }
   return commits;
 }
-// ../plugin/src/features/magic-context/git-commits/indexer.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/git-commits/storage-git-commits.ts
-init_logger();
 var insertStatements = new WeakMap;
 var existingShasStatements = new WeakMap;
 var projectCountStatements = new WeakMap;
 var evictStatements = new WeakMap;
+var evictOverflowStatements = new WeakMap;
 var latestCommitTimeStatements = new WeakMap;
 function getInsertStatement(db) {
   let stmt = insertStatements.get(db);
@@ -167423,17 +167608,17 @@ function getLatestCommitTimeStatement(db) {
   }
   return stmt;
 }
-function getEvictStatement(db) {
-  let stmt = evictStatements.get(db);
+function getEvictOverflowStatement(db) {
+  let stmt = evictOverflowStatements.get(db);
   if (!stmt) {
     stmt = db.prepare(`DELETE FROM git_commits
-             WHERE sha IN (
-                 SELECT sha FROM git_commits
+             WHERE rowid IN (
+                 SELECT rowid FROM git_commits
                  WHERE project_path = ?
-                 ORDER BY committed_at ASC
-                 LIMIT ?
+                 ORDER BY committed_at DESC, sha DESC
+                 LIMIT -1 OFFSET ?
              )`);
-    evictStatements.set(db, stmt);
+    evictOverflowStatements.set(db, stmt);
   }
   return stmt;
 }
@@ -167471,22 +167656,15 @@ function getLatestIndexedCommitTimeMs(db, projectPath) {
   const row = getLatestCommitTimeStatement(db).get(projectPath);
   return row?.latest ?? null;
 }
-function evictOldestCommits(db, projectPath, excess) {
-  if (excess <= 0)
-    return 0;
-  const before = getCommitCount(db, projectPath);
-  getEvictStatement(db).run(projectPath, excess);
-  const after = getCommitCount(db, projectPath);
-  return Math.max(0, before - after);
-}
 function enforceProjectCap(db, projectPath, maxCommits) {
   if (maxCommits <= 0)
     return 0;
   const count = getCommitCount(db, projectPath);
   if (count <= maxCommits)
     return 0;
-  const excess = count - maxCommits;
-  const evicted = evictOldestCommits(db, projectPath, excess);
+  getEvictOverflowStatement(db).run(projectPath, maxCommits);
+  const after = getCommitCount(db, projectPath);
+  const evicted = Math.max(0, count - after);
   if (evicted > 0) {
     log(`[git-commits] evicted ${evicted} oldest commits for project ${projectPath} (cap=${maxCommits}, was=${count})`);
   }
@@ -167518,7 +167696,8 @@ async function indexCommitsForProject(db, projectPath, directory, options3) {
     const sinceMs = latestIndexed !== null ? Math.max(latestIndexed - 60000, Date.now() - options3.sinceDays * MS_PER_DAY) : Date.now() - options3.sinceDays * MS_PER_DAY;
     const commits = await readGitCommits(directory, {
       sinceMs,
-      maxCommits: options3.maxCommits
+      maxCommits: options3.maxCommits,
+      projectIdentity: projectPath
     });
     result.scanned = commits.length;
     if (commits.length === 0) {
@@ -167594,7 +167773,6 @@ async function embedUnembeddedCommits(db, projectPath) {
   }
 }
 // ../plugin/src/features/magic-context/git-commits/search-git-commits.ts
-init_logger();
 var ftsStatements = new WeakMap;
 var ftsPlainStatements = new WeakMap;
 var getBySHAStatements = new WeakMap;
@@ -167725,6 +167903,62 @@ function searchGitCommitsSync(db, projectPath, query, options3) {
   });
   return results.slice(0, options3.limit);
 }
+// ../plugin/src/features/magic-context/literal-probes.ts
+var MAX_PROBES = 5;
+var MIN_PROBE_LENGTH = 3;
+var SLASH_COMMAND_RE = /\/[a-z][a-z0-9]*(?:-[a-z0-9]+)+/gi;
+var KEBAB_SNAKE_RE = /[a-z][a-z0-9]*(?:[-_][a-z0-9]+)+/gi;
+var DOTTED_RE = /[a-z0-9][a-z0-9_-]*(?:\.[a-z0-9_-]+)+/gi;
+var CAMEL_RE = /\b[a-zA-Z][a-z0-9]*(?:[A-Z][a-z0-9]*)+\b/g;
+var SHA_RE = /\b[0-9a-f]{7,40}\b/gi;
+var ERROR_CODE_RE = /\b(?:TS\d{4,}|ERR_[A-Z][A-Z0-9_]*)\b/g;
+var QUOTED_RE = /["`]([^"`]{3,80})["`]/g;
+function looksLikeSha(token) {
+  return /[0-9]/.test(token) && /^[0-9a-f]{7,40}$/i.test(token);
+}
+function extractLiteralProbes(query) {
+  const trimmed = query.trim();
+  if (trimmed.length === 0)
+    return [];
+  const ordered = [];
+  const seen = new Set;
+  const add = (raw) => {
+    if (!raw)
+      return;
+    const probe = raw.trim();
+    if (probe.length < MIN_PROBE_LENGTH)
+      return;
+    const key = probe.toLowerCase();
+    if (seen.has(key))
+      return;
+    seen.add(key);
+    ordered.push(probe);
+  };
+  for (const m of trimmed.matchAll(QUOTED_RE))
+    add(m[1]);
+  for (const m of trimmed.matchAll(SLASH_COMMAND_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(ERROR_CODE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(DOTTED_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(KEBAB_SNAKE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(CAMEL_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(SHA_RE)) {
+    if (looksLikeSha(m[0]))
+      add(m[0]);
+  }
+  return ordered.slice(0, MAX_PROBES);
+}
+function containsProbeVerbatim(text, probes) {
+  if (probes.length === 0)
+    return false;
+  const haystack = text.toLowerCase();
+  return probes.some((probe) => haystack.includes(probe.toLowerCase()));
+}
+
 // ../plugin/src/features/magic-context/search.ts
 var DEFAULT_UNIFIED_SEARCH_LIMIT = 10;
 var FTS_SEMANTIC_CANDIDATE_LIMIT = 50;
@@ -167902,36 +168136,82 @@ function linearDecayScore(rank, total) {
     return 0;
   return Math.max(0, 1 - rank / total);
 }
-function searchMessages(args) {
-  const sanitizedQuery = sanitizeFtsQuery(args.query.trim());
-  if (sanitizedQuery.length === 0) {
+function runMessageFtsQuery(db, sessionId, ftsQuery, fetchLimit, cutoff) {
+  if (ftsQuery.length === 0)
     return [];
-  }
-  const fetchLimit = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.limit * 3 : args.limit;
-  const rows = getMessageSearchStatement(args.db).all(args.sessionId, sanitizedQuery, fetchLimit).map((row) => row);
-  const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
-  const filtered = rows.map((row) => {
+  const rows = getMessageSearchStatement(db).all(sessionId, ftsQuery, fetchLimit).map((row) => row);
+  const result = [];
+  for (const row of rows) {
     const messageOrdinal = getMessageOrdinal(row.messageOrdinal);
     if (messageOrdinal === null || typeof row.messageId !== "string" || typeof row.role !== "string" || typeof row.content !== "string") {
-      return null;
+      continue;
     }
     if (cutoff !== null && messageOrdinal > cutoff) {
-      return null;
+      continue;
     }
-    return {
+    result.push({
       messageOrdinal,
       messageId: row.messageId,
       role: row.role,
       content: row.content
-    };
-  }).filter((result) => result !== null).slice(0, args.limit);
-  return filtered.map((row, rank) => ({
+    });
+  }
+  return result;
+}
+var RRF_K = 60;
+var VERBATIM_PROBE_BONUS = 0.5;
+function searchMessages(args) {
+  const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
+  const fetchLimit = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.limit * 3 : args.limit;
+  const baseQuery = sanitizeFtsQuery(args.query.trim());
+  const probes = args.probes ?? [];
+  if (probes.length === 0) {
+    const filtered = runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff).slice(0, args.limit);
+    return filtered.map((row, rank) => ({
+      source: "message",
+      content: previewText(row.content),
+      score: linearDecayScore(rank, filtered.length),
+      messageOrdinal: row.messageOrdinal,
+      messageId: row.messageId,
+      role: row.role
+    }));
+  }
+  const queryLists = [];
+  if (baseQuery.length > 0) {
+    queryLists.push(runMessageFtsQuery(args.db, args.sessionId, baseQuery, fetchLimit, cutoff));
+  }
+  for (const probe of probes) {
+    const probeQuery = sanitizeFtsQuery(probe);
+    if (probeQuery.length === 0)
+      continue;
+    queryLists.push(runMessageFtsQuery(args.db, args.sessionId, probeQuery, fetchLimit, cutoff));
+  }
+  const fused = new Map;
+  for (const list of queryLists) {
+    list.forEach((row, rank) => {
+      const rrf = 1 / (RRF_K + rank);
+      const existing = fused.get(row.messageId);
+      if (existing) {
+        existing.score += rrf;
+      } else {
+        fused.set(row.messageId, { row, score: rrf });
+      }
+    });
+  }
+  for (const entry of fused.values()) {
+    if (containsProbeVerbatim(entry.row.content, probes)) {
+      entry.score += VERBATIM_PROBE_BONUS;
+    }
+  }
+  const ranked = [...fused.values()].sort((a, b) => b.score !== a.score ? b.score - a.score : a.row.messageOrdinal - b.row.messageOrdinal).slice(0, args.limit);
+  const maxScore = ranked.length > 0 ? ranked[0].score : 1;
+  return ranked.map((entry) => ({
     source: "message",
-    content: previewText(row.content),
-    score: linearDecayScore(rank, filtered.length),
-    messageOrdinal: row.messageOrdinal,
-    messageId: row.messageId,
-    role: row.role
+    content: previewText(entry.row.content),
+    score: maxScore > 0 ? entry.score / maxScore : 0,
+    messageOrdinal: entry.row.messageOrdinal,
+    messageId: entry.row.messageId,
+    role: entry.row.role
   }));
 }
 function getSourceBoost(result) {
@@ -168015,12 +168295,14 @@ async function unifiedSearch(db, sessionId, projectPath, query, options3 = {}) {
     return null;
   }) : Promise.resolve(null);
   await Promise.resolve();
+  const messageProbes = options3.explicitSearch ? extractLiteralProbes(trimmedQuery) : [];
   const messageResults = runMessages ? searchMessages({
     db,
     sessionId,
     query: trimmedQuery,
     limit: tierLimit,
-    maxOrdinal: options3.maxMessageOrdinal
+    maxOrdinal: options3.maxMessageOrdinal,
+    probes: messageProbes
   }) : [];
   const queryEmbedding = await queryEmbeddingPromise;
   const [memoryResults, gitCommitResults] = await Promise.all([
@@ -168161,9 +168443,6 @@ class BoundedSessionMap {
   }
 }
 
-// ../plugin/src/hooks/magic-context/inject-compartments.ts
-init_logger();
-
 // ../plugin/src/hooks/magic-context/decay-curve.ts
 var H50 = 24;
 var D = 25;
@@ -168338,26 +168617,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;
@@ -168374,7 +168685,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;
       }
@@ -168384,12 +168696,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;
       }
@@ -168408,7 +168721,6 @@ function isAftAvailable() {
 }
 
 // ../plugin/src/hooks/magic-context/key-files-block.ts
-init_logger();
 var cachedKeyFilesBySession = new Map;
 var staleUpdates = new Map;
 function staleKey(update2) {
@@ -168506,9 +168818,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;
@@ -168791,7 +169100,8 @@ function createCtxSearchTool(deps) {
         maxMessageOrdinal: lastCompartmentEnd >= 0 ? lastCompartmentEnd : undefined,
         gitCommitsEnabled,
         sources: params.sources,
-        visibleMemoryIds
+        visibleMemoryIds,
+        explicitSearch: true
       });
       return {
         content: [{ type: "text", text: formatSearchResults(query, results) }],