@cortexkit/opencode-magic-context 0.33.0 → 0.33.1

package/dist/{index-h86twgsp.js → index-c2gahrks.js}

@@ -2,9 +2,6 @@ import {
   deriveTriggerBudget,
   modelSupportsVision
 } from "./index-63dq2g4d.js";
-import {
-  AGENTIC_DREAM_TASKS
-} from "./index-anhrfygk.js";
 import {
   parseProviderModel
 } from "./index-td9depx5.js";
@@ -32,10 +29,9 @@ import {
   persistCachedM0,
   readRawSessionMessages,
   readSessionChunk,
-  registerPrivilegedWriter,
   updateSessionMeta,
   withPrivilegedWriter
-} from "./index-bmkea2dq.js";
+} from "./index-ey1bc14z.js";
 import {
   log,
   sessionLog
@@ -1955,6 +1951,184 @@ function pullMemoryMirrorOnce(args) {
   mirrorFlights.set(args.module, flight);
   return flight;
 }
+// src/hooks/magic-context/compartment-parser.ts
+var COMPARTMENT_REGEX = /<compartment\s+([^>]*?)\s*>(.*?)<\/compartment>/gs;
+var ATTR_START_REGEX = /\bstart="(\d+)"/;
+var ATTR_END_REGEX = /\bend="(\d+)"/;
+var ATTR_TITLE_REGEX = /\btitle="([^"]*)"/;
+var ATTR_EPISODE_REGEX = /\bepisode_type="([^"]*)"/;
+var ATTR_IMPORTANCE_REGEX = /\bimportance="(\d+)"/;
+function makeTierOpenRegex(n) {
+  return new RegExp(`<p${n}\\s*(/?)>`);
+}
+var TIER_OPEN_REGEXES = [
+  makeTierOpenRegex(1),
+  makeTierOpenRegex(2),
+  makeTierOpenRegex(3),
+  makeTierOpenRegex(4)
+];
+var TIER_CLOSE_ANY_REGEX = /<\/p\d/;
+var TIER_OPEN_ANY_REGEX = /<p\d/;
+var CATEGORY_BLOCK_REGEX = /<(PROJECT_RULES|ARCHITECTURE|CONSTRAINTS|CONFIG_VALUES|NAMING)>(.*?)<\/\1>/gs;
+var FACT_ITEM_REGEX = /^\s*\*\s*(.+)$/gm;
+var UNPROCESSED_REGEX = /<unprocessed_from>(\d+)<\/unprocessed_from>/;
+var USER_OBSERVATIONS_REGEX = /<user_observations>(.*?)<\/user_observations>/s;
+var USER_OBS_ITEM_REGEX = /^\s*\*\s*(.+)$/gm;
+var PRIMER_CANDIDATES_REGEX = /<primer_candidates>(.*?)<\/primer_candidates>/s;
+var PRIMER_ELEMENT_REGEX = /<primer\s+at_compartment="(\d+)"\s*>(.*?)<\/primer>/gs;
+var PRIMER_ITEM_REGEX = /^\s*(?:\*|-|\d+\.)\s*(.+)$/gm;
+var FACTS_BLOCK_REGEX = /<facts>(.*?)<\/facts>/s;
+var EVENTS_BLOCK_REGEX = /<events>(.*?)<\/events>/s;
+var EVENT_ELEMENT_REGEX = /<([a-z_]+)\s+at_compartment="(\d+)"\s*>(.*?)<\/\1>/gs;
+var EVENT_FIELD_REGEX = /<([a-z_]+)\s*>(.*?)<\/\1>/gs;
+function extractTier(inner, index) {
+  const openMatch = TIER_OPEN_REGEXES[index].exec(inner);
+  if (!openMatch)
+    return;
+  if (openMatch[1] === "/")
+    return "";
+  const rest = inner.slice(openMatch.index + openMatch[0].length);
+  const closeAt = rest.search(TIER_CLOSE_ANY_REGEX);
+  let body = closeAt === -1 ? rest : rest.slice(0, closeAt);
+  const openInside = body.search(TIER_OPEN_ANY_REGEX);
+  if (openInside !== -1)
+    body = body.slice(0, openInside);
+  return unescapeXml(body.trim());
+}
+function extractTiersFromInner(inner) {
+  return {
+    p1: extractTier(inner, 0),
+    p2: extractTier(inner, 1),
+    p3: extractTier(inner, 2),
+    p4: extractTier(inner, 3)
+  };
+}
+function parseCompartmentOutput(text) {
+  const compartments = [];
+  const facts = [];
+  for (const match of text.matchAll(COMPARTMENT_REGEX)) {
+    const attrs = match[1];
+    const inner = match[2];
+    const startMatch = attrs.match(ATTR_START_REGEX);
+    const endMatch = attrs.match(ATTR_END_REGEX);
+    const titleMatch = attrs.match(ATTR_TITLE_REGEX);
+    if (!startMatch || !endMatch || !titleMatch)
+      continue;
+    const startMessage = parseInt(startMatch[1], 10);
+    const endMessage = parseInt(endMatch[1], 10);
+    const title = unescapeXml(titleMatch[1]);
+    if (Number.isNaN(startMessage) || Number.isNaN(endMessage) || !title)
+      continue;
+    const episodeMatch = attrs.match(ATTR_EPISODE_REGEX);
+    const importanceMatch = attrs.match(ATTR_IMPORTANCE_REGEX);
+    const episodeType = episodeMatch ? unescapeXml(episodeMatch[1]) : undefined;
+    const importance = importanceMatch ? parseInt(importanceMatch[1], 10) : undefined;
+    const p1 = extractTier(inner, 0);
+    if (typeof p1 === "string" && p1.length > 0) {
+      const p2 = extractTier(inner, 1);
+      const p3 = extractTier(inner, 2);
+      const p4 = extractTier(inner, 3);
+      compartments.push({
+        startMessage,
+        endMessage,
+        title,
+        content: p1,
+        p1,
+        p2: typeof p2 === "string" ? p2 : p1,
+        p3: typeof p3 === "string" ? p3 : typeof p2 === "string" ? p2 : p1,
+        p4: typeof p4 === "string" ? p4 : "",
+        importance,
+        episodeType
+      });
+      continue;
+    }
+    const content = unescapeXml(inner.trim());
+    if (content) {
+      compartments.push({
+        startMessage,
+        endMessage,
+        title,
+        content,
+        importance,
+        episodeType
+      });
+    }
+  }
+  const factsBlockMatch = text.match(FACTS_BLOCK_REGEX);
+  const factsScope = factsBlockMatch ? factsBlockMatch[1] : text.replace(EVENTS_BLOCK_REGEX, "").replace(/<compartment\s+[^>]*?\s*>.*?<\/compartment>/gs, "");
+  for (const categoryMatch of factsScope.matchAll(CATEGORY_BLOCK_REGEX)) {
+    const category = categoryMatch[1];
+    const blockContent = categoryMatch[2];
+    for (const itemMatch of blockContent.matchAll(FACT_ITEM_REGEX)) {
+      const content = unescapeXml(itemMatch[1].trim());
+      if (content) {
+        facts.push({ category, content });
+      }
+    }
+  }
+  const unprocessedMatch = text.match(UNPROCESSED_REGEX);
+  const unprocessedFrom = unprocessedMatch ? parseInt(unprocessedMatch[1], 10) : null;
+  const userObservations = [];
+  const userObsMatch = text.match(USER_OBSERVATIONS_REGEX);
+  if (userObsMatch) {
+    for (const itemMatch of userObsMatch[1].matchAll(USER_OBS_ITEM_REGEX)) {
+      const obs = unescapeXml(itemMatch[1].trim());
+      if (obs)
+        userObservations.push(obs);
+    }
+  }
+  const primerCandidates = [];
+  const primerMatch = text.match(PRIMER_CANDIDATES_REGEX);
+  if (primerMatch) {
+    const block = primerMatch[1];
+    let sawElement = false;
+    for (const el of block.matchAll(PRIMER_ELEMENT_REGEX)) {
+      sawElement = true;
+      const question = unescapeXml(el[2].trim());
+      if (question) {
+        primerCandidates.push({
+          question,
+          originCompartmentIndex: Number.parseInt(el[1], 10)
+        });
+      }
+    }
+    if (!sawElement) {
+      for (const itemMatch of block.matchAll(PRIMER_ITEM_REGEX)) {
+        const question = unescapeXml(itemMatch[1].trim());
+        if (question)
+          primerCandidates.push({ question });
+      }
+    }
+  }
+  const events = parseEvents(text);
+  compartments.sort((a, b) => a.startMessage - b.startMessage);
+  return { compartments, facts, events, unprocessedFrom, userObservations, primerCandidates };
+}
+function parseEvents(text) {
+  const blockMatch = text.match(EVENTS_BLOCK_REGEX);
+  if (!blockMatch)
+    return [];
+  const block = blockMatch[1];
+  const events = [];
+  for (const elMatch of block.matchAll(EVENT_ELEMENT_REGEX)) {
+    const kind = elMatch[1];
+    const atRaw = parseInt(elMatch[2], 10);
+    const atCompartment = Number.isNaN(atRaw) ? null : atRaw;
+    const fields = {};
+    for (const fieldMatch of elMatch[3].matchAll(EVENT_FIELD_REGEX)) {
+      const name = fieldMatch[1];
+      const value = unescapeXml(fieldMatch[2].trim());
+      if (value)
+        fields[name] = value;
+    }
+    events.push({ kind, atCompartment, fields });
+  }
+  return events;
+}
+function unescapeXml(s) {
+  return s.replace(/&amp;/g, "&").replace(/&apos;/g, "'").replace(/&quot;/g, '"').replace(/&lt;/g, "<").replace(/&gt;/g, ">");
+}
+
 // src/features/magic-context/storage-schema-helpers.ts
 function ensureColumn(db, table, column, definition) {
   if (!/^[a-z][a-z0-9_]*$/.test(table) || !/^[a-z][a-z0-9_]*$/.test(column) || !/^[A-Z0-9_"'(),[\]\s]+$/i.test(definition)) {
@@ -2704,15 +2878,38 @@ function isSqliteLockError(error) {
 function tableExists2(db, name) {
   return Boolean(db.prepare("SELECT name FROM sqlite_master WHERE type='table' AND name = ?").get(name));
 }
+function healMismatchedTierClose(db, table, hasLegacy) {
+  if (!tableExists2(db, table))
+    return;
+  const columns = new Set(db.prepare(`PRAGMA table_info(${table})`).all().map((row) => row.name));
+  for (const required of ["content", "p1", "p2", "p3", "p4"]) {
+    if (!columns.has(required))
+      return;
+  }
+  if (hasLegacy && !columns.has("legacy"))
+    return;
+  const predicate = hasLegacy ? "legacy = 1 AND p1 IS NULL AND content LIKE '%<p1%'" : "p1 IS NULL AND content LIKE '%<p1%'";
+  const rows = db.prepare(`SELECT id, content FROM ${table} WHERE ${predicate}`).all();
+  const update = db.prepare(`UPDATE ${table} SET p1 = ?, p2 = ?, p3 = ?, p4 = ?${hasLegacy ? ", legacy = 0" : ""} WHERE id = ?`);
+  for (const row of rows) {
+    const tiers = extractTiersFromInner(row.content);
+    if (typeof tiers.p1 !== "string" || tiers.p1.length === 0)
+      continue;
+    const p1 = tiers.p1;
+    const p2 = typeof tiers.p2 === "string" ? tiers.p2 : p1;
+    const p3 = typeof tiers.p3 === "string" ? tiers.p3 : p2;
+    const p4 = typeof tiers.p4 === "string" ? tiers.p4 : "";
+    update.run(p1, p2, p3, p4, row.id);
+  }
+}
 function assertForeignKeyIntegrity(db, table) {
   const rows = (table ? db.prepare(`PRAGMA foreign_key_check(${table})`) : db.prepare("PRAGMA foreign_key_check")).all();
   if (rows.length > 0) {
     throw new Error(`foreign_key_check failed after embedding table rebuild${table ? ` (${table})` : ""} (${rows.length} violation(s))`);
   }
 }
-function authorityPrivilegeCheck(db) {
-  const native = db;
-  return typeof native.function === "function" || typeof native.createFunction === "function" ? "mc_privileged_writer() = 0" : "COALESCE((SELECT enabled FROM context_privilege_state WHERE id = 1), 0) = 0";
+function authorityPrivilegeCheck() {
+  return "COALESCE((SELECT enabled FROM context_privilege_state WHERE id = 1), 0) = 0";
 }
 function managedAuthorityNoteRow(row) {
   return `(
@@ -2731,7 +2928,7 @@ function managedAuthorityNoteRow(row) {
     )`;
 }
 function installLatestAuthorityTriggers(db) {
-  const privilegeCheck = authorityPrivilegeCheck(db);
+  const privilegeCheck = authorityPrivilegeCheck();
   if (tableExists2(db, "memories")) {
     db.exec(`
             DROP TRIGGER IF EXISTS memories_authority_guard_insert;
@@ -4657,6 +4854,21 @@ var MIGRATIONS = [
                     ON memory_mutation_log(project_path, target_memory_id, id);
             `);
     }
+  },
+  {
+    version: 70,
+    description: "heal legacy compartments stranded by mismatched tier closing tags (issue #246)",
+    up(db) {
+      healMismatchedTierClose(db, "compartments", true);
+      healMismatchedTierClose(db, "recomp_compartments", false);
+    }
+  },
+  {
+    version: 71,
+    description: "rebuild authority guard triggers to the durable state-table form (issue #253)",
+    up(db) {
+      installLatestAuthorityTriggers(db);
+    }
   }
 ];
 var LATEST_MIGRATION_VERSION = MIGRATIONS.reduce((max, m) => Math.max(max, m.version), 0);
@@ -5286,7 +5498,7 @@ var lastSchemaFenceRejection = null;
 function getSchemaFenceRejection() {
   return lastSchemaFenceRejection;
 }
-var LATEST_SUPPORTED_VERSION = 69;
+var LATEST_SUPPORTED_VERSION = 71;
 var PERMISSIONS_ENFORCEABLE = process.platform !== "win32";
 function ensureSecureStorageDir(dir) {
   mkdirSync(dir, { recursive: true, mode: 448 });
@@ -6551,7 +6763,6 @@ function openDatabase(dbPathOrOptions) {
     if (!enforceSchemaFence(existing, dbPath, latestSupportedVersion)) {
       return null;
     }
-    registerPrivilegedWriter(existing);
     if (!persistenceByDatabase.has(existing)) {
       persistenceByDatabase.set(existing, true);
     }
@@ -6564,7 +6775,6 @@ function openDatabase(dbPathOrOptions) {
     }
     ensureSecureStorageDir(dbDir);
     const db = new Database(dbPath);
-    registerPrivilegedWriter(db);
     if (!enforceSchemaFence(db, dbPath, latestSupportedVersion)) {
       closeQuietly(db);
       return null;
@@ -6603,7 +6813,6 @@ async function openDatabaseAsync(dbPathOrOptions) {
         migrateLegacyStorageIfNeeded(dbPath, dbDir);
       ensureSecureStorageDir(dbDir);
       db = new Database(dbPath);
-      registerPrivilegedWriter(db);
       if (!enforceSchemaFence(db, dbPath, latestSupportedVersion)) {
         closeQuietly(db);
         return null;
@@ -9636,7 +9845,6 @@ class ModuleMemoryAuthorityError extends Error {
   }
 }
 function assertTsMemoryWriteAllowed(db, projectPath) {
-  registerPrivilegedWriter(db);
   try {
     const managed = db.prepare("SELECT 1 FROM authority_managed WHERE project_path = ? UNION SELECT 1 FROM authority_repair_pending WHERE project_path = ? LIMIT 1").get(projectPath, projectPath);
     if (managed)
@@ -25346,8 +25554,7 @@ var EXECUTE_THRESHOLD_CAP_MESSAGE = "execute_threshold is capped at 80% for cach
 var DEFAULT_HISTORIAN_TIMEOUT_MS = 300000;
 var DEFAULT_HISTORY_BUDGET_PERCENTAGE = 0.15;
 var DEFAULT_LOCAL_EMBEDDING_MODEL = "Xenova/all-MiniLM-L6-v2";
-var DreamingTaskSchema = exports_external.enum(AGENTIC_DREAM_TASKS);
-var PiThinkingLevelSchema = exports_external.enum(["off", "minimal", "low", "medium", "high", "xhigh"]).optional();
+var PiThinkingLevelSchema = exports_external.enum(["off", "minimal", "low", "medium", "high", "xhigh", "max"]).optional();
 var PiConfigSchema = exports_external.object({
   subagent_extensions: exports_external.array(exports_external.string().trim().min(1)).optional().describe("User-only allowlist of Pi extensions for Magic Context subagent children. When set, children use --no-extensions and load only these entries (plus Magic Context's scoped child extension where applicable). Relative paths resolve from ~/.pi/agent, matching Pi's settings.json package location. Unset preserves normal Pi extension discovery.")
 }).optional();
@@ -25420,7 +25627,7 @@ var SidekickConfigSchema = AgentOverrideConfigSchema.extend({
 }).optional();
 var HistorianConfigSchema = AgentOverrideConfigSchema.extend({
   two_pass: exports_external.boolean().default(false).describe("Run a second editor pass over historian output to clean low-signal U: lines and cross-compartment duplicates. Adds ~1 extra API call and ~1.3x cost per historian run. Useful for models without extended thinking support. (default: false)"),
-  thinking_level: PiThinkingLevelSchema.describe("Pi only: explicit thinking level passed as --thinking <level> to Pi historian subagent invocations. Required when using reasoning models (e.g. github-copilot/gpt-5.4) because Pi's default thinking-level resolution can pick a value the provider rejects. OpenCode users set variant instead. Valid: off | minimal | low | medium | high | xhigh"),
+  thinking_level: PiThinkingLevelSchema.describe("Pi only: explicit thinking level passed as --thinking <level> to Pi historian subagent invocations. Required when using reasoning models (e.g. github-copilot/gpt-5.4) because Pi's default thinking-level resolution can pick a value the provider rejects. OpenCode users set variant instead. Valid: off | minimal | low | medium | high | xhigh | max"),
   disallowed_tools: exports_external.array(exports_external.enum(["*", "read", "aft_outline", "aft_zoom", "aft_search"])).default([]).describe(`OpenCode only. Tools to REMOVE from the historian's default allow-list [read, aft_outline, aft_zoom, aft_search]. Applies to both historian and historian-editor agents. Use ["*"] to strip all tool definitions from the model request — this prevents weak instruction-following models (e.g. mistral-small-latest) from entering tool-calling loops. Individual tool names remove just that tool. Note: a user-supplied historian.permission override can re-allow a tool that disallowed_tools removed — disallowed_tools sets the baseline, permission overrides take precedence. (default: [])`)
 }).optional();
 var EmbeddingFallbackProviderSchema = exports_external.enum(["local", "openai-compatible", "off"]);
@@ -29376,6 +29583,9 @@ var shadowWorker = null;
 var SHADOW_MAX_ITEMS_PER_TICK = 64;
 var SHADOW_MAX_BYTES_PER_TICK = 512 * 1024;
 var SHADOW_MAX_WALL_CLOCK_MS = 2000;
+var pendingShadowBackfills = new Map;
+var shadowBackfillLastIds = new Map;
+var shadowBackfillStopReasons = new Map;
 var loadUnembeddedMemoriesStatements = new WeakMap;
 var upsertActiveIdentityStatements = new WeakMap;
 var backfillActiveIdentityStatements = new Map;
@@ -29910,6 +30120,7 @@ function registerProjectShadowEmbedding(db, projectIdentity, config2, sourceDire
     recordScopeActiveIdentity(db, projectIdentity, "chunk", registration.chunkModelId, now);
     persistShadowDescriptor(db, registration);
   })();
+  maybeArmShadowBackfill(db, projectIdentity, registration);
   return {
     projectIdentity,
     sourceDirectory,
@@ -29930,7 +30141,7 @@ function startShadowWorker() {
     return;
   shadowWorker = runShadowWorker().finally(() => {
     shadowWorker = null;
-    if (shadowQueue.length > 0)
+    if (shadowQueue.length > 0 || hasPendingShadowBackfill())
       startShadowWorker();
   });
 }
@@ -29977,6 +30188,117 @@ function enqueueShadowEmbeddingItems(projectIdentity, scope, ids) {
   shadowQueue.push({ projectIdentity, scope, ids: [...ids] });
   startShadowWorker();
 }
+function shadowBackfillMissingBase(scope, primaryModelId, shadowModelId, projectIdentity) {
+  if (scope === "memory") {
+    return {
+      sql: `SELECT m.id AS id
+                  FROM memories m
+                  JOIN memory_embeddings mp ON mp.memory_id = m.id AND mp.model_id = ?
+                  LEFT JOIN memory_embeddings ms ON ms.memory_id = m.id AND ms.model_id = ?
+                  WHERE m.project_path = ? AND m.status = 'active' AND ms.memory_id IS NULL`,
+      params: [primaryModelId, shadowModelId, projectIdentity],
+      orderBy: " ORDER BY m.id"
+    };
+  }
+  if (scope === "commit") {
+    return {
+      sql: `SELECT gc.sha AS id
+                  FROM git_commits gc
+                  JOIN git_commit_embeddings gp ON gp.sha = gc.sha AND gp.model_id = ?
+                  LEFT JOIN git_commit_embeddings gs ON gs.sha = gc.sha AND gs.model_id = ?
+                  WHERE gc.project_path = ? AND gs.sha IS NULL`,
+      params: [primaryModelId, shadowModelId, projectIdentity],
+      orderBy: " ORDER BY gc.committed_at DESC, gc.sha"
+    };
+  }
+  return {
+    sql: `SELECT DISTINCT cp.compartment_id AS id
+              FROM compartment_chunk_embeddings cp
+              WHERE cp.project_path = ? AND cp.model_id = ?
+                AND NOT EXISTS (
+                    SELECT 1 FROM compartment_chunk_embeddings cs
+                    WHERE cs.compartment_id = cp.compartment_id AND cs.model_id = ?
+                )`,
+    params: [projectIdentity, primaryModelId, shadowModelId],
+    orderBy: " ORDER BY cp.compartment_id"
+  };
+}
+function shadowBackfillMissingIds(db, projectIdentity, scope, primaryModelId, shadowModelId, limit) {
+  const { sql, params, orderBy } = shadowBackfillMissingBase(scope, primaryModelId, shadowModelId, projectIdentity);
+  const rows = db.prepare(`${sql}${orderBy} LIMIT ?`).all(...params, limit);
+  return rows.map((row) => String(row.id));
+}
+function shadowModelIdForScope(registration, scope) {
+  return scope === "chunk" ? registration.chunkModelId : registration.modelId;
+}
+function hasPendingShadowBackfill(projectIdentity) {
+  if (projectIdentity === undefined)
+    return pendingShadowBackfills.size > 0;
+  const scopes = pendingShadowBackfills.get(projectIdentity);
+  return scopes !== undefined && scopes.size > 0;
+}
+function pumpShadowBackfill() {
+  for (const [projectIdentity, scopes] of pendingShadowBackfills) {
+    const db = dbForShadowQueue.get(projectIdentity);
+    const shadow = shadowRegistrations.get(projectIdentity);
+    const primary = projectRegistrations.get(projectIdentity);
+    if (!db || !shadow || !primary) {
+      pendingShadowBackfills.delete(projectIdentity);
+      continue;
+    }
+    for (const scope of [...scopes]) {
+      const primaryModelId = shadowModelIdForScope(primary, scope);
+      const shadowModelId = shadowModelIdForScope(shadow, scope);
+      const stallKey = `${projectIdentity}:${scope}`;
+      if (primaryModelId === "off" || shadowModelId === "off") {
+        scopes.delete(scope);
+        shadowBackfillLastIds.delete(stallKey);
+        continue;
+      }
+      const ids = shadowBackfillMissingIds(db, projectIdentity, scope, primaryModelId, shadowModelId, SHADOW_MAX_ITEMS_PER_TICK);
+      if (ids.length === 0) {
+        shadowBackfillStopReasons.set(stallKey, "drained");
+        scopes.delete(scope);
+        shadowBackfillLastIds.delete(stallKey);
+        continue;
+      }
+      const signature = ids.join(",");
+      if (shadowBackfillLastIds.get(stallKey) === signature) {
+        shadowBackfillStopReasons.set(stallKey, "stalled_no_progress");
+        log(`[shadow] backfill scope ${scope} for ${projectIdentity} retired without progress — ` + `the last batch produced no writes (provider failure or timeout is the usual cause); ` + `${ids.length}+ items remain and retry on the next registration or manual --shadow run`);
+        scopes.delete(scope);
+        shadowBackfillLastIds.delete(stallKey);
+        continue;
+      }
+      shadowBackfillLastIds.set(stallKey, signature);
+      shadowQueue.push({ projectIdentity, scope, ids });
+    }
+    if (scopes.size === 0)
+      pendingShadowBackfills.delete(projectIdentity);
+  }
+}
+function maybeArmShadowBackfill(db, projectIdentity, shadow) {
+  if (untrustedLoadProjects.has(projectIdentity))
+    return;
+  const primary = projectRegistrations.get(projectIdentity);
+  if (!primary)
+    return;
+  const pending = new Set;
+  for (const scope of ["memory", "commit", "chunk"]) {
+    const primaryModelId = shadowModelIdForScope(primary, scope);
+    const shadowModelId = shadowModelIdForScope(shadow, scope);
+    if (primaryModelId === "off" || shadowModelId === "off")
+      continue;
+    const probe = shadowBackfillMissingIds(db, projectIdentity, scope, primaryModelId, shadowModelId, 1);
+    if (probe.length > 0)
+      pending.add(scope);
+  }
+  if (pending.size === 0)
+    return;
+  pendingShadowBackfills.set(projectIdentity, pending);
+  pumpShadowBackfill();
+  startShadowWorker();
+}
 async function embedShadowItems(registration, items, db, scope) {
   const raw = registration.config;
   const fingerprint = typeof raw.synapse_fingerprint === "string" ? raw.synapse_fingerprint : "";
@@ -30100,7 +30422,15 @@ async function runShadowWorker() {
   const startedAt = Date.now();
   let processed = 0;
   let processedBytes = 0;
-  while (shadowQueue.length > 0 && processed < SHADOW_MAX_ITEMS_PER_TICK && Date.now() - startedAt < SHADOW_MAX_WALL_CLOCK_MS) {
+  for (;; ) {
+    if (shadowQueue.length === 0) {
+      pumpShadowBackfill();
+      if (shadowQueue.length === 0)
+        break;
+    }
+    if (processed >= SHADOW_MAX_ITEMS_PER_TICK || Date.now() - startedAt >= SHADOW_MAX_WALL_CLOCK_MS) {
+      break;
+    }
     const item = shadowQueue.shift();
     if (!item)
       break;
@@ -31508,6 +31838,53 @@ function injectCompactionMarker(args) {
     return null;
   }
 }
+function listSessionCompactionMarkers(sessionId) {
+  const db = getWritableOpenCodeDb();
+  const partRows = db.prepare(`SELECT id, message_id
+             FROM part
+             WHERE session_id = ?
+               AND COALESCE(json_extract(data, '$.type'), '') = 'compaction'`).all(sessionId);
+  const markers = [];
+  const summaryStmt = db.prepare(`SELECT id
+         FROM message
+         WHERE session_id = ?
+           AND COALESCE(json_extract(data, '$.parentID'), '') = ?
+           AND COALESCE(json_extract(data, '$.summary'), 0) = 1
+           AND COALESCE(json_extract(data, '$.finish'), '') = 'stop'
+           AND COALESCE(json_extract(data, '$.providerID'), '') = 'magic-context'`);
+  for (const row of partRows) {
+    if (typeof row.id !== "string" || typeof row.message_id !== "string")
+      continue;
+    const summaryRows = summaryStmt.all(sessionId, row.message_id);
+    const summaryMessageIds = summaryRows.flatMap((summaryRow) => typeof summaryRow.id === "string" ? [summaryRow.id] : []);
+    markers.push({
+      compactionPartId: row.id,
+      boundaryMessageId: row.message_id,
+      summaryMessageIds
+    });
+  }
+  return markers;
+}
+function removeForeignCompactionMarker(sessionId, marker, protectedSummaryMessageId) {
+  try {
+    const db = getWritableOpenCodeDb();
+    db.transaction(() => {
+      const deletePartsOfMessage = db.prepare("DELETE FROM part WHERE session_id = ? AND message_id = ?");
+      const deleteMessage = db.prepare("DELETE FROM message WHERE session_id = ? AND id = ?");
+      for (const summaryMessageId of marker.summaryMessageIds) {
+        if (summaryMessageId === protectedSummaryMessageId)
+          continue;
+        deletePartsOfMessage.run(sessionId, summaryMessageId);
+        deleteMessage.run(sessionId, summaryMessageId);
+      }
+      db.prepare("DELETE FROM part WHERE session_id = ? AND id = ?").run(sessionId, marker.compactionPartId);
+    })();
+    return true;
+  } catch (error51) {
+    log(`[magic-context] compaction-marker: foreign-marker removal failed (${sessionId}, part ${marker.compactionPartId}): ${error51 instanceof Error ? error51.message : String(error51)}`);
+    return false;
+  }
+}
 function removeCompactionMarker(state) {
   try {
     const db = getWritableOpenCodeDb();
@@ -31708,6 +32085,50 @@ function removeCompactionMarkerForSession(db, sessionId) {
     }
   }
 }
+function reconcileForkOrphanedCompactionMarkers(db, sessionId) {
+  if (getHarness() !== "opencode") {
+    return { removed: 0, failed: false };
+  }
+  try {
+    const owned = getPersistedCompactionMarkerState(db, sessionId);
+    if (!owned) {
+      return { removed: 0, failed: false };
+    }
+    const markers = listSessionCompactionMarkers(sessionId);
+    let removed = 0;
+    let failed = false;
+    for (const marker of markers) {
+      if (marker.compactionPartId === owned.compactionPartId) {
+        continue;
+      }
+      if (marker.summaryMessageIds.length === 0) {
+        continue;
+      }
+      const ordering = compareOpenCodeMessagesByCanonicalOrder(sessionId, marker.boundaryMessageId, owned.boundaryMessageId);
+      if (ordering === null || ordering <= 0) {
+        continue;
+      }
+      const currentOwned = getPersistedCompactionMarkerState(db, sessionId);
+      if (!currentOwned || marker.compactionPartId === currentOwned.compactionPartId) {
+        continue;
+      }
+      const ok = removeForeignCompactionMarker(sessionId, marker, currentOwned.summaryMessageId);
+      if (ok) {
+        removed += 1;
+        sessionLog(sessionId, `compaction-marker hygiene: removed fork-orphaned marker part=${marker.compactionPartId} boundary=${marker.boundaryMessageId} (outranked owned boundary ${currentOwned.boundaryMessageId})`);
+      } else {
+        failed = true;
+      }
+    }
+    if (removed > 0) {
+      log(`[magic-context][${sessionId}] compaction-marker hygiene: removed ${removed} fork-orphaned marker(s); filterCompacted will now stop at this session's own marker`);
+    }
+    return { removed, failed };
+  } catch (error51) {
+    sessionLog(sessionId, "compaction-marker hygiene: scan failed (will retry on next degraded pass):", error51);
+    return { removed: 0, failed: true };
+  }
+}
 function checkCompactionMarkerConsistency(db) {
   const opencodeDbPath = join5(getDataDir(), "opencode", "opencode.db");
   let opencodeDb;
@@ -32468,6 +32889,8 @@ If no candidates, omit the \`<primer_candidates>\` section entirely.
 
 Output valid XML only in this shape:
 
+Closing tags must match their opening tier tag (e.g. \`<p1>...</p1>\`, never \`<p1>...</p2>\`).
+
 \`\`\`xml
 <output>
 <compartments>
@@ -32778,161 +33201,6 @@ function recordChildInvocation(input) {
   }
 }
 
-// src/hooks/magic-context/compartment-parser.ts
-var COMPARTMENT_REGEX = /<compartment\s+([^>]*?)\s*>(.*?)<\/compartment>/gs;
-var ATTR_START_REGEX = /\bstart="(\d+)"/;
-var ATTR_END_REGEX = /\bend="(\d+)"/;
-var ATTR_TITLE_REGEX = /\btitle="([^"]*)"/;
-var ATTR_EPISODE_REGEX = /\bepisode_type="([^"]*)"/;
-var ATTR_IMPORTANCE_REGEX = /\bimportance="(\d+)"/;
-function makeTierRegex(n) {
-  return new RegExp(`<p${n}\\s*/>|<p${n}\\s*>(.*?)</p${n}>`, "s");
-}
-var TIER_REGEXES = [makeTierRegex(1), makeTierRegex(2), makeTierRegex(3), makeTierRegex(4)];
-var CATEGORY_BLOCK_REGEX = /<(PROJECT_RULES|ARCHITECTURE|CONSTRAINTS|CONFIG_VALUES|NAMING)>(.*?)<\/\1>/gs;
-var FACT_ITEM_REGEX = /^\s*\*\s*(.+)$/gm;
-var UNPROCESSED_REGEX = /<unprocessed_from>(\d+)<\/unprocessed_from>/;
-var USER_OBSERVATIONS_REGEX = /<user_observations>(.*?)<\/user_observations>/s;
-var USER_OBS_ITEM_REGEX = /^\s*\*\s*(.+)$/gm;
-var PRIMER_CANDIDATES_REGEX = /<primer_candidates>(.*?)<\/primer_candidates>/s;
-var PRIMER_ELEMENT_REGEX = /<primer\s+at_compartment="(\d+)"\s*>(.*?)<\/primer>/gs;
-var PRIMER_ITEM_REGEX = /^\s*(?:\*|-|\d+\.)\s*(.+)$/gm;
-var FACTS_BLOCK_REGEX = /<facts>(.*?)<\/facts>/s;
-var EVENTS_BLOCK_REGEX = /<events>(.*?)<\/events>/s;
-var EVENT_ELEMENT_REGEX = /<([a-z_]+)\s+at_compartment="(\d+)"\s*>(.*?)<\/\1>/gs;
-var EVENT_FIELD_REGEX = /<([a-z_]+)\s*>(.*?)<\/\1>/gs;
-function extractTier(inner, index) {
-  const m = inner.match(TIER_REGEXES[index]);
-  if (!m)
-    return;
-  return unescapeXml((m[1] ?? "").trim());
-}
-function parseCompartmentOutput(text) {
-  const compartments = [];
-  const facts = [];
-  for (const match of text.matchAll(COMPARTMENT_REGEX)) {
-    const attrs = match[1];
-    const inner = match[2];
-    const startMatch = attrs.match(ATTR_START_REGEX);
-    const endMatch = attrs.match(ATTR_END_REGEX);
-    const titleMatch = attrs.match(ATTR_TITLE_REGEX);
-    if (!startMatch || !endMatch || !titleMatch)
-      continue;
-    const startMessage = parseInt(startMatch[1], 10);
-    const endMessage = parseInt(endMatch[1], 10);
-    const title = unescapeXml(titleMatch[1]);
-    if (Number.isNaN(startMessage) || Number.isNaN(endMessage) || !title)
-      continue;
-    const episodeMatch = attrs.match(ATTR_EPISODE_REGEX);
-    const importanceMatch = attrs.match(ATTR_IMPORTANCE_REGEX);
-    const episodeType = episodeMatch ? unescapeXml(episodeMatch[1]) : undefined;
-    const importance = importanceMatch ? parseInt(importanceMatch[1], 10) : undefined;
-    const p1 = extractTier(inner, 0);
-    if (typeof p1 === "string" && p1.length > 0) {
-      const p2 = extractTier(inner, 1);
-      const p3 = extractTier(inner, 2);
-      const p4 = extractTier(inner, 3);
-      compartments.push({
-        startMessage,
-        endMessage,
-        title,
-        content: p1,
-        p1,
-        p2: typeof p2 === "string" ? p2 : p1,
-        p3: typeof p3 === "string" ? p3 : typeof p2 === "string" ? p2 : p1,
-        p4: typeof p4 === "string" ? p4 : "",
-        importance,
-        episodeType
-      });
-      continue;
-    }
-    const content = unescapeXml(inner.trim());
-    if (content) {
-      compartments.push({
-        startMessage,
-        endMessage,
-        title,
-        content,
-        importance,
-        episodeType
-      });
-    }
-  }
-  const factsBlockMatch = text.match(FACTS_BLOCK_REGEX);
-  const factsScope = factsBlockMatch ? factsBlockMatch[1] : text.replace(EVENTS_BLOCK_REGEX, "").replace(/<compartment\s+[^>]*?\s*>.*?<\/compartment>/gs, "");
-  for (const categoryMatch of factsScope.matchAll(CATEGORY_BLOCK_REGEX)) {
-    const category = categoryMatch[1];
-    const blockContent = categoryMatch[2];
-    for (const itemMatch of blockContent.matchAll(FACT_ITEM_REGEX)) {
-      const content = unescapeXml(itemMatch[1].trim());
-      if (content) {
-        facts.push({ category, content });
-      }
-    }
-  }
-  const unprocessedMatch = text.match(UNPROCESSED_REGEX);
-  const unprocessedFrom = unprocessedMatch ? parseInt(unprocessedMatch[1], 10) : null;
-  const userObservations = [];
-  const userObsMatch = text.match(USER_OBSERVATIONS_REGEX);
-  if (userObsMatch) {
-    for (const itemMatch of userObsMatch[1].matchAll(USER_OBS_ITEM_REGEX)) {
-      const obs = unescapeXml(itemMatch[1].trim());
-      if (obs)
-        userObservations.push(obs);
-    }
-  }
-  const primerCandidates = [];
-  const primerMatch = text.match(PRIMER_CANDIDATES_REGEX);
-  if (primerMatch) {
-    const block = primerMatch[1];
-    let sawElement = false;
-    for (const el of block.matchAll(PRIMER_ELEMENT_REGEX)) {
-      sawElement = true;
-      const question = unescapeXml(el[2].trim());
-      if (question) {
-        primerCandidates.push({
-          question,
-          originCompartmentIndex: Number.parseInt(el[1], 10)
-        });
-      }
-    }
-    if (!sawElement) {
-      for (const itemMatch of block.matchAll(PRIMER_ITEM_REGEX)) {
-        const question = unescapeXml(itemMatch[1].trim());
-        if (question)
-          primerCandidates.push({ question });
-      }
-    }
-  }
-  const events = parseEvents(text);
-  compartments.sort((a, b) => a.startMessage - b.startMessage);
-  return { compartments, facts, events, unprocessedFrom, userObservations, primerCandidates };
-}
-function parseEvents(text) {
-  const blockMatch = text.match(EVENTS_BLOCK_REGEX);
-  if (!blockMatch)
-    return [];
-  const block = blockMatch[1];
-  const events = [];
-  for (const elMatch of block.matchAll(EVENT_ELEMENT_REGEX)) {
-    const kind = elMatch[1];
-    const atRaw = parseInt(elMatch[2], 10);
-    const atCompartment = Number.isNaN(atRaw) ? null : atRaw;
-    const fields = {};
-    for (const fieldMatch of elMatch[3].matchAll(EVENT_FIELD_REGEX)) {
-      const name = fieldMatch[1];
-      const value = unescapeXml(fieldMatch[2].trim());
-      if (value)
-        fields[name] = value;
-    }
-    events.push({ kind, atCompartment, fields });
-  }
-  return events;
-}
-function unescapeXml(s) {
-  return s.replace(/&amp;/g, "&").replace(/&apos;/g, "'").replace(/&quot;/g, '"').replace(/&lt;/g, "<").replace(/&gt;/g, ">");
-}
-
 // src/hooks/magic-context/compartment-runner-mapping.ts
 function tierFieldsOf(c) {
   return {
@@ -34540,6 +34808,38 @@ var INJECTION_CACHE_MAX = 100;
 var injectionCache = new BoundedSessionMap(INJECTION_CACHE_MAX);
 function clearInjectionCache(sessionId) {
   injectionCache.delete(sessionId);
+  resetDegradedReanchorState(sessionId);
+}
+var degradedRebuildCountBySession = new BoundedSessionMap(INJECTION_CACHE_MAX);
+var reAnchorLoggedBySession = new BoundedSessionMap(INJECTION_CACHE_MAX);
+var REANCHOR_MIN_DEGRADED_PASSES = 2;
+function resetDegradedReanchorState(sessionId) {
+  degradedRebuildCountBySession.delete(sessionId);
+  reAnchorLoggedBySession.delete(sessionId);
+}
+function noteDegradedRebuild(sessionId) {
+  const next = (degradedRebuildCountBySession.get(sessionId) ?? 0) + 1;
+  degradedRebuildCountBySession.set(sessionId, next);
+  return next;
+}
+function clearDegradedRebuild(sessionId) {
+  degradedRebuildCountBySession.delete(sessionId);
+  reAnchorLoggedBySession.delete(sessionId);
+}
+function logReanchorOnce(sessionId, message) {
+  if (reAnchorLoggedBySession.get(sessionId))
+    return;
+  reAnchorLoggedBySession.set(sessionId, true);
+  sessionLog(sessionId, message);
+}
+function findVisibleReanchorIndex(compartments, visibleMessageIds) {
+  for (let index = compartments.length - 1;index >= 0; index -= 1) {
+    const endMessageId = compartments[index]?.endMessageId;
+    if (typeof endMessageId === "string" && endMessageId.length > 0 && visibleMessageIds.has(endMessageId)) {
+      return index;
+    }
+  }
+  return -1;
 }
 function getVisibleMemoryIds(db, sessionId) {
   try {
@@ -34729,24 +35029,63 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
     return result2;
   }
   let skippedVisibleMessages = 0;
+  let needsFreshMaterialization = false;
+  let resultEndMessage = lastEnd;
+  let resultEndMessageId = null;
   const cutoffIndex = messages.findIndex((message) => message.info.id === trimEndMessageId);
   if (cutoffIndex >= 0) {
+    clearDegradedRebuild(sessionId);
     skippedVisibleMessages = cutoffIndex + 1;
     const remaining = messages.slice(cutoffIndex + 1);
     messages.splice(0, messages.length, ...remaining);
+    resultEndMessageId = trimEndMessageId;
   } else {
-    sessionLog(sessionId, `compartment injection entering degraded mode: boundary ${trimEndMessageId} not in visible messages`);
+    const degradedCount = noteDegradedRebuild(sessionId);
+    if (degradedCount === 1) {
+      reconcileForkOrphanedCompactionMarkers(db, sessionId);
+    }
+    let reAnchored = false;
+    if (degradedCount >= REANCHOR_MIN_DEGRADED_PASSES && isCacheBusting) {
+      const visibleMessageIds = new Set;
+      for (const message of messages) {
+        if (typeof message.info.id === "string")
+          visibleMessageIds.add(message.info.id);
+      }
+      const reAnchorIndex = findVisibleReanchorIndex(compartments, visibleMessageIds);
+      if (reAnchorIndex >= 0) {
+        const reAnchorCompartment = compartments[reAnchorIndex];
+        const reAnchorCutoff = messages.findIndex((message) => message.info.id === reAnchorCompartment.endMessageId);
+        if (reAnchorCutoff >= 0) {
+          skippedVisibleMessages = reAnchorCutoff + 1;
+          const remaining = messages.slice(reAnchorCutoff + 1);
+          messages.splice(0, messages.length, ...remaining);
+          resultEndMessage = reAnchorCompartment.endMessage;
+          resultEndMessageId = reAnchorCompartment.endMessageId;
+          reAnchored = true;
+          logReanchorOnce(sessionId, `compartment injection re-anchored: natural boundary ${trimEndMessageId} not visible for ${degradedCount} passes; splicing at visible compartment boundary ${resultEndMessageId} (ordinal ${resultEndMessage})`);
+        }
+      }
+      if (!reAnchored) {
+        needsFreshMaterialization = true;
+        logReanchorOnce(sessionId, `compartment injection degraded: boundary ${trimEndMessageId} not visible for ${degradedCount} passes and no compartment boundary is visible; requesting fresh materialization to re-cut the baseline`);
+      }
+    } else {
+      sessionLog(sessionId, `compartment injection entering degraded mode: boundary ${trimEndMessageId} not in visible messages (consecutive degraded passes: ${degradedCount})`);
+    }
   }
   const result = {
     block,
-    compartmentEndMessage: lastEnd,
-    compartmentEndMessageId: cutoffIndex >= 0 ? trimEndMessageId : null,
+    compartmentEndMessage: resultEndMessage,
+    compartmentEndMessageId: resultEndMessageId,
     compartmentCount: compartments.length,
     skippedVisibleMessages,
     factCount: facts.length,
     memoryCount,
     rebuiltFromDb: true
   };
+  if (needsFreshMaterialization) {
+    result.needsFreshMaterialization = true;
+  }
   injectionCache.set(sessionId, { kind: "populated", injection: result });
   return result;
 }