@cortexkit/opencode-magic-context 0.14.0 → 0.14.2

package/dist/index.js

@@ -15615,6 +15615,77 @@ var init_data_path = () => {};
 function getErrorMessage(error48) {
   return error48 instanceof Error ? error48.message : String(error48);
 }
+function readString(value) {
+  if (typeof value === "string" && value.length > 0)
+    return value;
+  if (typeof value === "number")
+    return String(value);
+  return;
+}
+function clip(value, max) {
+  if (value.length <= max)
+    return value;
+  return `${value.slice(0, max)}\u2026`;
+}
+function describeError(error48) {
+  const stringForm = clip(safeString(error48), 400);
+  if (!(error48 instanceof Error) && !(error48 && typeof error48 === "object")) {
+    return {
+      name: typeof error48,
+      message: "",
+      stringForm,
+      brief: stringForm || "<empty>"
+    };
+  }
+  const obj = error48;
+  const nameFromField = readString(obj.name);
+  const nameFromCtor = error48?.constructor?.name;
+  const name = nameFromField ?? nameFromCtor ?? "Error";
+  const message = readString(obj.message) ?? "";
+  const status = readString(obj.status) ?? readString(obj.statusCode);
+  const code = readString(obj.code);
+  let causeName;
+  const cause = obj.cause;
+  if (cause && typeof cause === "object") {
+    const causeRecord = cause;
+    causeName = readString(causeRecord.name) ?? cause.constructor?.name;
+  }
+  const stack = readString(obj.stack);
+  const stackHead = stack ? stack.split(`
+`).slice(0, 4).map((l) => l.trim()).filter((l) => l.length > 0).join(" | ") : undefined;
+  const briefParts = [];
+  if (name)
+    briefParts.push(name);
+  if (message)
+    briefParts.push(`message="${clip(message, 200)}"`);
+  if (status)
+    briefParts.push(`status=${status}`);
+  if (code)
+    briefParts.push(`code=${code}`);
+  if (causeName)
+    briefParts.push(`cause=${causeName}`);
+  if (!message && stringForm && stringForm !== name) {
+    briefParts.push(`str="${clip(stringForm, 200)}"`);
+  }
+  const brief = briefParts.join(" ") || stringForm || name;
+  return {
+    name,
+    message,
+    ...status ? { status } : {},
+    ...code ? { code } : {},
+    ...causeName ? { causeName } : {},
+    ...stackHead ? { stackHead } : {},
+    stringForm,
+    brief
+  };
+}
+function safeString(value) {
+  try {
+    return String(value);
+  } catch {
+    return "<unstringifiable>";
+  }
+}
 
 // src/features/magic-context/memory/storage-memory-embeddings.ts
 function isEmbeddingBlob(value) {
@@ -151183,7 +151254,10 @@ function incrementHistorianFailure(db, sessionId, error48) {
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
     const current = getHistorianFailureState(db, sessionId);
-    db.prepare("UPDATE session_meta SET historian_failure_count = ?, historian_last_error = ?, historian_last_failure_at = ? WHERE session_id = ?").run(current.failureCount + 1, error48, Date.now(), sessionId);
+    const nextCount = current.failureCount + 1;
+    db.prepare("UPDATE session_meta SET historian_failure_count = ?, historian_last_error = ?, historian_last_failure_at = ? WHERE session_id = ?").run(nextCount, error48, Date.now(), sessionId);
+    const reason = error48.replace(/\s+/g, " ").trim().slice(0, 300);
+    sessionLog(sessionId, `historian failure recorded: count=${nextCount} reason="${reason}"`);
   })();
 }
 function clearHistorianFailureState(db, sessionId) {
@@ -151267,6 +151341,7 @@ function removeStrippedPlaceholderId(db, sessionId, messageId) {
   return true;
 }
 var init_storage_meta_persisted = __esm(() => {
+  init_logger();
   init_storage_meta_shared();
 });
 
@@ -152157,14 +152232,12 @@ async function runHistorianPrompt(args) {
     const dumpPath = dumpHistorianResponse(parentSessionId, dumpLabel ?? "historian-response", result);
     return { ok: true, result, dumpPath };
   } catch (modelError) {
-    const modelMsg = getErrorMessage(modelError);
-    const modelStack = modelError instanceof Error ? modelError.stack : undefined;
-    sessionLog(parentSessionId, "compartment agent: historian attempt failed", {
-      error: modelMsg,
-      promptLength: prompt.length,
-      stack: modelStack
-    });
-    return { ok: false, error: `Historian failed while processing this session: ${modelMsg}` };
+    const desc = describeError(modelError);
+    sessionLog(parentSessionId, `historian prompt failed: ${desc.brief} promptLength=${prompt.length}${desc.stackHead ? ` stackHead="${desc.stackHead}"` : ""}`);
+    return {
+      ok: false,
+      error: `Historian failed while processing this session: ${desc.brief}`
+    };
   } finally {
     if (agentSessionId) {
       await client.session.delete({ path: { id: agentSessionId }, query: { directory: sessionDirectory } }).catch((e) => {
@@ -152941,6 +153014,7 @@ async function executePartialRecompInternal(deps, range) {
       setRecompPartialRange(db, sessionId, null);
       clearCompressionDepthRange(db, sessionId, snapStart, snapEnd);
       clearInjectionCache(sessionId);
+      deps.onInjectionCacheCleared?.(sessionId);
       const lastEnd = merged[merged.length - 1]?.endMessage ?? snapEnd;
       return { compartmentCount: merged.length, lastEndMessage: lastEnd };
     };
@@ -153333,6 +153407,8 @@ var init_compaction_marker = __esm(() => {
 });
 
 // src/hooks/magic-context/compaction-marker-manager.ts
+import { Database as SqliteDb } from "bun:sqlite";
+import { join as join14 } from "path";
 function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd, directory) {
   const existing = getPersistedCompactionMarkerState(db, sessionId);
   if (existing) {
@@ -153374,10 +153450,63 @@ function removeCompactionMarkerForSession(db, sessionId) {
     }
   }
 }
+function checkCompactionMarkerConsistency(db) {
+  const opencodeDbPath = join14(getDataDir(), "opencode", "opencode.db");
+  let opencodeDb;
+  try {
+    opencodeDb = new SqliteDb(opencodeDbPath, { readonly: true });
+  } catch (error48) {
+    log(`[magic-context] compaction-marker consistency check skipped: ${error48 instanceof Error ? error48.message : String(error48)}`);
+    return;
+  }
+  try {
+    const persistedRows = db.prepare("SELECT session_id, compaction_marker_state FROM session_meta WHERE compaction_marker_state IS NOT NULL AND compaction_marker_state != ''").all();
+    if (persistedRows.length === 0)
+      return;
+    const checkMessage = opencodeDb.prepare("SELECT 1 FROM message WHERE id = ? LIMIT 1");
+    const checkPart = opencodeDb.prepare("SELECT 1 FROM part WHERE id = ? LIMIT 1");
+    let reconciledCount = 0;
+    for (const row of persistedRows) {
+      const state = getPersistedCompactionMarkerState(db, row.session_id);
+      if (!state)
+        continue;
+      const boundaryExists = checkMessage.get(state.boundaryMessageId) !== null;
+      const summaryMessageExists = checkMessage.get(state.summaryMessageId) !== null;
+      const compactionPartExists = checkPart.get(state.compactionPartId) !== null;
+      const summaryPartExists = checkPart.get(state.summaryPartId) !== null;
+      const allPresent = boundaryExists && summaryMessageExists && compactionPartExists && summaryPartExists;
+      if (allPresent)
+        continue;
+      let removedOk = false;
+      try {
+        removedOk = removeCompactionMarker(state);
+      } catch (error48) {
+        sessionLog(row.session_id, "compaction-marker consistency: partial cleanup of half-written marker failed:", error48);
+      }
+      if (removedOk) {
+        setPersistedCompactionMarkerState(db, row.session_id, null);
+        sessionLog(row.session_id, `compaction-marker consistency: cleared orphaned state (boundary=${boundaryExists} summary=${summaryMessageExists} cPart=${compactionPartExists} sPart=${summaryPartExists}); next publication will re-inject`);
+        reconciledCount++;
+      } else {
+        sessionLog(row.session_id, `compaction-marker consistency: cleanup failed for orphaned state (boundary=${boundaryExists} summary=${summaryMessageExists} cPart=${compactionPartExists} sPart=${summaryPartExists}); will retry on next startup`);
+      }
+    }
+    if (reconciledCount > 0) {
+      log(`[magic-context] compaction-marker consistency: reconciled ${reconciledCount} session(s) with orphaned marker state at startup`);
+    }
+  } catch (error48) {
+    log(`[magic-context] compaction-marker consistency check failed: ${error48 instanceof Error ? error48.message : String(error48)}`);
+  } finally {
+    try {
+      opencodeDb.close(false);
+    } catch {}
+  }
+}
 var MARKER_SUMMARY_TEXT = "[Compacted by magic-context \u2014 session history is managed by the plugin]";
 var init_compaction_marker_manager = __esm(() => {
   init_compaction_marker();
   init_storage_meta_persisted();
+  init_data_path();
   init_logger();
 });
 
@@ -154261,6 +154390,7 @@ async function runCompartmentAgent(deps) {
     const priorFacts = existingFacts;
     const existingValidationError = validateStoredCompartments(priorCompartments);
     if (existingValidationError) {
+      sessionLog(sessionId, `historian failure: source=existing-validation reason="${existingValidationError}"`);
       await notifyHistorianIssue(`## Historian alert
 
 Historian skipped this session because existing stored compartments are invalid: ${existingValidationError}
@@ -154279,6 +154409,7 @@ No new compartments or facts were written. Rebuild or clear the broken compartme
     }
     const chunkCoverageError = validateChunkCoverage(chunk);
     if (chunkCoverageError) {
+      sessionLog(sessionId, `historian failure: source=chunk-coverage reason="${chunkCoverageError}" chunkRange=${chunk.startIndex}-${chunk.endIndex}`);
       await notifyHistorianIssue(`## Historian alert
 
 Historian skipped this session because the raw chunk could not be represented safely: ${chunkCoverageError}
@@ -154314,6 +154445,7 @@ ${chunk.text}`);
       twoPass: deps.historianTwoPass
     });
     if (!validatedPass.ok) {
+      sessionLog(sessionId, `historian failure: source=validation reason="${validatedPass.error}" chunkRange=${chunk.startIndex}-${chunk.endIndex} fallbackModel=${deps.fallbackModelId ?? "<none>"} twoPass=${deps.historianTwoPass ? "true" : "false"}`);
       incrementHistorianFailure(db, sessionId, validatedPass.error);
       await notifyHistorianIssue(`## Historian alert
 
@@ -154325,6 +154457,8 @@ No new compartments or facts were written. Check the historian model/output and
     const newCompartments = validatedPass.compartments;
     const lastNewEnd = newCompartments[newCompartments.length - 1]?.endMessage ?? 0;
     if (lastNewEnd + 1 <= offset) {
+      sessionLog(sessionId, `historian failure: source=no-progress reason="historian returned compartments that did not advance past raw message ${offset - 1}" newCompartmentCount=${newCompartments.length} lastNewEnd=${lastNewEnd} priorEnd=${offset - 1}`);
+      incrementHistorianFailure(db, sessionId, `no forward progress beyond raw message ${offset - 1}`);
       await notifyHistorianIssue(`## Historian alert
 
 Historian returned compartments that made no forward progress beyond raw message ${offset - 1}.
@@ -154339,6 +154473,7 @@ No new compartments or facts were written. Check the historian model/output and
       clearEmergencyRecovery(db, sessionId);
     })();
     clearInjectionCache(sessionId);
+    deps.onInjectionCacheCleared?.(sessionId);
     if (deps.directory) {
       promoteSessionFactsToMemory(db, sessionId, resolveProjectIdentity(deps.directory), validatedPass.facts ?? []);
     }
@@ -154377,11 +154512,13 @@ No new compartments or facts were written. Check the historian model/output and
       }
     }
   } catch (error48) {
-    const msg = getErrorMessage(error48);
+    const desc = describeError(error48);
+    sessionLog(sessionId, `historian failure: source=exception ${desc.brief}${desc.stackHead ? ` stackHead="${desc.stackHead}"` : ""}`);
     if (!issueNotified) {
+      incrementHistorianFailure(db, sessionId, desc.brief);
       await notifyHistorianIssue(`## Historian alert
 
-Historian failed unexpectedly: ${msg}
+Historian failed unexpectedly: ${desc.brief}
 
 No new compartments or facts were written. Check the historian model/output and try again.`);
     }
@@ -154442,6 +154579,7 @@ async function executeContextRecompInternal(deps) {
         return null;
       clearCompressionDepth(db, sessionId);
       clearInjectionCache(sessionId);
+      deps.onInjectionCacheCleared?.(sessionId);
       if (deps.directory) {
         promoteSessionFactsToMemory(db, sessionId, resolveProjectIdentity(deps.directory), promoted2.facts);
       }
@@ -154610,6 +154748,7 @@ Nothing was written.`;
     }
     clearCompressionDepth(db, sessionId);
     clearInjectionCache(sessionId);
+    deps.onInjectionCacheCleared?.(sessionId);
     const finalCompartments = promoted?.compartments ?? candidateCompartments;
     const finalFacts = promoted?.facts ?? candidateFacts;
     if (deps.directory) {
@@ -162343,10 +162482,10 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = EMPTY;
   };
-  var join16 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
+  var join17 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
   var join_content = (inside, value, gap) => {
     const comment = process_comments(value, PREFIX_BEFORE, gap + indent, true);
-    return join16(comment, inside, gap);
+    return join17(comment, inside, gap);
   };
   var stringify_string = (holder, key, value) => {
     const raw = get_raw_string_literal(holder, key);
@@ -162368,13 +162507,13 @@ var require_stringify = __commonJS((exports, module) => {
       if (i !== 0) {
         inside += COMMA;
       }
-      const before = join16(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
+      const before = join17(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += stringify(i, value, deeper_gap) || STR_NULL;
       inside += process_comments(value, AFTER_VALUE(i), deeper_gap);
       after_comma = process_comments(value, AFTER(i), deeper_gap);
     }
-    inside += join16(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join17(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return BRACKET_OPEN + join_content(inside, value, gap) + BRACKET_CLOSE;
   };
   var object_stringify = (value, gap) => {
@@ -162395,13 +162534,13 @@ var require_stringify = __commonJS((exports, module) => {
         inside += COMMA;
       }
       first = false;
-      const before = join16(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
+      const before = join17(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += quote(key) + process_comments(value, AFTER_PROP(key), deeper_gap) + COLON + process_comments(value, AFTER_COLON(key), deeper_gap) + SPACE + sv + process_comments(value, AFTER_VALUE(key), deeper_gap);
       after_comma = process_comments(value, AFTER(key), deeper_gap);
     };
     keys.forEach(iteratee);
-    inside += join16(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join17(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return CURLY_BRACKET_OPEN + join_content(inside, value, gap) + CURLY_BRACKET_CLOSE;
   };
   function stringify(key, holder, gap) {
@@ -162499,11 +162638,11 @@ __export(exports_tui_config, {
   ensureTuiPluginEntry: () => ensureTuiPluginEntry
 });
 import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync3 } from "fs";
-import { dirname as dirname3, join as join16 } from "path";
+import { dirname as dirname3, join as join17 } from "path";
 function resolveTuiConfigPath() {
   const configDir = getOpenCodeConfigPaths({ binary: "opencode" }).configDir;
-  const jsoncPath = join16(configDir, "tui.jsonc");
-  const jsonPath = join16(configDir, "tui.json");
+  const jsoncPath = join17(configDir, "tui.jsonc");
+  const jsonPath = join17(configDir, "tui.json");
   if (existsSync8(jsoncPath))
     return jsoncPath;
   if (existsSync8(jsonPath))
@@ -166549,6 +166688,47 @@ function modelRequiresInterleavedReasoning(model) {
 
 // src/hooks/magic-context/transform.ts
 init_send_session_notification();
+// src/hooks/magic-context/sentinel.ts
+function makeSentinel(originalPart) {
+  const sentinel = {
+    type: "text",
+    text: ""
+  };
+  if (isRecord(originalPart)) {
+    if (originalPart.cache_control !== undefined) {
+      sentinel.cache_control = originalPart.cache_control;
+    }
+    if (originalPart.cacheControl !== undefined) {
+      sentinel.cacheControl = originalPart.cacheControl;
+    }
+  }
+  return sentinel;
+}
+function isSentinel(part) {
+  return isRecord(part) && part.type === "text" && typeof part.text === "string" && part.text === "";
+}
+function replaySentinelByMessageIds(messages, ids) {
+  if (ids.size === 0)
+    return { replayed: 0, missingIds: [] };
+  const seen = new Set;
+  let replayed = 0;
+  for (const msg of messages) {
+    const id = msg.info.id;
+    if (!id || !ids.has(id))
+      continue;
+    seen.add(id);
+    if (msg.parts.length === 1 && isSentinel(msg.parts[0]))
+      continue;
+    msg.parts.length = 0;
+    msg.parts.push(makeSentinel(undefined));
+    replayed++;
+  }
+  const missingIds = [];
+  for (const id of ids)
+    if (!seen.has(id))
+      missingIds.push(id);
+  return { replayed, missingIds };
+}
 
 // src/hooks/magic-context/strip-content.ts
 var DROPPED_PLACEHOLDER_PATTERN = /^\[dropped \u00A7\d+\u00A7\]$/;
@@ -166570,12 +166750,15 @@ function isSystemInjectedText(text) {
 }
 function stripSystemInjectedMessages(messages, protectedTailStart) {
   let stripped = 0;
-  for (let i = messages.length - 1;i >= 0; i--) {
+  const sentineledIds = [];
+  for (let i = 0;i < messages.length; i++) {
     if (i >= protectedTailStart)
       continue;
     const msg = messages[i];
     if (msg.parts.length === 0)
       continue;
+    if (msg.parts.length === 1 && isSentinel(msg.parts[0]))
+      continue;
     let hasContentPart = false;
     let allContentIsSystemInjection = true;
     for (const part of msg.parts) {
@@ -166602,11 +166785,14 @@ function stripSystemInjectedMessages(messages, protectedTailStart) {
       break;
     }
     if (hasContentPart && allContentIsSystemInjection) {
-      messages.splice(i, 1);
+      msg.parts.length = 0;
+      msg.parts.push(makeSentinel(undefined));
       stripped++;
+      if (typeof msg.info.id === "string")
+        sentineledIds.push(msg.info.id);
     }
   }
-  return stripped;
+  return { stripped, sentineledIds };
 }
 var METADATA_PART_TYPES = new Set([
   "step-start",
@@ -166620,12 +166806,15 @@ var METADATA_PART_TYPES = new Set([
 ]);
 function stripDroppedPlaceholderMessages(messages) {
   let stripped = 0;
-  for (let i = messages.length - 1;i >= 0; i--) {
+  const sentineledIds = [];
+  for (let i = 0;i < messages.length; i++) {
     const msg = messages[i];
     if (msg.parts.length === 0)
       continue;
     if (msg.info.role === "user")
       continue;
+    if (msg.parts.length === 1 && isSentinel(msg.parts[0]))
+      continue;
     let hasContentPart = false;
     let hasNonDroppedContent = false;
     for (const part of msg.parts) {
@@ -166666,11 +166855,14 @@ function stripDroppedPlaceholderMessages(messages) {
       break;
     }
     if (hasContentPart && !hasNonDroppedContent) {
-      messages.splice(i, 1);
+      msg.parts.length = 0;
+      msg.parts.push(makeSentinel(undefined));
       stripped++;
+      if (typeof msg.info.id === "string")
+        sentineledIds.push(msg.info.id);
     }
   }
-  return stripped;
+  return { stripped, sentineledIds };
 }
 function replayClearedReasoning(messages, reasoningByMessage, messageTagNumbers, persistedWatermark, skipTypedReasoningCleanup = false) {
   if (skipTypedReasoningCleanup)
@@ -166764,23 +166956,22 @@ function stripClearedReasoning(messages, skipTypedReasoningCleanup = false) {
   for (const message of messages) {
     if (message.info.role !== "assistant")
       continue;
-    const originalLength = message.parts.length;
-    const kept = message.parts.filter((part) => {
+    for (let i = 0;i < message.parts.length; i++) {
+      const part = message.parts[i];
       if (!isRecord(part))
-        return true;
+        continue;
       const partType = part.type;
       if (!CLEARED_REASONING_TYPES.has(partType))
-        return true;
+        continue;
       if (!("thinking" in part) && !("text" in part))
-        return true;
+        continue;
       const thinking = "thinking" in part ? part.thinking : undefined;
       const text = "text" in part ? part.text : undefined;
-      return thinking !== undefined && thinking !== "[cleared]" || text !== undefined && text !== "[cleared]";
-    });
-    if (kept.length < originalLength) {
-      message.parts.length = 0;
-      message.parts.push(...kept);
-      stripped += originalLength - kept.length;
+      const isCleared = (thinking === undefined || thinking === "[cleared]") && (text === undefined || text === "[cleared]");
+      if (!isCleared)
+        continue;
+      message.parts[i] = makeSentinel(part);
+      stripped++;
     }
   }
   return stripped;
@@ -166868,13 +167059,15 @@ function stripReasoningFromMergedAssistants(messages) {
           continue;
         if (part.ignored === true)
           continue;
+        if (isSentinel(part))
+          continue;
         if (REASONING_PART_TYPES.has(partType)) {
           keepIndex = i;
         }
         break;
       }
     }
-    for (let i = message.parts.length - 1;i >= 0; i--) {
+    for (let i = 0;i < message.parts.length; i++) {
       const part = message.parts[i];
       if (!isRecord(part))
         continue;
@@ -166884,7 +167077,7 @@ function stripReasoningFromMergedAssistants(messages) {
         keptReasoningInRun = true;
         continue;
       }
-      message.parts.splice(i, 1);
+      message.parts[i] = makeSentinel(part);
       stripped++;
     }
     prevRole = role;
@@ -166907,7 +167100,7 @@ function stripProcessedImages(messages, watermark, messageTagNumbers) {
     if (maxTag > watermark) {
       continue;
     }
-    for (let j = msg.parts.length - 1;j >= 0; j--) {
+    for (let j = 0;j < msg.parts.length; j++) {
       const part = msg.parts[j];
       if (!isRecord(part) || part.type !== "file") {
         continue;
@@ -166916,7 +167109,7 @@ function stripProcessedImages(messages, watermark, messageTagNumbers) {
         continue;
       }
       if (typeof part.url === "string" && part.url.startsWith("data:") && part.url.length > 200) {
-        msg.parts.splice(j, 1);
+        msg.parts[j] = makeSentinel(part);
         stripped++;
       }
     }
@@ -167014,7 +167207,8 @@ async function runCompartmentPhase(args) {
         experimentalUserMemories: args.experimentalUserMemories,
         historianTwoPass: args.historianTwoPass,
         compressorMinCompartmentRatio: args.compressorMinCompartmentRatio,
-        compressorMaxMergeDepth: args.compressorMaxMergeDepth
+        compressorMaxMergeDepth: args.compressorMaxMergeDepth,
+        onInjectionCacheCleared: args.onInjectionCacheCleared
       });
       compartmentInProgress = true;
     }
@@ -167038,7 +167232,8 @@ async function runCompartmentPhase(args) {
         experimentalUserMemories: args.experimentalUserMemories,
         historianTwoPass: args.historianTwoPass,
         compressorMinCompartmentRatio: args.compressorMinCompartmentRatio,
-        compressorMaxMergeDepth: args.compressorMaxMergeDepth
+        compressorMaxMergeDepth: args.compressorMaxMergeDepth,
+        onInjectionCacheCleared: args.onInjectionCacheCleared
       });
       activeRun = getActiveCompartmentRun(args.sessionId);
     } else if (!activeRun && hasEligibleHistoryForCompartment()) {
@@ -167284,19 +167479,20 @@ function stripStructuralNoise(messages) {
     if (!Array.isArray(message.parts)) {
       continue;
     }
-    const originalLength = message.parts.length;
-    const keptParts = message.parts.filter((part) => !isStructuralNoisePart(part));
-    if (keptParts.length < originalLength && keptParts.length > 0) {
-      message.parts.length = 0;
-      message.parts.push(...keptParts);
-      strippedParts += originalLength - keptParts.length;
+    for (let i = 0;i < message.parts.length; i++) {
+      const part = message.parts[i];
+      if (isSentinel(part))
+        continue;
+      if (!isStructuralNoisePart(part))
+        continue;
+      message.parts[i] = makeSentinel(part);
+      strippedParts++;
     }
   }
   return strippedParts;
 }
 // src/hooks/magic-context/tag-messages.ts
 init_storage();
-
 // src/hooks/magic-context/drop-stale-reduce-calls.ts
 var STALE_TOOL_NAMES = new Set(["ctx_reduce"]);
 function isReduceToolPart(part) {
@@ -167328,20 +167524,25 @@ function hasAnyMeaningfulPart(parts) {
 function dropStaleReduceCalls(messages, protectedCount = 0) {
   let didDrop = false;
   const protectedStart = messages.length - protectedCount;
-  for (let i = messages.length - 1;i >= 0; i -= 1) {
+  for (let i = 0;i < messages.length; i++) {
     if (i >= protectedStart)
-      continue;
+      break;
     const message = messages[i];
-    const originalLength = message.parts.length;
-    for (let j = message.parts.length - 1;j >= 0; j -= 1) {
-      if (isReduceToolPart(message.parts[j])) {
-        message.parts.splice(j, 1);
+    let touched = false;
+    for (let j = 0;j < message.parts.length; j++) {
+      const part = message.parts[j];
+      if (isSentinel(part))
+        continue;
+      if (isReduceToolPart(part)) {
+        message.parts[j] = makeSentinel(part);
+        touched = true;
       }
     }
-    if (message.parts.length < originalLength) {
+    if (touched) {
       didDrop = true;
       if (!hasAnyMeaningfulPart(message.parts)) {
-        messages.splice(i, 1);
+        message.parts.length = 0;
+        message.parts.push(makeSentinel(undefined));
       }
     }
   }
@@ -168906,55 +169107,31 @@ async function runPostTransformPhase(args) {
   {
     const persistedIds = getStrippedPlaceholderIds(args.db, args.sessionId);
     if (persistedIds.size > 0) {
-      let replayed = 0;
-      for (let i = args.messages.length - 1;i >= 0; i--) {
-        const msgId = args.messages[i].info.id;
-        if (msgId && persistedIds.has(msgId)) {
-          args.messages.splice(i, 1);
-          replayed++;
-        }
-      }
+      const { replayed, missingIds } = replaySentinelByMessageIds(args.messages, persistedIds);
       if (replayed > 0) {
-        sessionLog(args.sessionId, `placeholder replay: removed ${replayed} previously-stripped messages`);
+        sessionLog(args.sessionId, `sentinel replay: neutralized ${replayed} previously-stripped messages`);
+      }
+      if (missingIds.length > 0) {
+        for (const id of missingIds)
+          persistedIds.delete(id);
+        setStrippedPlaceholderIds(args.db, args.sessionId, persistedIds);
       }
     }
     if (isCacheBustingPass) {
-      const preStripIds = new Set;
-      for (const msg of args.messages) {
-        if (msg.info.id)
-          preStripIds.add(msg.info.id);
-      }
-      const strippedDropped = stripDroppedPlaceholderMessages(args.messages);
-      if (strippedDropped > 0) {
-        const postStripIds = new Set;
-        for (const msg of args.messages) {
-          if (msg.info.id)
-            postStripIds.add(msg.info.id);
-        }
-        let newlyStrippedCount = 0;
-        for (const id of preStripIds) {
-          if (!postStripIds.has(id)) {
-            persistedIds.add(id);
-            newlyStrippedCount++;
-          }
-        }
-        for (const id of persistedIds) {
-          if (!preStripIds.has(id) && !postStripIds.has(id)) {
-            persistedIds.delete(id);
-          }
-        }
+      const droppedResult = stripDroppedPlaceholderMessages(args.messages);
+      const protectedTailStart = Math.max(0, args.messages.length - args.protectedTags * 2);
+      const systemInjectedResult = stripSystemInjectedMessages(args.messages, protectedTailStart);
+      const newlyNeutralized = droppedResult.sentineledIds.length + systemInjectedResult.sentineledIds.length;
+      if (newlyNeutralized > 0) {
+        for (const id of droppedResult.sentineledIds)
+          persistedIds.add(id);
+        for (const id of systemInjectedResult.sentineledIds)
+          persistedIds.add(id);
         setStrippedPlaceholderIds(args.db, args.sessionId, persistedIds);
-        sessionLog(args.sessionId, `stripped ${strippedDropped} placeholder messages (${newlyStrippedCount} new, ${persistedIds.size} total persisted)`);
+        sessionLog(args.sessionId, `neutralized ${droppedResult.stripped} dropped + ${systemInjectedResult.stripped} system-injected messages (${newlyNeutralized} new, ${persistedIds.size} total persisted)`);
       }
     }
   }
-  if (isCacheBustingPass) {
-    const protectedTailStart = Math.max(0, args.messages.length - args.protectedTags * 2);
-    const strippedSystemInjected = stripSystemInjectedMessages(args.messages, protectedTailStart);
-    if (strippedSystemInjected > 0) {
-      sessionLog(args.sessionId, `stripped ${strippedSystemInjected} system-injected messages (notifications/reminders)`);
-    }
-  }
   const pendingUserTurnReminder = getPersistedStickyTurnReminder(args.db, args.sessionId);
   if (pendingUserTurnReminder) {
     if (args.hasRecentReduceCall && isCacheBustingPass) {
@@ -169243,7 +169420,10 @@ function createTransform(deps) {
         experimentalTemporalAwareness: deps.experimentalTemporalAwareness,
         historianTwoPass: deps.historianTwoPass,
         compressorMinCompartmentRatio: deps.compressorMinCompartmentRatio,
-        compressorMaxMergeDepth: deps.compressorMaxMergeDepth
+        compressorMaxMergeDepth: deps.compressorMaxMergeDepth,
+        onInjectionCacheCleared: (sid) => {
+          deps.flushedSessions.add(sid);
+        }
       });
       skipCompartmentAwaitForThisPass = true;
       return true;
@@ -169391,7 +169571,10 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so ma
       historianTwoPass: deps.historianTwoPass,
       compressorMinCompartmentRatio: deps.compressorMinCompartmentRatio,
       compressorMaxMergeDepth: deps.compressorMaxMergeDepth,
-      compressorCooldownMs: deps.compressorCooldownMs
+      compressorCooldownMs: deps.compressorCooldownMs,
+      onInjectionCacheCleared: (sid) => {
+        deps.flushedSessions.add(sid);
+      }
     });
     pendingCompartmentInjection = compartmentPhase.pendingCompartmentInjection;
     const awaitedCompartmentRun = compartmentPhase.awaitedCompartmentRun;
@@ -170000,29 +170183,6 @@ function estimateProjectedPercentage(db, sessionId, contextUsage, preloadedTags)
   const dropRatio = pendingDropBytes / totalActiveBytes;
   return contextUsage.percentage * (1 - dropRatio);
 }
-function generateEmergencyNudgeText(db, sessionId, contextUsage, config2) {
-  const largest = formatLargestTags(getTopNBySize(db, sessionId, 3));
-  const protectedCount = config2.protected_tags;
-  const activeTags = getTagsBySession(db, sessionId).filter((t) => t.status === "active");
-  const highestProtected = activeTags.map((t) => t.tagNumber).sort((a, b) => b - a).slice(0, protectedCount)[0];
-  const protectedHint = highestProtected ? ` Tags \xA7${highestProtected}\xA7 and above are protected (last ${protectedCount}) \u2014 You MUST NOT try to reduce those.` : "";
-  const oldToolHint = formatOldToolTags(activeTags, protectedCount, 5);
-  return [
-    `<instruction name="context_emergency">`,
-    `CONTEXT EMERGENCY \u2014 ~${Math.round(contextUsage.percentage)}%. STOP all current work immediately.`,
-    ``,
-    `You MUST use \`ctx_reduce\` RIGHT NOW to free space. If context overflows, you lose all work.`,
-    ``,
-    `Steps:`,
-    `1. Find OLD tool outputs (grep results, file reads, build logs) you already processed \u2014 look at \xA7N\xA7 tags`,
-    `2. Drop those specifically: e.g. drop="3,7,12" \u2014 NEVER drop large ranges like "1-50"`,
-    `3. KEEP anything related to current task, recent errors, or decisions`,
-    ``,
-    `Largest tags: ${largest}.${oldToolHint}${protectedHint}`,
-    `</instruction>`
-  ].join(`
-`);
-}
 
 // src/hooks/magic-context/hook.ts
 init_read_session_db();
@@ -170036,6 +170196,7 @@ function createTextCompleteHandler() {
 }
 
 // src/hooks/magic-context/hook.ts
+init_compaction_marker_manager();
 init_compartment_runner();
 
 // src/hooks/magic-context/hook-handlers.ts
@@ -170121,59 +170282,12 @@ function createEventHook(args) {
       args.agentBySession.delete(sessionId);
       args.recentReduceBySession.delete(sessionId);
       args.toolUsageSinceUserTurn.delete(sessionId);
-      args.emergencyNudgeFired.delete(sessionId);
       args.flushedSessions.delete(sessionId);
       args.lastHeuristicsTurnId.delete(sessionId);
       args.commitSeenLastPass?.delete(sessionId);
       clearNoteNudgeState(args.db, sessionId);
       clearAutoSearchForSession(sessionId);
     }
-    if (input.event.type === "message.removed") {
-      return;
-    }
-    const entry = args.contextUsageMap.get(sessionId);
-    if (!entry)
-      return;
-    if (entry.usage.percentage < FORCE_COMPARTMENT_PERCENTAGE) {
-      args.emergencyNudgeFired.delete(sessionId);
-      return;
-    }
-    if (args.ctxReduceEnabled === false)
-      return;
-    if (args.emergencyNudgeFired.has(sessionId))
-      return;
-    const meta3 = getOrCreateSessionMeta(args.db, sessionId);
-    if (meta3.isSubagent)
-      return;
-    args.emergencyNudgeFired.add(sessionId);
-    updateSessionMeta(args.db, sessionId, { lastNudgeTokens: entry.usage.inputTokens });
-    const nudgeText = generateEmergencyNudgeText(args.db, sessionId, entry.usage, {
-      protected_tags: args.protectedTags
-    });
-    sessionLog(sessionId, "firing 80% emergency nudge as ignored notification");
-    try {
-      const model = args.liveModelBySession.get(sessionId);
-      const variant = args.variantBySession.get(sessionId);
-      const agent = args.agentBySession.get(sessionId);
-      const c = args.client;
-      if (typeof c.session?.promptAsync !== "function") {
-        sessionLog(sessionId, "emergency nudge: promptAsync unavailable");
-        args.emergencyNudgeFired.delete(sessionId);
-        return;
-      }
-      await c.session.promptAsync({
-        path: { id: sessionId },
-        body: {
-          ...agent ? { agent } : {},
-          ...model ? { model } : {},
-          ...variant ? { variant } : {},
-          parts: [{ type: "text", text: nudgeText }]
-        }
-      });
-    } catch (error48) {
-      sessionLog(sessionId, "emergency nudge promptAsync failed:", error48);
-      args.emergencyNudgeFired.delete(sessionId);
-    }
   };
 }
 function createCommandExecuteBeforeHook(commandHandler) {
@@ -170217,7 +170331,7 @@ init_send_session_notification();
 
 // src/hooks/magic-context/system-prompt-hash.ts
 import { existsSync as existsSync7, readFileSync as readFileSync6, realpathSync } from "fs";
-import { join as join14, resolve as resolve3, sep } from "path";
+import { join as join15, resolve as resolve3, sep } from "path";
 
 // src/agents/magic-context-prompt.ts
 function getToolHistoryGuidance(dropToolStructure) {
@@ -170436,11 +170550,17 @@ var USER_PROFILE_MARKER = "<user-profile>";
 var KEY_FILES_MARKER = "<key-files>";
 var cachedUserProfileBySession = new Map;
 var cachedKeyFilesBySession = new Map;
+function clearSystemPromptHashSession(sessionId, handleMaps) {
+  cachedUserProfileBySession.delete(sessionId);
+  cachedKeyFilesBySession.delete(sessionId);
+  handleMaps.stickyDateBySession.delete(sessionId);
+  handleMaps.cachedDocsBySession.delete(sessionId);
+}
 var DOC_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 function readProjectDocs(directory) {
   const sections = [];
   for (const filename of DOC_FILES) {
-    const filePath = join14(directory, filename);
+    const filePath = join15(directory, filename);
     try {
       if (existsSync7(filePath)) {
         const content = readFileSync6(filePath, "utf-8").trim();
@@ -170466,7 +170586,7 @@ function createSystemPromptHashHandler(deps) {
   const stickyDateBySession = new Map;
   const cachedDocsBySession = new Map;
   const shouldInjectDocs = deps.dreamerEnabled && deps.injectDocs;
-  return async (input, output) => {
+  const handler = async (input, output) => {
     const sessionId = input.sessionID;
     if (!sessionId)
       return;
@@ -170633,6 +170753,15 @@ ${sections.join(`
       updateSessionMeta(deps.db, sessionId, { systemPromptTokens });
     }
   };
+  return {
+    handler,
+    clearSession: (sessionId) => {
+      clearSystemPromptHashSession(sessionId, {
+        stickyDateBySession,
+        cachedDocsBySession
+      });
+    }
+  };
 }
 
 // src/hooks/magic-context/hook.ts
@@ -170671,6 +170800,13 @@ function createMagicContextHook(deps) {
   }
   const projectPath = resolveProjectIdentity(deps.directory);
   registerDreamProjectDirectory(projectPath, deps.directory);
+  if (deps.config.compaction_markers !== false) {
+    try {
+      checkCompactionMarkerConsistency(db);
+    } catch (error48) {
+      log("[magic-context] startup compaction-marker consistency check failed:", error48);
+    }
+  }
   let lastScheduleCheckMs = 0;
   const getHistorianChunkTokens = () => deriveHistorianChunkTokens(resolveHistorianContextLimit(deps.config.historian?.model));
   const nudgePlacements = createNudgePlacementStore(db);
@@ -170763,6 +170899,9 @@ function createMagicContextHook(deps) {
     onSessionCacheInvalidated: (sessionId) => {
       clearInjectionCache(sessionId);
       deps.onSessionCacheInvalidated?.(sessionId);
+    },
+    onSessionDeleted: (sessionId) => {
+      systemPromptHash.clearSession(sessionId);
     }
   });
   const runDreamQueueInBackground = () => {
@@ -170831,7 +170970,10 @@ function createMagicContextHook(deps) {
         return model ? `${model.providerID}/${model.modelID}` : undefined;
       })(),
       getNotificationParams: () => getLiveNotificationParams(sessionId, liveModelBySession, variantBySession, agentBySession),
-      historianTwoPass: deps.config.historian?.two_pass === true
+      historianTwoPass: deps.config.historian?.two_pass === true,
+      onInjectionCacheCleared: (sid) => {
+        flushedSessions.add(sid);
+      }
     }, options),
     sendNotification: async (sessionId, text, params) => {
       await sendIgnoredMessage(deps.client, sessionId, text, {
@@ -170861,8 +171003,7 @@ function createMagicContextHook(deps) {
       } : undefined
     } : undefined
   });
-  const emergencyNudgeFired = new Set;
-  const systemPromptHashHandler = createSystemPromptHashHandler({
+  const systemPromptHash = createSystemPromptHashHandler({
     db,
     protectedTags: deps.config.protected_tags,
     ctxReduceEnabled,
@@ -170877,6 +171018,7 @@ function createMagicContextHook(deps) {
     experimentalPinKeyFilesTokenBudget: deps.config.dreamer?.pin_key_files?.token_budget,
     experimentalTemporalAwareness: deps.config.experimental?.temporal_awareness === true
   });
+  const systemPromptHashHandler = systemPromptHash.handler;
   const eventHook = createEventHook({
     eventHandler,
     contextUsageMap,
@@ -170886,7 +171028,6 @@ function createMagicContextHook(deps) {
     agentBySession,
     recentReduceBySession,
     toolUsageSinceUserTurn,
-    emergencyNudgeFired,
     flushedSessions,
     lastHeuristicsTurnId,
     commitSeenLastPass,
@@ -172322,13 +172463,13 @@ import { dirname as dirname2 } from "path";
 
 // src/shared/rpc-utils.ts
 import { createHash as createHash2 } from "crypto";
-import { join as join15 } from "path";
+import { join as join16 } from "path";
 function projectHash(directory) {
   const normalized = directory.replace(/\/+$/, "");
   return createHash2("sha256").update(normalized).digest("hex").slice(0, 16);
 }
 function rpcPortFilePath(storageDir, directory) {
-  return join15(storageDir, "rpc", projectHash(directory), "port");
+  return join16(storageDir, "rpc", projectHash(directory), "port");
 }
 
 // src/shared/rpc-server.ts