@cortexkit/opencode-magic-context 0.30.5 → 0.30.7

package/dist/index.js

@@ -15446,6 +15446,340 @@ var init_magic_context = __esm(() => {
   });
 });
 
+// src/shared/error-message.ts
+function getErrorMessage(error51) {
+  return error51 instanceof Error ? error51.message : String(error51);
+}
+function readString(value) {
+  if (typeof value === "string" && value.length > 0)
+    return value;
+  if (typeof value === "number")
+    return String(value);
+  return;
+}
+function clip(value, max) {
+  if (value.length <= max)
+    return value;
+  return `${value.slice(0, max)}…`;
+}
+function describeError(error51) {
+  const stringForm = clip(safeString(error51), 400);
+  if (!(error51 instanceof Error) && !(error51 && typeof error51 === "object")) {
+    return {
+      name: typeof error51,
+      message: "",
+      stringForm,
+      brief: stringForm || "<empty>"
+    };
+  }
+  const obj = error51;
+  const nameFromField = readString(obj.name);
+  const nameFromCtor = error51?.constructor?.name;
+  const name = nameFromField ?? nameFromCtor ?? "Error";
+  const message = readString(obj.message) ?? "";
+  const status = readString(obj.status) ?? readString(obj.statusCode);
+  const code = readString(obj.code);
+  let causeName;
+  const cause = obj.cause;
+  if (cause && typeof cause === "object") {
+    const causeRecord = cause;
+    causeName = readString(causeRecord.name) ?? cause.constructor?.name;
+  }
+  const stack = readString(obj.stack);
+  const stackHead = stack ? stack.split(`
+`).slice(0, 4).map((l) => l.trim()).filter((l) => l.length > 0).join(" | ") : undefined;
+  const briefParts = [];
+  if (name)
+    briefParts.push(name);
+  if (message)
+    briefParts.push(`message="${clip(message, 200)}"`);
+  if (status)
+    briefParts.push(`status=${status}`);
+  if (code)
+    briefParts.push(`code=${code}`);
+  if (causeName)
+    briefParts.push(`cause=${causeName}`);
+  if (!message && stringForm && stringForm !== name) {
+    briefParts.push(`str="${clip(stringForm, 200)}"`);
+  }
+  const brief = briefParts.join(" ") || stringForm || name;
+  return {
+    name,
+    message,
+    ...status ? { status } : {},
+    ...code ? { code } : {},
+    ...causeName ? { causeName } : {},
+    ...stackHead ? { stackHead } : {},
+    stringForm,
+    brief
+  };
+}
+function safeString(value) {
+  try {
+    return String(value);
+  } catch {
+    return "<unstringifiable>";
+  }
+}
+
+// src/shared/sqlite.ts
+function buildNodeSqliteDatabaseClass(DatabaseSync) {
+  const SAVEPOINT = "mc_tx_sp";
+
+  class NodeSqliteDatabase extends DatabaseSync {
+    constructor(filename, options) {
+      const translated = { ...options };
+      if (options && "readonly" in options) {
+        translated.readOnly = options.readonly;
+        delete translated.readonly;
+      }
+      super(typeof filename === "string" ? filename : ":memory:", translated);
+    }
+    prepare(sql) {
+      const stmt = super.prepare(sql);
+      for (const method of ["run", "get", "all"]) {
+        const original = stmt[method].bind(stmt);
+        stmt[method] = (...args) => args.length === 1 && Array.isArray(args[0]) ? original(...args[0]) : original(...args);
+      }
+      return stmt;
+    }
+    transaction(fn) {
+      const self2 = this;
+      const wrapped = function(...args) {
+        const nested = self2.isTransaction === true;
+        self2.exec(nested ? `SAVEPOINT ${SAVEPOINT}` : "BEGIN");
+        try {
+          const result = fn.apply(this, args);
+          self2.exec(nested ? `RELEASE ${SAVEPOINT}` : "COMMIT");
+          return result;
+        } catch (error51) {
+          if (nested) {
+            self2.exec(`ROLLBACK TO ${SAVEPOINT}`);
+            self2.exec(`RELEASE ${SAVEPOINT}`);
+          } else {
+            self2.exec("ROLLBACK");
+          }
+          throw error51;
+        }
+      };
+      return wrapped;
+    }
+  }
+  return NodeSqliteDatabase;
+}
+var isBun, bunSpec, nodeSpec, sqliteModule, DatabaseImpl, Database;
+var init_sqlite = __esm(async () => {
+  isBun = typeof process !== "undefined" && typeof process.versions?.bun === "string";
+  bunSpec = "bun:" + "sqlite";
+  nodeSpec = "node:" + "sqlite";
+  sqliteModule = isBun ? await import(bunSpec) : await import(nodeSpec);
+  DatabaseImpl = isBun ? sqliteModule.Database : buildNodeSqliteDatabaseClass(sqliteModule.DatabaseSync);
+  Database = DatabaseImpl;
+});
+
+// src/shared/sqlite-helpers.ts
+function closeQuietly(db) {
+  if (!db)
+    return;
+  try {
+    db.close();
+  } catch {}
+}
+
+// src/features/magic-context/compaction-marker.ts
+import { existsSync as existsSync6 } from "node:fs";
+import { join as join3 } from "node:path";
+function randomBase62(length) {
+  const chars = [];
+  for (let i = 0;i < length; i++) {
+    chars.push(BASE62_CHARS[Math.floor(Math.random() * BASE62_CHARS.length)]);
+  }
+  return chars.join("");
+}
+function generateId(prefix, timestampMs, counter = 0n) {
+  const encoded = BigInt(timestampMs) * 0x1000n + counter;
+  const hex3 = encoded.toString(16).padStart(14, "0");
+  return `${prefix}_${hex3}${randomBase62(14)}`;
+}
+function generateMessageId(timestampMs, counter = 0n) {
+  return generateId("msg", timestampMs, counter);
+}
+function generatePartId(timestampMs, counter = 0n) {
+  return generateId("prt", timestampMs, counter);
+}
+function getOpenCodeDbPath() {
+  return join3(getDataDir(), "opencode", "opencode.db");
+}
+function isOpenCodeSchemaCompatible(db, dbPath) {
+  if (cachedSchemaCompatible?.path === dbPath) {
+    return cachedSchemaCompatible.compatible;
+  }
+  try {
+    const messageCols = new Set(db.prepare("PRAGMA table_info(message)").all().map((r) => r.name ?? "").filter((n) => n.length > 0));
+    const partCols = new Set(db.prepare("PRAGMA table_info(part)").all().map((r) => r.name ?? "").filter((n) => n.length > 0));
+    const missingMessage = REQUIRED_MESSAGE_COLUMNS.filter((c) => !messageCols.has(c));
+    const missingPart = REQUIRED_PART_COLUMNS.filter((c) => !partCols.has(c));
+    if (missingMessage.length > 0 || missingPart.length > 0) {
+      log(`[magic-context] compaction-marker: OpenCode DB schema missing required columns ` + `(message: [${missingMessage.join(", ")}], part: [${missingPart.join(", ")}]). ` + `Marker injection disabled for this process. ` + `This usually means OpenCode was updated and magic-context is out of date.`);
+      cachedSchemaCompatible = { path: dbPath, compatible: false };
+      return false;
+    }
+    cachedSchemaCompatible = { path: dbPath, compatible: true };
+    return true;
+  } catch (error51) {
+    log(`[magic-context] compaction-marker: schema probe failed: ${error51 instanceof Error ? error51.message : String(error51)}. ` + `Marker injection disabled until next process restart.`);
+    cachedSchemaCompatible = { path: dbPath, compatible: false };
+    return false;
+  }
+}
+function getWritableOpenCodeDb() {
+  const dbPath = getOpenCodeDbPath();
+  if (cachedWriteDb?.path === dbPath) {
+    return cachedWriteDb.db;
+  }
+  if (cachedWriteDb) {
+    try {
+      closeQuietly(cachedWriteDb.db);
+    } catch {}
+  }
+  if (!existsSync6(dbPath)) {
+    throw new Error(`OpenCode database not found at ${dbPath} (is OpenCode installed?)`);
+  }
+  const db = new Database(dbPath);
+  db.exec("PRAGMA busy_timeout=5000");
+  db.exec("PRAGMA journal_mode=WAL");
+  cachedWriteDb = { path: dbPath, db };
+  return db;
+}
+function getNonSummaryMessageSortKey(sessionId, messageId) {
+  const db = getWritableOpenCodeDb();
+  const row = db.prepare(`SELECT time_created, id
+             FROM message
+             WHERE session_id = ?
+               AND id = ?
+               AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
+                        AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')
+             LIMIT 1`).get(sessionId, messageId);
+  if (typeof row?.time_created !== "number" || typeof row.id !== "string") {
+    return null;
+  }
+  return { id: row.id, timeCreated: row.time_created };
+}
+function findBoundaryUserMessage(sessionId, endMessageId) {
+  const db = getWritableOpenCodeDb();
+  const target = getNonSummaryMessageSortKey(sessionId, endMessageId);
+  if (!target)
+    return null;
+  const boundary = db.prepare(`SELECT id, time_created, data
+             FROM message
+             WHERE session_id = ?
+               AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
+                        AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')
+               AND COALESCE(json_extract(data, '$.role'), '') = 'user'
+               AND (time_created < ? OR (time_created = ? AND id <= ?))
+             ORDER BY time_created DESC, id DESC
+             LIMIT 1`).get(sessionId, target.timeCreated, target.timeCreated, target.id);
+  if (typeof boundary?.id !== "string" || typeof boundary.time_created !== "number") {
+    return null;
+  }
+  return { id: boundary.id, timeCreated: boundary.time_created };
+}
+function compareOpenCodeMessagesByCanonicalOrder(sessionId, leftMessageId, rightMessageId) {
+  const left = getNonSummaryMessageSortKey(sessionId, leftMessageId);
+  const right = getNonSummaryMessageSortKey(sessionId, rightMessageId);
+  if (!left || !right)
+    return null;
+  if (left.timeCreated < right.timeCreated)
+    return -1;
+  if (left.timeCreated > right.timeCreated)
+    return 1;
+  if (left.id < right.id)
+    return -1;
+  if (left.id > right.id)
+    return 1;
+  return 0;
+}
+function getOpenCodeMessageById(sessionId, messageId) {
+  const db = getWritableOpenCodeDb();
+  const row = db.prepare(`SELECT id FROM message WHERE session_id = ? AND id = ? LIMIT 1`).get(sessionId, messageId);
+  return row ?? null;
+}
+function injectCompactionMarker(args) {
+  const db = getWritableOpenCodeDb();
+  if (!isOpenCodeSchemaCompatible(db, getOpenCodeDbPath())) {
+    return null;
+  }
+  const boundary = args.resolvedBoundary ?? findBoundaryUserMessage(args.sessionId, args.endMessageId);
+  if (!boundary) {
+    log(`[magic-context] compaction-marker: no user message found at or before endMessageId ${args.endMessageId} (ordinal ${args.endOrdinal})`);
+    return null;
+  }
+  const boundaryTime = boundary.timeCreated;
+  const summaryMsgId = generateMessageId(boundaryTime + 1, 1n);
+  const compactionPartId = generatePartId(boundaryTime, 1n);
+  const summaryPartId = generatePartId(boundaryTime + 1, 2n);
+  const summaryMsgData = JSON.stringify({
+    role: "assistant",
+    parentID: boundary.id,
+    summary: true,
+    finish: "stop",
+    mode: "compaction",
+    agent: "compaction",
+    path: { cwd: args.directory, root: args.directory },
+    cost: 0,
+    tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
+    modelID: "magic-context",
+    providerID: "magic-context",
+    time: { created: boundaryTime + 1 }
+  });
+  try {
+    db.transaction(() => {
+      db.prepare("INSERT INTO part (id, message_id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?, ?)").run(compactionPartId, boundary.id, args.sessionId, boundaryTime, boundaryTime, '{"type":"compaction","auto":true}');
+      db.prepare("INSERT INTO message (id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?)").run(summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, summaryMsgData);
+      db.prepare("INSERT INTO part (id, message_id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?, ?)").run(summaryPartId, summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, JSON.stringify({ type: "text", text: args.summaryText }));
+    })();
+    log(`[magic-context] compaction-marker: injected boundary at user msg ${boundary.id} (ordinal ~${args.endOrdinal}), summary msg ${summaryMsgId}`);
+    return {
+      boundaryMessageId: boundary.id,
+      summaryMessageId: summaryMsgId,
+      compactionPartId,
+      summaryPartId
+    };
+  } catch (error51) {
+    log(`[magic-context] compaction-marker: injection failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    return null;
+  }
+}
+function removeCompactionMarker(state) {
+  try {
+    const db = getWritableOpenCodeDb();
+    db.transaction(() => {
+      db.prepare("DELETE FROM part WHERE id = ?").run(state.summaryPartId);
+      db.prepare("DELETE FROM message WHERE id = ?").run(state.summaryMessageId);
+      db.prepare("DELETE FROM part WHERE id = ?").run(state.compactionPartId);
+    })();
+    return true;
+  } catch (error51) {
+    log(`[magic-context] compaction-marker: removal failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    return false;
+  }
+}
+var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", cachedWriteDb = null, REQUIRED_MESSAGE_COLUMNS, REQUIRED_PART_COLUMNS, cachedSchemaCompatible = null;
+var init_compaction_marker = __esm(async () => {
+  init_data_path();
+  init_logger();
+  await init_sqlite();
+  REQUIRED_MESSAGE_COLUMNS = ["id", "session_id", "time_created", "time_updated", "data"];
+  REQUIRED_PART_COLUMNS = [
+    "id",
+    "message_id",
+    "session_id",
+    "time_created",
+    "time_updated",
+    "data"
+  ];
+});
+
 // src/features/magic-context/memory/project-identity.ts
 import { execFileSync } from "node:child_process";
 import { createHash } from "node:crypto";
@@ -15625,6 +15959,80 @@ var init_project_identity = __esm(() => {
   };
 });
 
+// src/features/magic-context/session-project-storage.ts
+function getUpsertSessionProjectStatement(db) {
+  let stmt = upsertSessionProjectStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`INSERT INTO session_projects (session_id, harness, project_path, updated_at)
+             VALUES (?, ?, ?, ?)
+             ON CONFLICT(session_id, harness) DO UPDATE SET
+                 project_path = excluded.project_path,
+                 updated_at = excluded.updated_at
+             WHERE session_projects.project_path <> excluded.project_path`);
+    upsertSessionProjectStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getRepairSessionChunkProjectStatement(db) {
+  let stmt = repairSessionChunkProjectStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`UPDATE compartment_chunk_embeddings
+             SET project_path = ?
+             WHERE session_id = ?
+               AND harness = ?
+               AND project_path <> ?`);
+    repairSessionChunkProjectStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getRepairProjectChunkProjectStatement(db) {
+  let stmt = repairProjectChunkProjectStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`UPDATE compartment_chunk_embeddings
+             SET project_path = (
+                 SELECT sp.project_path
+                 FROM session_projects sp
+                 WHERE sp.session_id = compartment_chunk_embeddings.session_id
+                   AND sp.harness = compartment_chunk_embeddings.harness
+                 LIMIT 1
+             )
+             WHERE EXISTS (
+                 SELECT 1
+                 FROM session_projects sp
+                 WHERE sp.session_id = compartment_chunk_embeddings.session_id
+                   AND sp.harness = compartment_chunk_embeddings.harness
+                   AND sp.project_path <> compartment_chunk_embeddings.project_path
+                   AND (
+                       sp.project_path = ?
+                       OR compartment_chunk_embeddings.project_path = ?
+                   )
+             )`);
+    repairProjectChunkProjectStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function recordSessionProjectIdentity(db, sessionId, projectPath) {
+  if (!sessionId || !projectPath)
+    return;
+  const harness = getHarness();
+  const now = Date.now();
+  db.transaction(() => {
+    getUpsertSessionProjectStatement(db).run(sessionId, harness, projectPath, now);
+    getRepairSessionChunkProjectStatement(db).run(projectPath, sessionId, harness, projectPath);
+  })();
+}
+function repairMisScopedCompartmentChunkEmbeddingsForProject(db, projectPath) {
+  if (!projectPath)
+    return 0;
+  return getRepairProjectChunkProjectStatement(db).run(projectPath, projectPath).changes;
+}
+var upsertSessionProjectStatements, repairSessionChunkProjectStatements, repairProjectChunkProjectStatements;
+var init_session_project_storage = __esm(() => {
+  upsertSessionProjectStatements = new WeakMap;
+  repairSessionChunkProjectStatements = new WeakMap;
+  repairProjectChunkProjectStatements = new WeakMap;
+});
+
 // src/features/magic-context/overflow-detection.ts
 function extractErrorMessage(error51) {
   if (!error51)
@@ -16735,78 +17143,14 @@ function removeSystemReminders(text) {
 }
 var SYSTEM_DIRECTIVE_PREFIX = "[SYSTEM DIRECTIVE: MAGIC-CONTEXT";
 
-// src/shared/sqlite.ts
-function buildNodeSqliteDatabaseClass(DatabaseSync) {
-  const SAVEPOINT = "mc_tx_sp";
-
-  class NodeSqliteDatabase extends DatabaseSync {
-    constructor(filename, options) {
-      const translated = { ...options };
-      if (options && "readonly" in options) {
-        translated.readOnly = options.readonly;
-        delete translated.readonly;
-      }
-      super(typeof filename === "string" ? filename : ":memory:", translated);
-    }
-    prepare(sql) {
-      const stmt = super.prepare(sql);
-      for (const method of ["run", "get", "all"]) {
-        const original = stmt[method].bind(stmt);
-        stmt[method] = (...args) => args.length === 1 && Array.isArray(args[0]) ? original(...args[0]) : original(...args);
-      }
-      return stmt;
-    }
-    transaction(fn) {
-      const self2 = this;
-      const wrapped = function(...args) {
-        const nested = self2.isTransaction === true;
-        self2.exec(nested ? `SAVEPOINT ${SAVEPOINT}` : "BEGIN");
-        try {
-          const result = fn.apply(this, args);
-          self2.exec(nested ? `RELEASE ${SAVEPOINT}` : "COMMIT");
-          return result;
-        } catch (error51) {
-          if (nested) {
-            self2.exec(`ROLLBACK TO ${SAVEPOINT}`);
-            self2.exec(`RELEASE ${SAVEPOINT}`);
-          } else {
-            self2.exec("ROLLBACK");
-          }
-          throw error51;
-        }
-      };
-      return wrapped;
-    }
-  }
-  return NodeSqliteDatabase;
-}
-var isBun, bunSpec, nodeSpec, sqliteModule, DatabaseImpl, Database;
-var init_sqlite = __esm(async () => {
-  isBun = typeof process !== "undefined" && typeof process.versions?.bun === "string";
-  bunSpec = "bun:" + "sqlite";
-  nodeSpec = "node:" + "sqlite";
-  sqliteModule = isBun ? await import(bunSpec) : await import(nodeSpec);
-  DatabaseImpl = isBun ? sqliteModule.Database : buildNodeSqliteDatabaseClass(sqliteModule.DatabaseSync);
-  Database = DatabaseImpl;
-});
-
-// src/shared/sqlite-helpers.ts
-function closeQuietly(db) {
-  if (!db)
-    return;
-  try {
-    db.close();
-  } catch {}
-}
-
 // src/hooks/magic-context/read-session-db.ts
-import { existsSync as existsSync6 } from "node:fs";
-import { join as join3 } from "node:path";
-function getOpenCodeDbPath() {
-  return join3(getDataDir(), "opencode", "opencode.db");
+import { existsSync as existsSync9 } from "node:fs";
+import { join as join4 } from "node:path";
+function getOpenCodeDbPath2() {
+  return join4(getDataDir(), "opencode", "opencode.db");
 }
 function openCodeDbExists() {
-  return existsSync6(getOpenCodeDbPath());
+  return existsSync9(getOpenCodeDbPath2());
 }
 function closeCachedReadOnlyDb() {
   if (!cachedReadOnlyDb) {
@@ -16821,7 +17165,7 @@ function closeCachedReadOnlyDb() {
   }
 }
 function getReadOnlySessionDb() {
-  const dbPath = getOpenCodeDbPath();
+  const dbPath = getOpenCodeDbPath2();
   if (cachedReadOnlyDb?.path === dbPath) {
     return cachedReadOnlyDb.db;
   }
@@ -152555,82 +152899,6 @@ var init_project_docs_hash = __esm(() => {
   docsCache = new Map;
 });
 
-// src/shared/error-message.ts
-function getErrorMessage(error51) {
-  return error51 instanceof Error ? error51.message : String(error51);
-}
-function readString(value) {
-  if (typeof value === "string" && value.length > 0)
-    return value;
-  if (typeof value === "number")
-    return String(value);
-  return;
-}
-function clip(value, max) {
-  if (value.length <= max)
-    return value;
-  return `${value.slice(0, max)}…`;
-}
-function describeError(error51) {
-  const stringForm = clip(safeString(error51), 400);
-  if (!(error51 instanceof Error) && !(error51 && typeof error51 === "object")) {
-    return {
-      name: typeof error51,
-      message: "",
-      stringForm,
-      brief: stringForm || "<empty>"
-    };
-  }
-  const obj = error51;
-  const nameFromField = readString(obj.name);
-  const nameFromCtor = error51?.constructor?.name;
-  const name2 = nameFromField ?? nameFromCtor ?? "Error";
-  const message = readString(obj.message) ?? "";
-  const status = readString(obj.status) ?? readString(obj.statusCode);
-  const code = readString(obj.code);
-  let causeName;
-  const cause = obj.cause;
-  if (cause && typeof cause === "object") {
-    const causeRecord = cause;
-    causeName = readString(causeRecord.name) ?? cause.constructor?.name;
-  }
-  const stack = readString(obj.stack);
-  const stackHead = stack ? stack.split(`
-`).slice(0, 4).map((l) => l.trim()).filter((l) => l.length > 0).join(" | ") : undefined;
-  const briefParts = [];
-  if (name2)
-    briefParts.push(name2);
-  if (message)
-    briefParts.push(`message="${clip(message, 200)}"`);
-  if (status)
-    briefParts.push(`status=${status}`);
-  if (code)
-    briefParts.push(`code=${code}`);
-  if (causeName)
-    briefParts.push(`cause=${causeName}`);
-  if (!message && stringForm && stringForm !== name2) {
-    briefParts.push(`str="${clip(stringForm, 200)}"`);
-  }
-  const brief = briefParts.join(" ") || stringForm || name2;
-  return {
-    name: name2,
-    message,
-    ...status ? { status } : {},
-    ...code ? { code } : {},
-    ...causeName ? { causeName } : {},
-    ...stackHead ? { stackHead } : {},
-    stringForm,
-    brief
-  };
-}
-function safeString(value) {
-  try {
-    return String(value);
-  } catch {
-    return "<unstringifiable>";
-  }
-}
-
 // src/shared/stable-json.ts
 function stableStringify(value, seen = new WeakSet) {
   if (value === undefined)
@@ -152742,12 +153010,12 @@ var init_tool_definition_tokens = __esm(() => {
 });
 
 // src/features/magic-context/tool-owner-backfill.ts
-import { existsSync as existsSync7 } from "node:fs";
-import { join as join4 } from "node:path";
+import { existsSync as existsSync10 } from "node:fs";
+import { join as join5 } from "node:path";
 function resolveOpencodeDbPath() {
-  return join4(getDataDir(), "opencode", "opencode.db");
+  return join5(getDataDir(), "opencode", "opencode.db");
 }
-function ensureBackfillStateTable(db) {
+function ensureBackfillStateTable2(db) {
   db.exec(`
         CREATE TABLE IF NOT EXISTS tool_owner_backfill_state (
             session_id TEXT PRIMARY KEY,
@@ -152763,7 +153031,7 @@ function ensureBackfillStateTable(db) {
 }
 function runToolOwnerBackfill(db) {
   const startedAt = performance.now();
-  ensureBackfillStateTable(db);
+  ensureBackfillStateTable2(db);
   const result = {
     sessionsProcessed: 0,
     sessionsSkippedNoOcDb: 0,
@@ -152780,7 +153048,7 @@ function runToolOwnerBackfill(db) {
     return result;
   }
   const opencodeDbPath = resolveOpencodeDbPath();
-  if (!existsSync7(opencodeDbPath)) {
+  if (!existsSync10(opencodeDbPath)) {
     log(`[backfill] OpenCode DB not found at ${opencodeDbPath} — marking all unbackfilled sessions as skipped. Lazy adoption (defense-in-depth) handles legacy rows at runtime.`);
     markAllUnbackfilledSessionsSkipped(db);
     result.sessionsSkippedNoOcDb = countSessionsByStatus(db, "skipped");
@@ -152803,7 +153071,7 @@ function runToolOwnerBackfill(db) {
   return result;
 }
 function isToolOwnerBackfillNeeded(db) {
-  ensureBackfillStateTable(db);
+  ensureBackfillStateTable2(db);
   const row = db.prepare(`SELECT 1 AS hit
              FROM tags
              WHERE type = 'tool' AND tool_owner_message_id IS NULL
@@ -153004,8 +153272,8 @@ var init_tool_owner_backfill = __esm(() => {
 });
 
 // src/features/magic-context/storage-db.ts
-import { chmodSync, copyFileSync, cpSync, existsSync as existsSync8, mkdirSync as mkdirSync4, mkdtempSync } from "node:fs";
-import { dirname as dirname4, join as join5 } from "node:path";
+import { chmodSync, copyFileSync, cpSync, existsSync as existsSync11, mkdirSync as mkdirSync4, mkdtempSync } from "node:fs";
+import { dirname as dirname4, join as join6 } from "node:path";
 function getSchemaFenceRejection() {
   return lastSchemaFenceRejection;
 }
@@ -153024,7 +153292,7 @@ function restrictDatabaseFilePermissions(dbPath) {
     return;
   for (const suffix of ["", "-wal", "-shm"]) {
     const file2 = `${dbPath}${suffix}`;
-    if (!existsSync8(file2))
+    if (!existsSync11(file2))
       continue;
     try {
       chmodSync(file2, 384);
@@ -153039,22 +153307,22 @@ function resolveDatabasePath(dbPathOverride) {
   }
   const testDataDir = process.env.MAGIC_CONTEXT_TEST_DATA_DIR;
   if (testDataDir && !process.env.XDG_DATA_HOME) {
-    const dbDir2 = join5(testDataDir, "cortexkit", "magic-context");
-    return { dbDir: dbDir2, dbPath: join5(dbDir2, "context.db") };
+    const dbDir2 = join6(testDataDir, "cortexkit", "magic-context");
+    return { dbDir: dbDir2, dbPath: join6(dbDir2, "context.db") };
   }
   if (false) {}
   const dbDir = getMagicContextStorageDir();
-  return { dbDir, dbPath: join5(dbDir, "context.db") };
+  return { dbDir, dbPath: join6(dbDir, "context.db") };
 }
 function getDatabasePath(db) {
   return pathByDatabase.get(db) ?? null;
 }
 function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
-  if (existsSync8(targetDbPath))
+  if (existsSync11(targetDbPath))
     return;
   const legacyDir = getLegacyOpenCodeMagicContextStorageDir();
-  const legacyDbPath = join5(legacyDir, "context.db");
-  if (!existsSync8(legacyDbPath))
+  const legacyDbPath = join6(legacyDir, "context.db");
+  if (!existsSync11(legacyDbPath))
     return;
   log(`[magic-context] migrating legacy plugin storage: ${legacyDir} -> ${targetDbDir} (legacy left in place as backup)`);
   ensureSecureStorageDir(targetDbDir);
@@ -153070,8 +153338,8 @@ function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
   }
   for (const suffix of ["", "-wal", "-shm"]) {
     const src = `${legacyDbPath}${suffix}`;
-    const dst = join5(targetDbDir, `context.db${suffix}`);
-    if (existsSync8(src)) {
+    const dst = join6(targetDbDir, `context.db${suffix}`);
+    if (existsSync11(src)) {
       try {
         copyFileSync(src, dst);
       } catch (error51) {
@@ -153079,9 +153347,9 @@ function migrateLegacyStorageIfNeeded(targetDbPath, targetDbDir) {
       }
     }
   }
-  const legacyModelsDir = join5(legacyDir, "models");
-  const targetModelsDir = join5(targetDbDir, "models");
-  if (existsSync8(legacyModelsDir) && !existsSync8(targetModelsDir)) {
+  const legacyModelsDir = join6(legacyDir, "models");
+  const targetModelsDir = join6(targetDbDir, "models");
+  if (existsSync11(legacyModelsDir) && !existsSync11(targetModelsDir)) {
     try {
       cpSync(legacyModelsDir, targetModelsDir, { recursive: true });
     } catch (error51) {
@@ -164181,10 +164449,10 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = 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) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two)), gap) : 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) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two)), gap) : EMPTY;
   var join_content = (inside, value, gap) => {
     const comment = process_comments(value, PREFIX_BEFORE, gap + indent, true);
-    return join6(comment, inside, gap);
+    return join7(comment, inside, gap);
   };
   var stringify_string = (holder, key, value) => {
     const raw = get_raw_string_literal(holder, key);
@@ -164206,13 +164474,13 @@ var require_stringify = __commonJS((exports, module) => {
       if (i !== 0) {
         inside += COMMA;
       }
-      const before = join6(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
+      const before = join7(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 += join6(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join7(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) => {
@@ -164233,13 +164501,13 @@ var require_stringify = __commonJS((exports, module) => {
         inside += COMMA;
       }
       first = false;
-      const before = join6(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
+      const before = join7(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 += join6(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join7(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) {
@@ -165239,16 +165507,16 @@ var init_compartment_prompt = () => {};
 
 // src/shared/opencode-config-dir.ts
 import { homedir as homedir6 } from "node:os";
-import { join as join10, resolve as resolve3 } from "node:path";
+import { join as join11, resolve as resolve3 } from "node:path";
 function getCliConfigDir() {
   const envConfigDir = process.env.OPENCODE_CONFIG_DIR?.trim();
   if (envConfigDir) {
     return resolve3(envConfigDir);
   }
   if (process.platform === "win32") {
-    return join10(homedir6(), ".config", "opencode");
+    return join11(homedir6(), ".config", "opencode");
   }
-  return join10(process.env.XDG_CONFIG_HOME || join10(homedir6(), ".config"), "opencode");
+  return join11(process.env.XDG_CONFIG_HOME || join11(homedir6(), ".config"), "opencode");
 }
 function getOpenCodeConfigDir(_options) {
   return getCliConfigDir();
@@ -165257,16 +165525,16 @@ function getOpenCodeConfigPaths(options) {
   const configDir = getOpenCodeConfigDir(options);
   return {
     configDir,
-    configJson: join10(configDir, "opencode.json"),
-    configJsonc: join10(configDir, "opencode.jsonc"),
-    packageJson: join10(configDir, "package.json"),
-    omoConfig: join10(configDir, "magic-context.jsonc")
+    configJson: join11(configDir, "opencode.json"),
+    configJsonc: join11(configDir, "opencode.jsonc"),
+    packageJson: join11(configDir, "package.json"),
+    omoConfig: join11(configDir, "magic-context.jsonc")
   };
 }
 var init_opencode_config_dir = () => {};
 
 // src/shared/conflict-detector.ts
-import { join as join11 } from "node:path";
+import { join as join12 } from "node:path";
 function detectConflicts(directory) {
   const conflicts = {
     compactionAuto: false,
@@ -165323,8 +165591,8 @@ function checkCompaction(directory) {
   return { auto: true, prune: false };
 }
 function readProjectCompaction(directory) {
-  const dotOcJsonc = join11(directory, ".opencode", "opencode.jsonc");
-  const dotOcJson = join11(directory, ".opencode", "opencode.json");
+  const dotOcJsonc = join12(directory, ".opencode", "opencode.jsonc");
+  const dotOcJson = join12(directory, ".opencode", "opencode.json");
   const dotOcConfig = readJsoncFile(dotOcJsonc) ?? readJsoncFile(dotOcJson);
   if (dotOcConfig?.compaction) {
     const c = dotOcConfig.compaction;
@@ -165332,8 +165600,8 @@ function readProjectCompaction(directory) {
       return { auto: c.auto === true, prune: c.prune === true, resolved: true };
     }
   }
-  const rootJsonc = join11(directory, "opencode.jsonc");
-  const rootJson = join11(directory, "opencode.json");
+  const rootJsonc = join12(directory, "opencode.jsonc");
+  const rootJson = join12(directory, "opencode.json");
   const rootConfig = readJsoncFile(rootJsonc) ?? readJsoncFile(rootJson);
   if (rootConfig?.compaction) {
     const c = rootConfig.compaction;
@@ -165387,10 +165655,10 @@ function collectPluginEntries(directory) {
     }
   };
   for (const configPath of [
-    join11(directory, ".opencode", "opencode.jsonc"),
-    join11(directory, ".opencode", "opencode.json"),
-    join11(directory, "opencode.jsonc"),
-    join11(directory, "opencode.json")
+    join12(directory, ".opencode", "opencode.jsonc"),
+    join12(directory, ".opencode", "opencode.json"),
+    join12(directory, "opencode.jsonc"),
+    join12(directory, "opencode.json")
   ]) {
     const config2 = readJsoncFile(configPath);
     pushFrom(config2?.plugin);
@@ -165431,7 +165699,7 @@ function readOmoDisabledHooks(directory) {
   try {
     const paths = getOpenCodeConfigPaths({ binary: "opencode" });
     for (const name2 of configNames) {
-      const configPath = join11(paths.configDir, name2);
+      const configPath = join12(paths.configDir, name2);
       const config2 = readJsoncFile(configPath);
       if (config2?.disabled_hooks) {
         for (const hook of config2.disabled_hooks) {
@@ -165441,7 +165709,7 @@ function readOmoDisabledHooks(directory) {
     }
   } catch {}
   for (const name2 of configNames) {
-    const config2 = readJsoncFile(join11(directory, name2));
+    const config2 = readJsoncFile(join12(directory, name2));
     if (config2?.disabled_hooks) {
       for (const hook of config2.disabled_hooks) {
         disabled.add(hook);
@@ -165592,28 +165860,28 @@ __export(exports_conflict_warning_hook, {
   sendConflictWarning: () => sendConflictWarning,
   cleanupConflictWarnings: () => cleanupConflictWarnings
 });
-import { existsSync as existsSync12, readFileSync as readFileSync10 } from "node:fs";
+import { existsSync as existsSync15, readFileSync as readFileSync10 } from "node:fs";
 import { homedir as homedir7, platform as platform2 } from "node:os";
-import { join as join12 } from "node:path";
+import { join as join13 } from "node:path";
 function getDesktopStatePath() {
   const os2 = platform2();
   const home = homedir7();
   if (os2 === "darwin") {
-    return join12(home, "Library", "Application Support", "ai.opencode.desktop", "opencode.global.dat");
+    return join13(home, "Library", "Application Support", "ai.opencode.desktop", "opencode.global.dat");
   }
   if (os2 === "linux") {
-    const xdgConfig = process.env.XDG_CONFIG_HOME || join12(home, ".config");
-    return join12(xdgConfig, "ai.opencode.desktop", "opencode.global.dat");
+    const xdgConfig = process.env.XDG_CONFIG_HOME || join13(home, ".config");
+    return join13(xdgConfig, "ai.opencode.desktop", "opencode.global.dat");
   }
   if (os2 === "win32") {
-    const appData = process.env.APPDATA || join12(home, "AppData", "Roaming");
-    return join12(appData, "ai.opencode.desktop", "opencode.global.dat");
+    const appData = process.env.APPDATA || join13(home, "AppData", "Roaming");
+    return join13(appData, "ai.opencode.desktop", "opencode.global.dat");
   }
   return null;
 }
 function readDesktopState(directory) {
   const statePath = getDesktopStatePath();
-  if (!statePath || !existsSync12(statePath)) {
+  if (!statePath || !existsSync15(statePath)) {
     log(`[magic-context] conflict-warning: Desktop state file not found at ${statePath}`);
     return { sessionId: null, sidecarUrl: null };
   }
@@ -165915,196 +166183,6 @@ var init_conflict_warning_hook = __esm(() => {
   cachedDesktopStateByDir = new Map;
 });
 
-// src/features/magic-context/compaction-marker.ts
-import { join as join13 } from "node:path";
-function randomBase62(length) {
-  const chars = [];
-  for (let i = 0;i < length; i++) {
-    chars.push(BASE62_CHARS[Math.floor(Math.random() * BASE62_CHARS.length)]);
-  }
-  return chars.join("");
-}
-function generateId(prefix, timestampMs, counter = 0n) {
-  const encoded = BigInt(timestampMs) * 0x1000n + counter;
-  const hex3 = encoded.toString(16).padStart(14, "0");
-  return `${prefix}_${hex3}${randomBase62(14)}`;
-}
-function generateMessageId(timestampMs, counter = 0n) {
-  return generateId("msg", timestampMs, counter);
-}
-function generatePartId(timestampMs, counter = 0n) {
-  return generateId("prt", timestampMs, counter);
-}
-function getOpenCodeDbPath2() {
-  return join13(getDataDir(), "opencode", "opencode.db");
-}
-function isOpenCodeSchemaCompatible(db, dbPath) {
-  if (cachedSchemaCompatible?.path === dbPath) {
-    return cachedSchemaCompatible.compatible;
-  }
-  try {
-    const messageCols = new Set(db.prepare("PRAGMA table_info(message)").all().map((r) => r.name ?? "").filter((n) => n.length > 0));
-    const partCols = new Set(db.prepare("PRAGMA table_info(part)").all().map((r) => r.name ?? "").filter((n) => n.length > 0));
-    const missingMessage = REQUIRED_MESSAGE_COLUMNS.filter((c) => !messageCols.has(c));
-    const missingPart = REQUIRED_PART_COLUMNS.filter((c) => !partCols.has(c));
-    if (missingMessage.length > 0 || missingPart.length > 0) {
-      log(`[magic-context] compaction-marker: OpenCode DB schema missing required columns ` + `(message: [${missingMessage.join(", ")}], part: [${missingPart.join(", ")}]). ` + `Marker injection disabled for this process. ` + `This usually means OpenCode was updated and magic-context is out of date.`);
-      cachedSchemaCompatible = { path: dbPath, compatible: false };
-      return false;
-    }
-    cachedSchemaCompatible = { path: dbPath, compatible: true };
-    return true;
-  } catch (error51) {
-    log(`[magic-context] compaction-marker: schema probe failed: ${error51 instanceof Error ? error51.message : String(error51)}. ` + `Marker injection disabled until next process restart.`);
-    cachedSchemaCompatible = { path: dbPath, compatible: false };
-    return false;
-  }
-}
-function getWritableOpenCodeDb() {
-  const dbPath = getOpenCodeDbPath2();
-  if (cachedWriteDb?.path === dbPath) {
-    return cachedWriteDb.db;
-  }
-  if (cachedWriteDb) {
-    try {
-      closeQuietly(cachedWriteDb.db);
-    } catch {}
-  }
-  const db = new Database(dbPath);
-  db.exec("PRAGMA busy_timeout=5000");
-  db.exec("PRAGMA journal_mode=WAL");
-  cachedWriteDb = { path: dbPath, db };
-  return db;
-}
-function getNonSummaryMessageSortKey(sessionId, messageId) {
-  const db = getWritableOpenCodeDb();
-  const row = db.prepare(`SELECT time_created, id
-             FROM message
-             WHERE session_id = ?
-               AND id = ?
-               AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
-                        AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')
-             LIMIT 1`).get(sessionId, messageId);
-  if (typeof row?.time_created !== "number" || typeof row.id !== "string") {
-    return null;
-  }
-  return { id: row.id, timeCreated: row.time_created };
-}
-function findBoundaryUserMessage(sessionId, endMessageId) {
-  const db = getWritableOpenCodeDb();
-  const target = getNonSummaryMessageSortKey(sessionId, endMessageId);
-  if (!target)
-    return null;
-  const boundary = db.prepare(`SELECT id, time_created, data
-             FROM message
-             WHERE session_id = ?
-               AND NOT (COALESCE(json_extract(data, '$.summary'), 0) = 1
-                        AND COALESCE(json_extract(data, '$.finish'), '') = 'stop')
-               AND COALESCE(json_extract(data, '$.role'), '') = 'user'
-               AND (time_created < ? OR (time_created = ? AND id <= ?))
-             ORDER BY time_created DESC, id DESC
-             LIMIT 1`).get(sessionId, target.timeCreated, target.timeCreated, target.id);
-  if (typeof boundary?.id !== "string" || typeof boundary.time_created !== "number") {
-    return null;
-  }
-  return { id: boundary.id, timeCreated: boundary.time_created };
-}
-function compareOpenCodeMessagesByCanonicalOrder(sessionId, leftMessageId, rightMessageId) {
-  const left = getNonSummaryMessageSortKey(sessionId, leftMessageId);
-  const right = getNonSummaryMessageSortKey(sessionId, rightMessageId);
-  if (!left || !right)
-    return null;
-  if (left.timeCreated < right.timeCreated)
-    return -1;
-  if (left.timeCreated > right.timeCreated)
-    return 1;
-  if (left.id < right.id)
-    return -1;
-  if (left.id > right.id)
-    return 1;
-  return 0;
-}
-function getOpenCodeMessageById(sessionId, messageId) {
-  const db = getWritableOpenCodeDb();
-  const row = db.prepare(`SELECT id FROM message WHERE session_id = ? AND id = ? LIMIT 1`).get(sessionId, messageId);
-  return row ?? null;
-}
-function injectCompactionMarker(args) {
-  const db = getWritableOpenCodeDb();
-  if (!isOpenCodeSchemaCompatible(db, getOpenCodeDbPath2())) {
-    return null;
-  }
-  const boundary = args.resolvedBoundary ?? findBoundaryUserMessage(args.sessionId, args.endMessageId);
-  if (!boundary) {
-    log(`[magic-context] compaction-marker: no user message found at or before endMessageId ${args.endMessageId} (ordinal ${args.endOrdinal})`);
-    return null;
-  }
-  const boundaryTime = boundary.timeCreated;
-  const summaryMsgId = generateMessageId(boundaryTime + 1, 1n);
-  const compactionPartId = generatePartId(boundaryTime, 1n);
-  const summaryPartId = generatePartId(boundaryTime + 1, 2n);
-  const summaryMsgData = JSON.stringify({
-    role: "assistant",
-    parentID: boundary.id,
-    summary: true,
-    finish: "stop",
-    mode: "compaction",
-    agent: "compaction",
-    path: { cwd: args.directory, root: args.directory },
-    cost: 0,
-    tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-    modelID: "magic-context",
-    providerID: "magic-context",
-    time: { created: boundaryTime + 1 }
-  });
-  try {
-    db.transaction(() => {
-      db.prepare("INSERT INTO part (id, message_id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?, ?)").run(compactionPartId, boundary.id, args.sessionId, boundaryTime, boundaryTime, '{"type":"compaction","auto":true}');
-      db.prepare("INSERT INTO message (id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?)").run(summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, summaryMsgData);
-      db.prepare("INSERT INTO part (id, message_id, session_id, time_created, time_updated, data) VALUES (?, ?, ?, ?, ?, ?)").run(summaryPartId, summaryMsgId, args.sessionId, boundaryTime + 1, boundaryTime + 1, JSON.stringify({ type: "text", text: args.summaryText }));
-    })();
-    log(`[magic-context] compaction-marker: injected boundary at user msg ${boundary.id} (ordinal ~${args.endOrdinal}), summary msg ${summaryMsgId}`);
-    return {
-      boundaryMessageId: boundary.id,
-      summaryMessageId: summaryMsgId,
-      compactionPartId,
-      summaryPartId
-    };
-  } catch (error51) {
-    log(`[magic-context] compaction-marker: injection failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
-    return null;
-  }
-}
-function removeCompactionMarker(state) {
-  try {
-    const db = getWritableOpenCodeDb();
-    db.transaction(() => {
-      db.prepare("DELETE FROM part WHERE id = ?").run(state.summaryPartId);
-      db.prepare("DELETE FROM message WHERE id = ?").run(state.summaryMessageId);
-      db.prepare("DELETE FROM part WHERE id = ?").run(state.compactionPartId);
-    })();
-    return true;
-  } catch (error51) {
-    log(`[magic-context] compaction-marker: removal failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
-    return false;
-  }
-}
-var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", cachedWriteDb = null, REQUIRED_MESSAGE_COLUMNS, REQUIRED_PART_COLUMNS, cachedSchemaCompatible = null;
-var init_compaction_marker = __esm(async () => {
-  init_data_path();
-  init_logger();
-  await init_sqlite();
-  REQUIRED_MESSAGE_COLUMNS = ["id", "session_id", "time_created", "time_updated", "data"];
-  REQUIRED_PART_COLUMNS = [
-    "id",
-    "message_id",
-    "session_id",
-    "time_created",
-    "time_updated",
-    "data"
-  ];
-});
-
 // src/features/magic-context/dreamer/task-config.ts
 var exports_task_config = {};
 __export(exports_task_config, {
@@ -167985,6 +168063,20 @@ function markGitSweepSuccessAndRelease(db, projectPath, holderId) {
     return result.changes === 1;
   });
 }
+function parkGitSweepNonIndexable(db, projectPath, holderId, reprobeMs = GIT_SWEEP_NON_INDEXABLE_REPROBE_MS) {
+  return runImmediate2(db, () => {
+    const now = Date.now();
+    const sweptAt = now + reprobeMs - GIT_SWEEP_COOLDOWN_MS;
+    const result = db.prepare(`UPDATE git_sweep_coordinator
+                 SET lease_holder = NULL,
+                     lease_expires_at = NULL,
+                     last_swept_at = ?
+                 WHERE project_path = ?
+                   AND lease_holder = ?
+                   AND lease_expires_at > ?`).run(sweptAt, projectPath, holderId, now);
+    return result.changes === 1;
+  });
+}
 function releaseGitSweepLease(db, projectPath, holderId) {
   runImmediate2(db, () => {
     db.prepare(`UPDATE git_sweep_coordinator
@@ -167994,10 +168086,11 @@ function releaseGitSweepLease(db, projectPath, holderId) {
                AND lease_holder = ?`).run(projectPath, holderId);
   });
 }
-var GIT_SWEEP_COOLDOWN_MS, GIT_SWEEP_LEASE_TTL_MS, GIT_SWEEP_LEASE_RENEWAL_MS;
+var GIT_SWEEP_COOLDOWN_MS, GIT_SWEEP_LEASE_TTL_MS, GIT_SWEEP_NON_INDEXABLE_REPROBE_MS, GIT_SWEEP_LEASE_RENEWAL_MS;
 var init_sweep_coordinator = __esm(() => {
   GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
   GIT_SWEEP_LEASE_TTL_MS = 5 * 60 * 1000;
+  GIT_SWEEP_NON_INDEXABLE_REPROBE_MS = 24 * 60 * 60 * 1000;
   GIT_SWEEP_LEASE_RENEWAL_MS = 60 * 1000;
 });
 
@@ -168057,80 +168150,6 @@ var init_embedding_cache = __esm(() => {
   embeddingCacheTtlMs = DEFAULT_EMBEDDING_CACHE_TTL_MS;
 });
 
-// src/features/magic-context/session-project-storage.ts
-function getUpsertSessionProjectStatement(db) {
-  let stmt = upsertSessionProjectStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare(`INSERT INTO session_projects (session_id, harness, project_path, updated_at)
-             VALUES (?, ?, ?, ?)
-             ON CONFLICT(session_id, harness) DO UPDATE SET
-                 project_path = excluded.project_path,
-                 updated_at = excluded.updated_at
-             WHERE session_projects.project_path <> excluded.project_path`);
-    upsertSessionProjectStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getRepairSessionChunkProjectStatement(db) {
-  let stmt = repairSessionChunkProjectStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare(`UPDATE compartment_chunk_embeddings
-             SET project_path = ?
-             WHERE session_id = ?
-               AND harness = ?
-               AND project_path <> ?`);
-    repairSessionChunkProjectStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function getRepairProjectChunkProjectStatement(db) {
-  let stmt = repairProjectChunkProjectStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare(`UPDATE compartment_chunk_embeddings
-             SET project_path = (
-                 SELECT sp.project_path
-                 FROM session_projects sp
-                 WHERE sp.session_id = compartment_chunk_embeddings.session_id
-                   AND sp.harness = compartment_chunk_embeddings.harness
-                 LIMIT 1
-             )
-             WHERE EXISTS (
-                 SELECT 1
-                 FROM session_projects sp
-                 WHERE sp.session_id = compartment_chunk_embeddings.session_id
-                   AND sp.harness = compartment_chunk_embeddings.harness
-                   AND sp.project_path <> compartment_chunk_embeddings.project_path
-                   AND (
-                       sp.project_path = ?
-                       OR compartment_chunk_embeddings.project_path = ?
-                   )
-             )`);
-    repairProjectChunkProjectStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function recordSessionProjectIdentity(db, sessionId, projectPath) {
-  if (!sessionId || !projectPath)
-    return;
-  const harness = getHarness();
-  const now = Date.now();
-  db.transaction(() => {
-    getUpsertSessionProjectStatement(db).run(sessionId, harness, projectPath, now);
-    getRepairSessionChunkProjectStatement(db).run(projectPath, sessionId, harness, projectPath);
-  })();
-}
-function repairMisScopedCompartmentChunkEmbeddingsForProject(db, projectPath) {
-  if (!projectPath)
-    return 0;
-  return getRepairProjectChunkProjectStatement(db).run(projectPath, projectPath).changes;
-}
-var upsertSessionProjectStatements, repairSessionChunkProjectStatements, repairProjectChunkProjectStatements;
-var init_session_project_storage = __esm(() => {
-  upsertSessionProjectStatements = new WeakMap;
-  repairSessionChunkProjectStatements = new WeakMap;
-  repairProjectChunkProjectStatements = new WeakMap;
-});
-
 // src/features/magic-context/project-embedding-registry.ts
 import { createHash as createHash8, randomUUID } from "node:crypto";
 function markProjectLoadUntrusted(projectIdentity) {
@@ -169767,7 +169786,7 @@ function getMemoryVerifications(db, memoryIds) {
 var MEMORY_VERIFICATION_SENTINEL = "";
 // src/features/magic-context/memory/verification-paths.ts
 import { execFile } from "node:child_process";
-import { existsSync as existsSync14, realpathSync as realpathSync2, statSync as statSync5 } from "node:fs";
+import { existsSync as existsSync16, realpathSync as realpathSync2, statSync as statSync5 } from "node:fs";
 import path6 from "node:path";
 import { promisify } from "node:util";
 async function runGit(cwd, args) {
@@ -169870,7 +169889,7 @@ function verificationFileExists(baseRoot, filePath) {
     return false;
   const root = path6.resolve(baseRoot);
   const candidate = path6.resolve(root, filePath);
-  return isWithin(root, candidate) && existsSync14(candidate);
+  return isWithin(root, candidate) && existsSync16(candidate);
 }
 async function normalizeVerificationFiles(args) {
   const cwd = path6.resolve(args.cwd);
@@ -169903,7 +169922,7 @@ async function normalizeVerificationFiles(args) {
       warnings.push(`Skipped verification path "${value}" because it is the repo/project root.`);
       continue;
     }
-    if (existsSync14(candidate)) {
+    if (existsSync16(candidate)) {
       try {
         if (statSync5(candidate).isDirectory()) {
           warnings.push(`Skipped verification path "${value}" because it is a directory.`);
@@ -169934,7 +169953,7 @@ async function normalizeVerificationFiles(args) {
       }
       normalized.push(tracked);
     } else {
-      if (!existsSync14(candidate)) {
+      if (!existsSync16(candidate)) {
         warnings.push(`Skipped verification path "${value}" because it does not exist.`);
         continue;
       }
@@ -177278,6 +177297,9 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory) {
   }
 }
 function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, directory) {
+  if (getHarness() !== "opencode") {
+    return true;
+  }
   const targetEndMessageId = getCompartmentEndMessageIdForOrdinal(db, sessionId, lastCompartmentEnd);
   if (!targetEndMessageId) {
     sessionLog(sessionId, `compaction-marker: no compartment endMessageId for ordinal ${lastCompartmentEnd}; preserving existing marker`);
@@ -186334,6 +186356,29 @@ function getMagicContextBuiltinCommands() {
   };
 }
 
+// src/features/magic-context/dreamer/open-opencode-db.ts
+init_logger();
+await __promiseAll([
+  init_sqlite(),
+  init_compaction_marker()
+]);
+import { existsSync as existsSync7 } from "node:fs";
+function openOpenCodeDb() {
+  const dbPath = getOpenCodeDbPath();
+  if (!existsSync7(dbPath)) {
+    log(`[dreamer] OpenCode DB not found at ${dbPath} — skipping OpenCode history scan`);
+    return null;
+  }
+  try {
+    const db = new Database(dbPath, { readonly: true });
+    db.exec("PRAGMA busy_timeout = 5000");
+    return db;
+  } catch (error51) {
+    log(`[dreamer] failed to open OpenCode DB at ${dbPath}: ${getErrorMessage(error51)}`);
+    return null;
+  }
+}
+
 // src/features/magic-context/dreamer/task-prompts.ts
 var DREAMER_SYSTEM_PROMPT = `You are a background maintenance agent for the magic-context system, running during a scheduled dream window. Your task and its full instructions arrive in the message below. Never read or quote secrets from .env, credentials, or key files, and never commit — the user handles git.`;
 var PROJECT_MEMORY_TAXONOMY = `## Memory taxonomy (5 categories)
@@ -186643,6 +186688,192 @@ function buildDreamTaskPrompt(task, args) {
 // src/index.ts
 init_project_identity();
 
+// src/features/magic-context/session-project-backfill.ts
+init_logger();
+init_project_identity();
+init_session_project_storage();
+import { existsSync as existsSync8 } from "node:fs";
+var LEASE_TTL_MS = 10 * 60 * 1000;
+var SESSION_QUERY_CHUNK_SIZE = 250;
+var YIELD_EVERY_NEW_DIRECTORIES = 10;
+function ensureBackfillStateTable(db) {
+  db.exec(`
+        CREATE TABLE IF NOT EXISTS session_project_backfill_state (
+            harness TEXT PRIMARY KEY,
+            status TEXT NOT NULL CHECK (status IN ('running', 'completed')),
+            started_at INTEGER,
+            lease_expires_at INTEGER,
+            completed_at INTEGER
+        );
+    `);
+}
+function withImmediateTransaction(db, fn) {
+  db.exec("BEGIN IMMEDIATE");
+  try {
+    const result = fn();
+    db.exec("COMMIT");
+    return result;
+  } catch (error51) {
+    try {
+      db.exec("ROLLBACK");
+    } catch {}
+    throw error51;
+  }
+}
+function defaultYieldFn() {
+  return new Promise((resolve2) => setTimeout(resolve2, 0));
+}
+function acquireBackfillLease(db, harness, now) {
+  ensureBackfillStateTable(db);
+  return withImmediateTransaction(db, () => {
+    const current = db.prepare(`SELECT harness, status, started_at, lease_expires_at, completed_at
+                 FROM session_project_backfill_state
+                 WHERE harness = ?`).get(harness);
+    if (current?.status === "completed") {
+      return "already_completed";
+    }
+    if (current?.status === "running" && current.lease_expires_at !== null && current.lease_expires_at > now) {
+      return "blocked_by_lease";
+    }
+    db.prepare(`INSERT INTO session_project_backfill_state(
+                harness,
+                status,
+                started_at,
+                lease_expires_at,
+                completed_at
+            )
+             VALUES (?, 'running', ?, ?, NULL)
+             ON CONFLICT(harness) DO UPDATE SET
+                status = 'running',
+                started_at = excluded.started_at,
+                lease_expires_at = excluded.lease_expires_at,
+                completed_at = NULL`).run(harness, now, now + LEASE_TTL_MS);
+    return "completed";
+  });
+}
+function renewBackfillLease(db, harness, now) {
+  ensureBackfillStateTable(db);
+  db.prepare(`UPDATE session_project_backfill_state
+         SET lease_expires_at = ?
+         WHERE harness = ? AND status = 'running'`).run(now + LEASE_TTL_MS, harness);
+}
+function markBackfillCompleted(db, harness, now) {
+  ensureBackfillStateTable(db);
+  db.prepare(`INSERT INTO session_project_backfill_state(
+            harness,
+            status,
+            started_at,
+            lease_expires_at,
+            completed_at
+        )
+         VALUES (?, 'completed', ?, NULL, ?)
+         ON CONFLICT(harness) DO UPDATE SET
+            status = 'completed',
+            lease_expires_at = NULL,
+            completed_at = excluded.completed_at`).run(harness, now, now);
+}
+function dedupeSessions(sessions) {
+  const sessionsById = new Map;
+  for (const session of sessions) {
+    if (!session.sessionId)
+      continue;
+    const existing = sessionsById.get(session.sessionId);
+    if (!existing) {
+      sessionsById.set(session.sessionId, {
+        sessionId: session.sessionId,
+        directory: session.directory
+      });
+      continue;
+    }
+    if (!existing.directory && session.directory) {
+      sessionsById.set(session.sessionId, {
+        sessionId: session.sessionId,
+        directory: session.directory
+      });
+    }
+  }
+  return [...sessionsById.values()];
+}
+function getMappedSessionIds(db, harness, sessions) {
+  const mapped = new Set;
+  for (let index = 0;index < sessions.length; index += SESSION_QUERY_CHUNK_SIZE) {
+    const chunk = sessions.slice(index, index + SESSION_QUERY_CHUNK_SIZE);
+    if (chunk.length === 0)
+      continue;
+    const placeholders = chunk.map(() => "?").join(", ");
+    const rows = db.prepare(`SELECT session_id
+                 FROM session_projects
+                 WHERE harness = ?
+                   AND session_id IN (${placeholders})`).all(harness, ...chunk.map((session) => session.sessionId));
+    for (const row of rows) {
+      mapped.add(row.session_id);
+    }
+  }
+  return mapped;
+}
+async function runSessionProjectBackfill(db, sessions, options = {}) {
+  const startedAt = performance.now();
+  const harness = getHarness();
+  const now = options.now ?? Date.now;
+  const resolveIdentity = options.resolveIdentity ?? resolveProjectIdentity;
+  const yieldFn = options.yieldFn ?? defaultYieldFn;
+  const dedupedSessions = dedupeSessions(sessions);
+  const result = {
+    status: "completed",
+    totalSessions: dedupedSessions.length,
+    alreadyMappedSessions: 0,
+    unmappedSessions: 0,
+    backfilledSessions: 0,
+    skippedDeadDirectories: 0,
+    skippedEmptyDirectories: 0,
+    durationMs: 0
+  };
+  const leaseStatus = acquireBackfillLease(db, harness, now());
+  if (leaseStatus !== "completed") {
+    result.status = leaseStatus;
+    result.durationMs = performance.now() - startedAt;
+    return result;
+  }
+  const mappedSessionIds = getMappedSessionIds(db, harness, dedupedSessions);
+  result.alreadyMappedSessions = mappedSessionIds.size;
+  const existenceCache = new Map;
+  const identityCache2 = new Map;
+  let newDirectoryResolutions = 0;
+  for (const session of dedupedSessions) {
+    if (mappedSessionIds.has(session.sessionId)) {
+      continue;
+    }
+    result.unmappedSessions += 1;
+    if (!session.directory) {
+      result.skippedEmptyDirectories += 1;
+      continue;
+    }
+    const stillExists = existenceCache.get(session.directory) ?? existsSync8(session.directory);
+    existenceCache.set(session.directory, stillExists);
+    if (!stillExists) {
+      result.skippedDeadDirectories += 1;
+      continue;
+    }
+    let identity = identityCache2.get(session.directory);
+    if (!identity) {
+      identity = resolveIdentity(session.directory);
+      identityCache2.set(session.directory, identity);
+      newDirectoryResolutions += 1;
+      if (newDirectoryResolutions % YIELD_EVERY_NEW_DIRECTORIES === 0) {
+        renewBackfillLease(db, harness, now());
+        await yieldFn();
+        renewBackfillLease(db, harness, now());
+      }
+    }
+    recordSessionProjectIdentity(db, session.sessionId, identity);
+    result.backfilledSessions += 1;
+  }
+  markBackfillCompleted(db, harness, now());
+  result.durationMs = performance.now() - startedAt;
+  log(`[session-projects] backfilled ${result.backfilledSessions} of ${result.unmappedSessions} unmapped sessions (skipped ${result.skippedDeadDirectories} dead dirs) in ${Math.round(result.durationMs)}ms`);
+  return result;
+}
+
 // src/features/magic-context/sidekick/agent.ts
 init_language_directive();
 
@@ -187033,45 +187264,45 @@ async function runDeferredV22Backfill(db, options = {}) {
 
 // src/hooks/auto-update-checker/index.ts
 init_logger();
-import { existsSync as existsSync11, mkdirSync as mkdirSync5, readFileSync as readFileSync9, renameSync as renameSync3, writeFileSync as writeFileSync5 } from "node:fs";
-import { dirname as dirname7, join as join9 } from "node:path";
+import { existsSync as existsSync14, mkdirSync as mkdirSync5, readFileSync as readFileSync9, renameSync as renameSync3, writeFileSync as writeFileSync5 } from "node:fs";
+import { dirname as dirname7, join as join10 } from "node:path";
 
 // src/hooks/auto-update-checker/cache.ts
 init_logger();
 var import_comment_json2 = __toESM(require_src2(), 1);
 import { spawn } from "node:child_process";
-import { existsSync as existsSync10, readFileSync as readFileSync8, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "node:fs";
-import { basename as basename2, dirname as dirname6, join as join8 } from "node:path";
+import { existsSync as existsSync13, readFileSync as readFileSync8, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "node:fs";
+import { basename as basename2, dirname as dirname6, join as join9 } from "node:path";
 
 // src/hooks/auto-update-checker/checker.ts
 init_logger();
 var import_comment_json = __toESM(require_src2(), 1);
-import { existsSync as existsSync9, readFileSync as readFileSync7, renameSync as renameSync2, statSync as statSync4, writeFileSync as writeFileSync3 } from "node:fs";
+import { existsSync as existsSync12, readFileSync as readFileSync7, renameSync as renameSync2, statSync as statSync4, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { dirname as dirname5, isAbsolute as isAbsolute3, join as join7, resolve as resolve2 } from "node:path";
+import { dirname as dirname5, isAbsolute as isAbsolute3, join as join8, resolve as resolve2 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // src/hooks/auto-update-checker/constants.ts
 import { homedir as homedir4, platform } from "node:os";
-import { join as join6 } from "node:path";
+import { join as join7 } from "node:path";
 var PACKAGE_NAME = "@cortexkit/opencode-magic-context";
 var NPM_REGISTRY_URL = "https://registry.npmjs.org";
 var NPM_FETCH_TIMEOUT = 1e4;
 function getOpenCodeCacheRoot() {
   if (platform() === "win32") {
-    return join6(process.env.LOCALAPPDATA ?? homedir4(), "opencode");
+    return join7(process.env.LOCALAPPDATA ?? homedir4(), "opencode");
   }
-  return join6(homedir4(), ".cache", "opencode");
+  return join7(homedir4(), ".cache", "opencode");
 }
 function getOpenCodeConfigRoot() {
   if (platform() === "win32") {
-    return join6(process.env.APPDATA ?? join6(homedir4(), "AppData", "Roaming"), "opencode");
+    return join7(process.env.APPDATA ?? join7(homedir4(), "AppData", "Roaming"), "opencode");
   }
-  return join6(process.env.XDG_CONFIG_HOME ?? join6(homedir4(), ".config"), "opencode");
+  return join7(process.env.XDG_CONFIG_HOME ?? join7(homedir4(), ".config"), "opencode");
 }
-var CACHE_DIR = join6(getOpenCodeCacheRoot(), "packages");
-var USER_OPENCODE_CONFIG = join6(getOpenCodeConfigRoot(), "opencode.json");
-var USER_OPENCODE_CONFIG_JSONC = join6(getOpenCodeConfigRoot(), "opencode.jsonc");
+var CACHE_DIR = join7(getOpenCodeCacheRoot(), "packages");
+var USER_OPENCODE_CONFIG = join7(getOpenCodeConfigRoot(), "opencode.json");
+var USER_OPENCODE_CONFIG_JSONC = join7(getOpenCodeConfigRoot(), "opencode.jsonc");
 // src/hooks/auto-update-checker/types.ts
 init_zod();
 var NpmPackageEnvelopeSchema = exports_external.object({
@@ -187132,8 +187363,8 @@ function extractChannel(version2) {
 }
 function getConfigPaths(directory) {
   return [
-    join7(directory, ".opencode", "opencode.json"),
-    join7(directory, ".opencode", "opencode.jsonc"),
+    join8(directory, ".opencode", "opencode.json"),
+    join8(directory, ".opencode", "opencode.jsonc"),
     USER_OPENCODE_CONFIG,
     USER_OPENCODE_CONFIG_JSONC
   ];
@@ -187155,8 +187386,8 @@ function findPackageJsonUp(startPath) {
     const stat = statSync4(startPath);
     let dir = stat.isDirectory() ? startPath : dirname5(startPath);
     for (let i = 0;i < 10; i++) {
-      const pkgPath = join7(dir, "package.json");
-      if (existsSync9(pkgPath)) {
+      const pkgPath = join8(dir, "package.json");
+      if (existsSync12(pkgPath)) {
         try {
           const pkg = PackageJsonSchema.safeParse(JSON.parse(readFileSync7(pkgPath, "utf-8")));
           if (pkg.success && pkg.data.name === PACKAGE_NAME)
@@ -187174,7 +187405,7 @@ function findPackageJsonUp(startPath) {
 function getLocalDevPath(directory) {
   for (const configPath of getConfigPaths(directory)) {
     try {
-      if (!existsSync9(configPath))
+      if (!existsSync12(configPath))
         continue;
       const rawConfig = parseJsonConfig(readFileSync7(configPath, "utf-8"));
       const plugins = getPluginEntries(rawConfig);
@@ -187220,7 +187451,7 @@ function getCurrentRuntimePackageJsonPath(currentModuleUrl = import.meta.url) {
 function findPluginEntry(directory) {
   for (const configPath of getConfigPaths(directory)) {
     try {
-      if (!existsSync9(configPath))
+      if (!existsSync12(configPath))
         continue;
       const rawConfig = parseJsonConfig(readFileSync7(configPath, "utf-8"));
       const plugins = getPluginEntries(rawConfig);
@@ -187245,7 +187476,7 @@ function findPluginEntry(directory) {
 }
 var cachedPackageVersion = null;
 function getSpecCachePackageJsonPath(spec) {
-  return join7(CACHE_DIR, spec, "node_modules", PACKAGE_NAME, "package.json");
+  return join8(CACHE_DIR, spec, "node_modules", PACKAGE_NAME, "package.json");
 }
 function getCachedVersion(spec) {
   if (!spec && cachedPackageVersion)
@@ -187254,11 +187485,11 @@ function getCachedVersion(spec) {
     getCurrentRuntimePackageJsonPath(),
     spec ? getSpecCachePackageJsonPath(spec) : null,
     getSpecCachePackageJsonPath(`${PACKAGE_NAME}@latest`),
-    join7(homedir5(), ".cache", "opencode", "node_modules", PACKAGE_NAME, "package.json")
+    join8(homedir5(), ".cache", "opencode", "node_modules", PACKAGE_NAME, "package.json")
   ].filter(isString);
   for (const packageJsonPath of candidates) {
     try {
-      if (!existsSync9(packageJsonPath))
+      if (!existsSync12(packageJsonPath))
         continue;
       const pkg = PackageJsonSchema.safeParse(JSON.parse(readFileSync7(packageJsonPath, "utf-8")));
       if (pkg.success && pkg.data.version) {
@@ -187312,8 +187543,8 @@ function stripPackageNameFromPath(pathValue, packageName) {
   return current;
 }
 function removeFromPackageLock(installDir, packageName) {
-  const lockPath = join8(installDir, "package-lock.json");
-  if (!existsSync10(lockPath))
+  const lockPath = join9(installDir, "package-lock.json");
+  if (!existsSync13(lockPath))
     return false;
   try {
     const lock = import_comment_json2.parse(readFileSync8(lockPath, "utf-8"));
@@ -187339,7 +187570,7 @@ function removeFromPackageLock(installDir, packageName) {
   }
 }
 function ensureDependencyVersion(packageJsonPath, packageName, version2) {
-  if (!existsSync10(packageJsonPath))
+  if (!existsSync13(packageJsonPath))
     return false;
   try {
     const raw = import_comment_json2.parse(readFileSync8(packageJsonPath, "utf-8"));
@@ -187361,8 +187592,8 @@ function ensureDependencyVersion(packageJsonPath, packageName, version2) {
   }
 }
 function removeInstalledPackage(installDir, packageName) {
-  const packageDir = join8(installDir, "node_modules", packageName);
-  if (!existsSync10(packageDir))
+  const packageDir = join9(installDir, "node_modules", packageName);
+  if (!existsSync13(packageDir))
     return false;
   try {
     rmSync2(packageDir, { recursive: true, force: true, maxRetries: 5, retryDelay: 100 });
@@ -187383,8 +187614,8 @@ function resolveInstallContext(runtimePackageJsonPath = getCurrentRuntimePackage
     const nodeModulesDir = stripPackageNameFromPath(packageDir, PACKAGE_NAME);
     if (nodeModulesDir && basename2(nodeModulesDir) === "node_modules") {
       const installDir = dirname6(nodeModulesDir);
-      const packageJsonPath = join8(installDir, "package.json");
-      if (!existsSync10(packageJsonPath)) {
+      const packageJsonPath = join9(installDir, "package.json");
+      if (!existsSync13(packageJsonPath)) {
         try {
           writeFileSync4(packageJsonPath, `${JSON.stringify({ private: true, dependencies: {} }, null, 2)}
 `);
@@ -187398,8 +187629,8 @@ function resolveInstallContext(runtimePackageJsonPath = getCurrentRuntimePackage
     }
     return null;
   }
-  const legacyPackageJsonPath = join8(dirname6(CACHE_DIR), "package.json");
-  if (existsSync10(legacyPackageJsonPath)) {
+  const legacyPackageJsonPath = join9(dirname6(CACHE_DIR), "package.json");
+  if (existsSync13(legacyPackageJsonPath)) {
     return { installDir: dirname6(CACHE_DIR), packageJsonPath: legacyPackageJsonPath };
   }
   return null;
@@ -187523,8 +187754,8 @@ function claimCheckSlot(storageDir, intervalMs) {
   if (!storageDir)
     return true;
   try {
-    const file2 = join9(storageDir, TIMESTAMP_FILENAME);
-    if (existsSync11(file2)) {
+    const file2 = join10(storageDir, TIMESTAMP_FILENAME);
+    if (existsSync14(file2)) {
       try {
         const raw = JSON.parse(readFileSync9(file2, "utf-8"));
         const last = typeof raw.lastCheckedMs === "number" ? raw.lastCheckedMs : 0;
@@ -187830,29 +188061,6 @@ function releaseLease(db, holderId, leaseKey = DREAMING_LEASE_KEY) {
   });
 }
 
-// src/features/magic-context/dreamer/open-opencode-db.ts
-init_logger();
-await __promiseAll([
-  init_sqlite(),
-  init_compaction_marker()
-]);
-import { existsSync as existsSync13 } from "node:fs";
-function openOpenCodeDb() {
-  const dbPath = getOpenCodeDbPath2();
-  if (!existsSync13(dbPath)) {
-    log(`[key-files] OpenCode DB not found at ${dbPath} — skipping`);
-    return null;
-  }
-  try {
-    const db = new Database(dbPath, { readonly: true });
-    db.exec("PRAGMA busy_timeout = 5000");
-    return db;
-  } catch (error51) {
-    log(`[key-files] failed to open OpenCode DB at ${dbPath}: ${getErrorMessage(error51)}`);
-    return null;
-  }
-}
-
 // src/features/magic-context/dreamer/retrospective-orphan-sweep.ts
 init_logger();
 var RETROSPECTIVE_CHILD_TITLE = "magic-context-dream-retrospective";
@@ -188275,7 +188483,7 @@ init_task_config();
 
 // src/features/magic-context/dreamer/task-executor.ts
 import { createHash as createHash10 } from "node:crypto";
-import { existsSync as existsSync17 } from "node:fs";
+import { existsSync as existsSync19 } from "node:fs";
 
 // src/agents/dreamer.ts
 var DREAMER_AGENT = "dreamer";
@@ -190362,7 +190570,7 @@ Output exactly JSON: {"met": false}`;
 
 // src/features/magic-context/dreamer/maintain-docs-protected-enforcement.ts
 init_logger();
-import { existsSync as existsSync15, readFileSync as readFileSync11, writeFileSync as writeFileSync6 } from "node:fs";
+import { existsSync as existsSync17, readFileSync as readFileSync11, writeFileSync as writeFileSync6 } from "node:fs";
 import { join as join15 } from "node:path";
 
 // src/features/magic-context/dreamer/protected-regions.ts
@@ -190466,7 +190674,7 @@ function snapshotMaintainDocsFiles(docsDir) {
   for (const name2 of MAINTAIN_DOCS_SNAPSHOT_FILES) {
     const path8 = join15(docsDir, name2);
     try {
-      if (existsSync15(path8)) {
+      if (existsSync17(path8)) {
         snapshot.set(name2, readFileSync11(path8, "utf8"));
       }
     } catch {}
@@ -190498,7 +190706,7 @@ init_memory();
 init_subagent_token_capture();
 
 // src/features/magic-context/dreamer/map-memories-prompt.ts
-import { existsSync as existsSync16, statSync as statSync6 } from "node:fs";
+import { existsSync as existsSync18, statSync as statSync6 } from "node:fs";
 import path8 from "node:path";
 var MAP_MEMORIES_SYSTEM_PROMPT = `You are a memory mapper for the magic-context system. You map project memories to the repository files that back them.
 
@@ -190536,7 +190744,7 @@ function extractMemoryCandidatePaths(content, repoDir) {
     if (!abs.startsWith(`${root}/`))
       continue;
     try {
-      if (existsSync16(abs) && statSync6(abs).isFile())
+      if (existsSync18(abs) && statSync6(abs).isFile())
         found.add(rel);
     } catch {}
     if (found.size >= MAX_SEED_PATHS_PER_MEMORY)
@@ -192365,8 +192573,8 @@ async function runAgenticTask(config2, ctx, helpers) {
   const lastRunAt = getTaskScheduleState(db, projectIdentity, config2.task)?.lastRunAt ?? null;
   const maintainDocsSnapshot = task === "maintain-docs" ? snapshotMaintainDocsFiles(docsDir) : undefined;
   const existingDocs = task === "maintain-docs" ? {
-    architecture: existsSync17(`${docsDir}/ARCHITECTURE.md`),
-    structure: existsSync17(`${docsDir}/STRUCTURE.md`)
+    architecture: existsSync19(`${docsDir}/ARCHITECTURE.md`),
+    structure: existsSync19(`${docsDir}/STRUCTURE.md`)
   } : undefined;
   const userMemories = task === "curate" ? getActiveUserMemories(db).map((um) => ({ id: um.id, content: um.content })) : undefined;
   let curateMemories;
@@ -192632,11 +192840,21 @@ function recordTransientFailure(db, projectIdentity, due, finishedAt, error51) {
     });
   }
 }
+var LEASE_WAIT_POLL_MS = 2000;
+var MANUAL_RUN_LEASE_WAIT_MS = 60000;
 async function runDomainGroup(deps, group, cb) {
   const { db, projectIdentity, executor } = deps;
   const leaseKey = leaseKeyFor(group[0].config.task, projectIdentity);
   const holderId = crypto.randomUUID();
-  if (!acquireLease(db, holderId, leaseKey)) {
+  let acquired = acquireLease(db, holderId, leaseKey);
+  if (!acquired && cb?.leaseWaitMs) {
+    const deadline = Date.now() + cb.leaseWaitMs;
+    while (!acquired && Date.now() < deadline) {
+      await new Promise((resolve4) => setTimeout(resolve4, LEASE_WAIT_POLL_MS));
+      acquired = acquireLease(db, holderId, leaseKey);
+    }
+  }
+  if (!acquired) {
     log(`[dreamer] domain lease busy (${leaseKey}) — deferring ${group.length} task(s)`);
     for (const due of group)
       cb?.onBusy?.(due.config.task);
@@ -192731,6 +192949,7 @@ async function runManualDream(deps) {
   }
   await Promise.all([...groups.values()].map((group) => runDomainGroup({ ...deps, executor: deps.executor }, group, {
     forceGate,
+    leaseWaitMs: MANUAL_RUN_LEASE_WAIT_MS,
     onRan: (t) => result.ran.push(t),
     onFailed: (t) => result.failed.push(t),
     onBusy: (t) => result.deferredBusy.push(t)
@@ -192779,7 +192998,15 @@ var GIT_TIMEOUT_MS3 = 1e4;
 var DEFAULT_MAX_COMMITS = 5000;
 var RECORD_SEPARATOR = "\x1E";
 var FIELD_SEPARATOR = "\x1F";
-async function readGitCommits(directory, options = {}) {
+function classifyGitLogFailure(message) {
+  if (message.includes("not a git repository"))
+    return "not_a_repo";
+  if (message.includes("unknown revision or path not in the working tree") || message.includes("does not have any commits yet") || message.includes("bad revision")) {
+    return "no_head";
+  }
+  return "transient";
+}
+async function readGitCommitsResult(directory, options = {}) {
   const revision = options.branch ?? "HEAD";
   if (revision.startsWith("-")) {
     throw new Error(`readGitCommits: refusing revision that looks like an option: "${revision}"`);
@@ -192807,13 +193034,18 @@ async function readGitCommits(directory, options = {}) {
     stdout = result.stdout;
   } catch (error51) {
     const message = error51 instanceof Error ? error51.message : String(error51);
-    log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
-    return [];
+    const failure = classifyGitLogFailure(message);
+    if (failure === "transient") {
+      log(`[git-commits] readGitCommits failed for ${projectLabel}: ${message.slice(0, 500)}`);
+    } else {
+      log(`[git-commits] ${projectLabel} is not indexable (${failure})`);
+    }
+    return { commits: [], failure };
   }
   if (stdout.trim().length === 0) {
     log(`[git-commits] readGitCommits returned empty stdout for ${projectLabel} (sinceMs=${options.sinceMs ?? "none"} args=${args.slice(0, 4).join(" ")})`);
   }
-  return parseGitLogOutput(stdout);
+  return { commits: parseGitLogOutput(stdout), failure: null };
 }
 function parseGitLogOutput(stdout) {
   const commits = [];
@@ -192872,7 +193104,8 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
     inserted: 0,
     updated: 0,
     evicted: 0,
-    embedded: 0
+    embedded: 0,
+    nonIndexable: false
   };
   if (indexInProgress.has(projectPath)) {
     log(`[git-commits] index already in progress for ${projectPath}, skipping`);
@@ -192882,12 +193115,17 @@ async function indexCommitsForProject(db, projectPath, directory, options) {
   try {
     const latestIndexed = getLatestIndexedCommitTimeMs(db, projectPath);
     const sinceMs = latestIndexed !== null ? Math.max(latestIndexed - 60000, Date.now() - options.sinceDays * MS_PER_DAY) : Date.now() - options.sinceDays * MS_PER_DAY;
-    const commits = await readGitCommits(directory, {
+    const read = await readGitCommitsResult(directory, {
       sinceMs,
       maxCommits: options.maxCommits,
       projectIdentity: projectPath
     });
+    const commits = read.commits;
     result.scanned = commits.length;
+    if (read.failure === "not_a_repo" || read.failure === "no_head") {
+      result.nonIndexable = true;
+      return result;
+    }
     if (commits.length === 0) {
       result.evicted = enforceProjectCap(db, projectPath, options.maxCommits);
       log(`[git-commits] no new commits for ${projectPath} (sinceMs=${sinceMs} latestIndexed=${latestIndexed ?? "none"} evicted=${result.evicted})`);
@@ -193320,6 +193558,12 @@ async function sweepGitCommits(args) {
       sinceDays: gitCommitIndexing.since_days,
       maxCommits: gitCommitIndexing.max_commits
     });
+    if (result.nonIndexable) {
+      if (!parkGitSweepNonIndexable(db, projectIdentity, holderId)) {
+        releaseGitSweepLease(db, projectIdentity, holderId);
+      }
+      return;
+    }
     let drainedEmbeddings = 0;
     if (result.embedded > 0) {
       drainedEmbeddings = await embedUnembeddedCommits(db, projectIdentity);
@@ -194631,7 +194875,7 @@ function summarizeManualDream(s) {
   if (s.skippedNoWork.length > 0)
     lines.push(`Skipped (no work): ${s.skippedNoWork.join(", ")}`);
   if (s.deferredBusy.length > 0)
-    lines.push(`Busy (already running): ${s.deferredBusy.join(", ")}`);
+    lines.push(`Busy: ${s.deferredBusy.join(", ")} — another dream task holds this domain's lease; retry in a minute`);
   if (s.ran.length === 0 && s.failed.length === 0 && s.skippedNoWork.length === 0 && s.deferredBusy.length === 0) {
     lines.push("No enabled dream tasks to run.");
   }
@@ -204922,6 +205166,31 @@ var server = async (ctx) => {
       log(`[v22-backfill] failed to start background runner: ${err}`);
     }
   }
+  if (pluginConfig.enabled && hooks.magicContext) {
+    setTimeout(() => {
+      try {
+        const db = openDatabase();
+        if (!db || !isDatabasePersisted(db))
+          return;
+        const ocDb = openOpenCodeDb();
+        if (!ocDb)
+          return;
+        try {
+          const sessions = ocDb.prepare("SELECT id, COALESCE(directory, '') AS directory FROM session ORDER BY id ASC").all();
+          runSessionProjectBackfill(db, sessions.map((session) => ({
+            sessionId: session.id,
+            directory: session.directory
+          }))).catch((err) => {
+            log(`[session-projects] background runner failed: ${err}`);
+          });
+        } finally {
+          closeQuietly(ocDb);
+        }
+      } catch (err) {
+        log(`[session-projects] failed to start background runner: ${err}`);
+      }
+    }, 0);
+  }
   const storageDir = getMagicContextStorageDir();
   let rpcServer = null;
   let stopDreamTimerRegistration;