@cortexkit/pi-magic-context 0.17.2 → 0.19.0

package/dist/subagent-entry.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 path3 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(path3.dirname(cachedPath), { recursive: true });
+    mkdirSync3(path3.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)`);
@@ -23749,10 +23808,10 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = EMPTY;
   };
-  var join7 = (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 join6 = (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 join7(comment, inside, gap);
+    return join6(comment, inside, gap);
   };
   var stringify_string = (holder, key, value) => {
     const raw = get_raw_string_literal(holder, key);
@@ -23774,13 +23833,13 @@ var require_stringify = __commonJS((exports, module) => {
       if (i !== 0) {
         inside += COMMA;
       }
-      const before = join7(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
+      const before = join6(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 += join7(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join6(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) => {
@@ -23801,13 +23860,13 @@ var require_stringify = __commonJS((exports, module) => {
         inside += COMMA;
       }
       first = false;
-      const before = join7(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
+      const before = join6(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 += join7(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join6(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) {
@@ -23908,9 +23967,9 @@ __export(exports_read_session_db, {
   findLastAssistantModelFromOpenCodeDb: () => findLastAssistantModelFromOpenCodeDb,
   closeReadOnlySessionDb: () => closeReadOnlySessionDb
 });
-import { join as join8 } from "node:path";
+import { join as join7 } from "node:path";
 function getOpenCodeDbPath() {
-  return join8(getDataDir(), "opencode", "opencode.db");
+  return join7(getDataDir(), "opencode", "opencode.db");
 }
 function closeCachedReadOnlyDb() {
   if (!cachedReadOnlyDb) {
@@ -24005,8 +24064,8 @@ init_embedding();
 
 // ../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 join6 } from "node:path";
+import { copyFileSync, cpSync, existsSync as existsSync3, mkdirSync as mkdirSync4 } from "node:fs";
+import { join as join5 } from "node:path";
 
 // ../plugin/src/shared/error-message.ts
 function getErrorMessage(error51) {
@@ -24223,6 +24282,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
                 );
 
@@ -24343,6 +24405,48 @@ var MIGRATIONS = [
                 WHERE type = 'tool' AND tool_owner_message_id IS NULL;
             `);
     }
+  },
+  {
+    version: 11,
+    description: "Add todo state synthesis columns to session_meta",
+    up: (db) => {
+      const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+      if (!cols.some((c) => c.name === "last_todo_state")) {
+        db.exec("ALTER TABLE session_meta ADD COLUMN last_todo_state TEXT DEFAULT ''");
+      }
+      if (!cols.some((c) => c.name === "todo_synthetic_call_id")) {
+        db.exec("ALTER TABLE session_meta ADD COLUMN todo_synthetic_call_id TEXT DEFAULT ''");
+      }
+      if (!cols.some((c) => c.name === "todo_synthetic_anchor_message_id")) {
+        db.exec("ALTER TABLE session_meta ADD COLUMN todo_synthetic_anchor_message_id TEXT DEFAULT ''");
+      }
+      if (!cols.some((c) => c.name === "todo_synthetic_state_json")) {
+        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 = (name) => Boolean(db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name = ?").get(name));
+      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) {
@@ -157002,6 +157106,28 @@ function mergeCommitHashes(existing, next) {
   return merged;
 }
 
+// ../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;
@@ -157037,11 +157163,11 @@ function loadToolDefinitionMeasurements(db) {
 init_data_path();
 init_logger();
 import { existsSync as existsSync2 } from "node:fs";
-import { join as join5 } from "node:path";
+import { join as join4 } from "node:path";
 var LEASE_DURATION_MS = 5 * 60 * 1000;
 var LEASE_RENEWAL_MS = 60 * 1000;
 function resolveOpencodeDbPath() {
-  return join5(getDataDir(), "opencode", "opencode.db");
+  return join4(getDataDir(), "opencode", "opencode.db");
 }
 function ensureBackfillStateTable(db) {
   db.exec(`
@@ -157284,20 +157410,20 @@ var persistenceByDatabase = new WeakMap;
 var persistenceErrorByDatabase = new WeakMap;
 function resolveDatabasePath() {
   const dbDir = getMagicContextStorageDir();
-  return { dbDir, dbPath: join6(dbDir, "context.db") };
+  return { dbDir, dbPath: join5(dbDir, "context.db") };
 }
 function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
   if (existsSync3(targetDbPath))
     return;
   const legacyDir = getLegacyOpenCodeMagicContextStorageDir();
-  const legacyDbPath = join6(legacyDir, "context.db");
+  const legacyDbPath = join5(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 = join6(targetDbDir, `context.db${suffix}`);
+    const dst = join5(targetDbDir, `context.db${suffix}`);
     if (existsSync3(src)) {
       try {
         copyFileSync(src, dst);
@@ -157306,8 +157432,8 @@ function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
       }
     }
   }
-  const legacyModelsDir = join6(legacyDir, "models");
-  const targetModelsDir = join6(targetDbDir, "models");
+  const legacyModelsDir = join5(legacyDir, "models");
+  const targetModelsDir = join5(targetDbDir, "models");
   if (existsSync3(legacyModelsDir) && !existsSync3(targetModelsDir)) {
     try {
       cpSync(legacyModelsDir, targetModelsDir, { recursive: true });
@@ -157317,9 +157443,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,
@@ -157417,6 +157543,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
@@ -157509,6 +157638,10 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       note_nudge_trigger_message_id TEXT DEFAULT '',
       note_nudge_sticky_text TEXT DEFAULT '',
       note_nudge_sticky_message_id TEXT DEFAULT '',
+      last_todo_state TEXT DEFAULT '',
+      todo_synthetic_call_id TEXT DEFAULT '',
+      todo_synthetic_anchor_message_id TEXT DEFAULT '',
+      todo_synthetic_state_json TEXT DEFAULT '',
       is_subagent INTEGER DEFAULT 0,
       last_context_percentage REAL DEFAULT 0,
       last_input_tokens INTEGER DEFAULT 0,
@@ -157520,7 +157653,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);
@@ -157573,6 +157712,10 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "note_nudge_trigger_message_id", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "note_nudge_sticky_text", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "note_nudge_sticky_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "last_todo_state", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "todo_synthetic_call_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "todo_synthetic_anchor_message_id", "TEXT DEFAULT ''");
+  ensureColumn(db, "session_meta", "todo_synthetic_state_json", "TEXT DEFAULT ''");
   ensureColumn(db, "session_meta", "note_last_read_at", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "times_execute_threshold_reached", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "compartment_in_progress", "INTEGER DEFAULT 0");
@@ -157604,6 +157747,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'");
@@ -157637,6 +157781,10 @@ function healNullTextColumns(db) {
     ["note_nudge_trigger_message_id", ""],
     ["note_nudge_sticky_text", ""],
     ["note_nudge_sticky_message_id", ""],
+    ["last_todo_state", ""],
+    ["todo_synthetic_call_id", ""],
+    ["todo_synthetic_anchor_message_id", ""],
+    ["todo_synthetic_state_json", ""],
     ["system_prompt_hash", ""],
     ["stripped_placeholder_ids", ""],
     ["memory_block_cache", ""],
@@ -157689,7 +157837,7 @@ function openDatabase() {
   }
   try {
     migrateLegacyStorageIfNeeded(dbPath, dbDir);
-    mkdirSync3(dbDir, { recursive: true });
+    mkdirSync4(dbDir, { recursive: true });
     const db = new Database(dbPath);
     initializeDatabase(db);
     runMigrations(db);
@@ -157711,20 +157859,6 @@ function openDatabase() {
   }
 }
 
-// ../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;
-}
-
 // src/subagent-entry.ts
 init_logger();
 
@@ -157732,12 +157866,12 @@ init_logger();
 init_magic_context();
 import { existsSync as existsSync5, readFileSync as readFileSync2 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join7 } from "node:path";
+import { join as join6 } from "node:path";
 
 // ../plugin/src/config/variable.ts
 import { existsSync as existsSync4, readFileSync } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { dirname as dirname2, isAbsolute, resolve } from "node:path";
+import { dirname as dirname3, isAbsolute, resolve } from "node:path";
 var ENV_PATTERN = /\{env:([^}]+)\}/g;
 var FILE_PATTERN = /\{file:([^}]+)\}/g;
 function substituteConfigVariables(input) {
@@ -157756,7 +157890,7 @@ function substituteConfigVariables(input) {
   if (fileMatches.length === 0) {
     return { text, warnings };
   }
-  const configDir = input.configPath ? dirname2(input.configPath) : process.cwd();
+  const configDir = input.configPath ? dirname3(input.configPath) : process.cwd();
   let output = "";
   let cursor = 0;
   for (const match of fileMatches) {
@@ -157800,12 +157934,12 @@ function substituteConfigVariables(input) {
 var import_comment_json = __toESM(require_src2(), 1);
 var CONFIG_FILE_NAME = "magic-context";
 function getProjectConfigPaths(cwd) {
-  const basePath = join7(cwd, ".pi", CONFIG_FILE_NAME);
+  const basePath = join6(cwd, ".pi", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function getUserConfigPaths() {
   const home = process.env.HOME ?? homedir3();
-  const basePath = join7(home, ".pi", "agent", CONFIG_FILE_NAME);
+  const basePath = join6(home, ".pi", "agent", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function resolveFirstExisting(paths) {
@@ -163998,7 +164132,8 @@ var META_COLUMNS = {
   systemPromptTokens: "system_prompt_tokens",
   conversationTokens: "conversation_tokens",
   toolCallTokens: "tool_call_tokens",
-  clearedReasoningThroughTag: "cleared_reasoning_through_tag"
+  clearedReasoningThroughTag: "cleared_reasoning_through_tag",
+  lastTodoState: "last_todo_state"
 };
 var BOOLEAN_META_KEYS = new Set(["isSubagent", "compartmentInProgress"]);
 function isStringOrNull(value) {
@@ -164011,7 +164146,7 @@ function isSessionMetaRow(row) {
   if (row === null || typeof row !== "object")
     return false;
   const r = row;
-  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag);
+  return typeof r.session_id === "string" && typeof r.last_response_time === "number" && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state);
 }
 function getDefaultSessionMeta(sessionId) {
   return {
@@ -164031,7 +164166,8 @@ function getDefaultSessionMeta(sessionId) {
     systemPromptTokens: 0,
     conversationTokens: 0,
     toolCallTokens: 0,
-    clearedReasoningThroughTag: 0
+    clearedReasoningThroughTag: 0,
+    lastTodoState: ""
   };
 }
 function ensureSessionMetaRow(db, sessionId) {
@@ -164043,6 +164179,7 @@ function toSessionMeta(row) {
   const transformErrorRaw = typeof row.last_transform_error === "string" ? row.last_transform_error : "";
   const cacheTtlRaw = typeof row.cache_ttl === "string" && row.cache_ttl.length > 0 ? row.cache_ttl : "5m";
   const systemPromptHashRaw = row.system_prompt_hash == null ? "" : row.system_prompt_hash;
+  const lastTodoStateRaw = typeof row.last_todo_state === "string" ? row.last_todo_state : "";
   const numOrZero = (value) => typeof value === "number" ? value : 0;
   return {
     sessionId: row.session_id,
@@ -164061,7 +164198,8 @@ function toSessionMeta(row) {
     systemPromptTokens: numOrZero(row.system_prompt_tokens),
     conversationTokens: numOrZero(row.conversation_tokens),
     toolCallTokens: numOrZero(row.tool_call_tokens),
-    clearedReasoningThroughTag: numOrZero(row.cleared_reasoning_through_tag)
+    clearedReasoningThroughTag: numOrZero(row.cleared_reasoning_through_tag),
+    lastTodoState: lastTodoStateRaw
   };
 }
 
@@ -164258,6 +164396,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();
@@ -164277,7 +164437,7 @@ function resolveIsSubagentFromOpenCodeDb(sessionId) {
 
 // ../plugin/src/features/magic-context/storage-meta-session.ts
 function getOrCreateSessionMeta(db, sessionId) {
-  const result = db.prepare("SELECT session_id, last_response_time, cache_ttl, counter, last_nudge_tokens, last_nudge_band, last_transform_error, is_subagent, last_context_percentage, last_input_tokens, times_execute_threshold_reached, compartment_in_progress, system_prompt_hash, system_prompt_tokens, conversation_tokens, tool_call_tokens, cleared_reasoning_through_tag FROM session_meta WHERE session_id = ?").get(sessionId);
+  const result = db.prepare("SELECT session_id, last_response_time, cache_ttl, counter, last_nudge_tokens, last_nudge_band, last_transform_error, is_subagent, last_context_percentage, last_input_tokens, times_execute_threshold_reached, compartment_in_progress, system_prompt_hash, system_prompt_tokens, conversation_tokens, tool_call_tokens, cleared_reasoning_through_tag, last_todo_state FROM session_meta WHERE session_id = ?").get(sessionId);
   if (isSessionMetaRow(result)) {
     return toSessionMeta(result);
   }
@@ -166174,16 +166334,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);
@@ -166215,7 +166383,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;
@@ -166248,9 +166420,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];
@@ -166268,9 +166441,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;
@@ -166279,17 +166453,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;
 }