@cortexkit/pi-magic-context 0.32.2 → 0.32.4

package/dist/index.js

@@ -158851,6 +158851,7 @@ var STRICT_TOOL_ALLOWLIST_ENTRIES = [
   ["magic-context-dreamer", ["ctx_memory"]]
 ];
 var STRICT_TOOL_ALLOWLIST = new Map(STRICT_TOOL_ALLOWLIST_ENTRIES);
+var ZERO_TOOL_PROMPT_REQUIRED_AGENTS = new Set(STRICT_TOOL_ALLOWLIST_ENTRIES.filter(([, tools]) => tools.length === 0).map(([agent]) => agent));
 function inferAccountingSubagent(agent) {
   if (agent.includes("sidekick"))
     return "sidekick";
@@ -158968,12 +158969,13 @@ class PiSubagentRunner {
       }
       return result;
     }
-    const failBeforeSpawn = (reason, error) => {
+    const failBeforeSpawn = (reason, error, transient = false) => {
       const result = {
         ok: false,
         reason,
         error,
-        durationMs: Date.now() - startTime
+        durationMs: Date.now() - startTime,
+        ...transient ? { transient: true } : {}
       };
       try {
         recordAccounting(result);
@@ -158982,6 +158984,9 @@ class PiSubagentRunner {
       }
       return result;
     };
+    if (ZERO_TOOL_PROMPT_REQUIRED_AGENTS.has(options.agent) && options.systemPrompt.trim().length === 0) {
+      return failBeforeSpawn("invalid_prompt", `zero-tool Pi subagent "${options.agent}" requires a non-empty system prompt`, true);
+    }
     const promptBytes = Buffer.byteLength(options.userMessage, "utf8");
     const deliverViaStdin = promptBytes > PROMPT_ARGV_MAX_BYTES || this.platform === "win32";
     let systemPromptTempDir;
@@ -159549,26 +159554,32 @@ init_logger();
 // ../plugin/src/features/magic-context/compaction-marker.ts
 init_data_path();
 init_logger();
+import { createHash as createHash7 } from "node:crypto";
 import { existsSync as existsSync10 } from "node:fs";
 import { join as join9 } from "node:path";
 var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-function randomBase62(length) {
-  const chars = [];
-  for (let i = 0;i < length; i++) {
-    chars.push(BASE62_CHARS[Math.floor(Math.random() * BASE62_CHARS.length)]);
+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${createHash7("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 = 0n) {
-  const encoded = BigInt(timestampMs) * 0x1000n + counter;
-  const hex = encoded.toString(16).padStart(14, "0");
-  return `${prefix}_${hex}${randomBase62(14)}`;
+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) {
-  return generateId("msg", timestampMs, counter);
+function generateMessageId(timestampMs, counter = 0n, identity = "") {
+  return generateId("msg", timestampMs, counter, identity);
 }
-function generatePartId(timestampMs, counter = 0n) {
-  return generateId("prt", timestampMs, counter);
+function generatePartId(timestampMs, counter = 0n, identity = "") {
+  return generateId("prt", timestampMs, counter, identity);
 }
 function getOpenCodeDbPath2() {
   return join9(getDataDir(), "opencode", "opencode.db");
@@ -159673,6 +159684,38 @@ function compareOpenCodeMessagesByCanonicalOrder(sessionId, leftMessageId, right
     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, getOpenCodeDbPath2())) {
@@ -159684,9 +159727,10 @@ function injectCompactionMarker(args) {
     return null;
   }
   const boundaryTime = boundary.timeCreated;
-  const summaryMsgId = generateMessageId(boundaryTime + 1, 1n);
-  const compactionPartId = generatePartId(boundaryTime, 1n);
-  const summaryPartId = generatePartId(boundaryTime + 1, 2n);
+  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,
@@ -159703,9 +159747,36 @@ function injectCompactionMarker(args) {
   });
   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 }));
+      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 {
@@ -159752,7 +159823,7 @@ function openOpenCodeDb() {
 }
 
 // ../plugin/src/features/magic-context/dreamer/task-executor.ts
-import { createHash as createHash12 } from "node:crypto";
+import { createHash as createHash13 } from "node:crypto";
 import { existsSync as existsSync15 } from "node:fs";
 
 // ../plugin/src/agents/dreamer.ts
@@ -159770,6 +159841,9 @@ init_logger();
 // ../plugin/src/shared/model-suggestion-retry.ts
 init_logger();
 var ABORT_CALL_TIMEOUT_MS = 3000;
+function copyPromptArgs(args, body) {
+  return { ...args, body: { ...body } };
+}
 function extractMessage(error) {
   if (typeof error === "string")
     return error;
@@ -159883,40 +159957,41 @@ function shortErr(error) {
   return extractMessage(error);
 }
 async function attemptOnce(client, args, timeoutMs, signal, callContext, label) {
+  const originalBody = { ...args.body };
+  const attemptArgs = copyPromptArgs(args, originalBody);
   try {
-    await promptWithTimeout(client, args, timeoutMs, signal);
+    await promptWithTimeout(client, attemptArgs, timeoutMs, signal);
     return;
   } catch (error) {
     if (isNonRetryable(error, signal))
       throw error;
     const suggestion = parseModelSuggestion(error);
-    if (!suggestion || !args.body.model) {
+    if (!suggestion || !originalBody.model) {
       throw error;
     }
     log(`[${callContext}] ${label}: model not found, retrying with suggestion`, {
       original: `${suggestion.providerID}/${suggestion.modelID}`,
       suggested: suggestion.suggestion
     });
-    await promptWithTimeout(client, {
-      ...args,
-      body: {
-        ...args.body,
-        model: {
-          providerID: suggestion.providerID,
-          modelID: suggestion.suggestion
-        }
+    await promptWithTimeout(client, copyPromptArgs(args, {
+      ...originalBody,
+      model: {
+        providerID: suggestion.providerID,
+        modelID: suggestion.suggestion
       }
-    }, timeoutMs, signal);
+    }), timeoutMs, signal);
   }
 }
 async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
   const timeoutMs = options.timeoutMs ?? 300000;
   const callContext = options.callContext ?? "subagent";
   const fallbacks = options.fallbackModels ?? [];
-  const explicitPrimaryLabel = args.body.model?.providerID && args.body.model.modelID ? `${args.body.model.providerID}/${args.body.model.modelID}` : "primary";
+  const baseBody = { ...args.body };
+  const baseArgs = copyPromptArgs(args, baseBody);
+  const explicitPrimaryLabel = baseBody.model?.providerID && baseBody.model.modelID ? `${baseBody.model.providerID}/${baseBody.model.modelID}` : "primary";
   let lastError = null;
   try {
-    await attemptOnce(client, args, timeoutMs, options.signal, callContext, explicitPrimaryLabel);
+    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel);
     return;
   } catch (error) {
     lastError = error;
@@ -159934,10 +160009,10 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
       continue;
     }
     const label = `${parsed.providerID}/${parsed.modelID}`;
-    const attemptArgs = {
-      ...args,
-      body: { ...args.body, model: parsed }
-    };
+    const attemptArgs = copyPromptArgs(baseArgs, {
+      ...baseBody,
+      model: parsed
+    });
     try {
       await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label);
       log(`[${callContext}] fallback succeeded with ${label} (attempt ${i + 2}/${fallbacks.length + 1})`);
@@ -159965,17 +160040,19 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
   const timeoutMs = options.timeoutMs ?? 300000;
   const callContext = options.callContext ?? "subagent";
   const fallbacks = options.fallbackModels ?? [];
-  const explicitPrimaryLabel = args.body.model?.providerID && args.body.model.modelID ? `${args.body.model.providerID}/${args.body.model.modelID}` : "primary";
+  const baseBody = { ...args.body };
+  const baseArgs = copyPromptArgs(args, baseBody);
+  const explicitPrimaryLabel = baseBody.model?.providerID && baseBody.model.modelID ? `${baseBody.model.providerID}/${baseBody.model.modelID}` : "primary";
   const totalAttempts = fallbacks.length + 1;
   let firstError = null;
   let lastError = null;
   try {
-    return await attemptAndValidate(client, args, timeoutMs, options.signal, callContext, {
+    return await attemptAndValidate(client, baseArgs, timeoutMs, options.signal, callContext, {
       label: explicitPrimaryLabel,
       attemptIndex: 0,
       isFallback: false,
       totalAttempts,
-      model: args.body.model
+      model: baseBody.model
     }, options);
   } catch (error) {
     firstError = error;
@@ -159994,10 +160071,10 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
       continue;
     }
     const label = `${parsed.providerID}/${parsed.modelID}`;
-    const attemptArgs = {
-      ...args,
-      body: { ...args.body, model: parsed }
-    };
+    const attemptArgs = copyPromptArgs(baseArgs, {
+      ...baseBody,
+      model: parsed
+    });
     const attempt = {
       label,
       attemptIndex: i + 1,
@@ -174844,7 +174921,7 @@ var MagicContextConfigSchema = exports_external.object({
 init_logger();
 
 // ../plugin/src/features/magic-context/compartment-chunk-embedding.ts
-import { createHash as createHash7 } from "node:crypto";
+import { createHash as createHash8 } from "node:crypto";
 init_logger();
 
 // ../plugin/src/features/magic-context/recursive-text-splitter.ts
@@ -175056,7 +175133,7 @@ function parseCanonicalLineRange(line) {
   return { start, end };
 }
 function hashChunkText(text) {
-  return createHash7("sha256").update(text).digest("hex");
+  return createHash8("sha256").update(text).digest("hex");
 }
 function vectorBlob2(vector) {
   return new Uint8Array(vector.buffer, vector.byteOffset, vector.byteLength);
@@ -175449,7 +175526,7 @@ function cosineSimilarity(a, b) {
 }
 
 // ../plugin/src/features/magic-context/memory/embedding-synapse.ts
-import { createHash as createHash8 } from "node:crypto";
+import { createHash as createHash9 } from "node:crypto";
 
 // ../../node_modules/.bun/@cortexkit+subc-client@0.4.1/node_modules/@cortexkit/subc-client/dist/client.js
 import { promises as fs4 } from "node:fs";
@@ -177663,7 +177740,7 @@ function wait(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function sha256(value) {
-  return createHash8("sha256").update(value).digest("hex");
+  return createHash9("sha256").update(value).digest("hex");
 }
 function stableJson(value) {
   if (Array.isArray(value))
@@ -178069,13 +178146,13 @@ class SynapseEmbeddingProvider {
 }
 
 // ../plugin/src/features/magic-context/memory/normalize-hash.ts
-import { createHash as createHash9 } from "node:crypto";
+import { createHash as createHash10 } from "node:crypto";
 function normalizeMemoryContent(content) {
   return content.toLowerCase().replace(/\s+/g, " ").trim();
 }
 function computeNormalizedHash(content) {
   const normalized = normalizeMemoryContent(content);
-  return createHash9("md5").update(normalized).digest("hex");
+  return createHash10("md5").update(normalized).digest("hex");
 }
 
 // ../plugin/src/features/magic-context/memory/embedding-identity.ts
@@ -178884,7 +178961,7 @@ function getMemoryEmbedCoverage(db, projectPath, modelId) {
 }
 
 // ../plugin/src/features/magic-context/project-embedding-registry.ts
-import { createHash as createHash10, randomUUID as randomUUID2 } from "node:crypto";
+import { createHash as createHash11, randomUUID as randomUUID2 } from "node:crypto";
 init_logger();
 
 // ../plugin/src/features/magic-context/git-commits/storage-git-commit-embeddings.ts
@@ -179416,10 +179493,10 @@ function stableStringify2(value) {
   return JSON.stringify(value);
 }
 function sha256Prefix(value, length = 16) {
-  return createHash10("sha256").update(value).digest("hex").slice(0, length);
+  return createHash11("sha256").update(value).digest("hex").slice(0, length);
 }
 function contentSha256(value) {
-  return createHash10("sha256").update(value).digest("hex");
+  return createHash11("sha256").update(value).digest("hex");
 }
 function getRuntimeFingerprint(config2) {
   if (config2.provider === "off") {
@@ -183386,7 +183463,7 @@ function throwIfAborted2(signal) {
 }
 
 // ../plugin/src/features/magic-context/smart-notes/compiler.ts
-import { createHash as createHash11 } from "node:crypto";
+import { createHash as createHash12 } from "node:crypto";
 init_logger();
 
 // ../plugin/src/features/magic-context/smart-notes/compiler-prompt.ts
@@ -183820,7 +183897,7 @@ function manifestAdvisoryWarnings(code, manifest) {
   return warnings;
 }
 function hashCheck(surfaceCondition, compiledCheck, manifest, checkCron) {
-  return createHash11("sha256").update(surfaceCondition ?? "").update("\x00").update(compiledCheck).update("\x00").update(JSON.stringify(manifest)).update("\x00").update(checkCron).digest("hex");
+  return createHash12("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);
@@ -186632,7 +186709,7 @@ function parseFrictionGateVerdict(verdict) {
 }
 function computeRetrospectiveWindowKey(flagged) {
   const anchors = flagged.map((message) => `${message.sessionId}:${message.ts}`).sort().join("|");
-  return createHash12("sha256").update(anchors).digest("hex").slice(0, 32);
+  return createHash13("sha256").update(anchors).digest("hex").slice(0, 32);
 }
 function renderFrictionWindow(messages, flaggedOrdinals, radius = 2) {
   const flagged = new Set(flaggedOrdinals);
@@ -187959,7 +188036,7 @@ async function sweepGitCommits(args) {
 import { statSync as statSync7 } from "node:fs";
 
 // ../plugin/src/plugin/embedding-bootstrap-helpers.ts
-import { createHash as createHash13 } from "node:crypto";
+import { createHash as createHash14 } from "node:crypto";
 init_logger();
 var EMBEDDING_AFFECTING_KEYS = new Set([
   "embedding.api_key",
@@ -188006,7 +188083,7 @@ var EMBEDDING_WARNING_TERMS = [
 ];
 var loggedFailureSignatures = new Map;
 function sha256Prefix2(value, length = 16) {
-  return createHash13("sha256").update(value).digest("hex").slice(0, length);
+  return createHash14("sha256").update(value).digest("hex").slice(0, length);
 }
 function warningLooksEmbeddingRelated(message) {
   const lower = message.toLowerCase();
@@ -189594,7 +189671,11 @@ function createPiDreamerClient(opts) {
       try {
         const result = await runPromise;
         if (!result.ok) {
-          throw new Error(`Pi dreamer subagent failed (${result.reason}): ${result.error}`);
+          const error51 = new Error(`Pi dreamer subagent failed (${result.reason}): ${result.error}`);
+          if (result.transient) {
+            error51.transient = true;
+          }
+          throw error51;
         }
         dreamSession.messages = [
           makeMessage("user", [{ type: "text", text: userMessage }]),
@@ -194190,7 +194271,7 @@ function containsProbeVerbatim(text, probes) {
 }
 
 // ../plugin/src/features/magic-context/search-measurement.ts
-import { createHash as createHash14 } from "node:crypto";
+import { createHash as createHash15 } from "node:crypto";
 function resultId(result) {
   switch (result.source) {
     case "memory":
@@ -194273,7 +194354,7 @@ async function recordShadowMeasurement(args) {
   });
 }
 function sha2562(value) {
-  return createHash14("sha256").update(value).digest("hex");
+  return createHash15("sha256").update(value).digest("hex");
 }
 
 // ../plugin/src/features/magic-context/search.ts
@@ -201761,7 +201842,7 @@ function stripPiProcessedImages(args) {
 }
 
 // src/system-prompt.ts
-import { createHash as createHash15 } from "node:crypto";
+import { createHash as createHash16 } 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
@@ -201914,7 +201995,7 @@ function processSystemPromptForCache(args) {
       sessionLog(sessionId, `system prompt date frozen: real=${liveDate}, using=${stickyDate} (cache-stable pass)`);
     }
   }
-  const currentHash = createHash15("md5").update(frozenPrompt).digest("hex");
+  const currentHash = createHash16("md5").update(frozenPrompt).digest("hex");
   const hashChanged = !isFirstHash && currentHash !== previousHash;
   if (hashChanged) {
     sessionLog(sessionId, `system prompt hash changed: ${previousHash} → ${currentHash} (len=${frozenPrompt.length})`);
@@ -205062,6 +205143,19 @@ init_logger();
 init_data_path();
 init_logger();
 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
@@ -205102,6 +205196,7 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
     return false;
   }
   const existing = getPersistedCompactionMarkerState(db, sessionId);
+  const removedSummaryMessageId = existing?.summaryMessageId ?? null;
   if (existing) {
     if (existingMarkerAlreadyCoversTarget(sessionId, existing, lastCompartmentEnd, targetEndMessageId)) {
       return true;
@@ -205118,7 +205213,7 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
       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;
     }
-    setPersistedCompactionMarkerState(db, sessionId, null);
+    persistMarkerStateAndDropReplacedTag(db, sessionId, null, removedSummaryMessageId);
     sessionLog(sessionId, `compaction-marker: removed old boundary at ordinal ${existing.boundaryOrdinal}, moving to ${lastCompartmentEnd}`);
   }
   const result = injectCompactionMarker({
@@ -205130,11 +205225,11 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
     resolvedBoundary: boundary
   });
   if (result) {
-    setPersistedCompactionMarkerState(db, sessionId, {
+    persistMarkerStateAndDropReplacedTag(db, sessionId, {
       ...result,
       boundaryOrdinal: lastCompartmentEnd,
       targetEndMessageId
-    });
+    }, removedSummaryMessageId);
     sessionLog(sessionId, `compaction-marker: injected at ordinal ${lastCompartmentEnd}, boundary user msg ${result.boundaryMessageId}`);
     return true;
   }
@@ -207461,7 +207556,13 @@ import {
 
 // ../plugin/src/hooks/magic-context/m0-token-breakdown.ts
 function computeM0BlockTokens(db, sessionId, args) {
-  const { m0Text, projectIdentity, injectionBudgetTokens, memoryBlockCount } = args;
+  const {
+    m0Text,
+    projectIdentity,
+    injectionBudgetTokens,
+    memoryBlockCount,
+    compartmentTokensOverride
+  } = args;
   const docsBlock = extractM0Block(m0Text, "project-docs");
   const docsTokens = docsBlock ? estimateTokens(docsBlock) : 0;
   const profileBlock = extractM0Block(m0Text, "user-profile");
@@ -207475,7 +207576,9 @@ function computeM0BlockTokens(db, sessionId, args) {
   }
   let compartmentTokens = 0;
   const historyBlock = extractM0Block(m0Text, "session-history");
-  if (historyBlock) {
+  if (typeof compartmentTokensOverride === "number" && Number.isFinite(compartmentTokensOverride) && compartmentTokensOverride >= 0) {
+    compartmentTokens = compartmentTokensOverride;
+  } else if (historyBlock) {
     compartmentTokens = estimateTokens(historyBlock);
   } else {
     try {
@@ -207512,7 +207615,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.32.2",
+  version: "0.32.4",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/pi-magic-context",
-	"version": "0.32.2",
+	"version": "0.32.4",
 	"type": "module",
 	"description": "Pi coding agent extension for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",