@cortexkit/pi-magic-context 0.22.1 → 0.22.3

package/dist/index.js

@@ -86,9 +86,6 @@ function getMagicContextStorageDir() {
 function getLegacyOpenCodeMagicContextStorageDir() {
   return path2.join(getOpenCodeStorageDir(), "plugin", "magic-context");
 }
-function getCacheDir() {
-  return process.env.XDG_CACHE_HOME ?? path2.join(os.homedir(), ".cache");
-}
 var init_data_path = () => {};
 
 // ../plugin/src/shared/logger.ts
@@ -140945,14 +140942,48 @@ function readRawSessionMessagesFromDb(db, sessionId) {
 var encoder = new TextEncoder;
 var TAG_PREFIX_REGEX = /^(?:§\d+§\s*)+/;
 var MALFORMED_TAG_PREFIX_REGEX = /^(?:§\d+">§(?:\d+§)?\s*)+/;
+var COMPLETE_TAG_PAIR_GLOBAL_REGEX = /\u00a7\d+\u00a7/g;
+var MALFORMED_TAG_GLOBAL_REGEX = /\u00a7\d+">(?:\u00a7(?:\d+\u00a7)?)?/g;
+var STRAY_SECTION_CHAR_REGEX = /\u00a7/g;
+function stripWellFormedLeadingTagPrefix(value) {
+  return value.replace(/^(\u00a7\d+\u00a7\s*)+/, "");
+}
+function stripCompleteTagPairsGlobally(value) {
+  return value.replace(COMPLETE_TAG_PAIR_GLOBAL_REGEX, "");
+}
+function stripMalformedTagNotationGlobally(value) {
+  return value.replace(MALFORMED_TAG_GLOBAL_REGEX, "");
+}
+function stripTagSectionCharacters(value) {
+  return value.replace(STRAY_SECTION_CHAR_REGEX, "");
+}
+function stripPersistedAssistantText(value) {
+  let text = stripWellFormedLeadingTagPrefix(value);
+  text = stripCompleteTagPairsGlobally(text);
+  text = stripMalformedTagNotationGlobally(text);
+  text = stripTagSectionCharacters(text);
+  return text.trim();
+}
 function byteSize(value) {
   return encoder.encode(value).length;
 }
 function stripTagPrefix(value) {
-  let stripped = value.replace(MALFORMED_TAG_PREFIX_REGEX, "");
-  stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+  let stripped = value;
+  for (let pass = 0;pass < 8; pass++) {
+    const prev = stripped;
+    stripped = stripped.replace(MALFORMED_TAG_PREFIX_REGEX, "");
+    stripped = stripped.replace(TAG_PREFIX_REGEX, "");
+    if (stripped === prev)
+      break;
+  }
   return stripped;
 }
+function peelLeadingMcTagNotation(value) {
+  const body = stripTagPrefix(value);
+  if (body === value)
+    return { tagPrefix: "", body };
+  return { tagPrefix: value.slice(0, value.length - body.length), body };
+}
 function prependTag(tagId, value) {
   const stripped = stripTagPrefix(value);
   return `§${tagId}§ ${stripped}`;
@@ -140994,7 +141025,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;
@@ -142698,7 +142731,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 = 29;
 function resolveDatabasePath(dbPathOverride) {
   if (dbPathOverride) {
     return { dbDir: dirname2(dbPathOverride), dbPath: dbPathOverride };
@@ -143018,6 +143051,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,
@@ -144240,6 +144284,38 @@ 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");
+      }
+    }
   }
 ];
 var LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
@@ -145127,7 +145203,8 @@ function toNote(row) {
     updatedAt: row.updated_at,
     lastCheckedAt: toNullableNumber(row.last_checked_at),
     readyAt: toNullableNumber(row.ready_at),
-    readyReason: toNullableString(row.ready_reason)
+    readyReason: toNullableString(row.ready_reason),
+    anchorOrdinal: toNullableNumber(row.anchor_ordinal)
   };
 }
 function getNoteById(db, noteId) {
@@ -145179,7 +145256,7 @@ function getNotes(db, options = {}) {
 }
 function addNote(db, type, options) {
   const now = Date.now();
-  const result = type === "session" ? db.prepare("INSERT INTO notes (type, status, content, session_id, created_at, updated_at, harness) VALUES ('session', 'active', ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId, now, now, getHarness()) : db.prepare("INSERT INTO notes (type, status, content, session_id, project_path, surface_condition, created_at, updated_at, harness) VALUES ('smart', 'pending', ?, ?, ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId ?? null, options.projectPath, options.surfaceCondition, now, now, getHarness());
+  const result = type === "session" ? db.prepare("INSERT INTO notes (type, status, content, session_id, created_at, updated_at, harness, anchor_ordinal) VALUES ('session', 'active', ?, ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId, now, now, getHarness(), options.anchorOrdinal ?? null) : db.prepare("INSERT INTO notes (type, status, content, session_id, project_path, surface_condition, created_at, updated_at, harness, anchor_ordinal) VALUES ('smart', 'pending', ?, ?, ?, ?, ?, ?, ?, ?) RETURNING *").get(options.content, options.sessionId ?? null, options.projectPath, options.surfaceCondition, now, now, getHarness(), options.anchorOrdinal ?? null);
   if (!isNoteRow(result)) {
     throw new Error("[notes] failed to insert note");
   }
@@ -145949,212 +146026,41 @@ function getAgentFallbackModels(agent) {
 
 // ../plugin/src/shared/models-dev-cache.ts
 init_data_path();
-import { createHash as createHash5 } from "node:crypto";
-import { existsSync as existsSync5, readFileSync as readFileSync3 } from "node:fs";
-import { homedir as homedir2, platform } from "node:os";
+init_logger();
+import { mkdirSync as mkdirSync3, readFileSync as readFileSync3, renameSync, writeFileSync } from "node:fs";
 import { join as join6 } from "node:path";
-
-// ../plugin/src/shared/jsonc-parser.ts
-function stripJsonComments(content) {
-  let result = "";
-  let inString = false;
-  let escaped = false;
-  let inLineComment = false;
-  let inBlockComment = false;
-  for (let index = 0;index < content.length; index += 1) {
-    const char = content[index];
-    const next = content[index + 1];
-    if (inLineComment) {
-      if (char === `
-`) {
-        inLineComment = false;
-        result += char;
-      }
-      continue;
-    }
-    if (inBlockComment) {
-      if (char === "*" && next === "/") {
-        inBlockComment = false;
-        index += 1;
-      }
-      continue;
-    }
-    if (inString) {
-      result += char;
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-      result += char;
-      continue;
-    }
-    if (char === "/" && next === "/") {
-      inLineComment = true;
-      index += 1;
-      continue;
-    }
-    if (char === "/" && next === "*") {
-      inBlockComment = true;
-      index += 1;
-      continue;
-    }
-    result += char;
-  }
-  return result;
-}
-function stripTrailingCommas(content) {
-  let result = "";
-  let inString = false;
-  let escaped = false;
-  for (let index = 0;index < content.length; index += 1) {
-    const char = content[index];
-    if (inString) {
-      result += char;
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-      result += char;
-      continue;
-    }
-    if (char === ",") {
-      let lookahead = index + 1;
-      while (lookahead < content.length && /\s/.test(content[lookahead] ?? "")) {
-        lookahead += 1;
-      }
-      const next = content[lookahead];
-      if (next === "}" || next === "]") {
-        continue;
-      }
-    }
-    result += char;
-  }
-  return result;
+var MIN_SANE_LIMIT = 20000;
+var MAX_SANE_LIMIT = 3000000;
+function isSaneLimit(limit) {
+  return typeof limit === "number" && limit >= MIN_SANE_LIMIT && limit <= MAX_SANE_LIMIT;
 }
-function parseJsonc(content) {
-  const normalized = stripTrailingCommas(stripJsonComments(content));
-  return JSON.parse(normalized);
-}
-
-// ../plugin/src/shared/models-dev-cache.ts
-init_logger();
-var RELOAD_INTERVAL_MS = 5 * 60 * 1000;
 var apiCache = null;
-var apiLoadedAt = 0;
-var fileCache = null;
-var fileLastAttempt = 0;
-function hashFast(input) {
-  return createHash5("sha1").update(input).digest("hex");
-}
-function getModelsJsonPath() {
-  const explicit = process.env.OPENCODE_MODELS_PATH?.trim();
-  if (explicit)
-    return explicit;
-  const cacheBase = getCacheDir();
-  const source = process.env.OPENCODE_MODELS_URL?.trim();
-  const filename = source && source !== "https://models.dev" ? `models-${hashFast(source)}.json` : "models.json";
-  return join6(cacheBase, "opencode", filename);
-}
-function getOpencodeConfigPath() {
-  const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
-  const configDir = envDir ? envDir : platform() === "win32" ? join6(homedir2(), ".config", "opencode") : join6(process.env.XDG_CONFIG_HOME || join6(homedir2(), ".config"), "opencode");
-  const jsonc = join6(configDir, "opencode.jsonc");
-  if (existsSync5(jsonc))
-    return jsonc;
-  const json = join6(configDir, "opencode.json");
-  if (existsSync5(json))
-    return json;
-  return null;
-}
-function resolveLimit(limit) {
-  if (!limit)
-    return;
-  if (typeof limit.input === "number" && limit.input > 0)
-    return limit.input;
-  if (typeof limit.context === "number" && limit.context > 0)
-    return limit.context;
-  return;
+var persistSeedLoaded = false;
+function persistFilePath() {
+  return join6(getMagicContextStorageDir(), `model-context-limits-${getHarness()}.json`);
 }
-function setCachedModelMetadata(cache, key, model) {
-  const limit = resolveLimit(model?.limit);
-  if (limit === undefined) {
+function loadPersistedApiCacheOnce() {
+  if (persistSeedLoaded || apiCache !== null)
     return;
-  }
-  const value = { limit };
-  cache.set(key, value);
-  const modes = model?.experimental?.modes;
-  if (modes && typeof modes === "object") {
-    for (const mode of Object.keys(modes)) {
-      cache.set(`${key}-${mode}`, value);
-    }
-  }
-}
-function loadModelsDevMetadataFromFile() {
-  const metadata = new Map;
-  const modelsJsonPath = getModelsJsonPath();
-  let fileFound = false;
+  persistSeedLoaded = true;
   try {
-    if (existsSync5(modelsJsonPath)) {
-      fileFound = true;
-      const raw = readFileSync3(modelsJsonPath, "utf-8");
-      const data = JSON.parse(raw);
-      for (const [providerId, provider] of Object.entries(data)) {
-        if (!provider?.models || typeof provider.models !== "object")
-          continue;
-        for (const [modelId, model] of Object.entries(provider.models)) {
-          setCachedModelMetadata(metadata, `${providerId}/${modelId}`, model);
-        }
-      }
+    const raw = readFileSync3(persistFilePath(), "utf-8");
+    const obj = JSON.parse(raw);
+    const map = new Map;
+    for (const [key, limit] of Object.entries(obj)) {
+      if (isSaneLimit(limit))
+        map.set(key, { limit });
     }
-  } catch (error) {
-    sessionLog("global", `models-dev-cache: failed to read models.json at ${modelsJsonPath}:`, error instanceof Error ? error.message : String(error));
-  }
-  try {
-    const configPath = getOpencodeConfigPath();
-    if (configPath && existsSync5(configPath)) {
-      const config = parseJsonc(readFileSync3(configPath, "utf-8"));
-      if (config.provider && typeof config.provider === "object") {
-        for (const [providerId, provider] of Object.entries(config.provider)) {
-          if (!provider?.models || typeof provider.models !== "object")
-            continue;
-          for (const [modelId, model] of Object.entries(provider.models)) {
-            setCachedModelMetadata(metadata, `${providerId}/${modelId}`, model);
-          }
-        }
-      }
+    if (map.size > 0) {
+      apiCache = map;
+      sessionLog("global", `models-dev-cache: seeded ${map.size} entries from persisted cache (cold start)`);
     }
-  } catch (error) {
-    sessionLog("global", "models-dev-cache: failed to read opencode config for custom models:", error instanceof Error ? error.message : String(error));
-  }
-  sessionLog("global", `models-dev-cache: file-layer loaded ${metadata.size} model metadata entries (modelsJsonPath=${modelsJsonPath}, found=${fileFound})`);
-  return metadata;
+  } catch {}
 }
-function getModelsDevContextLimit(providerID, modelID) {
-  const now = Date.now();
-  if (!fileCache || now - fileLastAttempt > RELOAD_INTERVAL_MS) {
-    fileLastAttempt = now;
-    fileCache = loadModelsDevMetadataFromFile();
-  }
+function getSdkContextLimit(providerID, modelID) {
+  loadPersistedApiCacheOnce();
   const fromApi = lookupLimitWithTagFallback(apiCache, providerID, modelID);
-  const fromFile = lookupLimitWithTagFallback(fileCache, providerID, modelID);
-  if (typeof fromApi === "number" && typeof fromFile === "number") {
-    return Math.max(fromApi, fromFile);
-  }
-  return fromApi ?? fromFile;
+  return isSaneLimit(fromApi) ? fromApi : undefined;
 }
 function lookupLimitWithTagFallback(cache, providerID, modelID) {
   if (!cache)
@@ -146171,12 +146077,6 @@ function lookupLimitWithTagFallback(cache, providerID, modelID) {
   }
   return;
 }
-function clearModelsDevCache() {
-  apiCache = null;
-  apiLoadedAt = 0;
-  fileCache = null;
-  fileLastAttempt = 0;
-}
 
 // ../plugin/src/hooks/magic-context/derive-budgets.ts
 var TRIGGER_BUDGET_PERCENTAGE = 0.05;
@@ -146207,7 +146107,7 @@ function resolveHistorianContextLimit(historianModelOverride) {
     const [providerID, ...rest] = historianModelOverride.split("/");
     const modelID = rest.join("/");
     if (providerID && modelID) {
-      const limit = getModelsDevContextLimit(providerID, modelID);
+      const limit = getSdkContextLimit(providerID, modelID);
       if (typeof limit === "number" && limit > 0)
         return limit;
     }
@@ -146226,7 +146126,7 @@ function resolveHistorianContextLimit(historianModelOverride) {
     const modelID = rest.join("/");
     if (!providerID || !modelID)
       continue;
-    const limit = getModelsDevContextLimit(providerID, modelID);
+    const limit = getSdkContextLimit(providerID, modelID);
     if (typeof limit !== "number" || limit <= 0)
       continue;
     if (minLimit === undefined || limit < minLimit)
@@ -146239,37 +146139,6 @@ function resolveHistorianContextLimit(historianModelOverride) {
 init_logger();
 var DEFAULT_CONTEXT_LIMIT = 128000;
 var MAX_EXECUTE_THRESHOLD = 80;
-function resolveContextLimit(providerID, modelID, ctx) {
-  const fromModelsDev = providerID && modelID ? getModelsDevContextLimit(providerID, modelID) : undefined;
-  const baseline = fromModelsDev ?? DEFAULT_CONTEXT_LIMIT;
-  if (ctx?.db && ctx.sessionID) {
-    try {
-      const overflow = getOverflowState(ctx.db, ctx.sessionID);
-      if (overflow.detectedContextLimit > 0 && overflow.detectedContextLimit < baseline) {
-        return overflow.detectedContextLimit;
-      }
-    } catch {}
-  }
-  return baseline;
-}
-function resolveTrustedContextLimit(providerID, modelID, ctx) {
-  const fromModelsDev = providerID && modelID ? getModelsDevContextLimit(providerID, modelID) : undefined;
-  let detected;
-  if (ctx?.db && ctx.sessionID) {
-    try {
-      const overflow = getOverflowState(ctx.db, ctx.sessionID);
-      if (overflow.detectedContextLimit > 0) {
-        detected = overflow.detectedContextLimit;
-      }
-    } catch {}
-  }
-  if (typeof fromModelsDev === "number" && fromModelsDev > 0) {
-    if (detected !== undefined && detected < fromModelsDev)
-      return detected;
-    return fromModelsDev;
-  }
-  return detected;
-}
 function resolveCacheTtl(cacheTtl, modelKey) {
   if (typeof cacheTtl === "string") {
     return cacheTtl;
@@ -146490,7 +146359,7 @@ function clearNoteNudgeTriggerOnly(db, sessionId) {
 }
 
 // ../plugin/src/hooks/magic-context/todo-view.ts
-import { createHash as createHash6 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 var TERMINAL_STATUSES = new Set(["completed", "cancelled"]);
 var TITLE_DONE_STATUSES = new Set(["completed"]);
 var SYNTHETIC_CALL_ID_PREFIX = "mc_synthetic_todo_";
@@ -146535,7 +146404,7 @@ function buildSyntheticTodoPart(stateJson) {
   };
 }
 function computeSyntheticCallId(stateJson) {
-  const hash = createHash6("sha256").update(stateJson).digest("hex").slice(0, 16);
+  const hash = createHash5("sha256").update(stateJson).digest("hex").slice(0, 16);
   return `${SYNTHETIC_CALL_ID_PREFIX}${hash}`;
 }
 function parseTodoState(stateJson) {
@@ -146789,7 +146658,7 @@ init_logger();
 
 // src/subagent-runner.ts
 import * as childProcess from "node:child_process";
-import { existsSync as existsSync7 } from "node:fs";
+import { existsSync as existsSync6 } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
 import { dirname as dirname3, join as join8, resolve as resolvePath } from "node:path";
 import { createInterface } from "node:readline";
@@ -146893,7 +146762,7 @@ function resolveBundledPiCli() {
     const require_ = createRequire2(import.meta.url);
     const pkgJson = require_.resolve("@earendil-works/pi-coding-agent/package.json");
     const cliPath = join8(dirname3(pkgJson), "dist/cli.js");
-    if (existsSync7(cliPath))
+    if (existsSync6(cliPath))
       return cliPath;
     return null;
   } catch {
@@ -146904,7 +146773,7 @@ function resolveSubagentEntryPath() {
   try {
     const here = dirname3(fileURLToPath(import.meta.url));
     const candidate = resolvePath(here, "subagent-entry.js");
-    if (existsSync7(candidate))
+    if (existsSync6(candidate))
       return candidate;
     return;
   } catch {
@@ -147664,7 +147533,7 @@ function clearStaleEntries(db, maxAgeMs, projectIdentity) {
 // src/commands/ctx-dream.ts
 init_logger();
 // ../plugin/src/features/magic-context/dreamer/runner.ts
-import { existsSync as existsSync9 } from "node:fs";
+import { existsSync as existsSync8 } from "node:fs";
 import { join as join11 } from "node:path";
 
 // ../plugin/src/shared/index.ts
@@ -147918,12 +147787,12 @@ init_logger();
 
 // ../plugin/src/features/magic-context/key-files/aft-availability.ts
 var import_comment_json = __toESM(require_src2(), 1);
-import { existsSync as existsSync8, readFileSync as readFileSync5 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
+import { existsSync as existsSync7, readFileSync as readFileSync5 } from "node:fs";
+import { homedir as homedir2 } from "node:os";
 import { join as join9 } from "node:path";
 var overrideAvailability = null;
 function parseConfig(path7) {
-  if (!existsSync8(path7))
+  if (!existsSync7(path7))
     return null;
   return import_comment_json.parse(readFileSync5(path7, "utf-8"));
 }
@@ -147945,7 +147814,7 @@ function hasAftAtKeys(value, keys) {
   return false;
 }
 function getAftAvailability() {
-  const home = process.env.HOME || homedir3();
+  const home = process.env.HOME || homedir2();
   const opencodePaths = [
     join9(home, ".config", "opencode", "opencode.jsonc"),
     join9(home, ".config", "opencode", "opencode.json")
@@ -148589,13 +148458,13 @@ function invalidateMemory(projectPath, memoryId) {
 }
 
 // ../plugin/src/features/magic-context/memory/normalize-hash.ts
-import { createHash as createHash7 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 function normalizeMemoryContent(content) {
   return content.toLowerCase().replace(/\s+/g, " ").trim();
 }
 function computeNormalizedHash(content) {
   const normalized = normalizeMemoryContent(content);
-  return createHash7("md5").update(normalized).digest("hex");
+  return createHash6("md5").update(normalized).digest("hex");
 }
 
 // ../plugin/src/features/magic-context/memory/storage-memory.ts
@@ -149746,7 +149615,7 @@ function getOpenCodeDbPath2() {
 }
 function openOpenCodeDb() {
   const dbPath = getOpenCodeDbPath2();
-  if (!existsSync9(dbPath)) {
+  if (!existsSync8(dbPath)) {
     log(`[key-files] OpenCode DB not found at ${dbPath} — skipping`);
     return null;
   }
@@ -149896,8 +149765,8 @@ async function runDream(args) {
       try {
         const docsDir = args.sessionDirectory ?? args.projectIdentity;
         const existingDocs = taskName === "maintain-docs" ? {
-          architecture: existsSync9(join11(docsDir, "ARCHITECTURE.md")),
-          structure: existsSync9(join11(docsDir, "STRUCTURE.md"))
+          architecture: existsSync8(join11(docsDir, "ARCHITECTURE.md")),
+          structure: existsSync8(join11(docsDir, "STRUCTURE.md"))
         } : undefined;
         const userMemories = taskName === "archive-stale" ? getActiveUserMemories(args.db).map((um) => ({
           id: um.id,
@@ -150387,7 +150256,7 @@ async function processDreamQueue(args) {
     return null;
   }
   const projectDirectory = args.sessionDirectoryOverride ?? resolveDreamSessionDirectory(entry.projectIdentity);
-  log(`[dreamer] dequeued project ${entry.projectIdentity} (dir=${projectDirectory}), starting dream run`);
+  log(`[dreamer] dequeued project ${entry.projectIdentity}, starting dream run`);
   let result;
   try {
     result = await runDream({
@@ -150511,6 +150380,7 @@ async function readGitCommits(directory, options = {}) {
   if (revision.startsWith("-")) {
     throw new Error(`readGitCommits: refusing revision that looks like an option: "${revision}"`);
   }
+  const projectLabel = options.projectIdentity ?? "<project>";
   const args = [
     "log",
     revision,
@@ -150533,11 +150403,11 @@ async function readGitCommits(directory, options = {}) {
     stdout = result.stdout;
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    log(`[git-commits] readGitCommits failed at cwd=${directory}: ${message.slice(0, 500)}`);
+    log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
     return [];
   }
   if (stdout.trim().length === 0) {
-    log(`[git-commits] readGitCommits returned empty stdout at cwd=${directory} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
+    log(`[git-commits] readGitCommits returned empty stdout for ${projectLabel} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
   }
   return parseGitLogOutput(stdout);
 }
@@ -165103,7 +164973,7 @@ function getEmbeddingProviderIdentity(config2) {
 }
 
 // ../plugin/src/features/magic-context/memory/embedding-local.ts
-import { mkdirSync as mkdirSync4 } from "node:fs";
+import { mkdirSync as mkdirSync5 } from "node:fs";
 import { open, stat, unlink, writeFile } from "node:fs/promises";
 import { dirname as dirname4, join as join12 } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -165284,7 +165154,7 @@ class LocalEmbeddingProvider {
         }
         const modelCacheDir = join12(getMagicContextStorageDir(), "models");
         try {
-          mkdirSync4(modelCacheDir, { recursive: true });
+          mkdirSync5(modelCacheDir, { recursive: true });
           env.cacheDir = modelCacheDir;
         } catch {
           log("[magic-context] could not create model cache dir, using library default");
@@ -165659,7 +165529,7 @@ class OpenAICompatibleEmbeddingProvider {
 }
 
 // ../plugin/src/features/magic-context/project-embedding-registry.ts
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash7, randomUUID } from "node:crypto";
 init_logger();
 
 // ../plugin/src/features/magic-context/git-commits/storage-git-commit-embeddings.ts
@@ -165763,6 +165633,125 @@ function getDistinctCommitEmbeddingModelIds(db, projectPath) {
   return new Set(rows.map((row) => typeof row.modelId === "string" ? row.modelId : null));
 }
 
+// ../plugin/src/features/magic-context/git-commits/sweep-coordinator.ts
+var GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
+var GIT_SWEEP_LEASE_TTL_MS = 5 * 60 * 1000;
+var GIT_SWEEP_LEASE_RENEWAL_MS = 60 * 1000;
+function runImmediate2(db, body) {
+  db.exec("BEGIN IMMEDIATE");
+  let committed = false;
+  try {
+    const result = body();
+    db.exec("COMMIT");
+    committed = true;
+    return result;
+  } finally {
+    if (!committed) {
+      try {
+        db.exec("ROLLBACK");
+      } catch {}
+    }
+  }
+}
+function rowToState(row) {
+  return {
+    projectPath: row.project_path,
+    leaseHolder: row.lease_holder,
+    leaseExpiresAt: row.lease_expires_at,
+    lastSweptAt: row.last_swept_at
+  };
+}
+function getGitSweepCoordinatorState(db, projectPath) {
+  const row = db.prepare(`SELECT project_path, lease_holder, lease_expires_at, last_swept_at
+             FROM git_sweep_coordinator
+             WHERE project_path = ?`).get(projectPath);
+  return row ? rowToState(row) : null;
+}
+function acquireGitSweepLease(db, projectPath, holderId, options = {}) {
+  const cooldownMs = options.cooldownMs ?? GIT_SWEEP_COOLDOWN_MS;
+  const leaseTtlMs = options.leaseTtlMs ?? GIT_SWEEP_LEASE_TTL_MS;
+  return runImmediate2(db, () => {
+    const now = Date.now();
+    const row = getGitSweepCoordinatorState(db, projectPath);
+    if (row?.leaseHolder && row.leaseExpiresAt !== null && row.leaseExpiresAt > now) {
+      return {
+        acquired: false,
+        projectPath,
+        reason: "lease_active",
+        leaseHolder: row.leaseHolder,
+        leaseExpiresAt: row.leaseExpiresAt,
+        lastSweptAt: row.lastSweptAt,
+        nextAllowedAt: null
+      };
+    }
+    if (!options.ignoreCooldown && row?.lastSweptAt !== null && row?.lastSweptAt !== undefined) {
+      const nextAllowedAt = row.lastSweptAt + cooldownMs;
+      if (nextAllowedAt > now) {
+        return {
+          acquired: false,
+          projectPath,
+          reason: "cooldown_active",
+          leaseHolder: row.leaseHolder,
+          leaseExpiresAt: row.leaseExpiresAt,
+          lastSweptAt: row.lastSweptAt,
+          nextAllowedAt
+        };
+      }
+    }
+    const leaseExpiresAt = now + leaseTtlMs;
+    db.prepare(`INSERT INTO git_sweep_coordinator (
+                 project_path,
+                 lease_holder,
+                 lease_expires_at,
+                 last_swept_at
+             ) VALUES (?, ?, ?, NULL)
+             ON CONFLICT(project_path) DO UPDATE SET
+                 lease_holder = excluded.lease_holder,
+                 lease_expires_at = excluded.lease_expires_at`).run(projectPath, holderId, leaseExpiresAt);
+    return {
+      acquired: true,
+      projectPath,
+      holderId,
+      acquiredAt: now,
+      leaseExpiresAt
+    };
+  });
+}
+function renewGitSweepLease(db, projectPath, holderId, leaseTtlMs = GIT_SWEEP_LEASE_TTL_MS) {
+  return runImmediate2(db, () => {
+    const now = Date.now();
+    const leaseExpiresAt = now + leaseTtlMs;
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_expires_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(leaseExpiresAt, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function markGitSweepSuccessAndRelease(db, projectPath, holderId) {
+  return runImmediate2(db, () => {
+    const now = Date.now();
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_holder = NULL,
+                     lease_expires_at = NULL,
+                     last_swept_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(now, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
+function releaseGitSweepLease(db, projectPath, holderId) {
+  runImmediate2(db, () => {
+    db.prepare(`UPDATE git_sweep_coordinator
+             SET lease_holder = NULL,
+                 lease_expires_at = NULL
+             WHERE project_path = ?
+               AND lease_holder = ?`).run(projectPath, holderId);
+  });
+}
+
 // ../plugin/src/features/magic-context/project-embedding-registry.ts
 var OFF_PROVIDER_IDENTITY = "embedding-provider:off";
 var SWEEP_MAX_WALL_CLOCK_MS = 10 * 60 * 1000;
@@ -165815,7 +165804,7 @@ function stableStringify2(value) {
   return JSON.stringify(value);
 }
 function sha256Prefix(value, length = 16) {
-  return createHash8("sha256").update(value).digest("hex").slice(0, length);
+  return createHash7("sha256").update(value).digest("hex").slice(0, length);
 }
 function getRuntimeFingerprint(config2) {
   if (config2.provider === "off") {
@@ -166080,6 +166069,7 @@ 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);
@@ -166122,17 +166112,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;
 }
@@ -166170,22 +166160,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})`);
   }
@@ -166217,7 +166200,8 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
     const sinceMs = latestIndexed !== null ? Math.max(latestIndexed - 60000, Date.now() - options.sinceDays * MS_PER_DAY) : Date.now() - options.sinceDays * MS_PER_DAY;
     const commits = await readGitCommits(directory, {
       sinceMs,
-      maxCommits: options.maxCommits
+      maxCommits: options.maxCommits,
+      projectIdentity: projectPath
     });
     result.scanned = commits.length;
     if (commits.length === 0) {
@@ -166484,7 +166468,7 @@ async function startDreamScheduleTimer(args) {
   const isNewRegistration = !registeredProjects.has(args.directory);
   registeredProjects.set(args.directory, args);
   if (isNewRegistration) {
-    log(`[dreamer] registered project ${args.directory} (dreaming=${dreamingEnabled} embeddings=${embeddingSweepEnabled} commits=${commitIndexingEnabled}; total=${registeredProjects.size})`);
+    log(`[dreamer] registered project ${args.projectIdentity} (dreaming=${dreamingEnabled} embeddings=${embeddingSweepEnabled} commits=${commitIndexingEnabled}; total=${registeredProjects.size})`);
   }
   if (!activeTimer) {
     log(`[dreamer] started independent schedule timer (every ${DREAM_TIMER_INTERVAL_MS / 60000}m)`);
@@ -166499,7 +166483,7 @@ async function startDreamScheduleTimer(args) {
   }
   return () => {
     registeredProjects.delete(args.directory);
-    log(`[dreamer] unregistered project ${args.directory} (remaining=${registeredProjects.size})`);
+    log(`[dreamer] unregistered project ${args.projectIdentity} (remaining=${registeredProjects.size})`);
     if (registeredProjects.size === 0 && activeTimer) {
       clearInterval(activeTimer);
       activeTimer = null;
@@ -166547,7 +166531,7 @@ async function sweepProject(reg, origin, db, gitCommitEnabled = getProjectEmbedd
     return;
   }
   try {
-    log(`[dreamer] timer tick (${origin}) ${reg.directory} — checking schedule window "${reg.dreamerConfig.schedule}"`);
+    log(`[dreamer] timer tick (${origin}) ${reg.projectIdentity} — checking schedule window "${reg.dreamerConfig.schedule}"`);
     checkScheduleAndEnqueue(db, reg.dreamerConfig.schedule, reg.projectIdentity);
     await processDreamQueue({
       db,
@@ -166562,13 +166546,34 @@ async function sweepProject(reg, origin, db, gitCommitEnabled = getProjectEmbedd
       fallbackModels: resolveFallbackChain(DREAMER_AGENT, reg.dreamerConfig.fallback_models)
     });
   } catch (error51) {
-    log(`[dreamer] timer-triggered queue processing failed for ${reg.directory}:`, error51);
+    log(`[dreamer] timer-triggered queue processing failed for ${reg.projectIdentity}:`, error51);
   }
 }
+function startGitSweepLeaseRenewal(db, projectIdentity, holderId) {
+  const timer = setInterval(() => {
+    try {
+      if (!renewGitSweepLease(db, projectIdentity, holderId)) {
+        log(`[git-commits] sweep lease renewal failed for ${projectIdentity}`);
+      }
+    } catch (error51) {
+      log(`[git-commits] sweep lease renewal errored for ${projectIdentity}: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    }
+  }, GIT_SWEEP_LEASE_RENEWAL_MS);
+  timer.unref?.();
+  return () => clearInterval(timer);
+}
 async function sweepGitCommits(args) {
   const { directory, projectIdentity, db, gitCommitIndexing } = args;
+  const holderId = crypto.randomUUID();
+  const lease2 = acquireGitSweepLease(db, projectIdentity, holderId);
+  if (!lease2.acquired) {
+    const reason = lease2.reason === "cooldown_active" ? `cooldown active until ${lease2.nextAllowedAt}` : `lease held by ${lease2.leaseHolder ?? "another holder"} until ${lease2.leaseExpiresAt ?? "unknown"}`;
+    log(`[git-commits] sweep skipped for ${projectIdentity}: ${reason}`);
+    return;
+  }
   const startedAt = Date.now();
-  log(`[git-commits] sweep starting for ${directory} (sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
+  const stopRenewal = startGitSweepLeaseRenewal(db, projectIdentity, holderId);
+  log(`[git-commits] sweep starting for ${projectIdentity} (sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
   try {
     const result = await indexCommitsForProject(db, projectIdentity, directory, {
       sinceDays: gitCommitIndexing.since_days,
@@ -166578,16 +166583,24 @@ async function sweepGitCommits(args) {
     if (result.embedded > 0) {
       drainedEmbeddings = await embedUnembeddedCommits(db, projectIdentity);
     }
+    const cooldownMarked = markGitSweepSuccessAndRelease(db, projectIdentity, holderId);
+    if (!cooldownMarked) {
+      releaseGitSweepLease(db, projectIdentity, holderId);
+      log(`[git-commits] sweep finished for ${projectIdentity}, but lease was no longer active; cooldown not advanced`);
+    }
     const elapsedMs = Date.now() - startedAt;
     log(`[git-commits] sweep finished for ${projectIdentity} in ${elapsedMs}ms: scanned=${result.scanned} inserted=${result.inserted} updated=${result.updated} evicted=${result.evicted} embedded=${result.embedded} drained=${drainedEmbeddings}`);
   } catch (error51) {
+    releaseGitSweepLease(db, projectIdentity, holderId);
     const elapsedMs = Date.now() - startedAt;
-    log(`[git-commits] sweep failed for ${directory} after ${elapsedMs}ms: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    log(`[git-commits] sweep failed for ${projectIdentity} after ${elapsedMs}ms: ${error51 instanceof Error ? error51.message : String(error51)}`);
+  } finally {
+    stopRenewal();
   }
 }
 
 // ../plugin/src/plugin/embedding-bootstrap-helpers.ts
-import { createHash as createHash9 } from "node:crypto";
+import { createHash as createHash8 } from "node:crypto";
 init_logger();
 var EMBEDDING_AFFECTING_KEYS = new Set([
   "embedding.api_key",
@@ -166599,7 +166612,7 @@ var EMBEDDING_AFFECTING_TOP_LEVEL_KEYS = new Set(["embedding", "memory", "experi
 var EMBEDDING_WARNING_TERMS = ["api_key", "endpoint", "model", "provider", "embedding"];
 var loggedFailureSignatures = new Map;
 function sha256Prefix2(value, length = 16) {
-  return createHash9("sha256").update(value).digest("hex").slice(0, length);
+  return createHash8("sha256").update(value).digest("hex").slice(0, length);
 }
 function warningLooksEmbeddingRelated(message) {
   const lower = message.toLowerCase();
@@ -166663,8 +166676,8 @@ function handleUntrustedLoad(db, projectIdentity, directory, detailed) {
 }
 
 // src/config/index.ts
-import { existsSync as existsSync11, readFileSync as readFileSync8 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
+import { existsSync as existsSync10, readFileSync as readFileSync8 } from "node:fs";
+import { homedir as homedir4 } from "node:os";
 import { join as join13 } from "node:path";
 
 // ../plugin/src/config/migrate-experimental.ts
@@ -166754,9 +166767,67 @@ function migrateLegacyExperimental(rawConfig, warnings) {
 }
 
 // ../plugin/src/config/variable.ts
-import { existsSync as existsSync10, readFileSync as readFileSync7 } from "node:fs";
-import { homedir as homedir4 } from "node:os";
+import { existsSync as existsSync9, readFileSync as readFileSync7 } from "node:fs";
+import { homedir as homedir3 } from "node:os";
 import { dirname as dirname5, isAbsolute as isAbsolute2, resolve as resolve3 } from "node:path";
+
+// ../plugin/src/shared/jsonc-parser.ts
+function stripJsonComments(content) {
+  let result = "";
+  let inString = false;
+  let escaped = false;
+  let inLineComment = false;
+  let inBlockComment = false;
+  for (let index = 0;index < content.length; index += 1) {
+    const char = content[index];
+    const next = content[index + 1];
+    if (inLineComment) {
+      if (char === `
+`) {
+        inLineComment = false;
+        result += char;
+      }
+      continue;
+    }
+    if (inBlockComment) {
+      if (char === "*" && next === "/") {
+        inBlockComment = false;
+        index += 1;
+      }
+      continue;
+    }
+    if (inString) {
+      result += char;
+      if (escaped) {
+        escaped = false;
+      } else if (char === "\\") {
+        escaped = true;
+      } else if (char === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (char === '"') {
+      inString = true;
+      result += char;
+      continue;
+    }
+    if (char === "/" && next === "/") {
+      inLineComment = true;
+      index += 1;
+      continue;
+    }
+    if (char === "/" && next === "*") {
+      inBlockComment = true;
+      index += 1;
+      continue;
+    }
+    result += char;
+  }
+  return result;
+}
+
+// ../plugin/src/config/variable.ts
 var ENV_PATTERN = /\{env:([^}]+)\}/g;
 var FILE_PATTERN = /\{file:([^}]+)\}/g;
 function substituteConfigVariables(input) {
@@ -166808,11 +166879,11 @@ function substituteConfigVariables(input) {
     }
     let filePath = rawPath.trim();
     if (filePath.startsWith("~/")) {
-      filePath = resolve3(homedir4(), filePath.slice(2));
+      filePath = resolve3(homedir3(), filePath.slice(2));
     } else if (!isAbsolute2(filePath)) {
       filePath = resolve3(configDir, filePath);
     }
-    if (!existsSync10(filePath)) {
+    if (!existsSync9(filePath)) {
       warnings.push(`File not found for ${token} (resolved to ${filePath}); using empty string`);
       continue;
     }
@@ -166838,12 +166909,12 @@ function getProjectConfigPaths(cwd) {
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function getUserConfigPaths() {
-  const home = process.env.HOME ?? homedir5();
+  const home = process.env.HOME ?? homedir4();
   const basePath = join13(home, ".pi", "agent", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function resolveFirstExisting(paths) {
-  return paths.find((path7) => existsSync11(path7));
+  return paths.find((path7) => existsSync10(path7));
 }
 function loadConfigFile(path7, scope) {
   try {
@@ -169447,6 +169518,62 @@ function buildToolTarget(part, message) {
 
 // ../plugin/src/features/magic-context/search.ts
 init_logger();
+
+// ../plugin/src/features/magic-context/literal-probes.ts
+var MAX_PROBES = 5;
+var MIN_PROBE_LENGTH = 3;
+var SLASH_COMMAND_RE = /\/[a-z][a-z0-9]*(?:-[a-z0-9]+)+/gi;
+var KEBAB_SNAKE_RE = /[a-z][a-z0-9]*(?:[-_][a-z0-9]+)+/gi;
+var DOTTED_RE = /[a-z0-9][a-z0-9_-]*(?:\.[a-z0-9_-]+)+/gi;
+var CAMEL_RE = /\b[a-zA-Z][a-z0-9]*(?:[A-Z][a-z0-9]*)+\b/g;
+var SHA_RE = /\b[0-9a-f]{7,40}\b/gi;
+var ERROR_CODE_RE = /\b(?:TS\d{4,}|ERR_[A-Z][A-Z0-9_]*)\b/g;
+var QUOTED_RE = /["`]([^"`]{3,80})["`]/g;
+function looksLikeSha(token) {
+  return /[0-9]/.test(token) && /^[0-9a-f]{7,40}$/i.test(token);
+}
+function extractLiteralProbes(query) {
+  const trimmed = query.trim();
+  if (trimmed.length === 0)
+    return [];
+  const ordered = [];
+  const seen = new Set;
+  const add = (raw) => {
+    if (!raw)
+      return;
+    const probe = raw.trim();
+    if (probe.length < MIN_PROBE_LENGTH)
+      return;
+    const key = probe.toLowerCase();
+    if (seen.has(key))
+      return;
+    seen.add(key);
+    ordered.push(probe);
+  };
+  for (const m of trimmed.matchAll(QUOTED_RE))
+    add(m[1]);
+  for (const m of trimmed.matchAll(SLASH_COMMAND_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(ERROR_CODE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(DOTTED_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(KEBAB_SNAKE_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(CAMEL_RE))
+    add(m[0]);
+  for (const m of trimmed.matchAll(SHA_RE)) {
+    if (looksLikeSha(m[0]))
+      add(m[0]);
+  }
+  return ordered.slice(0, MAX_PROBES);
+}
+function containsProbeVerbatim(text, probes) {
+  if (probes.length === 0)
+    return false;
+  const haystack = text.toLowerCase();
+  return probes.some((probe) => haystack.includes(probe.toLowerCase()));
+}
 // ../plugin/src/features/magic-context/memory/embedding-backfill.ts
 init_logger();
 async function ensureMemoryEmbeddings(args) {
@@ -169709,36 +169836,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) {
@@ -169822,12 +169995,14 @@ async function unifiedSearch(db, sessionId, projectPath, query, options = {}) {
     return null;
   }) : Promise.resolve(null);
   await Promise.resolve();
+  const messageProbes = options.explicitSearch ? extractLiteralProbes(trimmedQuery) : [];
   const messageResults = runMessages ? searchMessages({
     db,
     sessionId,
     query: trimmedQuery,
     limit: tierLimit,
-    maxOrdinal: options.maxMessageOrdinal
+    maxOrdinal: options.maxMessageOrdinal,
+    probes: messageProbes
   }) : [];
   const queryEmbedding = await queryEmbeddingPromise;
   const [memoryResults, gitCommitResults] = await Promise.all([
@@ -175690,7 +175865,7 @@ function stripPiDroppedPlaceholderMessages(args) {
 }
 
 // src/system-prompt.ts
-import { createHash as createHash10 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 
 // ../plugin/src/agents/magic-context-prompt.ts
 var LONG_TERM_PARTNER_FRAME = `### You are the user's long-term partner on this project — not a one-off hire
@@ -175835,7 +176010,7 @@ function processSystemPromptForCache(args) {
       sessionLog(sessionId, `system prompt date frozen: real=${liveDate}, using=${stickyDate} (cache-stable pass)`);
     }
   }
-  const currentHash = createHash10("md5").update(frozenPrompt).digest("hex");
+  const currentHash = createHash9("md5").update(frozenPrompt).digest("hex");
   const hashChanged = !isFirstHash && currentHash !== previousHash;
   if (hashChanged) {
     sessionLog(sessionId, `system prompt hash changed: ${previousHash} → ${currentHash} (len=${frozenPrompt.length})`);
@@ -175880,10 +176055,8 @@ function injectPiTemporalMarkers(messages) {
       if (prefix !== null) {
         const userMsg = msg;
         if (typeof userMsg.content === "string") {
-          if (!TEMPORAL_MARKER_PATTERN.test(stripTagPrefix2(userMsg.content))) {
-            const tagMatch = userMsg.content.match(/^(?:§\d+§\s*)+/);
-            const tagPrefix = tagMatch ? tagMatch[0] : "";
-            const body = userMsg.content.slice(tagPrefix.length);
+          if (!TEMPORAL_MARKER_PATTERN.test(stripTagPrefix(userMsg.content))) {
+            const { tagPrefix, body } = peelLeadingMcTagNotation(userMsg.content);
             messages[i] = {
               ...userMsg,
               content: tagPrefix + prefix + body
@@ -175894,9 +176067,7 @@ function injectPiTemporalMarkers(messages) {
           const firstTextIndex = userMsg.content.findIndex((p) => p && typeof p === "object" && p.type === "text");
           if (firstTextIndex >= 0) {
             const existing = userMsg.content[firstTextIndex];
-            const tagMatch = existing.text.match(/^(?:§\d+§\s*)+/);
-            const tagPrefix = tagMatch ? tagMatch[0] : "";
-            const body = existing.text.slice(tagPrefix.length);
+            const { tagPrefix, body } = peelLeadingMcTagNotation(existing.text);
             if (!TEMPORAL_MARKER_PATTERN.test(body)) {
               const newContent = userMsg.content.slice();
               newContent[firstTextIndex] = {
@@ -175919,12 +176090,6 @@ function injectPiTemporalMarkers(messages) {
   }
   return injected;
 }
-function stripTagPrefix2(text) {
-  const match = text.match(/^(?:§\d+§\s*)+/);
-  if (!match)
-    return text;
-  return text.slice(match[0].length);
-}
 
 // src/timeout.ts
 function withTimeout(p, ms) {
@@ -176951,14 +177116,10 @@ function registerPiContextHandler(pi, options) {
       }
       const sessionMeta = sessionMetaForUsage;
       const modelKey = liveModelBySession.get(sessionId);
-      if (usageContextLimit === undefined && modelKey) {
-        const { providerID, modelID } = splitModelKeyForPi(modelKey);
-        const trusted = resolveTrustedContextLimit(providerID, modelID, {
-          db: options.db,
-          sessionID: sessionId
-        });
-        if (trusted !== undefined && trusted > 0) {
-          usageContextLimit = trusted;
+      if (usageContextLimit === undefined) {
+        const modelWindow = ctx.model?.contextWindow;
+        if (isSaneLimit(modelWindow)) {
+          usageContextLimit = modelWindow;
         }
       }
       let schedulerDecision;
@@ -177211,27 +177372,8 @@ async function awaitInFlightHistorians() {
     return;
   await Promise.allSettled(Array.from(inFlightHistorian.values()));
 }
-function splitModelKeyForPi(modelKey) {
-  if (!modelKey)
-    return { providerID: undefined, modelID: undefined };
-  const slash = modelKey.indexOf("/");
-  if (slash <= 0 || slash === modelKey.length - 1) {
-    return { providerID: undefined, modelID: undefined };
-  }
-  return {
-    providerID: modelKey.slice(0, slash),
-    modelID: modelKey.slice(slash + 1)
-  };
-}
 function resolvePiHistorianTriggerInputs(args) {
-  const { providerID, modelID } = splitModelKeyForPi(args.modelKey);
-  let contextLimit = resolveContextLimit(providerID, modelID, {
-    db: args.db,
-    sessionID: args.sessionId
-  });
-  if ((providerID === undefined || modelID === undefined) && typeof args.usageContextLimit === "number" && Number.isFinite(args.usageContextLimit) && args.usageContextLimit > 0) {
-    contextLimit = args.usageContextLimit;
-  }
+  const contextLimit = typeof args.usageContextLimit === "number" && Number.isFinite(args.usageContextLimit) && args.usageContextLimit > 0 ? args.usageContextLimit : DEFAULT_CONTEXT_LIMIT;
   const executeThresholdPercentage = resolveExecuteThreshold(args.historian.executeThresholdPercentage ?? 65, args.modelKey, 65, {
     tokensConfig: args.historian.executeThresholdTokens,
     contextLimit,
@@ -178053,7 +178195,7 @@ ${result}`;
 init_logger();
 
 // ../plugin/src/hooks/magic-context/historian-state-file.ts
-import { mkdirSync as mkdirSync5, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { mkdirSync as mkdirSync6, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
 init_data_path();
 function cleanupHistorianStateFile(path7) {
   if (!path7)
@@ -178257,7 +178399,7 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
 }
 
 // ../plugin/src/hooks/magic-context/compartment-runner-historian.ts
-import { mkdirSync as mkdirSync6, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "node:fs";
+import { mkdirSync as mkdirSync7, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "node:fs";
 import { join as join16 } from "node:path";
 init_data_path();
 function historianResponseDumpDir(directory) {
@@ -178562,11 +178704,11 @@ function cleanupHistorianDump(sessionId, dumpPath) {
 function dumpHistorianResponse(sessionId, directory, label, text) {
   try {
     const dumpDir = historianResponseDumpDir(directory);
-    mkdirSync6(dumpDir, { recursive: true });
+    mkdirSync7(dumpDir, { recursive: true });
     const safeSessionId = sanitizeDumpName(sessionId);
     const safeLabel = sanitizeDumpName(label);
     const dumpPath = join16(dumpDir, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
-    writeFileSync3(dumpPath, text, "utf8");
+    writeFileSync4(dumpPath, text, "utf8");
     sessionLog(sessionId, "compartment agent: historian response dumped", {
       label,
       dumpPath
@@ -180478,7 +180620,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.22.1",
+  version: "0.22.3",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -181063,8 +181205,6 @@ function computePiPressure(usage, contextLimit) {
 }
 
 // src/strip-tag-prefix.ts
-var LEADING_TAG_PREFIX_REGEX = /^(\u00a7\d+\u00a7\s*)+/;
-var SECTION_CHAR_REGEX = /\u00a7/g;
 function stripTagPrefixFromAssistantMessage(message) {
   if (message.role !== "assistant")
     return false;
@@ -181078,7 +181218,7 @@ function stripTagPrefixFromAssistantMessage(message) {
     const textPart = part;
     if (typeof textPart.text !== "string")
       continue;
-    const stripped = textPart.text.replace(LEADING_TAG_PREFIX_REGEX, "").replace(SECTION_CHAR_REGEX, "");
+    const stripped = stripPersistedAssistantText(textPart.text);
     if (stripped !== textPart.text) {
       textPart.text = stripped;
       mutated = true;
@@ -185582,15 +185722,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 = `
 
@@ -185612,6 +185763,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) {
@@ -185624,13 +185776,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") {
@@ -185693,9 +185850,13 @@ function createCtxNoteTool(deps) {
 
 No notes for the current filter.`);
       }
-      return ok3(`${sections.join(`
+      const body = sections.join(`
+
+`);
+      const anchorHint = body.includes("↳ @msg ") ? `
 
-`)}${DISMISS_FOOTER}`);
+↳ @msg N marks the conversation tail when a note was written. To see what led to it: ctx_expand(start=N-x, end=N) (pick x for how far back to look).` : "";
+      return ok3(`${body}${anchorHint}${DISMISS_FOOTER}`);
     }
   };
 }
@@ -186040,7 +186201,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) }],
@@ -186188,8 +186350,7 @@ function getPiMessageModel(message) {
   };
 }
 function resolvePiPressureContextLimit(args) {
-  const cachedLimit = args.provider && args.model ? getModelsDevContextLimit(args.provider, args.model) : undefined;
-  let effectiveContextLimit = cachedLimit ?? args.piContextWindow;
+  let effectiveContextLimit = isSaneLimit(args.piContextWindow) ? args.piContextWindow : 0;
   try {
     const overflowState = getOverflowState(args.db, args.sessionId);
     if (overflowState.detectedContextLimit > 0) {
@@ -186205,8 +186366,6 @@ async function persistPiPressureFromMessageEnd(args) {
   const effectiveContextLimit = resolvePiPressureContextLimit({
     db: args.db,
     sessionId: args.sessionId,
-    provider: provider2,
-    model,
     piContextWindow: args.piContextWindow
   });
   const usage = extractAssistantUsage(args.message);
@@ -186215,28 +186374,16 @@ async function persistPiPressureFromMessageEnd(args) {
   const messageHadOverflowError = typeof msg?.errorMessage === "string" && detectOverflow(msg.errorMessage).isOverflow;
   const updates = { lastResponseTime: Date.now() };
   if (pressure) {
-    let percentage = pressure.percentage;
-    let contextLimit = effectiveContextLimit;
+    const percentage = pressure.percentage;
+    const contextLimit = effectiveContextLimit;
     const meta3 = getOrCreateSessionMeta(args.db, args.sessionId);
     const observedSafeInputTokens = meta3.observedSafeInputTokens ?? 0;
     if (percentage > 100 && observedSafeInputTokens > 0 && pressure.inputTokens <= observedSafeInputTokens * 2) {
-      const oldLimit = contextLimit;
-      clearModelsDevCache();
-      contextLimit = resolvePiPressureContextLimit({
-        db: args.db,
-        sessionId: args.sessionId,
-        provider: provider2,
-        model,
-        piContextWindow: args.piContextWindow
-      });
-      if (contextLimit >= pressure.inputTokens) {
-        percentage = pressure.inputTokens / contextLimit * 100;
-        log(`${PREFIX} models-dev-cache: regression recovered for ${provider2}/${model} via Pi cache reload (was=${oldLimit}, now=${contextLimit})`);
-      } else if (!meta3.cacheAlertSent) {
+      if (!meta3.cacheAlertSent) {
         updates.cacheAlertSent = true;
         const safeTokens = Math.max(observedSafeInputTokens, pressure.inputTokens);
         const modelLabel = provider2 && model ? `${provider2}/${model}` : "the active model";
-        await args.notifyIssue?.(`⚠️ Magic Context: Pi reports a context limit of ${formatTokens(contextLimit)} tokens for ${modelLabel} but you've successfully sent ${formatTokens(safeTokens)} tokens in this session — the cached limit looks wrong. Restart Pi if you suspect this is incorrect.`);
+        await args.notifyIssue?.(`⚠️ Magic Context: Pi reports a context limit of ${formatTokens(contextLimit)} tokens for ${modelLabel} but you've successfully sent ${formatTokens(safeTokens)} tokens in this session — the reported limit looks wrong. Restart Pi if you suspect this is incorrect.`);
       }
     }
     updates.lastContextPercentage = percentage;
@@ -186703,7 +186850,7 @@ ${block}` : event.systemPrompt;
         cacheTtlConfig: config2.cache_ttl
       });
       const piUsage = ctx.getContextUsage?.();
-      const piContextWindow = piUsage && typeof piUsage.contextWindow === "number" ? piUsage.contextWindow : 0;
+      const piContextWindow = piUsage && typeof piUsage.contextWindow === "number" && piUsage.contextWindow > 0 ? piUsage.contextWindow : ctx.model?.contextWindow ?? 0;
       await persistPiPressureFromMessageEnd({
         db,
         sessionId,