@cortexkit/pi-magic-context 0.24.0 → 0.24.1

package/dist/index.js

@@ -146668,15 +146668,22 @@ function ownerMessageIdForTagRow(row) {
   }
   return row.message_id.replace(CONTENT_ID_SUFFIX, "");
 }
-function getActiveTagTokenAggregate(db, sessionId) {
-  const row = db.prepare(`SELECT
+function getActiveTagTokenAggregate(db, sessionId, protectedTags = 0) {
+  const toolOutputExpr = protectedTags > 0 ? `COALESCE(SUM(CASE WHEN type = 'tool' AND tag_number < (
+                    SELECT tag_number FROM tags
+                    WHERE session_id = ? AND status = 'active'
+                    ORDER BY tag_number DESC LIMIT 1 OFFSET ?
+                ) THEN COALESCE(token_count, 0) ELSE 0 END), 0)` : `COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0)`;
+  const sql = `SELECT
                 COALESCE(SUM(CASE WHEN type != 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0)
                     + COALESCE(SUM(COALESCE(reasoning_token_count, 0)), 0) AS conversation,
                 COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) + COALESCE(input_token_count, 0) ELSE 0 END), 0) AS tool_call,
-                COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0) AS tool_output,
+                ${toolOutputExpr} AS tool_output,
                 COALESCE(SUM(CASE WHEN token_count IS NULL THEN 1 ELSE 0 END), 0) AS null_count
              FROM tags
-             WHERE session_id = ? AND status = 'active'`).get(sessionId);
+             WHERE session_id = ? AND status = 'active'`;
+  const params = protectedTags > 0 ? [sessionId, protectedTags - 1, sessionId] : [sessionId];
+  const row = db.prepare(sql).get(...params);
   return {
     conversation: row?.conversation ?? 0,
     toolCall: row?.tool_call ?? 0,
@@ -166293,6 +166300,7 @@ init_logger();
 // ../plugin/src/features/magic-context/compartment-chunk-embedding.ts
 import { createHash as createHash8 } from "node:crypto";
 var DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS = 512;
+var CHUNK_WINDOW_SAFETY_RATIO = 0.9;
 var loadFtsRowsStatements = new WeakMap;
 var existingHashStatements = new WeakMap;
 var existingHashByProjectStatements = new WeakMap;
@@ -166528,9 +166536,10 @@ function chunkCanonicalText(canonicalText, startOrdinal, endOrdinal, maxInputTok
   if (lines.length === 0 || endOrdinal < startOrdinal)
     return [];
   const normalizedMax = normalizeCompartmentChunkMaxInputTokens(maxInputTokens);
+  const effectiveMax = Math.max(1, Math.floor(normalizedMax * CHUNK_WINDOW_SAFETY_RATIO));
   const fullText = lines.join(`
 `);
-  if (estimateTokens(fullText) <= normalizedMax) {
+  if (estimateTokens(fullText) <= effectiveMax) {
     return [
       {
         windowIndex: 0,
@@ -166568,7 +166577,7 @@ function chunkCanonicalText(canonicalText, startOrdinal, endOrdinal, maxInputTok
     const lineStart = range?.start ?? startOrdinal;
     const lineEnd = range?.end ?? lineStart;
     const lineTokens = estimateTokens(line);
-    if (currentLines.length > 0 && currentTokens + lineTokens > normalizedMax) {
+    if (currentLines.length > 0 && currentTokens + lineTokens > effectiveMax) {
       flush2();
     }
     if (currentLines.length === 0) {
@@ -167168,6 +167177,13 @@ function blockedEmbeddingEndpointReason(endpoint) {
 function normalizeEndpoint2(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
+function embeddingModelsMatch(served, requested) {
+  const a = served.trim().toLowerCase();
+  const b = requested.trim().toLowerCase();
+  if (a.length === 0 || b.length === 0)
+    return true;
+  return a === b || a.includes(b) || b.includes(a);
+}
 var FAILURE_THRESHOLD = 3;
 var FAILURE_WINDOW_MS = 60000;
 var OPEN_DURATION_MS = 5 * 60000;
@@ -167185,6 +167201,7 @@ class OpenAICompatibleEmbeddingProvider {
   failureTimes = [];
   circuitOpenUntil = 0;
   openLogged = false;
+  modelMismatchLogged = false;
   halfOpenProbeInFlight = false;
   constructor(options) {
     this.endpoint = normalizeEndpoint2(options.endpoint);
@@ -167283,6 +167300,15 @@ class OpenAICompatibleEmbeddingProvider {
         this.recordFailure(isProbe);
         return Array.from({ length: texts.length }, () => null);
       }
+      const servedModel = typeof body.model === "string" ? body.model : "";
+      if (this.model && servedModel && !embeddingModelsMatch(servedModel, this.model)) {
+        if (!this.modelMismatchLogged) {
+          log(`[magic-context] embedding endpoint served a DIFFERENT model than requested — refusing the substituted vectors (they have the wrong dimensions/space). requested="${this.model}" served="${servedModel}". The endpoint likely substituted a loaded model; load/select "${this.model}" on the endpoint, or set embedding.model to the served model.`);
+          this.modelMismatchLogged = true;
+        }
+        this.recordFailure(isProbe);
+        return Array.from({ length: texts.length }, () => null);
+      }
       const items = Array.isArray(body.data) ? body.data : [];
       const results = Array.from({ length: texts.length }, (_, index) => {
         const embedding = items[index]?.embedding;
@@ -167765,7 +167791,7 @@ function getChunkEmbeddingModelId(config2, providerIdentity) {
   }
   const chunkIdentity = {
     providerIdentity,
-    chunkerVersion: 1,
+    chunkerVersion: 2,
     maxInputTokens: normalizeCompartmentChunkMaxInputTokens("max_input_tokens" in config2 ? config2.max_input_tokens : undefined),
     truncate: config2.provider === "openai-compatible" ? config2.truncate ?? "" : ""
   };
@@ -170305,6 +170331,51 @@ function computePiWorkMetrics(sessionEntries) {
   return { newWorkTokens, totalInputTokens };
 }
 
+// ../plugin/src/hooks/magic-context/system-injection-stripper.ts
+var SYSTEM_INJECTION_MARKERS = [
+  "<!-- OMO_INTERNAL_INITIATOR -->",
+  "[SYSTEM DIRECTIVE: MAGIC-CONTEXT",
+  "[SYSTEM DIRECTIVE: OH-MY-OPENCODE",
+  "[Category+Skill Reminder]",
+  "[EDIT ERROR - IMMEDIATE ACTION REQUIRED]",
+  "[task CALL FAILED - IMMEDIATE RETRY REQUIRED]",
+  "[EMERGENCY CONTEXT WINDOW WARNING]",
+  "Unstable background agent appears idle",
+  "**THE SUBAGENT JUST CLAIMED THIS TASK IS DONE."
+];
+var SYSTEM_REMINDER_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
+var OMO_MARKER_REGEX = /<!-- OMO_INTERNAL_INITIATOR -->/g;
+function stripSystemInjection(text) {
+  let hasInjection = false;
+  for (const marker of SYSTEM_INJECTION_MARKERS) {
+    if (text.includes(marker)) {
+      hasInjection = true;
+      break;
+    }
+  }
+  if (SYSTEM_REMINDER_REGEX.test(text))
+    hasInjection = true;
+  SYSTEM_REMINDER_REGEX.lastIndex = 0;
+  if (!hasInjection)
+    return null;
+  let cleaned = text;
+  cleaned = cleaned.replace(SYSTEM_REMINDER_REGEX, "");
+  cleaned = cleaned.replace(OMO_MARKER_REGEX, "");
+  cleaned = cleaned.replace(/\[SYSTEM DIRECTIVE: OH-MY-(?:OPENCODE|CLAUDE)[^\]]*\][\s\S]*?(?=\n\n(?!\s*[-*])|$)/g, "");
+  for (const marker of SYSTEM_INJECTION_MARKERS) {
+    if (marker.startsWith("<!-- ") || marker.startsWith("[SYSTEM DIRECTIVE"))
+      continue;
+    const idx = cleaned.indexOf(marker);
+    if (idx === -1)
+      continue;
+    const blockEnd = cleaned.indexOf(`
+
+`, idx + marker.length);
+    cleaned = blockEnd !== -1 ? cleaned.slice(0, idx) + cleaned.slice(blockEnd) : cleaned.slice(0, idx);
+  }
+  return cleaned.trim();
+}
+
 // ../plugin/src/hooks/magic-context/apply-operations.ts
 var USER_DROP_PREVIEW_CHARS = 250;
 var RECENT_TOOL_SKELETON_WINDOW = 20;
@@ -170314,6 +170385,10 @@ function buildReplacementContent(tagId, target) {
     return `[dropped §${tagId}§]`;
   }
   const currentContent = target.getContent?.() ?? "";
+  const strippedInjection = stripSystemInjection(currentContent);
+  if (strippedInjection !== null && stripTagPrefix(strippedInjection).trim().length === 0) {
+    return `[dropped §${tagId}§]`;
+  }
   const originalText = stripTagPrefix(currentContent);
   if (originalText.length <= USER_DROP_PREVIEW_CHARS) {
     return `[truncated §${tagId}§]
@@ -171922,8 +171997,8 @@ var CHANNEL1_SENTINEL = "<system-reminder>";
 var TOKENS_PER_BYTE = 0.25;
 var CHANNEL1_FLOOR_TOKENS = 1e4;
 var CHANNEL1_REFIRE_FLOOR_TOKENS = 1e4;
-function channel1RefireTokens(historyBudgetTokens) {
-  const scaled = Math.round(0.05 * Math.max(0, historyBudgetTokens));
+function channel1RefireTokens(workingWindowTokens) {
+  const scaled = Math.round(0.05 * Math.max(0, workingWindowTokens));
   return Math.max(CHANNEL1_REFIRE_FLOOR_TOKENS, scaled);
 }
 var S_GENTLE = 0.2;
@@ -171939,7 +172014,7 @@ function toolOutputTokens(output) {
   return Math.round(byteSize(output) * TOKENS_PER_BYTE);
 }
 function decideChannel1(input) {
-  const { undroppedTokens, pressure, historyBudgetTokens, hasRecentReduce } = input;
+  const { undroppedTokens, pressure, workingWindowTokens, hasRecentReduce } = input;
   const resetCycle = hasRecentReduce || undroppedTokens < input.lastNudgeUndropped;
   const lastNudge = resetCycle ? 0 : input.lastNudgeUndropped;
   const lastLevel = resetCycle ? "" : input.lastNudgeLevel;
@@ -171954,7 +172029,7 @@ function decideChannel1(input) {
     return quiet();
   if (undroppedTokens < CHANNEL1_FLOOR_TOKENS)
     return quiet();
-  const budget = historyBudgetTokens > 0 ? historyBudgetTokens : undroppedTokens || 1;
+  const budget = workingWindowTokens > 0 ? workingWindowTokens : undroppedTokens || 1;
   const severity = undroppedTokens / budget * pressure;
   if (severity < S_GENTLE)
     return quiet();
@@ -171966,7 +172041,7 @@ function decideChannel1(input) {
   else
     level = "gentle";
   if (lastLevel === "") {
-    if (undroppedTokens < lastNudge + channel1RefireTokens(historyBudgetTokens)) {
+    if (undroppedTokens < lastNudge + channel1RefireTokens(workingWindowTokens)) {
       return quiet();
     }
   } else if (LEVEL_RANK[level] <= LEVEL_RANK[lastLevel]) {
@@ -172011,13 +172086,13 @@ function buildChannel1Reminder(level, undroppedTokens) {
   let body;
   switch (level) {
     case "gentle":
-      body = `You have ~${amount} tokens of tool output you have not reduced. ` + `Once you are done with earlier outputs, drop them with ctx_reduce to keep context lean.`;
+      body = `You have ~${amount} tokens of tool output you have not reduced. ` + `When you are done with earlier outputs, dropping them with ctx_reduce keeps context lean.`;
       break;
     case "firm":
-      body = `~${amount} tokens of unreduced tool output is accumulating. ` + `Drop what you have already processed with ctx_reduce before continuing.`;
+      body = `~${amount} tokens of unreduced tool output has built up. ` + `At your next natural stopping point, consider dropping what you have already processed with ctx_reduce.`;
       break;
     case "urgent":
-      body = `~${amount} tokens of unreduced tool output remain. ` + `A large span of this session will be comparted soon; drop spent outputs with ctx_reduce first so the archived span is the part that matters.`;
+      body = `~${amount} tokens of unreduced tool output remain, and a large span of this session will be comparted before long. ` + `Consider dropping spent outputs with ctx_reduce so the archived span is the part that matters.`;
       break;
   }
   return `
@@ -174336,10 +174411,11 @@ function maybeChannel1ReminderForToolResult(args) {
     contextLimit: state.contextLimit,
     executeThresholdPercentage: state.executeThresholdPercentage
   });
+  const workingWindowTokens = Math.round(state.contextLimit * state.executeThresholdPercentage / 100);
   const decision = decideChannel1({
     undroppedTokens,
     pressure,
-    historyBudgetTokens: state.historyBudgetTokens,
+    workingWindowTokens,
     lastNudgeUndropped: getLastNudgeUndropped(db, sessionId),
     lastNudgeLevel: getLastNudgeLevel(db, sessionId),
     hasRecentReduce: false
@@ -174574,51 +174650,6 @@ function planEmergencyDrop(input) {
   };
 }
 
-// ../plugin/src/hooks/magic-context/system-injection-stripper.ts
-var SYSTEM_INJECTION_MARKERS = [
-  "<!-- OMO_INTERNAL_INITIATOR -->",
-  "[SYSTEM DIRECTIVE: MAGIC-CONTEXT",
-  "[SYSTEM DIRECTIVE: OH-MY-OPENCODE",
-  "[Category+Skill Reminder]",
-  "[EDIT ERROR - IMMEDIATE ACTION REQUIRED]",
-  "[task CALL FAILED - IMMEDIATE RETRY REQUIRED]",
-  "[EMERGENCY CONTEXT WINDOW WARNING]",
-  "Unstable background agent appears idle",
-  "**THE SUBAGENT JUST CLAIMED THIS TASK IS DONE."
-];
-var SYSTEM_REMINDER_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
-var OMO_MARKER_REGEX = /<!-- OMO_INTERNAL_INITIATOR -->/g;
-function stripSystemInjection(text) {
-  let hasInjection = false;
-  for (const marker of SYSTEM_INJECTION_MARKERS) {
-    if (text.includes(marker)) {
-      hasInjection = true;
-      break;
-    }
-  }
-  if (SYSTEM_REMINDER_REGEX.test(text))
-    hasInjection = true;
-  SYSTEM_REMINDER_REGEX.lastIndex = 0;
-  if (!hasInjection)
-    return null;
-  let cleaned = text;
-  cleaned = cleaned.replace(SYSTEM_REMINDER_REGEX, "");
-  cleaned = cleaned.replace(OMO_MARKER_REGEX, "");
-  cleaned = cleaned.replace(/\[SYSTEM DIRECTIVE: OH-MY-(?:OPENCODE|CLAUDE)[^\]]*\][\s\S]*?(?=\n\n(?!\s*[-*])|$)/g, "");
-  for (const marker of SYSTEM_INJECTION_MARKERS) {
-    if (marker.startsWith("<!-- ") || marker.startsWith("[SYSTEM DIRECTIVE"))
-      continue;
-    const idx = cleaned.indexOf(marker);
-    if (idx === -1)
-      continue;
-    const blockEnd = cleaned.indexOf(`
-
-`, idx + marker.length);
-    cleaned = blockEnd !== -1 ? cleaned.slice(0, idx) + cleaned.slice(blockEnd) : cleaned.slice(0, idx);
-  }
-  return cleaned.trim();
-}
-
 // src/heuristic-cleanup-pi.ts
 init_logger();
 var DEDUP_SAFE_TOOLS = new Set([
@@ -181738,7 +181769,7 @@ function registerPiContextHandler(pi, baseOptions) {
           let tailToolTokens;
           let liveTailTokens;
           try {
-            const agg = getActiveTagTokenAggregate(options.db, sessionId);
+            const agg = getActiveTagTokenAggregate(options.db, sessionId, options.protectedTags ?? 20);
             tailToolTokens = agg.toolOutput;
             liveTailTokens = agg.conversation + agg.toolCall;
           } catch {
@@ -182091,6 +182122,15 @@ Historian previously failed ${failureState.failureCount} time(s), so Magic Conte
     const trigger = checkCompartmentTrigger(db, sessionId, sessionMeta, usage, 0, triggerInputs.executeThresholdPercentage, triggerInputs.triggerBudget, triggerInputs.clearReasoningAge, triggerInputs.commitClusterTrigger, args.activeTags, boundaryContextLimit);
     if (!trigger.shouldFire) {
       sessionLog(sessionId, `historian trigger eval: shouldFire=false (no trigger condition met)`);
+      try {
+        const overflowState = getOverflowState(db, sessionId);
+        if (overflowState.needsEmergencyRecovery && usage.percentage < FORCE_MATERIALIZATION_PERCENTAGE && !inFlightHistorian.has(sessionId) && !hasRunnableCompartmentWindow(boundarySnapshot)) {
+          clearEmergencyRecovery(db, sessionId);
+          sessionLog(sessionId, `historian: disarming stale emergency recovery — real pressure ${usage.percentage.toFixed(1)}% with no runnable compartment window (would otherwise bump to 95% every pass)`);
+        }
+      } catch (err) {
+        sessionLog(sessionId, `historian: emergency-recovery disarm check failed: ${err instanceof Error ? err.message : String(err)}`);
+      }
       return;
     }
     triggered = true;
@@ -184471,6 +184511,11 @@ Historian recomp started. Rebuilding compartments and facts from raw Pi session
             fallbackModelId: ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined
           }, parsed.kind === "partial" ? { range: parsed.range } : {});
           if (result.published) {
+            try {
+              clearEmergencyRecovery(deps.db, sessionId);
+            } catch (recoveryError) {
+              sessionLog(sessionId, `/ctx-recomp: clearEmergencyRecovery failed (continuing): ${describeError(recoveryError).brief}`);
+            }
             try {
               stagePiRecompMarker({ db: deps.db, sessionId, ctx });
             } catch (markerError) {
@@ -185124,7 +185169,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.24.0",
+  version: "0.24.1",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",

package/dist/subagent-entry.js

@@ -158702,6 +158702,7 @@ init_logger();
 // ../plugin/src/features/magic-context/compartment-chunk-embedding.ts
 import { createHash as createHash4 } from "node:crypto";
 var DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS = 512;
+var CHUNK_WINDOW_SAFETY_RATIO = 0.9;
 var loadFtsRowsStatements = new WeakMap;
 var existingHashStatements = new WeakMap;
 var existingHashByProjectStatements = new WeakMap;
@@ -158937,9 +158938,10 @@ function chunkCanonicalText(canonicalText, startOrdinal, endOrdinal, maxInputTok
   if (lines.length === 0 || endOrdinal < startOrdinal)
     return [];
   const normalizedMax = normalizeCompartmentChunkMaxInputTokens(maxInputTokens);
+  const effectiveMax = Math.max(1, Math.floor(normalizedMax * CHUNK_WINDOW_SAFETY_RATIO));
   const fullText = lines.join(`
 `);
-  if (estimateTokens(fullText) <= normalizedMax) {
+  if (estimateTokens(fullText) <= effectiveMax) {
     return [
       {
         windowIndex: 0,
@@ -158977,7 +158979,7 @@ function chunkCanonicalText(canonicalText, startOrdinal, endOrdinal, maxInputTok
     const lineStart = range?.start ?? startOrdinal;
     const lineEnd = range?.end ?? lineStart;
     const lineTokens = estimateTokens(line);
-    if (currentLines.length > 0 && currentTokens + lineTokens > normalizedMax) {
+    if (currentLines.length > 0 && currentTokens + lineTokens > effectiveMax) {
       flush2();
     }
     if (currentLines.length === 0) {
@@ -159587,6 +159589,13 @@ function blockedEmbeddingEndpointReason(endpoint) {
 function normalizeEndpoint3(endpoint) {
   return endpoint?.trim().replace(/\/+$/, "") ?? "";
 }
+function embeddingModelsMatch(served, requested) {
+  const a = served.trim().toLowerCase();
+  const b = requested.trim().toLowerCase();
+  if (a.length === 0 || b.length === 0)
+    return true;
+  return a === b || a.includes(b) || b.includes(a);
+}
 var FAILURE_THRESHOLD = 3;
 var FAILURE_WINDOW_MS = 60000;
 var OPEN_DURATION_MS = 5 * 60000;
@@ -159604,6 +159613,7 @@ class OpenAICompatibleEmbeddingProvider {
   failureTimes = [];
   circuitOpenUntil = 0;
   openLogged = false;
+  modelMismatchLogged = false;
   halfOpenProbeInFlight = false;
   constructor(options) {
     this.endpoint = normalizeEndpoint3(options.endpoint);
@@ -159702,6 +159712,15 @@ class OpenAICompatibleEmbeddingProvider {
         this.recordFailure(isProbe);
         return Array.from({ length: texts.length }, () => null);
       }
+      const servedModel = typeof body.model === "string" ? body.model : "";
+      if (this.model && servedModel && !embeddingModelsMatch(servedModel, this.model)) {
+        if (!this.modelMismatchLogged) {
+          log(`[magic-context] embedding endpoint served a DIFFERENT model than requested — refusing the substituted vectors (they have the wrong dimensions/space). requested="${this.model}" served="${servedModel}". The endpoint likely substituted a loaded model; load/select "${this.model}" on the endpoint, or set embedding.model to the served model.`);
+          this.modelMismatchLogged = true;
+        }
+        this.recordFailure(isProbe);
+        return Array.from({ length: texts.length }, () => null);
+      }
       const items = Array.isArray(body.data) ? body.data : [];
       const results = Array.from({ length: texts.length }, (_, index) => {
         const embedding = items[index]?.embedding;
@@ -160300,7 +160319,7 @@ function getChunkEmbeddingModelId(config2, providerIdentity) {
   }
   const chunkIdentity = {
     providerIdentity,
-    chunkerVersion: 1,
+    chunkerVersion: 2,
     maxInputTokens: normalizeCompartmentChunkMaxInputTokens("max_input_tokens" in config2 ? config2.max_input_tokens : undefined),
     truncate: config2.provider === "openai-compatible" ? config2.truncate ?? "" : ""
   };
@@ -168667,15 +168686,22 @@ function ownerMessageIdForTagRow(row) {
   }
   return row.message_id.replace(CONTENT_ID_SUFFIX, "");
 }
-function getActiveTagTokenAggregate(db, sessionId) {
-  const row = db.prepare(`SELECT
+function getActiveTagTokenAggregate(db, sessionId, protectedTags = 0) {
+  const toolOutputExpr = protectedTags > 0 ? `COALESCE(SUM(CASE WHEN type = 'tool' AND tag_number < (
+                    SELECT tag_number FROM tags
+                    WHERE session_id = ? AND status = 'active'
+                    ORDER BY tag_number DESC LIMIT 1 OFFSET ?
+                ) THEN COALESCE(token_count, 0) ELSE 0 END), 0)` : `COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0)`;
+  const sql = `SELECT
                 COALESCE(SUM(CASE WHEN type != 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0)
                     + COALESCE(SUM(COALESCE(reasoning_token_count, 0)), 0) AS conversation,
                 COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) + COALESCE(input_token_count, 0) ELSE 0 END), 0) AS tool_call,
-                COALESCE(SUM(CASE WHEN type = 'tool' THEN COALESCE(token_count, 0) ELSE 0 END), 0) AS tool_output,
+                ${toolOutputExpr} AS tool_output,
                 COALESCE(SUM(CASE WHEN token_count IS NULL THEN 1 ELSE 0 END), 0) AS null_count
              FROM tags
-             WHERE session_id = ? AND status = 'active'`).get(sessionId);
+             WHERE session_id = ? AND status = 'active'`;
+  const params = protectedTags > 0 ? [sessionId, protectedTags - 1, sessionId] : [sessionId];
+  const row = db.prepare(sql).get(...params);
   return {
     conversation: row?.conversation ?? 0,
     toolCall: row?.tool_call ?? 0,

package/package.json

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