@cortexkit/pi-magic-context 0.18.0 → 0.19.0

package/dist/index.js

@@ -11277,7 +11277,7 @@ function finalize(ctx, schema) {
     result.$schema = "http://json-schema.org/draft-07/schema#";
   } else if (ctx.target === "draft-04") {
     result.$schema = "http://json-schema.org/draft-04/schema#";
-  } else if (ctx.target === "openapi-3.0") {} else {}
+  } else if (ctx.target === "openapi-3.0") {}
   if (ctx.external?.uri) {
     const id = ctx.external.registry.get(schema)?.id;
     if (!id)
@@ -11538,7 +11538,7 @@ var formatMap, stringProcessor = (schema, ctx, _json, _params) => {
     if (val === undefined) {
       if (ctx.unrepresentable === "throw") {
         throw new Error("Literal `undefined` cannot be represented in JSON Schema");
-      } else {}
+      }
     } else if (typeof val === "bigint") {
       if (ctx.unrepresentable === "throw") {
         throw new Error("BigInt literals cannot be represented in JSON Schema");
@@ -14891,10 +14891,63 @@ var init_magic_context = __esm(() => {
   });
 });
 
-// ../plugin/src/shared/logger.ts
-import * as fs from "node:fs";
+// ../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, ".opencode", "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);
@@ -14905,6 +14958,8 @@ function flush() {
   const data = buffer.join("");
   buffer = [];
   try {
+    const logFile = getMagicContextLogPath();
+    ensureDir(logFile);
     fs.appendFileSync(logFile, data);
   } catch {}
 }
@@ -14935,9 +14990,9 @@ ${data.stack}` : ""}` : ` ${JSON.stringify(data)}`;
 function sessionLog(sessionId, message, data) {
   log(`[magic-context][${sessionId}] ${message}`, data);
 }
-var logFile, isTestEnv = false, buffer, flushTimer = null, FLUSH_INTERVAL_MS = 500, BUFFER_SIZE_LIMIT = 50;
+var isTestEnv = false, buffer, flushTimer = null, FLUSH_INTERVAL_MS = 500, BUFFER_SIZE_LIMIT = 50, lastEnsuredDir = null;
 var init_logger = __esm(() => {
-  logFile = path.join(os.tmpdir(), "magic-context.log");
+  init_data_path();
   buffer = [];
   if (!isTestEnv) {
     process.on("exit", flush);
@@ -14961,30 +15016,47 @@ function cosineSimilarity(a, b) {
   return denominator === 0 ? 0 : dotProduct / denominator;
 }
 
-// ../plugin/src/shared/data-path.ts
-import * as os2 from "node:os";
-import * as path2 from "node:path";
-function getDataDir() {
-  return process.env.XDG_DATA_HOME ?? path2.join(os2.homedir(), ".local", "share");
-}
-function getOpenCodeStorageDir() {
-  return path2.join(getDataDir(), "opencode", "storage");
+// ../plugin/src/features/magic-context/memory/normalize-hash.ts
+import { createHash } from "node:crypto";
+function normalizeMemoryContent(content) {
+  return content.toLowerCase().replace(/\s+/g, " ").trim();
 }
-function getMagicContextStorageDir() {
-  return path2.join(getDataDir(), "cortexkit", "magic-context");
+function computeNormalizedHash(content) {
+  const normalized = normalizeMemoryContent(content);
+  return createHash("md5").update(normalized).digest("hex");
 }
-function getLegacyOpenCodeMagicContextStorageDir() {
-  return path2.join(getOpenCodeStorageDir(), "plugin", "magic-context");
+var init_normalize_hash = () => {};
+
+// ../plugin/src/features/magic-context/memory/embedding-identity.ts
+function normalizeEndpoint(endpoint) {
+  return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
-function getCacheDir() {
-  return process.env.XDG_CACHE_HOME ?? path2.join(os2.homedir(), ".cache");
+function getEmbeddingProviderIdentity(config2) {
+  if (config2.provider === "off") {
+    return "embedding-provider:off";
+  }
+  const identityInput = config2.provider === "openai-compatible" ? {
+    provider: "openai-compatible",
+    model: config2.model.trim(),
+    endpoint: normalizeEndpoint(config2.endpoint),
+    apiKeyPresent: Boolean(config2.api_key?.trim())
+  } : {
+    provider: "local",
+    model: config2.model?.trim() || DEFAULT_LOCAL_EMBEDDING_MODEL,
+    endpoint: "",
+    apiKeyPresent: false
+  };
+  return `embedding-provider:${computeNormalizedHash(JSON.stringify(identityInput))}`;
 }
-var init_data_path = () => {};
+var init_embedding_identity = __esm(() => {
+  init_magic_context();
+  init_normalize_hash();
+});
 
 // ../plugin/src/features/magic-context/memory/embedding-local.ts
-import { mkdirSync } from "node:fs";
+import { mkdirSync as mkdirSync2 } from "node:fs";
 import { open, stat, unlink, writeFile } from "node:fs/promises";
-import { join as join3 } from "node:path";
+import { join as join2 } from "node:path";
 async function acquireModelLoadLock(lockPath) {
   const waitStart = Date.now();
   while (true) {
@@ -15099,7 +15171,7 @@ class LocalEmbeddingProvider {
   initPromise = null;
   constructor(model = DEFAULT_LOCAL_EMBEDDING_MODEL) {
     this.model = model;
-    this.modelId = `local:${model}`;
+    this.modelId = getEmbeddingProviderIdentity({ provider: "local", model });
   }
   async initialize() {
     if (this.pipeline) {
@@ -15118,15 +15190,15 @@ class LocalEmbeddingProvider {
         if (LogLevel && "ERROR" in LogLevel) {
           env.logLevel = LogLevel.ERROR;
         }
-        const modelCacheDir = join3(getMagicContextStorageDir(), "models");
+        const modelCacheDir = join2(getMagicContextStorageDir(), "models");
         try {
-          mkdirSync(modelCacheDir, { recursive: true });
+          mkdirSync2(modelCacheDir, { recursive: true });
           env.cacheDir = modelCacheDir;
         } catch {
           log("[magic-context] could not create model cache dir, using library default");
         }
         const createPipeline = transformersModule.pipeline;
-        const lockPath = join3(modelCacheDir, ".load.lock");
+        const lockPath = join2(modelCacheDir, ".load.lock");
         const releaseLock = await acquireModelLoadLock(lockPath);
         const stopHeartbeat = startLockHeartbeat(lockPath);
         try {
@@ -15241,12 +15313,13 @@ var init_embedding_local = __esm(() => {
   init_magic_context();
   init_data_path();
   init_logger();
+  init_embedding_identity();
   STALE_LOCK_MS = 3 * 60000;
   MAX_LOCK_WAIT_MS = 5 * 60000;
 });
 
 // ../plugin/src/features/magic-context/memory/embedding-openai.ts
-function normalizeEndpoint(endpoint) {
+function normalizeEndpoint2(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
 
@@ -15261,10 +15334,15 @@ class OpenAICompatibleEmbeddingProvider {
   openLogged = false;
   halfOpenProbeInFlight = false;
   constructor(options) {
-    this.endpoint = normalizeEndpoint(options.endpoint);
+    this.endpoint = normalizeEndpoint2(options.endpoint);
     this.model = options.model?.trim() ?? "";
     this.apiKey = options.apiKey?.trim() ?? "";
-    this.modelId = `openai-compat:${this.endpoint}:${this.model}`;
+    this.modelId = getEmbeddingProviderIdentity({
+      provider: "openai-compatible",
+      endpoint: this.endpoint,
+      model: this.model,
+      ...this.apiKey ? { api_key: this.apiKey } : {}
+    });
   }
   async initialize() {
     if (this.initialized)
@@ -15446,20 +15524,10 @@ class OpenAICompatibleEmbeddingProvider {
 var FAILURE_THRESHOLD = 3, FAILURE_WINDOW_MS = 60000, OPEN_DURATION_MS, FETCH_TIMEOUT_MS = 30000;
 var init_embedding_openai = __esm(() => {
   init_logger();
+  init_embedding_identity();
   OPEN_DURATION_MS = 5 * 60000;
 });
 
-// ../plugin/src/features/magic-context/memory/normalize-hash.ts
-import { createHash } from "node:crypto";
-function normalizeMemoryContent(content) {
-  return content.toLowerCase().replace(/\s+/g, " ").trim();
-}
-function computeNormalizedHash(content) {
-  const normalized = normalizeMemoryContent(content);
-  return createHash("md5").update(normalized).digest("hex");
-}
-var init_normalize_hash = () => {};
-
 // ../plugin/src/features/magic-context/memory/storage-memory-embeddings.ts
 var exports_storage_memory_embeddings = {};
 __export(exports_storage_memory_embeddings, {
@@ -15604,17 +15672,8 @@ function resolveEmbeddingConfig(config2) {
   }
   return { provider: "off" };
 }
-function resolveModelId(config2) {
-  if (config2.provider === "off") {
-    return "off";
-  }
-  if (config2.provider === "openai-compatible") {
-    const endpoint = config2.endpoint.trim();
-    const model = config2.model.trim();
-    const keyHash = config2.api_key ? computeNormalizedHash(config2.api_key) : "nokey";
-    return `openai-compat:${endpoint}:${model}:${keyHash}`;
-  }
-  return config2.model.trim() || DEFAULT_LOCAL_EMBEDDING_MODEL;
+function resolveProviderIdentity(config2) {
+  return getEmbeddingProviderIdentity(config2);
 }
 function createProvider(config2) {
   if (config2.provider === "off") {
@@ -15638,10 +15697,10 @@ function getOrCreateProvider() {
 }
 function initializeEmbedding(config2) {
   const nextConfig = resolveEmbeddingConfig(config2);
-  const nextModelId = resolveModelId(nextConfig);
+  const nextProviderIdentity = resolveProviderIdentity(nextConfig);
   const previousProvider = provider;
-  const previousModelId = previousProvider?.modelId ?? resolveModelId(embeddingConfig);
-  if (previousModelId === nextModelId) {
+  const previousProviderIdentity = previousProvider?.modelId ?? resolveProviderIdentity(embeddingConfig);
+  if (previousProviderIdentity === nextProviderIdentity) {
     embeddingConfig = nextConfig;
     return;
   }
@@ -15789,9 +15848,9 @@ var DEFAULT_EMBEDDING_CONFIG, embeddingConfig, provider = null, loadUnembeddedMe
 var init_embedding = __esm(() => {
   init_magic_context();
   init_logger();
+  init_embedding_identity();
   init_embedding_local();
   init_embedding_openai();
-  init_normalize_hash();
   init_storage_memory_embeddings();
   DEFAULT_EMBEDDING_CONFIG = {
     provider: "local",
@@ -15983,7 +16042,7 @@ var exports_native_binding = {};
 __export(exports_native_binding, {
   resolveBetterSqliteNativeBinding: () => resolveBetterSqliteNativeBinding
 });
-import { existsSync, mkdirSync as mkdirSync2, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync as mkdirSync3, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import * as path4 from "node:path";
 function logInfo(message) {
@@ -16083,7 +16142,7 @@ async function resolveBetterSqliteNativeBinding() {
       }
       logWarn(`cached binary at ${cachedPath} has wrong ABI (${cachedProbe.actual ?? "unknown"} != ${expected}); refetching`);
     }
-    mkdirSync2(path4.dirname(cachedPath), { recursive: true });
+    mkdirSync3(path4.dirname(cachedPath), { recursive: true });
     const nodeFileBytes = await downloadElectronPrebuild(pkgVersion, expected);
     writeFileSync(cachedPath, nodeFileBytes);
     logInfo(`cached Electron prebuild at ${cachedPath} (${(nodeFileBytes.length / 1024).toFixed(1)} KB)`);
@@ -16151,9 +16210,9 @@ __export(exports_read_session_db, {
   findLastAssistantModelFromOpenCodeDb: () => findLastAssistantModelFromOpenCodeDb,
   closeReadOnlySessionDb: () => closeReadOnlySessionDb
 });
-import { join as join5 } from "node:path";
+import { join as join4 } from "node:path";
 function getOpenCodeDbPath() {
-  return join5(getDataDir(), "opencode", "opencode.db");
+  return join4(getDataDir(), "opencode", "opencode.db");
 }
 function closeCachedReadOnlyDb() {
   if (!cachedReadOnlyDb) {
@@ -16251,21 +16310,22 @@ __export(exports_rpc_notifications, {
   drainNotifications: () => drainNotifications
 });
 function pushNotification(type, payload, sessionId) {
-  queue2.push({ type, payload, sessionId });
+  queue2.push({ id: nextNotificationId++, type, payload, sessionId });
   if (queue2.length > 100) {
     queue2 = queue2.slice(-50);
   }
 }
-function drainNotifications() {
+function drainNotifications(lastReceivedId = 0) {
   lastDrainAt = Date.now();
-  const result = queue2;
-  queue2 = [];
-  return result;
+  if (lastReceivedId > 0) {
+    queue2 = queue2.filter((notification) => notification.id > lastReceivedId);
+  }
+  return [...queue2];
 }
 function isTuiConnected() {
   return lastDrainAt > 0 && Date.now() - lastDrainAt < TUI_CONNECTED_WINDOW_MS;
 }
-var queue2, lastDrainAt = 0, TUI_CONNECTED_WINDOW_MS = 3000;
+var queue2, nextNotificationId = 1, lastDrainAt = 0, TUI_CONNECTED_WINDOW_MS = 3000;
 var init_rpc_notifications = __esm(() => {
   queue2 = [];
 });
@@ -23877,10 +23937,10 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = EMPTY;
   };
-  var join13 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
+  var join12 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
   var join_content = (inside, value, gap) => {
     const comment = process_comments(value, PREFIX_BEFORE, gap + indent, true);
-    return join13(comment, inside, gap);
+    return join12(comment, inside, gap);
   };
   var stringify_string = (holder, key, value) => {
     const raw = get_raw_string_literal(holder, key);
@@ -23902,13 +23962,13 @@ var require_stringify = __commonJS((exports, module) => {
       if (i !== 0) {
         inside += COMMA;
       }
-      const before = join13(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
+      const before = join12(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += stringify(i, value, deeper_gap) || STR_NULL;
       inside += process_comments(value, AFTER_VALUE(i), deeper_gap);
       after_comma = process_comments(value, AFTER(i), deeper_gap);
     }
-    inside += join13(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join12(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return BRACKET_OPEN + join_content(inside, value, gap) + BRACKET_CLOSE;
   };
   var object_stringify = (value, gap) => {
@@ -23929,13 +23989,13 @@ var require_stringify = __commonJS((exports, module) => {
         inside += COMMA;
       }
       first = false;
-      const before = join13(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
+      const before = join12(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += quote(key) + process_comments(value, AFTER_PROP(key), deeper_gap) + COLON + process_comments(value, AFTER_COLON(key), deeper_gap) + SPACE + sv + process_comments(value, AFTER_VALUE(key), deeper_gap);
       after_comma = process_comments(value, AFTER(key), deeper_gap);
     };
     keys.forEach(iteratee);
-    inside += join13(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join12(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return CURLY_BRACKET_OPEN + join_content(inside, value, gap) + CURLY_BRACKET_CLOSE;
   };
   function stringify(key, holder, gap) {
@@ -24030,7 +24090,7 @@ var require_src2 = __commonJS((exports, module) => {
 // src/index.ts
 init_embedding();
 import { createRequire as createRequire2 } from "node:module";
-import { join as join15 } from "node:path";
+import { join as join14 } from "node:path";
 
 // ../plugin/src/features/magic-context/memory/project-identity.ts
 import { execSync } from "node:child_process";
@@ -157083,21 +157143,6 @@ function readSessionChunk(sessionId, tokenBudget, offset = 1, eligibleEndOrdinal
     toolOnlyRanges
   };
 }
-
-// ../plugin/src/shared/harness.ts
-var currentHarness = "opencode";
-var harnessLocked = false;
-function setHarness(value) {
-  if (harnessLocked && currentHarness !== value) {
-    throw new Error(`Magic Context: harness already locked to "${currentHarness}"; cannot change to "${value}"`);
-  }
-  currentHarness = value;
-  harnessLocked = true;
-}
-function getHarness() {
-  return currentHarness;
-}
-
 // ../plugin/src/features/magic-context/compression-depth-storage.ts
 var incrementDepthStatements = new WeakMap;
 var totalDepthStatements = new WeakMap;
@@ -157773,8 +157818,8 @@ function escapeXmlContent(s) {
 }
 // ../plugin/src/features/magic-context/storage-db.ts
 init_data_path();
-import { copyFileSync, cpSync, existsSync as existsSync3, mkdirSync as mkdirSync3 } from "node:fs";
-import { join as join7 } from "node:path";
+import { copyFileSync, cpSync, existsSync as existsSync3, mkdirSync as mkdirSync4 } from "node:fs";
+import { join as join6 } from "node:path";
 
 // ../plugin/src/shared/error-message.ts
 function getErrorMessage(error51) {
@@ -157991,6 +158036,9 @@ var MIGRATIONS = [
                     embedding BLOB NOT NULL,
                     model_id TEXT NOT NULL,
                     created_at INTEGER NOT NULL,
+                    -- FK-cascade audit (v12): git_commit_embeddings.sha -> git_commits.sha
+                    -- uses ON DELETE CASCADE, so SQLite PRAGMA foreign_keys must be ON on
+                    -- every connection and v12 cleans historical orphan rows.
                     FOREIGN KEY(sha) REFERENCES git_commits(sha) ON DELETE CASCADE
                 );
 
@@ -158130,6 +158178,29 @@ var MIGRATIONS = [
         db.exec("ALTER TABLE session_meta ADD COLUMN todo_synthetic_state_json TEXT DEFAULT ''");
       }
     }
+  },
+  {
+    version: 12,
+    description: "Clean orphan rows from FK-cascade embedding tables",
+    up: (db) => {
+      const hasTable = (name2) => Boolean(db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name = ?").get(name2));
+      const memoryEmbeddings = hasTable("memory_embeddings") ? db.prepare(`DELETE FROM memory_embeddings
+                           WHERE memory_id NOT IN (SELECT id FROM memories)`).run().changes : 0;
+      log(`[migrations] v12 cleaned ${memoryEmbeddings} orphan memory_embeddings row(s)`);
+      const gitCommitEmbeddings = hasTable("git_commit_embeddings") ? db.prepare(`DELETE FROM git_commit_embeddings
+                           WHERE sha NOT IN (SELECT sha FROM git_commits)`).run().changes : 0;
+      log(`[migrations] v12 cleaned ${gitCommitEmbeddings} orphan git_commit_embeddings row(s)`);
+    }
+  },
+  {
+    version: 13,
+    description: "Add pending_compaction_marker_state column for deferred marker drain",
+    up: (db) => {
+      const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+      if (!cols.some((c) => c.name === "pending_compaction_marker_state")) {
+        db.exec("ALTER TABLE session_meta ADD COLUMN pending_compaction_marker_state TEXT");
+      }
+    }
   }
 ];
 function ensureMigrationsTable(db) {
@@ -158197,6 +158268,28 @@ function runMigrations(db) {
   log(`[migrations] schema version now: ${MIGRATIONS[MIGRATIONS.length - 1].version}`);
 }
 
+// ../plugin/src/shared/stable-json.ts
+function stableStringify(value, seen = new WeakSet) {
+  if (value === undefined)
+    return "undefined";
+  if (value === null || typeof value !== "object")
+    return JSON.stringify(value) ?? String(value);
+  if (seen.has(value))
+    return '"[Circular]"';
+  seen.add(value);
+  if (Array.isArray(value)) {
+    return `[${value.map((item) => stableStringify(item, seen)).join(",")}]`;
+  }
+  const entries = Object.entries(value).sort(([a], [b]) => {
+    if (a < b)
+      return -1;
+    if (a > b)
+      return 1;
+    return 0;
+  });
+  return `{${entries.map(([key, child]) => `${JSON.stringify(key)}:${stableStringify(child, seen)}`).join(",")}}`;
+}
+
 // ../plugin/src/features/magic-context/tool-definition-tokens.ts
 var measurements = new Map;
 var fingerprints = new Map;
@@ -158232,11 +158325,11 @@ function loadToolDefinitionMeasurements(db) {
 init_data_path();
 init_logger();
 import { existsSync as existsSync2 } from "node:fs";
-import { join as join6 } from "node:path";
+import { join as join5 } from "node:path";
 var LEASE_DURATION_MS = 5 * 60 * 1000;
 var LEASE_RENEWAL_MS = 60 * 1000;
 function resolveOpencodeDbPath() {
-  return join6(getDataDir(), "opencode", "opencode.db");
+  return join5(getDataDir(), "opencode", "opencode.db");
 }
 function ensureBackfillStateTable(db) {
   db.exec(`
@@ -158479,20 +158572,20 @@ var persistenceByDatabase = new WeakMap;
 var persistenceErrorByDatabase = new WeakMap;
 function resolveDatabasePath() {
   const dbDir = getMagicContextStorageDir();
-  return { dbDir, dbPath: join7(dbDir, "context.db") };
+  return { dbDir, dbPath: join6(dbDir, "context.db") };
 }
 function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
   if (existsSync3(targetDbPath))
     return;
   const legacyDir = getLegacyOpenCodeMagicContextStorageDir();
-  const legacyDbPath = join7(legacyDir, "context.db");
+  const legacyDbPath = join6(legacyDir, "context.db");
   if (!existsSync3(legacyDbPath))
     return;
   log(`[magic-context] migrating legacy plugin storage: ${legacyDir} -> ${targetDbDir} (legacy left in place as backup)`);
-  mkdirSync3(targetDbDir, { recursive: true });
+  mkdirSync4(targetDbDir, { recursive: true });
   for (const suffix of ["", "-wal", "-shm"]) {
     const src = `${legacyDbPath}${suffix}`;
-    const dst = join7(targetDbDir, `context.db${suffix}`);
+    const dst = join6(targetDbDir, `context.db${suffix}`);
     if (existsSync3(src)) {
       try {
         copyFileSync(src, dst);
@@ -158501,8 +158594,8 @@ function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
       }
     }
   }
-  const legacyModelsDir = join7(legacyDir, "models");
-  const targetModelsDir = join7(targetDbDir, "models");
+  const legacyModelsDir = join6(legacyDir, "models");
+  const targetModelsDir = join6(targetDbDir, "models");
   if (existsSync3(legacyModelsDir) && !existsSync3(targetModelsDir)) {
     try {
       cpSync(legacyModelsDir, targetModelsDir, { recursive: true });
@@ -158512,9 +158605,9 @@ function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
   }
 }
 function initializeDatabase(db) {
+  db.exec("PRAGMA foreign_keys=ON");
   db.exec("PRAGMA journal_mode=WAL");
   db.exec("PRAGMA busy_timeout=5000");
-  db.exec("PRAGMA foreign_keys=ON");
   db.exec(`
     CREATE TABLE IF NOT EXISTS tags (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -158612,6 +158705,9 @@ function initializeDatabase(db) {
     );
 
     CREATE TABLE IF NOT EXISTS memory_embeddings (
+      -- FK-cascade audit (v12): memory_embeddings.memory_id -> memories.id
+      -- uses ON DELETE CASCADE, so SQLite PRAGMA foreign_keys must be ON on
+      -- every connection and v12 cleans historical orphan rows.
       memory_id INTEGER PRIMARY KEY REFERENCES memories(id) ON DELETE CASCADE,
       embedding BLOB NOT NULL,
       model_id TEXT
@@ -158719,7 +158815,13 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       system_prompt_hash TEXT DEFAULT '',
       memory_block_cache TEXT DEFAULT '',
       memory_block_count INTEGER DEFAULT 0,
-      memory_block_ids TEXT DEFAULT ''
+      memory_block_ids TEXT DEFAULT '',
+      -- pending_compaction_marker_state: intentionally NULLABLE without a
+      -- default. Absence of a deferred marker is SQL NULL; presence is a
+      -- valid JSON blob written via setPendingCompactionMarkerState.
+      -- Excluded from healNullTextColumns. Readers filter IS NOT NULL AND
+      -- != empty-string defensively. Plan v6 section 3.
+      pending_compaction_marker_state TEXT
     );
 
     CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
@@ -158807,6 +158909,7 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "recomp_partial_range_end", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "detected_context_limit", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "needs_emergency_recovery", "INTEGER DEFAULT 0");
+  ensureColumn(db, "session_meta", "pending_compaction_marker_state", "TEXT");
   ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "source_contents", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
@@ -158896,7 +158999,7 @@ function openDatabase() {
   }
   try {
     migrateLegacyStorageIfNeeded(dbPath, dbDir);
-    mkdirSync3(dbDir, { recursive: true });
+    mkdirSync4(dbDir, { recursive: true });
     const db = new Database(dbPath);
     initializeDatabase(db);
     runMigrations(db);
@@ -159201,6 +159304,28 @@ function setStrippedPlaceholderIds(db, sessionId, ids) {
   const json2 = ids.size > 0 ? JSON.stringify([...ids]) : "";
   db.prepare("UPDATE session_meta SET stripped_placeholder_ids = ? WHERE session_id = ?").run(json2, sessionId);
 }
+function isPendingCompactionMarker(value) {
+  return typeof value === "object" && value !== null && typeof value.ordinal === "number" && typeof value.endMessageId === "string" && typeof value.publishedAt === "number";
+}
+function getPendingCompactionMarkerState(db, sessionId) {
+  const row = db.prepare("SELECT pending_compaction_marker_state FROM session_meta WHERE session_id = ?").get(sessionId);
+  const raw = row?.pending_compaction_marker_state;
+  if (raw === null || raw === undefined || raw === "")
+    return null;
+  try {
+    const parsed = JSON.parse(raw);
+    if (isPendingCompactionMarker(parsed)) {
+      return parsed;
+    }
+  } catch {}
+  return null;
+}
+function clearPendingCompactionMarkerStateIf(db, sessionId, expected) {
+  const expectedBlob = stableStringify(expected);
+  const result = db.prepare(`UPDATE session_meta SET pending_compaction_marker_state = NULL
+             WHERE session_id = ? AND pending_compaction_marker_state = ?`).run(sessionId, expectedBlob);
+  return result.changes > 0;
+}
 // ../plugin/src/features/magic-context/resolve-subagent-fallback.ts
 init_logger();
 await init_read_session_db();
@@ -159798,7 +159923,7 @@ init_data_path();
 import { createHash as createHash3 } from "node:crypto";
 import { existsSync as existsSync4, readFileSync } from "node:fs";
 import { homedir as homedir2, platform } from "node:os";
-import { join as join8 } from "node:path";
+import { join as join7 } from "node:path";
 
 // ../plugin/src/shared/jsonc-parser.ts
 function stripJsonComments(content) {
@@ -159913,15 +160038,15 @@ function getModelsJsonPath() {
   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 join8(cacheBase, "opencode", filename);
+  return join7(cacheBase, "opencode", filename);
 }
 function getOpencodeConfigPath() {
   const envDir = process.env.OPENCODE_CONFIG_DIR?.trim();
-  const configDir = envDir ? envDir : platform() === "win32" ? join8(homedir2(), ".config", "opencode") : join8(process.env.XDG_CONFIG_HOME || join8(homedir2(), ".config"), "opencode");
-  const jsonc = join8(configDir, "opencode.jsonc");
+  const configDir = envDir ? envDir : platform() === "win32" ? join7(homedir2(), ".config", "opencode") : join7(process.env.XDG_CONFIG_HOME || join7(homedir2(), ".config"), "opencode");
+  const jsonc = join7(configDir, "opencode.jsonc");
   if (existsSync4(jsonc))
     return jsonc;
-  const json2 = join8(configDir, "opencode.json");
+  const json2 = join7(configDir, "opencode.json");
   if (existsSync4(json2))
     return json2;
   return null;
@@ -160297,12 +160422,12 @@ init_logger();
 // src/subagent-runner.ts
 import * as childProcess from "node:child_process";
 import { existsSync as existsSync5 } from "node:fs";
-import { dirname as dirname2, resolve as resolvePath } from "node:path";
+import { dirname as dirname3, resolve as resolvePath } from "node:path";
 import { createInterface } from "node:readline";
 import { fileURLToPath } from "node:url";
 function resolveSubagentEntryPath() {
   try {
-    const here = dirname2(fileURLToPath(import.meta.url));
+    const here = dirname3(fileURLToPath(import.meta.url));
     const candidate = resolvePath(here, "subagent-entry.js");
     if (existsSync5(candidate))
       return candidate;
@@ -160744,69 +160869,6 @@ ${sidekickText}
   });
 }
 
-// ../plugin/src/features/magic-context/dreamer/queue.ts
-function enqueueDream(db, projectIdentity, reason, force = false) {
-  const now = Date.now();
-  return db.transaction(() => {
-    const staleThresholdMs = force ? 2 * 60 * 1000 : 120 * 60 * 1000;
-    db.prepare("DELETE FROM dream_queue WHERE project_path = ? AND started_at IS NOT NULL AND started_at < ?").run([projectIdentity, now - staleThresholdMs]);
-    const existing = db.prepare("SELECT id FROM dream_queue WHERE project_path = ?").get(projectIdentity);
-    if (existing) {
-      return null;
-    }
-    const result = db.prepare("INSERT INTO dream_queue (project_path, reason, enqueued_at) VALUES (?, ?, ?)").run(projectIdentity, reason, now);
-    return {
-      id: Number(result.lastInsertRowid),
-      projectIdentity,
-      reason,
-      enqueuedAt: now,
-      startedAt: null
-    };
-  })();
-}
-function peekQueue(db, projectIdentity) {
-  const row = projectIdentity ? db.prepare("SELECT id, project_path, reason, enqueued_at FROM dream_queue WHERE started_at IS NULL AND project_path = ? ORDER BY enqueued_at ASC LIMIT 1").get(projectIdentity) : db.prepare("SELECT id, project_path, reason, enqueued_at FROM dream_queue WHERE started_at IS NULL ORDER BY enqueued_at ASC LIMIT 1").get();
-  if (!row)
-    return null;
-  return {
-    id: row.id,
-    projectIdentity: row.project_path,
-    reason: row.reason,
-    enqueuedAt: row.enqueued_at,
-    startedAt: null
-  };
-}
-function dequeueNext(db, projectIdentity) {
-  const now = Date.now();
-  return db.transaction(() => {
-    const entry = peekQueue(db, projectIdentity);
-    if (!entry)
-      return null;
-    const result = db.prepare("UPDATE dream_queue SET started_at = ? WHERE id = ? AND started_at IS NULL").run(now, entry.id);
-    if (result.changes === 0)
-      return null;
-    return { ...entry, startedAt: now };
-  })();
-}
-function removeDreamEntry(db, id) {
-  db.prepare("DELETE FROM dream_queue WHERE id = ?").run(id);
-}
-function resetDreamEntry(db, id) {
-  db.prepare("UPDATE dream_queue SET started_at = NULL, retry_count = COALESCE(retry_count, 0) + 1 WHERE id = ?").run(id);
-}
-function getEntryRetryCount(db, id) {
-  const row = db.prepare("SELECT retry_count FROM dream_queue WHERE id = ?").get(id);
-  return row?.retry_count ?? 0;
-}
-function clearStaleEntries(db, maxAgeMs) {
-  const cutoff = Date.now() - maxAgeMs;
-  const result = db.prepare("DELETE FROM dream_queue WHERE started_at IS NOT NULL AND started_at < ?").run(cutoff);
-  return result.changes;
-}
-
-// src/commands/ctx-dream.ts
-init_logger();
-
 // ../plugin/src/features/magic-context/dreamer/storage-dream-state.ts
 var getDreamStateStatements = new WeakMap;
 var setDreamStateStatements = new WeakMap;
@@ -160902,9 +160964,84 @@ function releaseLease(db, holderId) {
     deleteDreamState(db, LEASE_EXPIRY_KEY);
   })();
 }
+
+// ../plugin/src/features/magic-context/dreamer/queue.ts
+function hasActiveDreamLease(db) {
+  try {
+    return isLeaseActive(db);
+  } catch (error51) {
+    if (String(error51).includes("no such table: dream_state")) {
+      return false;
+    }
+    throw error51;
+  }
+}
+function enqueueDream(db, projectIdentity, reason, force = false) {
+  const now = Date.now();
+  return db.transaction(() => {
+    if (!hasActiveDreamLease(db)) {
+      const staleThresholdMs = force ? 2 * 60 * 1000 : 120 * 60 * 1000;
+      db.prepare("DELETE FROM dream_queue WHERE project_path = ? AND started_at IS NOT NULL AND started_at < ?").run([projectIdentity, now - staleThresholdMs]);
+    }
+    const existing = db.prepare("SELECT id FROM dream_queue WHERE project_path = ?").get(projectIdentity);
+    if (existing) {
+      return null;
+    }
+    const result = db.prepare("INSERT INTO dream_queue (project_path, reason, enqueued_at) VALUES (?, ?, ?)").run(projectIdentity, reason, now);
+    return {
+      id: Number(result.lastInsertRowid),
+      projectIdentity,
+      reason,
+      enqueuedAt: now,
+      startedAt: null
+    };
+  })();
+}
+function peekQueue(db, projectIdentity) {
+  const row = projectIdentity ? db.prepare("SELECT id, project_path, reason, enqueued_at FROM dream_queue WHERE started_at IS NULL AND project_path = ? ORDER BY enqueued_at ASC LIMIT 1").get(projectIdentity) : db.prepare("SELECT id, project_path, reason, enqueued_at FROM dream_queue WHERE started_at IS NULL ORDER BY enqueued_at ASC LIMIT 1").get();
+  if (!row)
+    return null;
+  return {
+    id: row.id,
+    projectIdentity: row.project_path,
+    reason: row.reason,
+    enqueuedAt: row.enqueued_at,
+    startedAt: null
+  };
+}
+function dequeueNext(db, projectIdentity) {
+  const now = Date.now();
+  return db.transaction(() => {
+    const entry = peekQueue(db, projectIdentity);
+    if (!entry)
+      return null;
+    const result = db.prepare("UPDATE dream_queue SET started_at = ? WHERE id = ? AND started_at IS NULL").run(now, entry.id);
+    if (result.changes === 0)
+      return null;
+    return { ...entry, startedAt: now };
+  })();
+}
+function removeDreamEntry(db, id) {
+  db.prepare("DELETE FROM dream_queue WHERE id = ?").run(id);
+}
+function resetDreamEntry(db, id) {
+  db.prepare("UPDATE dream_queue SET started_at = NULL, retry_count = COALESCE(retry_count, 0) + 1 WHERE id = ?").run(id);
+}
+function getEntryRetryCount(db, id) {
+  const row = db.prepare("SELECT retry_count FROM dream_queue WHERE id = ?").get(id);
+  return row?.retry_count ?? 0;
+}
+function clearStaleEntries(db, maxAgeMs) {
+  const cutoff = Date.now() - maxAgeMs;
+  const result = db.prepare("DELETE FROM dream_queue WHERE started_at IS NOT NULL AND started_at < ?").run(cutoff);
+  return result.changes;
+}
+
+// src/commands/ctx-dream.ts
+init_logger();
 // ../plugin/src/features/magic-context/dreamer/runner.ts
 import { existsSync as existsSync6 } from "node:fs";
-import { join as join9 } from "node:path";
+import { join as join8 } from "node:path";
 
 // ../plugin/src/shared/index.ts
 init_logger();
@@ -162442,7 +162579,7 @@ function logWithStackHead(message, stackHead) {
   log(message, stackHead ? { stackHead } : undefined);
 }
 function getOpenCodeDbPath2() {
-  return join9(getDataDir(), "opencode", "opencode.db");
+  return join8(getDataDir(), "opencode", "opencode.db");
 }
 function openOpenCodeDb() {
   const dbPath = getOpenCodeDbPath2();
@@ -162517,9 +162654,11 @@ async function identifyKeyFilesForSession(args) {
       try {
         if (!renewLease(args.db, args.holderId)) {
           log(`[key-files][${args.sessionId}] lease renewal failed — aborting`);
+          args.onLeaseLost?.(`key-files:${args.sessionId}`);
           abortController.abort();
         }
-      } catch {
+      } catch (error51) {
+        args.onLeaseLost?.(`key-files:${args.sessionId}`, error51);
         abortController.abort();
       }
     }, 60000);
@@ -162574,6 +162713,10 @@ async function identifyKeyFilesForSession(args) {
       log(`[key-files][${args.sessionId}] could not parse agent output — using heuristic fallback`);
       applyHeuristicFallback();
     } catch (error51) {
+      if (args.isLeaseLost?.() || abortController.signal.aborted) {
+        log(`[key-files][${args.sessionId}] lease lost during identification — skipping heuristic fallback`);
+        throw error51;
+      }
       log(`[key-files][${args.sessionId}] identification failed: ${getErrorMessage(error51)} — using heuristic fallback`);
       try {
         applyHeuristicFallback();
@@ -162614,6 +162757,10 @@ async function identifyKeyFiles(args) {
   }
   log(`[key-files] evaluating ${sessionIds.length} active session(s) for ${args.projectIdentity}`);
   for (const sessionId of sessionIds) {
+    if (args.isLeaseLost?.()) {
+      log("[key-files] lease lost — stopping key-file identification");
+      break;
+    }
     if (Date.now() > args.deadline) {
       log("[key-files] deadline reached — stopping key-file identification");
       break;
@@ -162625,6 +162772,8 @@ async function identifyKeyFiles(args) {
       sessionDirectory: args.sessionDirectory,
       holderId: args.holderId,
       fallbackModels: args.fallbackModels,
+      onLeaseLost: args.onLeaseLost,
+      isLeaseLost: args.isLeaseLost,
       deadline: args.deadline,
       sessionId,
       config: args.config
@@ -162681,8 +162830,50 @@ async function runDream(args) {
   let lastErrorSignature = null;
   let consecutiveSameErrorFailures = 0;
   let circuitBreakerTripped = false;
+  let lostLease = false;
+  let lostLeaseReason = null;
+  let lostLeaseRecorded = false;
+  const markLeaseLost = (phase, error51) => {
+    const detail = error51 ? `: ${getErrorMessage(error51)}` : "";
+    lostLeaseReason = `Dream lease lost during ${phase}${detail}`;
+    if (!lostLease) {
+      log(`[dreamer] FATAL: ${lostLeaseReason}; aborting all remaining dream work`);
+    } else {
+      log(`[dreamer] FATAL: ${lostLeaseReason}; dream work is already aborting`);
+    }
+    lostLease = true;
+  };
+  const recordLeaseLostTask = (phase) => {
+    if (lostLeaseRecorded)
+      return;
+    lostLeaseRecorded = true;
+    result.tasks.push({
+      name: "lease-lost",
+      durationMs: 0,
+      result: "",
+      error: lostLeaseReason ?? `Dream lease lost during ${phase}; aborted remaining work`
+    });
+  };
+  const verifyLeaseStillHeld = (phase) => {
+    if (lostLease)
+      return false;
+    try {
+      if (!renewLease(args.db, holderId)) {
+        markLeaseLost(phase);
+        return false;
+      }
+      return true;
+    } catch (error51) {
+      markLeaseLost(phase, error51);
+      return false;
+    }
+  };
   try {
     for (const taskName of args.tasks) {
+      if (!verifyLeaseStillHeld(`before task ${taskName}`)) {
+        recordLeaseLostTask(`before task ${taskName}`);
+        break;
+      }
       if (Date.now() > deadline) {
         log(`[dreamer] deadline reached, stopping after ${result.tasks.length} tasks`);
         break;
@@ -162695,18 +162886,20 @@ async function runDream(args) {
         try {
           if (!renewLease(args.db, holderId)) {
             log(`[dreamer] task ${taskName}: lease renewal failed — aborting LLM call`);
+            markLeaseLost(`task ${taskName} lease renewal`);
             taskAbortController.abort();
           }
         } catch (err) {
           log(`[dreamer] task ${taskName}: lease renewal threw — aborting LLM call: ${err}`);
+          markLeaseLost(`task ${taskName} lease renewal`, err);
           taskAbortController.abort();
         }
       }, 60000);
       try {
         const docsDir = args.sessionDirectory ?? args.projectIdentity;
         const existingDocs = taskName === "maintain-docs" ? {
-          architecture: existsSync6(join9(docsDir, "ARCHITECTURE.md")),
-          structure: existsSync6(join9(docsDir, "STRUCTURE.md"))
+          architecture: existsSync6(join8(docsDir, "ARCHITECTURE.md")),
+          structure: existsSync6(join8(docsDir, "STRUCTURE.md"))
         } : undefined;
         const userMemories = taskName === "archive-stale" ? getActiveUserMemories(args.db).map((um) => ({
           id: um.id,
@@ -162745,6 +162938,9 @@ async function runDream(args) {
           fallbackModels: args.fallbackModels,
           callContext: `dreamer:${taskName}`
         });
+        if (lostLease) {
+          throw new Error(lostLeaseReason ?? `Dream lease lost during ${taskName}`);
+        }
         const messagesResponse = await args.client.session.messages({
           path: { id: agentSessionId },
           query: { directory: args.sessionDirectory ?? args.projectIdentity }
@@ -162775,7 +162971,10 @@ async function runDream(args) {
           result: null,
           error: errorDescription.brief
         });
-        if (shouldSkipCircuitBreaker(error51, errorDescription.brief)) {
+        if (lostLease) {
+          lastErrorSignature = null;
+          consecutiveSameErrorFailures = 0;
+        } else if (shouldSkipCircuitBreaker(error51, errorDescription.brief)) {
           lastErrorSignature = null;
           consecutiveSameErrorFailures = 0;
         } else {
@@ -162808,11 +163007,18 @@ async function runDream(args) {
           });
         }
       }
+      if (lostLease) {
+        recordLeaseLostTask(`task ${taskName}`);
+        break;
+      }
       if (circuitBreakerTripped) {
         break;
       }
     }
-    if (circuitBreakerTripped) {
+    if (lostLease) {
+      log("[dreamer] lease lost: skipping all post-task phases");
+      recordLeaseLostTask("post-task phases");
+    } else if (circuitBreakerTripped) {
       log("[dreamer] circuit breaker: skipping post-task phases");
       result.tasks.push({
         name: "post-task-phases",
@@ -162821,9 +163027,12 @@ async function runDream(args) {
         error: "Skipped post-task phases after circuit breaker tripped; configure dreamer model/fallback_models in magic-context.jsonc."
       });
     }
-    if (!circuitBreakerTripped && args.experimentalUserMemories?.enabled && Date.now() <= deadline) {
+    if (!circuitBreakerTripped && !lostLease && args.experimentalUserMemories?.enabled && Date.now() <= deadline) {
       const umStart = Date.now();
       try {
+        if (!verifyLeaseStillHeld("before user-memory review")) {
+          throw new Error(lostLeaseReason ?? "Dream lease lost before user-memory review");
+        }
         const reviewResult = await reviewUserMemories({
           db: args.db,
           client: args.client,
@@ -162834,6 +163043,9 @@ async function runDream(args) {
           promotionThreshold: args.experimentalUserMemories.promotionThreshold,
           fallbackModels: args.fallbackModels
         });
+        if (!verifyLeaseStillHeld("after user-memory review")) {
+          throw new Error(lostLeaseReason ?? "Dream lease lost after user-memory review");
+        }
         const umOutput = `promoted=${reviewResult.promoted} merged=${reviewResult.merged} dismissed=${reviewResult.dismissed} consumed=${reviewResult.candidatesConsumed}`;
         if (reviewResult.promoted > 0 || reviewResult.merged > 0 || reviewResult.dismissed > 0) {
           log(`[dreamer] user-memories: ${umOutput}`);
@@ -162853,9 +163065,14 @@ async function runDream(args) {
           error: errorDescription.brief
         });
       }
+      if (lostLease)
+        recordLeaseLostTask("user-memory review");
     }
-    if (!circuitBreakerTripped && Date.now() <= deadline) {
+    if (!circuitBreakerTripped && !lostLease && Date.now() <= deadline) {
       try {
+        if (!verifyLeaseStillHeld("before smart-note evaluation")) {
+          throw new Error(lostLeaseReason ?? "Dream lease lost before smart-note evaluation");
+        }
         await evaluateSmartNotes({
           db: args.db,
           client: args.client,
@@ -162865,16 +163082,26 @@ async function runDream(args) {
           holderId,
           deadline,
           result,
-          fallbackModels: args.fallbackModels
+          fallbackModels: args.fallbackModels,
+          onLeaseLost: markLeaseLost,
+          isLeaseLost: () => lostLease
         });
+        if (!verifyLeaseStillHeld("after smart-note evaluation")) {
+          throw new Error(lostLeaseReason ?? "Dream lease lost after smart-note evaluation");
+        }
       } catch (error51) {
         const errorDescription = describeError(error51);
         logWithStackHead(`[dreamer] smart note evaluation failed: ${errorDescription.brief}`, errorDescription.stackHead);
       }
+      if (lostLease)
+        recordLeaseLostTask("smart-note evaluation");
     }
-    if (!circuitBreakerTripped && args.experimentalPinKeyFiles?.enabled && Date.now() <= deadline) {
+    if (!circuitBreakerTripped && !lostLease && args.experimentalPinKeyFiles?.enabled && Date.now() <= deadline) {
       const kfStart = Date.now();
       try {
+        if (!verifyLeaseStillHeld("before key-file identification")) {
+          throw new Error(lostLeaseReason ?? "Dream lease lost before key-file identification");
+        }
         await identifyKeyFiles({
           db: args.db,
           client: args.client,
@@ -162884,8 +163111,13 @@ async function runDream(args) {
           holderId,
           deadline,
           config: args.experimentalPinKeyFiles,
-          fallbackModels: args.fallbackModels
+          fallbackModels: args.fallbackModels,
+          onLeaseLost: markLeaseLost,
+          isLeaseLost: () => lostLease
         });
+        if (!verifyLeaseStillHeld("after key-file identification")) {
+          throw new Error(lostLeaseReason ?? "Dream lease lost after key-file identification");
+        }
         result.tasks.push({
           name: "key files",
           durationMs: Date.now() - kfStart,
@@ -162901,6 +163133,8 @@ async function runDream(args) {
           error: errorDescription.brief
         });
       }
+      if (lostLease)
+        recordLeaseLostTask("key-file identification");
     }
   } finally {
     releaseLease(args.db, holderId);
@@ -162941,7 +163175,7 @@ async function runDream(args) {
     "circuit-breaker"
   ]);
   const hasSuccessfulTask = result.tasks.some((t) => !t.error && !POST_TASK_NAMES.has(t.name));
-  if (hasSuccessfulTask) {
+  if (hasSuccessfulTask && !lostLease) {
     setDreamState(args.db, `last_dream_at:${args.projectIdentity}`, String(result.finishedAt));
     setDreamState(args.db, "last_dream_at", String(result.finishedAt));
   }
@@ -162990,9 +163224,11 @@ Only include notes whose conditions you could definitively evaluate. Skip notes
     try {
       if (!renewLease(args.db, args.holderId)) {
         log("[dreamer] smart notes: lease renewal failed — aborting");
+        args.onLeaseLost?.("smart notes");
         abortController.abort();
       }
-    } catch {
+    } catch (error51) {
+      args.onLeaseLost?.("smart notes", error51);
       abortController.abort();
     }
   }, 60000);
@@ -164271,7 +164507,6 @@ function createScheduler(config2) {
     }
   };
 }
-
 // ../plugin/src/features/magic-context/tagger.ts
 var TOOL_COMPOSITE_KEY_SEP = "\x00";
 function makeToolCompositeKey(ownerMsgId, callId) {
@@ -165310,16 +165545,24 @@ function trimMemoriesToBudget(sessionId, memories, budgetTokens) {
 function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, projectPath, injectionBudgetTokens, temporalAwareness) {
   const cached2 = injectionCache.get(sessionId);
   if (!isCacheBusting && cached2) {
-    if (cached2.compartmentEndMessageId.length > 0) {
-      const cutoffIndex2 = messages.findIndex((message) => message.info.id === cached2.compartmentEndMessageId);
-      if (cutoffIndex2 >= 0) {
-        const remaining = messages.slice(cutoffIndex2 + 1);
-        messages.splice(0, messages.length, ...remaining);
-      } else {
-        sessionLog(sessionId, `compartment injection: cached boundary ${cached2.compartmentEndMessageId} not in messages (already trimmed), reusing cache`);
+    if (cached2.kind === "empty") {
+      return null;
+    }
+    const prepared = cached2.injection;
+    if (prepared.compartmentEndMessageId === null) {
+      sessionLog(sessionId, "compartment injection cache in degraded mode (null boundary), forcing rebuild");
+    } else {
+      if (prepared.compartmentEndMessageId.length > 0) {
+        const cutoffIndex2 = messages.findIndex((message) => message.info.id === prepared.compartmentEndMessageId);
+        if (cutoffIndex2 >= 0) {
+          const remaining = messages.slice(cutoffIndex2 + 1);
+          messages.splice(0, messages.length, ...remaining);
+        } else {
+          sessionLog(sessionId, `compartment injection: cached boundary ${prepared.compartmentEndMessageId} not in messages (already trimmed), reusing cache`);
+        }
       }
+      return { ...prepared, rebuiltFromDb: false };
     }
-    return cached2;
   }
   const compartments = getCompartments(db, sessionId);
   const facts = getSessionFacts(db, sessionId);
@@ -165351,7 +165594,11 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
     }
   }
   if (compartments.length === 0 && facts.length === 0 && !memoryBlock) {
-    injectionCache.delete(sessionId);
+    injectionCache.set(sessionId, {
+      kind: "empty",
+      compartmentEndMessageId: "",
+      renderedBytes: 0
+    });
     return null;
   }
   let dateRanges;
@@ -165384,9 +165631,10 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
       compartmentCount: 0,
       skippedVisibleMessages: 0,
       factCount: facts.length,
-      memoryCount
+      memoryCount,
+      rebuiltFromDb: true
     };
-    injectionCache.set(sessionId, result2);
+    injectionCache.set(sessionId, { kind: "populated", injection: result2 });
     return result2;
   }
   const lastCompartment = compartments[compartments.length - 1];
@@ -165404,9 +165652,10 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
       compartmentCount: compartments.length,
       skippedVisibleMessages: 0,
       factCount: facts.length,
-      memoryCount
+      memoryCount,
+      rebuiltFromDb: true
     };
-    injectionCache.set(sessionId, result2);
+    injectionCache.set(sessionId, { kind: "populated", injection: result2 });
     return result2;
   }
   let skippedVisibleMessages = 0;
@@ -165415,17 +165664,20 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
     skippedVisibleMessages = cutoffIndex + 1;
     const remaining = messages.slice(cutoffIndex + 1);
     messages.splice(0, messages.length, ...remaining);
+  } else {
+    sessionLog(sessionId, `compartment injection entering degraded mode: boundary ${lastEndMessageId} not in visible messages`);
   }
   const result = {
     block,
     compartmentEndMessage: lastEnd,
-    compartmentEndMessageId: lastEndMessageId,
+    compartmentEndMessageId: cutoffIndex >= 0 ? lastEndMessageId : null,
     compartmentCount: compartments.length,
     skippedVisibleMessages,
     factCount: facts.length,
-    memoryCount
+    memoryCount,
+    rebuiltFromDb: true
   };
-  injectionCache.set(sessionId, result);
+  injectionCache.set(sessionId, { kind: "populated", injection: result });
   return result;
 }
 
@@ -166968,7 +167220,7 @@ function injectSessionHistoryIntoPi(db, sessionId, piMessages, isCacheBusting, p
     };
   }
   const boundaryId = prepared.compartmentEndMessageId;
-  const skippedVisible = boundaryId.length > 0 ? trimPiMessagesToBoundary(piMessages, entryIds, boundaryId) : prepared.skippedVisibleMessages;
+  const skippedVisible = boundaryId != null && boundaryId.length > 0 ? trimPiMessagesToBoundary(piMessages, entryIds, boundaryId) : prepared.skippedVisibleMessages;
   const historyBlock = `<session-history>
 ${prepared.block}
 </session-history>`;
@@ -168018,17 +168270,17 @@ function getReducedRecompTokenBudget(currentBudget) {
 }
 
 // ../plugin/src/hooks/magic-context/historian-state-file.ts
-import { mkdirSync as mkdirSync4, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
-import { tmpdir as tmpdir2 } from "node:os";
-import { join as join10 } from "node:path";
+init_data_path();
+import { mkdirSync as mkdirSync5, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { join as join9 } from "node:path";
 var HISTORIAN_STATE_INLINE_THRESHOLD = 30000;
-var HISTORIAN_STATE_DIR = join10(tmpdir2(), "magic-context-historian");
-function maybeWriteHistorianStateFile(sessionId, existingState) {
+function maybeWriteHistorianStateFile(sessionId, existingState, directory) {
   if (existingState.length <= HISTORIAN_STATE_INLINE_THRESHOLD)
     return;
   try {
-    mkdirSync4(HISTORIAN_STATE_DIR, { recursive: true });
-    const path5 = join10(HISTORIAN_STATE_DIR, `state-${sessionId}-${Date.now()}.xml`);
+    const dir = getProjectMagicContextHistorianDir(directory);
+    mkdirSync5(dir, { recursive: true });
+    const path5 = join9(dir, `state-${sessionId}-${Date.now()}.xml`);
     writeFileSync2(path5, existingState, "utf8");
     return path5;
   } catch {
@@ -168128,7 +168380,7 @@ async function runPiHistorian(deps) {
       const existingState = priorCompartments.length > 0 || priorFacts.length > 0 ? buildExistingStateXml(priorCompartments, priorFacts, memoryBlock) : memoryBlock ? `${memoryBlock}
 
 This is your first run. No existing compartments or facts.` : "This is your first run. No existing state.";
-      stateFilePath = maybeWriteHistorianStateFile(sessionId, existingState);
+      stateFilePath = maybeWriteHistorianStateFile(sessionId, existingState, directory);
       if (stateFilePath) {
         sessionLog(sessionId, `pi-historian: existing state offloaded to file (${existingState.length} chars) → ${stateFilePath}`);
       }
@@ -170236,7 +170488,7 @@ init_logger();
 init_data_path();
 init_logger();
 await init_sqlite();
-import { join as join11 } from "node:path";
+import { join as join10 } from "node:path";
 var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 function randomBase62(length) {
   const chars = [];
@@ -170257,7 +170509,7 @@ function generatePartId(timestampMs, counter = 0n) {
   return generateId("prt", timestampMs, counter);
 }
 function getOpenCodeDbPath3() {
-  return join11(getDataDir(), "opencode", "opencode.db");
+  return join10(getDataDir(), "opencode", "opencode.db");
 }
 var cachedWriteDb = null;
 var REQUIRED_MESSAGE_COLUMNS = ["id", "session_id", "time_created", "time_updated", "data"];
@@ -170815,11 +171067,13 @@ async function runCompressorPass2(args) {
 }
 
 // ../plugin/src/hooks/magic-context/compartment-runner-historian.ts
-import { mkdirSync as mkdirSync5, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "node:fs";
-import { tmpdir as tmpdir3 } from "node:os";
-import { join as join12 } from "node:path";
+import { mkdirSync as mkdirSync6, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "node:fs";
+import { join as join11 } from "node:path";
 init_magic_context();
-var HISTORIAN_RESPONSE_DUMP_DIR = join12(tmpdir3(), "magic-context-historian");
+init_data_path();
+function historianResponseDumpDir(directory) {
+  return getProjectMagicContextHistorianDir(directory);
+}
 var MAX_HISTORIAN_RETRIES = 2;
 async function runValidatedHistorianPass(args) {
   const firstRun = await runHistorianPrompt({
@@ -170971,7 +171225,7 @@ async function runHistorianPrompt(args) {
     if (!result) {
       return { ok: false, error: "Historian returned no assistant output." };
     }
-    const dumpPath = dumpHistorianResponse(parentSessionId, dumpLabel ?? "historian-response", result);
+    const dumpPath = dumpHistorianResponse(parentSessionId, sessionDirectory, dumpLabel ?? "historian-response", result);
     return { ok: true, result, dumpPath };
   } catch (modelError) {
     const desc = describeError(modelError);
@@ -171063,12 +171317,13 @@ function cleanupHistorianDump(sessionId, dumpPath) {
     });
   }
 }
-function dumpHistorianResponse(sessionId, label, text) {
+function dumpHistorianResponse(sessionId, directory, label, text) {
   try {
-    mkdirSync5(HISTORIAN_RESPONSE_DUMP_DIR, { recursive: true });
+    const dumpDir = historianResponseDumpDir(directory);
+    mkdirSync6(dumpDir, { recursive: true });
     const safeSessionId = sanitizeDumpName(sessionId);
     const safeLabel = sanitizeDumpName(label);
-    const dumpPath = join12(HISTORIAN_RESPONSE_DUMP_DIR, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
+    const dumpPath = join11(dumpDir, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
     writeFileSync3(dumpPath, text, "utf8");
     sessionLog(sessionId, "compartment agent: historian response dumped", {
       label,
@@ -171293,9 +171548,18 @@ async function executePartialRecompInternal(deps, range) {
       }
       setRecompPartialRange(db, sessionId, null);
       clearCompressionDepthRange(db, sessionId, snapStart, snapEnd);
-      clearInjectionCache(sessionId);
-      deps.onInjectionCacheCleared?.(sessionId);
+      if (deps.preserveInjectionCacheUntilConsumed !== true) {
+        clearInjectionCache(sessionId);
+      }
+      deps.onCompartmentStatePublished?.(sessionId);
       const lastEnd = merged[merged.length - 1]?.endMessage ?? snapEnd;
+      if (deps.experimentalCompactionMarkers && lastEnd > 0) {
+        updateCompactionMarkerAfterPublication(db, sessionId, lastEnd, deps.directory);
+        const stalePending = getPendingCompactionMarkerState(db, sessionId);
+        if (stalePending) {
+          clearPendingCompactionMarkerStateIf(db, sessionId, stalePending);
+        }
+      }
       return { compartmentCount: merged.length, lastEndMessage: lastEnd };
     };
     const protectedTailStart = getProtectedTailStartOrdinal(sessionId);
@@ -171510,8 +171774,10 @@ async function executeContextRecompInternal(deps) {
       if (!promoted2)
         return null;
       clearCompressionDepth(db, sessionId);
-      clearInjectionCache(sessionId);
-      deps.onInjectionCacheCleared?.(sessionId);
+      if (deps.preserveInjectionCacheUntilConsumed !== true) {
+        clearInjectionCache(sessionId);
+      }
+      deps.onCompartmentStatePublished?.(sessionId);
       if (deps.directory && deps.memoryEnabled !== false && deps.autoPromote !== false) {
         promoteSessionFactsToMemory(db, sessionId, resolveProjectIdentity(deps.directory), promoted2.facts);
       }
@@ -171521,6 +171787,10 @@ async function executeContextRecompInternal(deps) {
       }
       if (deps.experimentalCompactionMarkers && lastCompartmentEnd2 > 0) {
         updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd2, deps.directory);
+        const stalePending = getPendingCompactionMarkerState(db, sessionId);
+        if (stalePending) {
+          clearPendingCompactionMarkerStateIf(db, sessionId, stalePending);
+        }
       }
       return [
         `Persisted ${promoted2.compartments.length} compartment${promoted2.compartments.length === 1 ? "" : "s"} from ${passCount} successful pass${passCount === 1 ? "" : "es"}.`,
@@ -171586,7 +171856,7 @@ Nothing was written.`;
 
 This is your first run. No existing compartments or facts.` : "This is your first run. No existing state.";
       cleanupHistorianStateFile(currentStateFilePath);
-      currentStateFilePath = maybeWriteHistorianStateFile(sessionId, existingState);
+      currentStateFilePath = maybeWriteHistorianStateFile(sessionId, existingState, sessionDirectory);
       const prompt = buildCompartmentAgentPrompt(existingState, `Messages ${chunk.startIndex}-${chunk.endIndex}:
 
 ${chunk.text}`, { stateFilePath: currentStateFilePath });
@@ -171682,8 +171952,10 @@ Nothing was written.`;
       clearRecompStaging(db, sessionId);
     }
     clearCompressionDepth(db, sessionId);
-    clearInjectionCache(sessionId);
-    deps.onInjectionCacheCleared?.(sessionId);
+    if (deps.preserveInjectionCacheUntilConsumed !== true) {
+      clearInjectionCache(sessionId);
+    }
+    deps.onCompartmentStatePublished?.(sessionId);
     const finalCompartments = promoted?.compartments ?? candidateCompartments;
     const finalFacts = promoted?.facts ?? candidateFacts;
     if (deps.directory && deps.memoryEnabled !== false && deps.autoPromote !== false) {
@@ -171732,21 +172004,39 @@ Staging data preserved for resume on next attempt.`;
 
 // ../plugin/src/hooks/magic-context/compartment-runner.ts
 var activeRuns = new Map;
+function markActiveCompartmentRunPublished(sessionId) {
+  const activeRun = activeRuns.get(sessionId);
+  if (activeRun)
+    activeRun.published = true;
+}
+function withPublishedCallback(deps) {
+  return {
+    ...deps,
+    onCompartmentStatePublished: (sid) => {
+      markActiveCompartmentRunPublished(sid);
+      deps.onCompartmentStatePublished?.(sid);
+    }
+  };
+}
 async function executeContextRecomp(deps, options = {}) {
   const { sessionId } = deps;
   if (activeRuns.has(sessionId)) {
     return "## Magic Recomp\n\nHistorian is already running for this session. Wait for it to finish, then try `/ctx-recomp` again.";
   }
-  const promise2 = options.range ? executePartialRecompInternal(deps, options.range) : executeContextRecompInternal(deps);
-  activeRuns.set(sessionId, promise2.then(() => {
+  const runnerDeps = withPublishedCallback(deps);
+  const promise2 = options.range ? executePartialRecompInternal(runnerDeps, options.range) : executeContextRecompInternal(runnerDeps);
+  const wrappedPromise = promise2.then(() => {
     return;
   }).catch((err) => {
     sessionLog(sessionId, "compartment agent: recomp unhandled rejection:", err);
-  }));
+  });
+  activeRuns.set(sessionId, { promise: wrappedPromise, published: false });
   try {
     return await promise2;
   } finally {
-    activeRuns.delete(sessionId);
+    if (activeRuns.get(sessionId)?.promise === wrappedPromise) {
+      activeRuns.delete(sessionId);
+    }
   }
 }
 
@@ -172239,7 +172529,7 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.18.0",
+  version: "0.19.0",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -172778,12 +173068,12 @@ function readHistorianState(db, sessionId, meta3) {
 init_magic_context();
 import { existsSync as existsSync8, readFileSync as readFileSync3 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
-import { join as join13 } from "node:path";
+import { join as join12 } from "node:path";
 
 // ../plugin/src/config/variable.ts
 import { existsSync as existsSync7, readFileSync as readFileSync2 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { dirname as dirname3, isAbsolute, resolve } from "node:path";
+import { dirname as dirname4, isAbsolute, resolve } from "node:path";
 var ENV_PATTERN = /\{env:([^}]+)\}/g;
 var FILE_PATTERN = /\{file:([^}]+)\}/g;
 function substituteConfigVariables(input) {
@@ -172802,7 +173092,7 @@ function substituteConfigVariables(input) {
   if (fileMatches.length === 0) {
     return { text, warnings };
   }
-  const configDir = input.configPath ? dirname3(input.configPath) : process.cwd();
+  const configDir = input.configPath ? dirname4(input.configPath) : process.cwd();
   let output = "";
   let cursor = 0;
   for (const match of fileMatches) {
@@ -172846,12 +173136,12 @@ function substituteConfigVariables(input) {
 var import_comment_json = __toESM(require_src2(), 1);
 var CONFIG_FILE_NAME = "magic-context";
 function getProjectConfigPaths(cwd) {
-  const basePath = join13(cwd, ".pi", CONFIG_FILE_NAME);
+  const basePath = join12(cwd, ".pi", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function getUserConfigPaths() {
   const home = process.env.HOME ?? homedir4();
-  const basePath = join13(home, ".pi", "agent", CONFIG_FILE_NAME);
+  const basePath = join12(home, ".pi", "agent", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function resolveFirstExisting(paths) {
@@ -173008,7 +173298,7 @@ function stripTagPrefixFromAssistantMessage(message) {
 // src/system-prompt.ts
 import { createHash as createHash4 } from "node:crypto";
 import { existsSync as existsSync9, readFileSync as readFileSync4, realpathSync } from "node:fs";
-import { join as join14, resolve as resolve2, sep } from "node:path";
+import { join as join13, resolve as resolve2, sep } from "node:path";
 
 // ../plugin/src/agents/magic-context-prompt.ts
 function getToolHistoryGuidance(dropToolStructure) {
@@ -173110,7 +173400,7 @@ var DOC_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 function readProjectDocs(directory) {
   const sections = [];
   for (const filename of DOC_FILES) {
-    const filePath = join14(directory, filename);
+    const filePath = join13(directory, filename);
     try {
       if (existsSync9(filePath)) {
         const content = readFileSync4(filePath, "utf-8").trim();
@@ -178341,7 +178631,7 @@ function resolveDreamerFromConfig(config2) {
 }
 async function src_default2(pi) {
   const storageDir = getMagicContextStorageDir();
-  const dbPath = join15(storageDir, "context.db");
+  const dbPath = join14(storageDir, "context.db");
   let db;
   try {
     db = openDatabase();