@cortexkit/pi-magic-context 0.33.0 → 0.33.1

package/dist/index.js

@@ -1,6 +1,5 @@
 import {
   AGE_RECLAIM_MIN_TOKENS,
-  CANONICAL_DREAM_TASKS,
   COMPARTMENT_LEASE_RENEWAL_MS,
   COMPARTMENT_RENDER_EPOCH,
   DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE,
@@ -63,7 +62,6 @@ import {
   clearPersistedTodoSyntheticAnchor,
   clearRecompStaging,
   closeQuietly,
-  compareTaskOrder,
   computeCueContentHash,
   computeNormalizedHash,
   computeWorkspaceEpochFingerprint,
@@ -150,13 +148,13 @@ import {
   getNotes,
   getNullOwnerToolTag,
   getOldestActiveUnprotectedToolTags,
+  getOpenCodeDbPath,
   getOrCreateSessionMeta,
   getOverflowState,
   getPendingCompactionMarkerState,
   getPendingOps,
   getPendingPiCompactionMarkerState,
   getPendingSmartNotes,
-  getPersistedCompactionMarkerState,
   getPersistedNoteNudge,
   getPersistedTodoSyntheticAnchor,
   getPersistedToolTagAccounting,
@@ -205,7 +203,6 @@ import {
   insertUserMemory,
   insertUserMemoryCandidates,
   invalidateMemory,
-  isCanonicalDreamTask,
   isCompartmentLeaseHeld,
   isDreamerRunnable,
   isEditTool,
@@ -215,8 +212,6 @@ import {
   isRecord,
   isSaneLimit,
   isWrapupInProgress,
-  leaseKeyFor,
-  leaseKindFor,
   loadPiConfig,
   loadProtectedTailMeta,
   markGitSweepSuccessAndRelease,
@@ -233,6 +228,7 @@ import {
   openDatabase,
   openDatabaseAsync,
   parkGitSweepNonIndexable,
+  parseCompartmentOutput,
   parseCron,
   parseTodos,
   peekDeferredExecutePending,
@@ -309,7 +305,6 @@ import {
   setMemoryClassification,
   setMuralCue,
   setPendingPiCompactionMarkerState,
-  setPersistedCompactionMarkerState,
   setPersistedNoteNudgeTrigger,
   setPersistedNoteNudgeTriggerMessageId,
   setPersistedTodoSyntheticAnchor,
@@ -333,6 +328,7 @@ import {
   trimWorkspaceMemoriesToBudgetV2,
   unifiedSearch,
   updateCavemanDepth,
+  updateCompactionMarkerAfterPublication,
   updatePrimerAnswer,
   updatePrimerCandidateEmbedding,
   updatePrimerSupport,
@@ -350,10 +346,9 @@ import {
   withMigrationLanguageDirective,
   withRawMessageProvider,
   withRawSessionMessageCache
-} from "./index-f3jfb2ed.js";
+} from "./index-e3kftg52.js";
 import {
   ensureCortexKitArtifactGitignore,
-  getDataDir,
   getHarness,
   getMagicContextStorageDir,
   getProjectMagicContextHistorianDir,
@@ -368,7 +363,7 @@ import {
 
 // src/index.ts
 import { createRequire as createRequire3 } from "node:module";
-import { join as join6, resolve as resolve2 } from "node:path";
+import { join as join5, resolve as resolve2 } from "node:path";
 
 // ../plugin/src/shared/resolve-fallbacks.ts
 function resolveFallbackChain(userFallbacks) {
@@ -415,6 +410,61 @@ function modelBodyField(spec) {
   return parsed ? { model: parsed } : {};
 }
 
+// ../plugin/src/features/magic-context/dreamer/task-registry.ts
+var CANONICAL_DREAM_TASKS = [
+  "map-memories",
+  "verify",
+  "verify-broad",
+  "curate",
+  "compress-cues",
+  "classify-memories",
+  "retrospective",
+  "maintain-docs",
+  "evaluate-smart-notes",
+  "review-user-memories",
+  "promote-primers",
+  "refresh-primers"
+];
+var MEMORY_DOMAIN_TASKS = [
+  "map-memories",
+  "verify",
+  "verify-broad",
+  "curate",
+  "compress-cues",
+  "classify-memories",
+  "retrospective",
+  "promote-primers",
+  "refresh-primers"
+];
+var MEMORY_DOMAIN_SET = new Set(MEMORY_DOMAIN_TASKS);
+function leaseKindFor(task) {
+  if (MEMORY_DOMAIN_SET.has(task))
+    return "memory";
+  switch (task) {
+    case "review-user-memories":
+      return "user-memories";
+    case "promote-primers":
+    case "refresh-primers":
+      return "memory";
+    case "maintain-docs":
+      return "maintain-docs";
+    case "evaluate-smart-notes":
+      return "evaluate-smart-notes";
+    default:
+      return "memory";
+  }
+}
+function leaseKeyFor(task, projectIdentity) {
+  const kind = leaseKindFor(task);
+  return kind === "user-memories" ? "user-memories" : `${kind}:${projectIdentity}`;
+}
+function isCanonicalDreamTask(value) {
+  return CANONICAL_DREAM_TASKS.includes(value);
+}
+function compareTaskOrder(a, b) {
+  return CANONICAL_DREAM_TASKS.indexOf(a) - CANONICAL_DREAM_TASKS.indexOf(b);
+}
+
 // ../plugin/src/features/magic-context/dreamer/task-config.ts
 function buildDreamTaskRuntimeConfigs(dreamer, language) {
   const tasks = dreamer.tasks ?? {};
@@ -2903,264 +2953,10 @@ ${sidekickText}
 }
 
 // ../plugin/src/features/magic-context/dreamer/open-opencode-db.ts
-import { existsSync as existsSync5 } from "node:fs";
-
-// ../plugin/src/features/magic-context/compaction-marker.ts
-import { createHash as createHash2 } from "node:crypto";
 import { existsSync as existsSync4 } from "node:fs";
-import { join as join3 } from "node:path";
-var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-var ID_PREFIX_HEX_LENGTH = 12;
-var ID_SUFFIX_LENGTH = 14;
-var ID_PREFIX_MASK = (1n << BigInt(ID_PREFIX_HEX_LENGTH * 4)) - 1n;
-function deterministicBase62(seed, length) {
-  let value = BigInt(`0x${createHash2("sha256").update(seed).digest("hex")}`);
-  const chars = Array(length);
-  for (let index = length - 1;index >= 0; index -= 1) {
-    chars[index] = BASE62_CHARS[Number(value % 62n)];
-    value /= 62n;
-  }
-  return chars.join("");
-}
-function generateId(prefix, timestampMs, counter, identity) {
-  const encoded = BigInt(Math.max(0, Math.floor(timestampMs))) * 0x1000n + counter & ID_PREFIX_MASK;
-  const hex = encoded.toString(16).padStart(ID_PREFIX_HEX_LENGTH, "0");
-  return `${prefix}_${hex}${deterministicBase62(`${prefix}\x00${identity}`, ID_SUFFIX_LENGTH)}`;
-}
-function generateMessageId(timestampMs, counter = 0n, identity = "") {
-  return generateId("msg", timestampMs, counter, identity);
-}
-function generatePartId(timestampMs, counter = 0n, identity = "") {
-  return generateId("prt", timestampMs, counter, identity);
-}
-function getOpenCodeDbPath() {
-  return join3(getDataDir(), "opencode", "opencode.db");
-}
-var cachedWriteDb = null;
-var REQUIRED_MESSAGE_COLUMNS = ["id", "session_id", "time_created", "time_updated", "data"];
-var REQUIRED_PART_COLUMNS = [
-  "id",
-  "message_id",
-  "session_id",
-  "time_created",
-  "time_updated",
-  "data"
-];
-var cachedSchemaCompatible = null;
-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 (error) {
-    log(`[magic-context] compaction-marker: schema probe failed: ${error instanceof Error ? error.message : String(error)}. ` + `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 (!existsSync4(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 removeLegacyMarkerLineageRows(db, args) {
-  const legacySummaries = db.prepare(`SELECT m.id
-             FROM message m
-             WHERE m.session_id = ?
-               AND m.id <> ?
-               AND COALESCE(json_extract(m.data, '$.summary'), 0) = 1
-               AND COALESCE(json_extract(m.data, '$.finish'), '') = 'stop'
-               AND COALESCE(json_extract(m.data, '$.parentID'), '') = ?
-               AND EXISTS (
-                   SELECT 1
-                   FROM part p
-                   WHERE p.session_id = m.session_id
-                     AND p.message_id = m.id
-                     AND COALESCE(json_extract(p.data, '$.type'), '') = 'text'
-                     AND COALESCE(json_extract(p.data, '$.text'), '') = ?
-               )`).all(args.sessionId, args.summaryMessageId, args.boundaryMessageId, args.summaryText);
-  const legacySummaryIds = legacySummaries.flatMap((row) => typeof row.id === "string" ? [row.id] : []);
-  if (legacySummaryIds.length === 0)
-    return;
-  const deleteSummaryParts = db.prepare("DELETE FROM part WHERE session_id = ? AND message_id = ?");
-  const deleteSummary = db.prepare("DELETE FROM message WHERE session_id = ? AND id = ?");
-  for (const summaryMessageId of legacySummaryIds) {
-    deleteSummaryParts.run(args.sessionId, summaryMessageId);
-    deleteSummary.run(args.sessionId, summaryMessageId);
-  }
-  db.prepare(`DELETE FROM part
-         WHERE session_id = ?
-           AND message_id = ?
-           AND id <> ?
-           AND COALESCE(json_extract(data, '$.type'), '') = 'compaction'
-           AND COALESCE(json_extract(data, '$.auto'), 0) = 1`).run(args.sessionId, args.boundaryMessageId, args.compactionPartId);
-}
-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 markerIdentity = `${args.sessionId}\x00${args.endMessageId}`;
-  const summaryMsgId = generateMessageId(boundaryTime + 1, 1n, `${markerIdentity}\x00summary-message`);
-  const compactionPartId = generatePartId(boundaryTime, 1n, `${markerIdentity}\x00compaction-part`);
-  const summaryPartId = generatePartId(boundaryTime + 1, 2n, `${markerIdentity}\x00summary-part`);
-  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(() => {
-      removeLegacyMarkerLineageRows(db, {
-        sessionId: args.sessionId,
-        boundaryMessageId: boundary.id,
-        summaryText: args.summaryText,
-        summaryMessageId: summaryMsgId,
-        compactionPartId
-      });
-      db.prepare(`INSERT INTO part (id, message_id, session_id, time_created, time_updated, data)
-                 VALUES (?, ?, ?, ?, ?, ?)
-                 ON CONFLICT(id) DO UPDATE SET
-                     message_id = excluded.message_id,
-                     session_id = excluded.session_id,
-                     time_created = excluded.time_created,
-                     time_updated = excluded.time_updated,
-                     data = excluded.data`).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 (?, ?, ?, ?, ?)
-                 ON CONFLICT(id) DO UPDATE SET
-                     session_id = excluded.session_id,
-                     time_created = excluded.time_created,
-                     time_updated = excluded.time_updated,
-                     data = excluded.data`).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 (?, ?, ?, ?, ?, ?)
-                 ON CONFLICT(id) DO UPDATE SET
-                     message_id = excluded.message_id,
-                     session_id = excluded.session_id,
-                     time_created = excluded.time_created,
-                     time_updated = excluded.time_updated,
-                     data = excluded.data`).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 (error) {
-    log(`[magic-context] compaction-marker: injection failed: ${error instanceof Error ? error.message : String(error)}`);
-    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 (error) {
-    log(`[magic-context] compaction-marker: removal failed: ${error instanceof Error ? error.message : String(error)}`);
-    return false;
-  }
-}
-
-// ../plugin/src/features/magic-context/dreamer/open-opencode-db.ts
 function openOpenCodeDb() {
   const dbPath = getOpenCodeDbPath();
-  if (!existsSync5(dbPath)) {
+  if (!existsSync4(dbPath)) {
     log(`[dreamer] OpenCode DB not found at ${dbPath} — skipping OpenCode history scan`);
     return null;
   }
@@ -3175,8 +2971,8 @@ function openOpenCodeDb() {
 }
 
 // ../plugin/src/features/magic-context/dreamer/task-executor.ts
-import { createHash as createHash7 } from "node:crypto";
-import { existsSync as existsSync8 } from "node:fs";
+import { createHash as createHash6 } from "node:crypto";
+import { existsSync as existsSync7 } from "node:fs";
 
 // ../plugin/src/agents/dreamer.ts
 var DREAMER_AGENT = "dreamer";
@@ -4585,7 +4381,7 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
 }
 
 // ../plugin/src/features/magic-context/dreamer/classify.ts
-import { createHash as createHash3 } from "node:crypto";
+import { createHash as createHash2 } from "node:crypto";
 
 // ../plugin/src/plugin/rust-tool-backends.ts
 function isRustAuthorityDrainingError(error) {
@@ -5146,7 +4942,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal) {
       v: 1,
       session_id: args.moduleSessionId,
       task: "classify",
-      command_id: `classify:${args.moduleCommandId ?? Date.now()}:${createHash3("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`,
+      command_id: `classify:${args.moduleCommandId ?? Date.now()}:${createHash2("sha256").update(chunk.map((candidate) => candidate.id).join(",")).digest("hex").slice(0, 24)}`,
       authority_generation: args.moduleAuthorityGeneration,
       payload: {
         prompt_body: prompt,
@@ -5842,7 +5638,7 @@ function throwIfAborted2(signal) {
 }
 
 // ../plugin/src/features/magic-context/smart-notes/compiler.ts
-import { createHash as createHash4 } from "node:crypto";
+import { createHash as createHash3 } from "node:crypto";
 
 // ../plugin/src/features/magic-context/smart-notes/compiler-prompt.ts
 var SMART_NOTE_COMPILER_SYSTEM_PROMPT = `You are the Magic Context smart-note compiler for the magic-context system.
@@ -6266,7 +6062,7 @@ function manifestAdvisoryWarnings(code, manifest) {
   return warnings;
 }
 function hashCheck(surfaceCondition, compiledCheck, manifest, checkCron) {
-  return createHash4("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
+  return createHash3("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
 }
 function extractJsonObject(output) {
   const fenced = output.match(/```(?:json)?\s*([\s\S]*?)```/i);
@@ -6964,8 +6760,8 @@ Output exactly JSON: {"met": false}`;
 }
 
 // ../plugin/src/features/magic-context/dreamer/maintain-docs-protected-enforcement.ts
-import { existsSync as existsSync6, readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "node:fs";
-import { join as join4 } from "node:path";
+import { existsSync as existsSync5, readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "node:fs";
+import { join as join3 } from "node:path";
 
 // ../plugin/src/features/magic-context/dreamer/protected-regions.ts
 var PROTECTED_START_TOKEN = "mc:protected START";
@@ -7066,9 +6862,9 @@ var MAINTAIN_DOCS_SNAPSHOT_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 function snapshotMaintainDocsFiles(docsDir) {
   const snapshot = new Map;
   for (const name of MAINTAIN_DOCS_SNAPSHOT_FILES) {
-    const path4 = join4(docsDir, name);
+    const path4 = join3(docsDir, name);
     try {
-      if (existsSync6(path4)) {
+      if (existsSync5(path4)) {
         snapshot.set(name, readFileSync2(path4, "utf8"));
       }
     } catch {}
@@ -7077,7 +6873,7 @@ function snapshotMaintainDocsFiles(docsDir) {
 }
 function enforceMaintainDocsProtectedRegions(args) {
   for (const [fileName, original] of args.snapshot) {
-    const path4 = join4(args.docsDir, fileName);
+    const path4 = join3(args.docsDir, fileName);
     try {
       const current = readFileSync2(path4, "utf8");
       const { text, violated } = enforceProtectedRegions(original, current);
@@ -7093,10 +6889,10 @@ function enforceMaintainDocsProtectedRegions(args) {
 }
 
 // ../plugin/src/features/magic-context/dreamer/map-memories.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash4 } from "node:crypto";
 
 // ../plugin/src/features/magic-context/dreamer/map-memories-prompt.ts
-import { existsSync as existsSync7, statSync } from "node:fs";
+import { existsSync as existsSync6, statSync } from "node:fs";
 import path4 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.
 
@@ -7134,7 +6930,7 @@ function extractMemoryCandidatePaths(content, repoDir) {
     if (!abs.startsWith(`${root}/`))
       continue;
     try {
-      if (existsSync7(abs) && statSync(abs).isFile())
+      if (existsSync6(abs) && statSync(abs).isFile())
         found.add(rel);
     } catch {}
     if (found.size >= MAX_SEED_PATHS_PER_MEMORY)
@@ -7353,7 +7149,7 @@ async function applyBatchMappings(args, batch, manifestText) {
             memory_project: args.projectIdentity,
             context_store_uuid: args.moduleRoute.moduleContextStoreUuid,
             authority_generation: args.moduleRoute.moduleAuthorityGeneration,
-            command_id: `${args.moduleRoute.moduleCommandId}:${createHash5("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
+            command_id: `${args.moduleRoute.moduleCommandId}:${createHash4("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
             rows
           }
         }
@@ -8473,7 +8269,7 @@ function recordRetrospectiveWindowProcessed(db, projectPath, windowKey) {
 }
 
 // ../plugin/src/features/magic-context/dreamer/verify.ts
-import { createHash as createHash6 } from "node:crypto";
+import { createHash as createHash5 } from "node:crypto";
 
 // ../plugin/src/features/magic-context/dreamer/verify-gate.ts
 import path5 from "node:path";
@@ -8811,7 +8607,7 @@ async function applyVerifyManifest(args, batch, manifestText) {
             memory_project: args.projectIdentity,
             context_store_uuid: args.moduleRoute.moduleContextStoreUuid,
             authority_generation: args.moduleRoute.moduleAuthorityGeneration,
-            command_id: `${args.moduleRoute.moduleCommandId}:${createHash6("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
+            command_id: `${args.moduleRoute.moduleCommandId}:${createHash5("sha256").update(rows.map((row) => row.memory_id).join(",")).digest("hex").slice(0, 16)}`,
             rows
           }
         }
@@ -9308,7 +9104,7 @@ function parseFrictionGateVerdict(verdict) {
 }
 function computeRetrospectiveWindowKey(flagged) {
   const anchors = flagged.map((message) => `${message.sessionId}:${message.ts}`).sort().join("|");
-  return createHash7("sha256").update(anchors).digest("hex").slice(0, 32);
+  return createHash6("sha256").update(anchors).digest("hex").slice(0, 32);
 }
 function renderFrictionWindow(messages, flaggedOrdinals, radius = 2) {
   const flagged = new Set(flaggedOrdinals);
@@ -9541,8 +9337,8 @@ async function runAgenticTask(config, ctx, helpers) {
   const lastRunAt = getTaskScheduleState(db, projectIdentity, config.task)?.lastRunAt ?? null;
   const maintainDocsSnapshot = task === "maintain-docs" ? snapshotMaintainDocsFiles(docsDir) : undefined;
   const existingDocs = task === "maintain-docs" ? {
-    architecture: existsSync8(`${docsDir}/ARCHITECTURE.md`),
-    structure: existsSync8(`${docsDir}/STRUCTURE.md`)
+    architecture: existsSync7(`${docsDir}/ARCHITECTURE.md`),
+    structure: existsSync7(`${docsDir}/STRUCTURE.md`)
   } : undefined;
   const userMemories = task === "curate" ? getActiveUserMemories(db).map((um) => ({ id: um.id, content: um.content })) : undefined;
   let curateMemories;
@@ -13977,7 +13773,7 @@ function advanceToolReclaimWatermarkToCurrentMax(db, sessionId) {
 }
 
 // ../plugin/src/shared/tag-transcript.ts
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash7 } from "node:crypto";
 
 // ../plugin/src/hooks/magic-context/image-token-estimate.ts
 var IMAGE_TOKEN_DIVISOR = 750;
@@ -14132,7 +13928,7 @@ function readUint32BE(b, offset) {
 // ../plugin/src/shared/tag-transcript.ts
 var TEXT_TAG_IDENTITY_MARKER = ":mc-text-v1:";
 function textIdentityDigest(value) {
-  return createHash8("sha256").update(value).digest("hex");
+  return createHash7("sha256").update(value).digest("hex");
 }
 function buildContentDerivedTextIds(messageId, parts) {
   const sources = parts.filter((part) => part.kind === "text").map((part) => stripTagPrefix(part.getText() ?? ""));
@@ -17745,6 +17541,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>
@@ -17961,161 +17759,6 @@ function queueDropsForCompartmentalizedMessages(db, sessionId, upToMessageIndex)
   sessionLog(sessionId, `compartment agent: queued ${dropsQueued} drops for messages 0-${upToMessageIndex}`);
 }
 
-// ../plugin/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 unescapeXml3((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 = unescapeXml3(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 ? unescapeXml3(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 = unescapeXml3(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 = unescapeXml3(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 = unescapeXml3(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 = unescapeXml3(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 = unescapeXml3(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 = unescapeXml3(fieldMatch[2].trim());
-      if (value)
-        fields[name] = value;
-    }
-    events.push({ kind, atCompartment, fields });
-  }
-  return events;
-}
-function unescapeXml3(s) {
-  return s.replace(/&amp;/g, "&").replace(/&apos;/g, "'").replace(/&quot;/g, '"').replace(/&lt;/g, "<").replace(/&gt;/g, ">");
-}
-
 // ../plugin/src/hooks/magic-context/compartment-runner-mapping.ts
 function tierFieldsOf(c) {
   return {
@@ -21427,7 +21070,7 @@ function stripPiProcessedImages(args) {
 }
 
 // src/system-prompt.ts
-import { createHash as createHash9 } from "node:crypto";
+import { createHash as createHash8 } from "node:crypto";
 
 // ../plugin/src/agents/magic-context-prompt.ts
 var LONG_TERM_PARTNER_FRAME = `### You are the user's long-term partner on this project — not a one-off hire
@@ -21580,7 +21223,7 @@ function processSystemPromptForCache(args) {
       sessionLog(sessionId, `system prompt date frozen: real=${liveDate}, using=${stickyDate} (cache-stable pass)`);
     }
   }
-  const currentHash = createHash9("md5").update(frozenPrompt).digest("hex");
+  const currentHash = createHash8("md5").update(frozenPrompt).digest("hex");
   const hashChanged = !isFirstHash && currentHash !== previousHash;
   if (hashChanged) {
     sessionLog(sessionId, `system prompt hash changed: ${previousHash} → ${currentHash} (len=${frozenPrompt.length})`);
@@ -24798,104 +24441,9 @@ function cleanupHistorianStateFile(path6) {
     unlinkSync(path6);
   } catch {}
 }
-// ../plugin/src/hooks/magic-context/compaction-marker-manager.ts
-var MARKER_SUMMARY_TEXT = "[Compacted by magic-context — session history is managed by the plugin]";
-function dropMarkerSummaryTag(db, sessionId, summaryMessageId) {
-  const tagNumber = getTagNumberByMessageId(db, sessionId, `${summaryMessageId}:p0`);
-  if (tagNumber !== null)
-    updateTagStatus(db, sessionId, tagNumber, "dropped");
-}
-function persistMarkerStateAndDropReplacedTag(db, sessionId, state, replacedSummaryMessageId) {
-  db.transaction(() => {
-    setPersistedCompactionMarkerState(db, sessionId, state);
-    if (replacedSummaryMessageId !== null) {
-      dropMarkerSummaryTag(db, sessionId, replacedSummaryMessageId);
-    }
-  })();
-}
-function getCompartmentEndMessageIdForOrdinal(db, sessionId, endOrdinal) {
-  const row = db.prepare(`SELECT end_message_id
-             FROM compartments
-             WHERE session_id = ? AND end_message = ?
-             ORDER BY sequence DESC
-             LIMIT 1`).get(sessionId, endOrdinal);
-  return typeof row?.end_message_id === "string" && row.end_message_id.length > 0 ? row.end_message_id : null;
-}
-function existingMarkerAlreadyCoversTarget(sessionId, existing, targetOrdinal, targetEndMessageId) {
-  if (existing.boundaryOrdinal < targetOrdinal) {
-    return false;
-  }
-  if (existing.boundaryOrdinal === targetOrdinal) {
-    const boundaryCompare = compareOpenCodeMessagesByCanonicalOrder(sessionId, existing.boundaryMessageId, targetEndMessageId);
-    if (boundaryCompare === null || boundaryCompare > 0) {
-      return false;
-    }
-    if (existing.targetEndMessageId !== null && existing.targetEndMessageId !== targetEndMessageId) {
-      return false;
-    }
-    return true;
-  }
-  if (existing.targetEndMessageId !== null) {
-    const targetCompare = compareOpenCodeMessagesByCanonicalOrder(sessionId, existing.targetEndMessageId, targetEndMessageId);
-    if (targetCompare !== null && targetCompare <= 0) {
-      return false;
-    }
-  }
-  return true;
-}
-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`);
-    return false;
-  }
-  const existing = getPersistedCompactionMarkerState(db, sessionId);
-  const removedSummaryMessageId = existing?.summaryMessageId ?? null;
-  if (existing) {
-    if (existingMarkerAlreadyCoversTarget(sessionId, existing, lastCompartmentEnd, targetEndMessageId)) {
-      return true;
-    }
-  }
-  const boundary = findBoundaryUserMessage(sessionId, targetEndMessageId);
-  if (!boundary) {
-    sessionLog(sessionId, `compaction-marker: no user boundary found at or before endMessageId ${targetEndMessageId} (ordinal ${lastCompartmentEnd}); preserving existing marker`);
-    return false;
-  }
-  if (existing) {
-    const removed = removeCompactionMarker(existing);
-    if (!removed) {
-      sessionLog(sessionId, `compaction-marker: failed to remove old boundary at ordinal ${existing.boundaryOrdinal}; preserving persisted state for retry (not injecting new marker this pass)`);
-      return false;
-    }
-    persistMarkerStateAndDropReplacedTag(db, sessionId, null, removedSummaryMessageId);
-    sessionLog(sessionId, `compaction-marker: removed old boundary at ordinal ${existing.boundaryOrdinal}, moving to ${lastCompartmentEnd}`);
-  }
-  const result = injectCompactionMarker({
-    sessionId,
-    endOrdinal: lastCompartmentEnd,
-    endMessageId: targetEndMessageId,
-    summaryText: MARKER_SUMMARY_TEXT,
-    directory: directory ?? process.cwd(),
-    resolvedBoundary: boundary
-  });
-  if (result) {
-    persistMarkerStateAndDropReplacedTag(db, sessionId, {
-      ...result,
-      boundaryOrdinal: lastCompartmentEnd,
-      targetEndMessageId
-    }, removedSummaryMessageId);
-    sessionLog(sessionId, `compaction-marker: injected at ordinal ${lastCompartmentEnd}, boundary user msg ${result.boundaryMessageId}`);
-    return true;
-  }
-  return false;
-}
-
 // ../plugin/src/hooks/magic-context/compartment-runner-historian.ts
 import { mkdirSync as mkdirSync3, unlinkSync as unlinkSync2, writeFileSync as writeFileSync5 } from "node:fs";
-import { join as join5 } from "node:path";
+import { join as join4 } from "node:path";
 
 // ../plugin/src/agents/historian.ts
 var HISTORIAN_AGENT = "historian";
@@ -25212,7 +24760,7 @@ function dumpHistorianResponse(sessionId, directory, label, text) {
     ensureCortexKitArtifactGitignore(directory);
     const safeSessionId = sanitizeDumpName(sessionId);
     const safeLabel = sanitizeDumpName(label);
-    const dumpPath = join5(dumpDir, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
+    const dumpPath = join4(dumpDir, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
     writeFileSync5(dumpPath, text, "utf8");
     sessionLog(sessionId, "compartment agent: historian response dumped", {
       label,
@@ -27286,7 +26834,7 @@ ${c.content}
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.33.0",
+  version: "0.33.1",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -27312,7 +26860,7 @@ var package_default = {
     "README.md"
   ],
   scripts: {
-    build: "bun build src/index.ts src/subagent-entry.ts --outdir dist --target node --format esm --splitting --external @earendil-works/pi-coding-agent --external @earendil-works/pi-tui --external @huggingface/transformers --external node:sqlite",
+    build: "rm -f dist/index.js dist/subagent-entry.js dist/*-*.js && bun build src/index.ts src/subagent-entry.ts --outdir dist --target node --format esm --splitting --external @earendil-works/pi-coding-agent --external @earendil-works/pi-tui --external @huggingface/transformers --external node:sqlite",
     typecheck: "tsc --noEmit",
     test: "bun test",
     lint: "biome check src",
@@ -28579,7 +28127,7 @@ async function src_default(pi) {
   }
   beginBootQuietPeriod();
   const storageDir = getMagicContextStorageDir();
-  const dbPath = join6(storageDir, "context.db");
+  const dbPath = join5(storageDir, "context.db");
   let db;
   let openFailureCause = null;
   try {