@retaw106/mmc-oc 2.4.0 → 2.6.0

package/dist/{index-kahkxcqw.js → index-xk1dz6q9.js}

@@ -20,6 +20,7 @@ import {
   peelLeadingMcTagNotation,
   isRecord,
   removeSystemReminders,
+  removeNestedBlocks,
   hasMeaningfulUserText2,
   extractTexts2,
   estimateTokens,
@@ -42,12 +43,16 @@ import {
   retreatPastHostUnservedRows,
   snapTerminalCompartmentToServedRow,
   isHostRenderedSystemMessage,
+  markCoveredInstructionRow,
+  isCoveredInstructionRow,
   completedToolArcCrossesBoundary,
   buildToolArcs,
   fenceBoundaryForCompletedToolArcs,
   fenceBoundaryForToolArcs,
   buildTrueRawTokenIndex,
   computeRawRangeFingerprint,
+  isFilePart,
+  BoundedSessionMap,
   setDatabase,
   loadToolDefinitionMeasurements,
   getMeasuredToolDefinitionTokens,
@@ -67,20 +72,22 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-48e9znrc.js";
+} from "./index-t0zx3tgz.js";
 import {
   inRootAsyncContext,
   registerSlowWriteReporter,
   registerSqliteDiagnosticSink,
   detectSqliteRuntime,
   Database,
+  createSqliteTurnDatabase,
+  hasSqliteTurnDeadlineRouting,
   prepareCachedStatement,
   withSqliteBackgroundWriter,
   withoutSqliteTransformPass,
   isTransientSqliteError,
   beginSqliteWriterAsync,
   withPrivilegedWriter
-} from "./index-dwh99z66.js";
+} from "./index-pte3cfs9.js";
 import {
   piModelRefToCanonical,
   modelRefLookupOrder,
@@ -98,9 +105,11 @@ import {
   openCodeDbPathExists,
   claimOpenCodeDbDiagnosticOnce,
   isStrictGapHealingMessage,
+  dropRawSessionOrdinalCheckpoints,
+  openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-ykq24x1n.js";
+} from "./index-8rmt6s4f.js";
 import {
   shouldEnforcePrivateStoragePermissions,
   ensureStorageDirectorySync,
@@ -125,7 +134,7 @@ import {
   getErrorMessage,
   describeError,
   sendStatusNotification2
-} from "./index-r7s7d350.js";
+} from "./index-s3ebcy63.js";
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
@@ -1454,51 +1463,6 @@ function scheduleAfterBootQuiet(task, additionalDelayMs = 0) {
   return timer;
 }
 
-// src/shared/bounded-session-map.ts
-class BoundedSessionMap {
-  maxEntries;
-  store = new Map;
-  constructor(maxEntries) {
-    if (!Number.isFinite(maxEntries) || maxEntries < 1) {
-      throw new Error(`BoundedSessionMap: maxEntries must be >= 1, got ${maxEntries}`);
-    }
-    this.maxEntries = maxEntries;
-  }
-  get(sessionId) {
-    const value = this.store.get(sessionId);
-    if (value === undefined)
-      return;
-    this.store.delete(sessionId);
-    this.store.set(sessionId, value);
-    return value;
-  }
-  peek(sessionId) {
-    return this.store.get(sessionId);
-  }
-  has(sessionId) {
-    return this.store.has(sessionId);
-  }
-  set(sessionId, value) {
-    if (this.store.has(sessionId)) {
-      this.store.delete(sessionId);
-    } else if (this.store.size >= this.maxEntries) {
-      const oldest = this.store.keys().next().value;
-      if (oldest !== undefined)
-        this.store.delete(oldest);
-    }
-    this.store.set(sessionId, value);
-  }
-  delete(sessionId) {
-    return this.store.delete(sessionId);
-  }
-  clear() {
-    this.store.clear();
-  }
-  get size() {
-    return this.store.size;
-  }
-}
-
 // src/shared/rpc-utils.ts
 import { execFile, execFileSync as execFileSync2 } from "node:child_process";
 import { createHash as createHash4 } from "node:crypto";
@@ -2285,76 +2249,6 @@ function isCompartmentLeaseHeld(db, sessionId, holderId) {
   return row != null;
 }
 
-// src/features/magic-context/compression-depth-storage.ts
-var incrementDepthStatements = new WeakMap;
-var totalDepthStatements = new WeakMap;
-var maxDepthStatements = new WeakMap;
-var clearDepthStatements = new WeakMap;
-function getClearDepthStatement(db) {
-  let stmt = clearDepthStatements.get(db);
-  if (!stmt) {
-    stmt = db.prepare("DELETE FROM compression_depth WHERE session_id = ?");
-    clearDepthStatements.set(db, stmt);
-  }
-  return stmt;
-}
-function clearCompressionDepth(db, sessionId) {
-  getClearDepthStatement(db).run(sessionId);
-}
-function clearCompressionDepthRange(db, sessionId, startOrdinal, endOrdinal) {
-  if (endOrdinal < startOrdinal) {
-    return;
-  }
-  db.prepare("DELETE FROM compression_depth WHERE session_id = ? AND message_ordinal BETWEEN ? AND ?").run(sessionId, startOrdinal, endOrdinal);
-}
-
-// src/features/magic-context/no-content-compartment.ts
-function isNoContentCompartment(row) {
-  return [row.title, row.content, row.p1, row.p2, row.p3, row.p4].every((value) => !value);
-}
-
-// src/features/magic-context/storage-m0-mutation-log.ts
-var M0_MUTATION_TYPES = new Set([
-  "compartment_delete",
-  "compartment_merge",
-  "recomp_boundary_change",
-  "compartment_upgrade"
-]);
-function assertMutationType(mutationType) {
-  if (!M0_MUTATION_TYPES.has(mutationType)) {
-    throw new Error(`Invalid m0 mutation type: ${mutationType}`);
-  }
-}
-function toM0Mutation(row) {
-  return {
-    id: row.id,
-    sessionId: row.session_id,
-    mutationType: row.mutation_type,
-    targetId: row.target_id,
-    queuedAt: row.queued_at
-  };
-}
-function queueM0Mutation(db, input) {
-  assertMutationType(input.mutationType);
-  const result = db.prepare(`INSERT INTO m0_mutation_log (session_id, mutation_type, target_id, queued_at)
-             VALUES (?, ?, ?, ?)`).run(input.sessionId, input.mutationType, input.targetId ?? null, input.queuedAt ?? Date.now());
-  const row = getM0Mutation(db, Number(result.lastInsertRowid));
-  if (!row) {
-    throw new Error("Failed to load queued m0 mutation");
-  }
-  return row;
-}
-function getM0Mutation(db, id) {
-  const row = db.prepare(`SELECT id, session_id, mutation_type, target_id, queued_at
-             FROM m0_mutation_log
-             WHERE id = ?`).get(id);
-  return row ? toM0Mutation(row) : null;
-}
-function getMaxM0MutationId(db, sessionId) {
-  const row = db.prepare("SELECT MAX(id) AS max_id FROM m0_mutation_log WHERE session_id = ?").get(sessionId);
-  return row?.max_id ?? null;
-}
-
 // src/features/magic-context/storage-meta-shared.ts
 import { Buffer as Buffer2 } from "node:buffer";
 var SESSION_META_SELECT_COLUMNS = [
@@ -2513,7 +2407,7 @@ function isSessionMetaRow(row) {
   if (row === null || typeof row !== "object")
     return false;
   const r = row;
-  return typeof r.session_id === "string" && isNumberOrNull(r.last_response_time) && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && typeof r.is_subagent === "number" && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isStringOrNull(r.cached_m0_mural_data_url) && isStringOrNull(r.cached_m0_mural_hash) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isStringOrNull(r.cached_m0_workspace_fingerprint) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.cached_m0_system_hash) && isStringOrNull(r.cached_m0_tool_set_hash) && isStringOrNull(r.cached_m0_model_key) && isStringOrNull(r.cached_m0_project_identity) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.last_usage_context_limit) && isNumberOrNull(r.prior_boundary_ordinal) && isNumberOrNull(r.protected_tail_policy_version) && isNumberOrNull(r.protected_tail_drain_window_started_at) && isNumberOrNull(r.protected_tail_drain_tokens) && isNumberOrNull(r.recovery_no_eligible_head_count) && isNumberOrNull(r.force_emergency_bypass_window_start) && isNumberOrNull(r.force_emergency_bypass_used) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.upgrade_reminder_last_sent_at) && isNumberOrNull(r.upgrade_reminder_count) && isNumberOrNull(r.pi_stable_id_scheme) && isNumberOrNull(r.tool_reclaim_watermark);
+  return typeof r.session_id === "string" && isNumberOrNull(r.last_response_time) && isStringOrNull(r.cache_ttl) && typeof r.counter === "number" && typeof r.last_nudge_tokens === "number" && isStringOrNull(r.last_nudge_band) && isStringOrNull(r.last_transform_error) && isNumberOrNull(r.is_subagent) && typeof r.last_context_percentage === "number" && typeof r.last_input_tokens === "number" && isNumberOrNull(r.observed_safe_input_tokens) && isNumberOrNull(r.cache_alert_sent) && isNumberOrNull(r.times_execute_threshold_reached) && isNumberOrNull(r.compartment_in_progress) && (r.system_prompt_hash === null || typeof r.system_prompt_hash === "string" || typeof r.system_prompt_hash === "number") && isNumberOrNull(r.system_prompt_tokens) && isNumberOrNull(r.conversation_tokens) && isNumberOrNull(r.tool_call_tokens) && isNumberOrNull(r.cleared_reasoning_through_tag) && isStringOrNull(r.last_todo_state) && isBlobOrNull(r.cached_m0_bytes) && isStringOrNull(r.cached_m0_mural_data_url) && isStringOrNull(r.cached_m0_mural_hash) && isBlobOrNull(r.cached_m1_bytes) && isNumberOrNull(r.cached_m0_project_memory_epoch) && isStringOrNull(r.cached_m0_workspace_fingerprint) && isNumberOrNull(r.cached_m0_project_user_profile_version) && isNumberOrNull(r.cached_m0_max_compartment_seq) && isNumberOrNull(r.cached_m0_max_memory_id) && isNumberOrNull(r.cached_m0_max_mutation_id) && isNumberOrNull(r.cached_m0_max_memory_mutation_id) && isStringOrNull(r.cached_m0_project_docs_hash) && isNumberOrNull(r.cached_m0_materialized_at) && isNumberOrNull(r.cached_m0_session_facts_version) && isStringOrNull(r.cached_m0_upgrade_state) && isStringOrNull(r.cached_m0_system_hash) && isStringOrNull(r.cached_m0_tool_set_hash) && isStringOrNull(r.cached_m0_model_key) && isStringOrNull(r.cached_m0_project_identity) && isStringOrNull(r.last_observed_model_key) && isNumberOrNull(r.last_usage_context_limit) && isNumberOrNull(r.prior_boundary_ordinal) && isNumberOrNull(r.protected_tail_policy_version) && isNumberOrNull(r.protected_tail_drain_window_started_at) && isNumberOrNull(r.protected_tail_drain_tokens) && isNumberOrNull(r.recovery_no_eligible_head_count) && isNumberOrNull(r.force_emergency_bypass_window_start) && isNumberOrNull(r.force_emergency_bypass_used) && isNumberOrNull(r.upgrade_reminded_at) && isNumberOrNull(r.upgrade_reminder_last_sent_at) && isNumberOrNull(r.upgrade_reminder_count) && isNumberOrNull(r.pi_stable_id_scheme) && isNumberOrNull(r.tool_reclaim_watermark);
 }
 function getDefaultSessionMeta(sessionId) {
   return {
@@ -2573,7 +2467,7 @@ function getDefaultSessionMeta(sessionId) {
   };
 }
 var sessionMetaExistsStatements = new WeakMap;
-function ensureSessionMetaRow(db, sessionId, initialIsSubagent = false) {
+function ensureSessionMetaRow(db, sessionId, initialIsSubagent = getHarness() === "opencode2" ? null : false) {
   let exists = sessionMetaExistsStatements.get(db);
   if (!exists) {
     exists = prepareCachedStatement(db, "SELECT 1 FROM session_meta WHERE session_id = ?");
@@ -2582,7 +2476,7 @@ function ensureSessionMetaRow(db, sessionId, initialIsSubagent = false) {
   if (exists.get(sessionId))
     return;
   const defaults = getDefaultSessionMeta(sessionId);
-  db.prepare("INSERT OR IGNORE INTO session_meta (session_id, harness, last_response_time, cache_ttl, counter, last_nudge_tokens, last_nudge_band, last_transform_error, is_subagent, last_context_percentage, last_input_tokens, observed_safe_input_tokens, cache_alert_sent, times_execute_threshold_reached, compartment_in_progress, system_prompt_hash, cleared_reasoning_through_tag) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(sessionId, getHarness(), defaults.lastResponseTime, defaults.cacheTtl, defaults.counter, defaults.lastNudgeTokens, defaults.lastNudgeBand ?? "", defaults.lastTransformError ?? "", initialIsSubagent ? 1 : 0, defaults.lastContextPercentage, defaults.lastInputTokens, defaults.observedSafeInputTokens, defaults.cacheAlertSent ? 1 : 0, defaults.timesExecuteThresholdReached, defaults.compartmentInProgress ? 1 : 0, defaults.systemPromptHash ?? "", defaults.clearedReasoningThroughTag);
+  db.prepare("INSERT OR IGNORE INTO session_meta (session_id, harness, last_response_time, cache_ttl, counter, last_nudge_tokens, last_nudge_band, last_transform_error, is_subagent, last_context_percentage, last_input_tokens, observed_safe_input_tokens, cache_alert_sent, times_execute_threshold_reached, compartment_in_progress, system_prompt_hash, cleared_reasoning_through_tag) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run(sessionId, getHarness(), defaults.lastResponseTime, defaults.cacheTtl, defaults.counter, defaults.lastNudgeTokens, defaults.lastNudgeBand ?? "", defaults.lastTransformError ?? "", initialIsSubagent === null ? null : initialIsSubagent ? 1 : 0, defaults.lastContextPercentage, defaults.lastInputTokens, defaults.observedSafeInputTokens, defaults.cacheAlertSent ? 1 : 0, defaults.timesExecuteThresholdReached, defaults.compartmentInProgress ? 1 : 0, defaults.systemPromptHash ?? "", defaults.clearedReasoningThroughTag);
 }
 function toSessionMeta(row) {
   const nudgeBandRaw = typeof row.last_nudge_band === "string" ? row.last_nudge_band : "";
@@ -2713,6 +2607,79 @@ function clearCachedM0M1(db, sessionId) {
     return;
   db.prepare(`UPDATE session_meta SET ${setClauses.join(", ")} WHERE session_id = ?`).run(...values, sessionId);
 }
+function clearCachedM0(db, sessionId) {
+  clearCachedM0M1(db, sessionId);
+}
+
+// src/features/magic-context/compression-depth-storage.ts
+var incrementDepthStatements = new WeakMap;
+var totalDepthStatements = new WeakMap;
+var maxDepthStatements = new WeakMap;
+var clearDepthStatements = new WeakMap;
+function getClearDepthStatement(db) {
+  let stmt = clearDepthStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM compression_depth WHERE session_id = ?");
+    clearDepthStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function clearCompressionDepth(db, sessionId) {
+  getClearDepthStatement(db).run(sessionId);
+}
+function clearCompressionDepthRange(db, sessionId, startOrdinal, endOrdinal) {
+  if (endOrdinal < startOrdinal) {
+    return;
+  }
+  db.prepare("DELETE FROM compression_depth WHERE session_id = ? AND message_ordinal BETWEEN ? AND ?").run(sessionId, startOrdinal, endOrdinal);
+}
+
+// src/features/magic-context/no-content-compartment.ts
+function isNoContentCompartment(row) {
+  return [row.title, row.content, row.p1, row.p2, row.p3, row.p4].every((value) => !value);
+}
+
+// src/features/magic-context/storage-m0-mutation-log.ts
+var M0_MUTATION_TYPES = new Set([
+  "compartment_delete",
+  "compartment_merge",
+  "recomp_boundary_change",
+  "compartment_upgrade"
+]);
+function assertMutationType(mutationType) {
+  if (!M0_MUTATION_TYPES.has(mutationType)) {
+    throw new Error(`Invalid m0 mutation type: ${mutationType}`);
+  }
+}
+function toM0Mutation(row) {
+  return {
+    id: row.id,
+    sessionId: row.session_id,
+    mutationType: row.mutation_type,
+    targetId: row.target_id,
+    queuedAt: row.queued_at
+  };
+}
+function queueM0Mutation(db, input) {
+  assertMutationType(input.mutationType);
+  const result = db.prepare(`INSERT INTO m0_mutation_log (session_id, mutation_type, target_id, queued_at)
+             VALUES (?, ?, ?, ?)`).run(input.sessionId, input.mutationType, input.targetId ?? null, input.queuedAt ?? Date.now());
+  const row = getM0Mutation(db, Number(result.lastInsertRowid));
+  if (!row) {
+    throw new Error("Failed to load queued m0 mutation");
+  }
+  return row;
+}
+function getM0Mutation(db, id) {
+  const row = db.prepare(`SELECT id, session_id, mutation_type, target_id, queued_at
+             FROM m0_mutation_log
+             WHERE id = ?`).get(id);
+  return row ? toM0Mutation(row) : null;
+}
+function getMaxM0MutationId(db, sessionId) {
+  const row = db.prepare("SELECT MAX(id) AS max_id FROM m0_mutation_log WHERE session_id = ?").get(sessionId);
+  return row?.max_id ?? null;
+}
 
 // src/features/magic-context/storage-schema-helpers.ts
 var columnCaches = new WeakMap;
@@ -8174,7 +8141,7 @@ function parseFrozenCalibration(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value))
     return null;
   const candidate = value;
-  if (typeof candidate.revision !== "string" || candidate.revision.length === 0 || typeof candidate.providerId !== "string" || typeof candidate.modelId !== "string" || !finitePositive(candidate.systemRatio) || !finitePositive(candidate.toolsRatio) || !finitePositive(candidate.proseRatio) || candidate.source !== "seed" && candidate.source !== "family-fallback") {
+  if (typeof candidate.revision !== "string" || candidate.revision.length === 0 || typeof candidate.providerId !== "string" || typeof candidate.modelId !== "string" || !finitePositive(candidate.systemRatio) || !finitePositive(candidate.toolsRatio) || !finitePositive(candidate.proseRatio) || candidate.source !== "seed" && candidate.source !== "family-fallback" && candidate.source !== "model-id") {
     return null;
   }
   return {
@@ -9809,7 +9776,11 @@ function parsePersistedCompactionMarkerState(raw, storedTargetEndMessageId) {
     if (parsed && typeof parsed === "object" && typeof parsed.boundaryMessageId === "string" && typeof parsed.summaryMessageId === "string" && typeof parsed.compactionPartId === "string" && typeof parsed.summaryPartId === "string" && typeof parsed.boundaryOrdinal === "number") {
       const targetEndMessageId = typeof storedTargetEndMessageId === "string" && storedTargetEndMessageId.length > 0 ? storedTargetEndMessageId : typeof parsed.targetEndMessageId === "string" && parsed.targetEndMessageId.length > 0 ? parsed.targetEndMessageId : null;
       return {
-        ...parsed,
+        boundaryMessageId: parsed.boundaryMessageId,
+        summaryMessageId: parsed.summaryMessageId,
+        compactionPartId: parsed.compactionPartId,
+        summaryPartId: parsed.summaryPartId,
+        boundaryOrdinal: parsed.boundaryOrdinal,
         targetEndMessageId
       };
     }
@@ -9820,11 +9791,57 @@ function getPersistedCompactionMarkerState(db, sessionId) {
   const row = db.prepare("SELECT compaction_marker_state, compaction_marker_target_end_message_id FROM session_meta WHERE session_id = ?").get(sessionId);
   return parsePersistedCompactionMarkerState(row?.compaction_marker_state, row?.compaction_marker_target_end_message_id);
 }
-function setPersistedCompactionMarkerState(db, sessionId, state) {
+function getCompactionMarkerPublicationState(db, sessionId) {
+  const row = db.prepare("SELECT compaction_marker_state FROM session_meta WHERE session_id = ?").get(sessionId);
+  const raw = row?.compaction_marker_state ?? "";
+  let pending = null;
+  try {
+    pending = parsePersistedCompactionMarkerState(JSON.stringify(JSON.parse(raw).pending));
+  } catch {}
+  return { raw, pending };
+}
+function compareAndSetCompactionMarkerPublicationState(db, sessionId, expectedRaw, state, pending) {
+  return db.transaction(() => {
+    ensureSessionMetaRow(db, sessionId);
+    let envelope = {};
+    if (pending) {
+      try {
+        const parsed = JSON.parse(expectedRaw);
+        if (parsed && typeof parsed === "object")
+          envelope = parsed;
+      } catch {}
+    }
+    const raw = JSON.stringify(pending ? { ...envelope, pending } : state);
+    const result = db.prepare(`UPDATE session_meta SET compaction_marker_state = ?, compaction_marker_target_end_message_id = ?
+             WHERE session_id = ? AND COALESCE(compaction_marker_state, '') = ?`).run(raw, state?.targetEndMessageId ?? null, sessionId, expectedRaw);
+    if (result.changes !== 1)
+      throw new Error("marker publication state changed concurrently");
+    return raw;
+  }).immediate();
+}
+function clearCompactionMarkerPublicationIntent(db, sessionId) {
+  const { raw, pending } = getCompactionMarkerPublicationState(db, sessionId);
+  if (!pending)
+    return;
+  let envelope = {};
+  try {
+    const parsed = JSON.parse(raw);
+    if (parsed && typeof parsed === "object")
+      envelope = parsed;
+  } catch {}
+  delete envelope.pending;
+  const json = Object.keys(envelope).length > 0 ? JSON.stringify(envelope) : "";
+  db.prepare("UPDATE session_meta SET compaction_marker_state = ? WHERE session_id = ? AND compaction_marker_state = ?").run(json, sessionId, raw);
+}
+function setPersistedCompactionMarkerState(db, sessionId, state, options = {}) {
   db.transaction(() => {
     ensureSessionMetaRow(db, sessionId);
     const previous = state === null ? getPersistedCompactionMarkerState(db, sessionId) ?? getDeferredClearedCompactionMarkerState(db, sessionId) : null;
-    const json = state ? JSON.stringify(state) : previous ? JSON.stringify({ deferredClear: previous }) : "";
+    const pending = state === null && options.preservePending ? getCompactionMarkerPublicationState(db, sessionId).pending : null;
+    const json = state ? JSON.stringify(state) : previous || pending ? JSON.stringify({
+      ...previous ? { deferredClear: previous } : {},
+      ...pending ? { pending } : {}
+    }) : "";
     db.prepare("UPDATE session_meta SET compaction_marker_state = ?, compaction_marker_target_end_message_id = ? WHERE session_id = ?").run(json, state?.targetEndMessageId ?? null, sessionId);
   }).immediate();
 }
@@ -10580,6 +10597,12 @@ class V2StoreReaderPool {
     this.idleWaiters.clear();
   }
 }
+function messageTimesQuery(count, withVersions = false) {
+  return `SELECT id, COALESCE(time_created, json_extract(data, '$.time.created')) AS created,
+                   json_extract(data, '$.time.completed') AS completed
+                   ${withVersions ? ", type, seq, time_created AS version_created, time_updated AS version_updated" : ""}
+            FROM session_message WHERE +session_id = ? AND id IN (${Array.from({ length: count }, () => "?").join(",")})`;
+}
 
 class V2StoreReader {
   path;
@@ -10676,6 +10699,12 @@ class V2StoreReader {
       return typeof row?.count === "number" ? row.count : 0;
     });
   }
+  messageCountAfterSequence(sessionID, after, through) {
+    const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
+    const row = this.prepare(`SELECT COUNT(*) AS count FROM session_message
+             WHERE session_id = ? AND seq > ? AND seq <= ? AND type IN (${rawTypes})`).get(sessionID, after, through, ...RAW_MESSAGE_TYPES);
+    return typeof row?.count === "number" ? row.count : 0;
+  }
   sessionDirectoryPage(afterSessionID, limit) {
     const rows = this.prepare(`SELECT id, COALESCE(directory, '') AS directory FROM session_v2
                  WHERE id > ? ORDER BY id ASC LIMIT ?`).all(afterSessionID ?? "", limit);
@@ -10709,6 +10738,49 @@ class V2StoreReader {
       return row ? decode2(row) : null;
     });
   }
+  messageTimeVersions(sessionID, ids, span) {
+    const versions = new Map;
+    if (ids.length > 0 && span && span.last - span.first < ids.length * 2) {
+      const wanted = new Set(ids);
+      const rows = this.prepare(`SELECT id, type, seq, time_created AS created, time_updated AS updated
+                FROM session_message WHERE session_id = ? AND seq >= ? AND seq <= ?`).all(sessionID, span.first, span.last);
+      for (const row of rows)
+        if (wanted.has(row.id))
+          versions.set(row.id, row);
+      for (const [id, version] of this.messageTimeVersions(sessionID, ids.filter((id) => !versions.has(id))))
+        versions.set(id, version);
+      return versions;
+    }
+    for (let offset = 0;offset < ids.length; offset += 500) {
+      const batch = ids.slice(offset, offset + 500);
+      const rows = this.prepare(`SELECT id, type, seq, time_created AS created, time_updated AS updated
+                FROM session_message WHERE +session_id = ? AND id IN (${batch.map(() => "?").join(",")})`).all(sessionID, ...batch);
+      for (const row of rows)
+        versions.set(row.id, row);
+    }
+    return versions;
+  }
+  messageTimes(sessionID, ids, versions) {
+    const times = new Map;
+    for (let offset = 0;offset < ids.length; offset += 500) {
+      const batch = ids.slice(offset, offset + 500);
+      const rows = this.prepare(messageTimesQuery(batch.length, versions !== undefined)).all(sessionID, ...batch);
+      for (const row of rows) {
+        times.set(row.id, {
+          created: typeof row.created === "number" ? row.created : undefined,
+          completed: typeof row.completed === "number" ? row.completed : undefined
+        });
+        versions?.set(row.id, {
+          id: row.id,
+          type: row.type,
+          seq: row.seq,
+          created: row.version_created,
+          updated: row.version_updated
+        });
+      }
+    }
+    return times;
+  }
   messageExistsById(sessionID, id) {
     return trackDecodeOperation("messageExistsById", () => {
       const rawTypes = RAW_MESSAGE_TYPES.map(() => "?").join(", ");
@@ -10794,6 +10866,14 @@ class V2StoreReader {
                          ORDER BY seq DESC LIMIT ?`).all(sessionID, ...RAW_MESSAGE_TYPES, throughSeq, limit).map(decode2);
     });
   }
+  instructionRowsThrough(sessionID, throughSeq) {
+    return trackDecodeOperation("instructionRowsThrough", () => {
+      if (!Number.isSafeInteger(throughSeq))
+        throw new Error("Invalid seq upper bound");
+      return this.prepare(`SELECT id, session_id, type, seq, time_created, data FROM session_message
+                     WHERE session_id = ? AND type = 'system' AND seq <= ? ORDER BY seq ASC`).all(sessionID, throughSeq).map(decode2);
+    });
+  }
   sequenceForId(sessionID, id) {
     if (!id)
       return;
@@ -10913,87 +10993,9 @@ class V2StoreReader {
 // src/features/magic-context/storage-meta-session.ts
 import { Buffer as Buffer3 } from "node:buffer";
 
-// src/shared/auto-search-lifecycle.ts
-var pending = new Map;
-var unpublishedNoHints = new Map;
-function rememberUnpublishedAutoSearchNoHint(sessionId, messageId, reason) {
-  let messages = unpublishedNoHints.get(sessionId);
-  if (!messages) {
-    messages = new Map;
-    unpublishedNoHints.set(sessionId, messages);
-  }
-  if (!messages.has(messageId))
-    messages.set(messageId, reason);
-}
-function getUnpublishedAutoSearchNoHint(sessionId, messageId) {
-  return unpublishedNoHints.get(sessionId)?.get(messageId);
-}
-function forgetUnpublishedAutoSearchNoHint(sessionId, messageId) {
-  const messages = unpublishedNoHints.get(sessionId);
-  messages?.delete(messageId);
-  if (messages?.size === 0)
-    unpublishedNoHints.delete(sessionId);
-}
-function clearUnpublishedAutoSearchNoHints(sessionId) {
-  if (sessionId === undefined)
-    unpublishedNoHints.clear();
-  else
-    unpublishedNoHints.delete(sessionId);
-}
-function registerAutoSearchWork(sessionId) {
-  const controller = new AbortController;
-  const work = pending.get(sessionId) ?? new Set;
-  pending.set(sessionId, work);
-  work.add(controller);
-  return {
-    signal: controller.signal,
-    done: () => {
-      work.delete(controller);
-      if (pending.get(sessionId) === work && work.size === 0)
-        pending.delete(sessionId);
-    }
-  };
-}
-function cancelAutoSearchWork(sessionId) {
-  for (const [id, work] of pending) {
-    if (sessionId !== undefined && id !== sessionId)
-      continue;
-    pending.delete(id);
-    for (const controller of work)
-      controller.abort();
-  }
-}
-
-// src/features/magic-context/resolve-subagent-fallback.ts
-function resolveIsSubagentFromOpenCodeDb(sessionId) {
-  try {
-    return withReadOnlySessionDb((openCodeDb) => {
-      const row = openCodeDb.prepare("SELECT parent_id FROM session WHERE id = ?").get(sessionId);
-      if (!row)
-        return null;
-      return typeof row.parent_id === "string" && row.parent_id.length > 0;
-    });
-  } catch (error) {
-    log(`[magic-context] resolveIsSubagentFromOpenCodeDb failed for ${sessionId}:`, error);
-    return null;
-  }
-}
-function resolveIsSubagentFromOpenCode2Db(sessionId) {
-  let reader;
-  try {
-    reader = new V2StoreReader(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"));
-    return reader.isSubagent(sessionId);
-  } catch (error) {
-    log(`[magic-context] resolveIsSubagentFromOpenCode2Db failed for ${sessionId}:`, error);
-    return null;
-  } finally {
-    reader?.close();
-  }
-}
-
 // src/hooks/magic-context/lkg-recovery-fence.ts
 import { createHash as createHash7, randomUUID as randomUUID2 } from "node:crypto";
-import { lstatSync, readdirSync as readdirSync2, readFileSync as readFileSync4, rmSync as rmSync2 } from "node:fs";
+import { lstatSync, readdirSync as readdirSync2, readFileSync as readFileSync4, rmdirSync, rmSync as rmSync2 } from "node:fs";
 import { basename, dirname, join as join3 } from "node:path";
 
 // src/shared/storage-file-mutex.ts
@@ -11038,7 +11040,16 @@ function withStorageFileMutex(directory, work, timeoutMs = 1000) {
   const birth = processBirth(process.pid);
   const ticket = { choosing: true, number: 0, birth, checksum: "" };
   const encodedTicket = () => JSON.stringify({ ...ticket, checksum: ticketChecksum(name, ticket) });
-  writeStorageFileSync(ownPath, encodedTicket(), { flag: "wx", forcePrivate: true });
+  for (let attempt = 0;; attempt++) {
+    try {
+      writeStorageFileSync(ownPath, encodedTicket(), { flag: "wx", forcePrivate: true });
+      break;
+    } catch (error) {
+      if (error.code !== "ENOENT" || attempt >= 2)
+        throw error;
+      ensurePrivateStorageDirectorySync(directory);
+    }
+  }
   const deadline = performance.now() + timeoutMs;
   const peers = () => {
     const found = [];
@@ -11315,15 +11326,112 @@ function commitLkgWithRecoveryFence(args) {
 function clearLkgRecoveryFence(sessionId, remove, shouldClear) {
   if (!durableFencesSupported())
     return remove?.();
-  return locked(sessionId, () => {
-    const result = remove?.();
-    if (shouldClear && !shouldClear(result))
-      return result;
-    rmSync2(lkgRecoveryFencePath(sessionId), { force: true });
-    syncStorageDirectorySync(dirname(lkgRecoveryFencePath(sessionId)));
+  const path = lkgRecoveryFencePath(sessionId);
+  const missing = (file) => {
+    try {
+      lstatSync(file);
+      return false;
+    } catch (error) {
+      return error.code === "ENOENT";
+    }
+  };
+  if (!remove && !shouldClear && missing(path) && missing(`${path}.locks`)) {
     clearLkgFenceProcessState(sessionId);
-    return result;
-  });
+    return;
+  }
+  try {
+    return locked(sessionId, () => {
+      const result = remove?.();
+      if (shouldClear && !shouldClear(result))
+        return result;
+      rmSync2(lkgRecoveryFencePath(sessionId), { force: true });
+      syncStorageDirectorySync(dirname(lkgRecoveryFencePath(sessionId)));
+      clearLkgFenceProcessState(sessionId);
+      return result;
+    });
+  } finally {
+    try {
+      rmdirSync(`${path}.locks`);
+    } catch {}
+  }
+}
+
+// src/shared/auto-search-lifecycle.ts
+var pending = new Map;
+var unpublishedNoHints = new Map;
+function rememberUnpublishedAutoSearchNoHint(sessionId, messageId, reason) {
+  let messages = unpublishedNoHints.get(sessionId);
+  if (!messages) {
+    messages = new Map;
+    unpublishedNoHints.set(sessionId, messages);
+  }
+  if (!messages.has(messageId))
+    messages.set(messageId, reason);
+}
+function getUnpublishedAutoSearchNoHint(sessionId, messageId) {
+  return unpublishedNoHints.get(sessionId)?.get(messageId);
+}
+function forgetUnpublishedAutoSearchNoHint(sessionId, messageId) {
+  const messages = unpublishedNoHints.get(sessionId);
+  messages?.delete(messageId);
+  if (messages?.size === 0)
+    unpublishedNoHints.delete(sessionId);
+}
+function clearUnpublishedAutoSearchNoHints(sessionId) {
+  if (sessionId === undefined)
+    unpublishedNoHints.clear();
+  else
+    unpublishedNoHints.delete(sessionId);
+}
+function registerAutoSearchWork(sessionId) {
+  const controller = new AbortController;
+  const work = pending.get(sessionId) ?? new Set;
+  pending.set(sessionId, work);
+  work.add(controller);
+  return {
+    signal: controller.signal,
+    done: () => {
+      work.delete(controller);
+      if (pending.get(sessionId) === work && work.size === 0)
+        pending.delete(sessionId);
+    }
+  };
+}
+function cancelAutoSearchWork(sessionId) {
+  for (const [id, work] of pending) {
+    if (sessionId !== undefined && id !== sessionId)
+      continue;
+    pending.delete(id);
+    for (const controller of work)
+      controller.abort();
+  }
+}
+
+// src/features/magic-context/resolve-subagent-fallback.ts
+function resolveIsSubagentFromOpenCodeDb(sessionId) {
+  try {
+    return withReadOnlySessionDb((openCodeDb) => {
+      const row = openCodeDb.prepare("SELECT parent_id FROM session WHERE id = ?").get(sessionId);
+      if (!row)
+        return null;
+      return typeof row.parent_id === "string" && row.parent_id.length > 0;
+    });
+  } catch (error) {
+    log(`[magic-context] resolveIsSubagentFromOpenCodeDb failed for ${sessionId}:`, error);
+    return null;
+  }
+}
+function resolveIsSubagentFromOpenCode2Db(sessionId) {
+  let reader;
+  try {
+    reader = new V2StoreReader(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"));
+    return reader.isSubagent(sessionId);
+  } catch (error) {
+    log(`[magic-context] resolveIsSubagentFromOpenCode2Db failed for ${sessionId}:`, error);
+    return null;
+  } finally {
+    reader?.close();
+  }
 }
 
 // src/features/magic-context/message-fts-rowid-map.ts
@@ -11572,8 +11680,9 @@ function deleteSessionScopedRows(db, sessionIds, harness, options = {}) {
       retire.run(tagIdentityRevisionKey(id), tagRevisionKey(id), ...harnessTables.map(() => id), ...tagTombstoneOwnerRange(id));
     }
   }
-  for (const sessionId of deletableSessionIds)
-    clearLkgRecoveryFence(sessionId);
+  if (!options.deferRecoveryFenceCleanup)
+    for (const sessionId of deletableSessionIds)
+      clearLkgRecoveryFence(sessionId);
   return deletableSessionIds.length;
 }
 
@@ -11626,17 +11735,48 @@ function findSessionMeta(db, sessionId) {
   const result = db.prepare(`SELECT ${getSessionMetaSelectColumns(db)} FROM session_meta WHERE session_id = ?`).get(sessionId);
   return isSessionMetaRow(result) ? toSessionMeta(result) : undefined;
 }
+var parentReadRetries = new WeakMap;
+var PARENT_READ_ATTEMPTS = 5;
+var PARENT_READ_COOLDOWN_MS = 30000;
 function getOrCreateSessionMeta(db, sessionId) {
   const existing = findSessionMeta(db, sessionId);
-  if (existing)
-    return existing;
   const harness = getHarness();
-  const defaults = getDefaultSessionMeta(sessionId);
+  if (existing) {
+    if (harness !== "opencode2")
+      return existing;
+    const row = db.prepare("SELECT is_subagent FROM session_meta WHERE session_id = ?").get(sessionId);
+    if (row.is_subagent !== null)
+      return existing;
+  }
+  const defaults = existing ?? getDefaultSessionMeta(sessionId);
+  let retries = parentReadRetries.get(db);
+  if (harness === "opencode2") {
+    if (!retries) {
+      retries = new BoundedSessionMap(1000);
+      parentReadRetries.set(db, retries);
+    }
+    const retry = retries.get(sessionId);
+    if (retry && retry.attempts >= PARENT_READ_ATTEMPTS && Date.now() - retry.at < PARENT_READ_COOLDOWN_MS)
+      return defaults;
+  }
   const fallbackSubagent = harness === "opencode" ? resolveIsSubagentFromOpenCodeDb(sessionId) : harness === "opencode2" ? resolveIsSubagentFromOpenCode2Db(sessionId) : null;
   if (fallbackSubagent === true) {
     defaults.isSubagent = true;
   }
-  ensureSessionMetaRow(db, sessionId, harness === "opencode2" && fallbackSubagent === true);
+  if (harness === "opencode2") {
+    if (fallbackSubagent === null) {
+      const previous = retries?.get(sessionId);
+      const attempts = previous && Date.now() - previous.at < PARENT_READ_COOLDOWN_MS ? previous.attempts + 1 : 1;
+      retries?.set(sessionId, { attempts, at: Date.now() });
+      ensureSessionMetaRow(db, sessionId, null);
+      return defaults;
+    }
+    retries?.delete(sessionId);
+    ensureSessionMetaRow(db, sessionId, fallbackSubagent);
+    db.prepare("UPDATE session_meta SET is_subagent = ? WHERE session_id = ? AND is_subagent IS NULL").run(fallbackSubagent ? 1 : 0, sessionId);
+    return defaults;
+  }
+  ensureSessionMetaRow(db, sessionId);
   if (harness === "opencode" && fallbackSubagent === true) {
     db.prepare("UPDATE session_meta SET is_subagent = 1 WHERE session_id = ?").run(sessionId);
   }
@@ -11689,12 +11829,16 @@ function clearSession(db, sessionId, _rustModuleCleanupAcknowledged = false, per
   cancelAutoSearchWork(sessionId);
   const transactionStartedAt = performance.now();
   let clearedMarker = null;
+  let eligibleSessions = 0;
   db.transaction(() => {
     clearedMarker = getPendingPiCompactionMarkerState(db, sessionId);
-    deleteSessionScopedRows(db, [sessionId], undefined, {
-      preserveTagRevisionTombstones: !permanentlyDeleted
+    eligibleSessions = deleteSessionScopedRows(db, [sessionId], undefined, {
+      preserveTagRevisionTombstones: !permanentlyDeleted,
+      deferRecoveryFenceCleanup: true
     });
   }).immediate();
+  if (eligibleSessions > 0)
+    clearLkgRecoveryFence(sessionId);
   if (clearedMarker)
     logPiCompactionMarkerClear(sessionId, clearedMarker, "session-reset");
   clearUnpublishedAutoSearchNoHints(sessionId);
@@ -11881,13 +12025,13 @@ function identity(slot) {
     slot.inputContentDigests
   ])).update(slot.jsonPrefix).digest("hex");
 }
-function envelope(modelKey, systemPromptTokens, agentName) {
+function envelope(modelKey, systemPromptTokens, agentName, sessionId) {
   const slash = modelKey.indexOf("/");
   return JSON.stringify([
     modelKey,
     systemPromptTokens,
     agentName,
-    getMeasuredToolDefinitionTokens(modelKey.slice(0, slash), modelKey.slice(slash + 1), agentName)
+    getMeasuredToolDefinitionTokens(modelKey.slice(0, slash), modelKey.slice(slash + 1), agentName, sessionId)
   ]);
 }
 function beginV2LkgRequest(sessionId, modelKey, previousResponseId, responseAfterSequence) {
@@ -11919,7 +12063,7 @@ function noteCapturedLkgRequest(args) {
     request,
     slot: identity(args.slot),
     prefixCount: JSON.parse(args.slot.jsonPrefix).length,
-    envelope: envelope(request.modelKey, args.systemPromptTokens, args.agentName)
+    envelope: envelope(request.modelKey, args.systemPromptTokens, args.agentName, args.sessionId)
   });
 }
 function noteLkgProviderResponse(args) {
@@ -12317,6 +12461,12 @@ function noteLkgCapturedPrefix(sessionId) {
     sessions.set(sessionId, {});
 }
 function readLkgRecoveryPrefix(sessionId, inputs, messages, db) {
+  return readRecoveryIdentityPrefix(sessionId, inputs.map((input, index) => ({
+    id: lkgInputIdentity(input.id, input.role, index),
+    contentDigest: input.contentDigest
+  })), messages, db);
+}
+function readRecoveryIdentityPrefix(sessionId, inputs, messages, db) {
   const state = sessions.get(sessionId);
   const slot = db && (!state || state.prefix || state.uncertifiedNormal) ? loadPersistedLkgSlot(db, sessionId, true) ?? getSlot(sessionId) : getSlot(sessionId);
   const prefix = state?.prefix;
@@ -12335,8 +12485,8 @@ function noteLkgHealthyPrefix(sessionId, inputs, messages, release) {
     fenceRevision: sessions.get(sessionId)?.fenceRevision,
     prefix: prefix && !release ? {
       ...prefix,
-      inputs: inputs.map((input) => ({
-        id: input.id ?? "",
+      inputs: inputs.map((input, index) => ({
+        id: lkgInputIdentity(input.id, input.role, index) ?? "",
         digest: input.contentDigest?.() ?? ""
       })),
       json: JSON.stringify(messages)
@@ -12345,6 +12495,12 @@ function noteLkgHealthyPrefix(sessionId, inputs, messages, release) {
 }
 
 // src/hooks/magic-context/lkg-slot.ts
+var POSITIONAL_SYSTEM_KEY = "\x00mc-system:";
+function lkgInputIdentity(id, role, index) {
+  if (typeof id === "string" && id.length > 0)
+    return id.startsWith(POSITIONAL_SYSTEM_KEY) ? null : id;
+  return role === "system" ? `${POSITIONAL_SYSTEM_KEY}${index}` : null;
+}
 var LKG_SINGLE_SLOT_BYTES = 72 * 1024 * 1024;
 var LKG_TOTAL_BYTES = 160 * 1024 * 1024;
 var LKG_METADATA_BYTES = 256;
@@ -12708,14 +12864,12 @@ function dropSlot(sessionId, _reason) {
   if (pass !== undefined)
     hydrationAttemptBySession.set(sessionId, pass);
 }
-function noteEntry(sessionId, messages) {
+function noteEntry(sessionId, input) {
   const slot = getSlot(sessionId);
   if (!slot)
     return null;
-  const entryInputIds = messages.map((message) => {
-    const id = message.info?.id;
-    return typeof id === "string" ? id : "";
-  });
+  const messages = input;
+  const entryInputIds = messages.map((message, index) => lkgInputIdentity(message.info?.id, message.info?.role, index) ?? "");
   const anchorIndex = entryInputIds.indexOf(slot.lastInputMessageId);
   if (anchorIndex < 0)
     return null;
@@ -13129,6 +13283,8 @@ function projectEntryWithDigests(messages, digests) {
       value: () => contentDigest,
       enumerable: false
     });
+    if (isCoveredInstructionRow(message.info))
+      markCoveredInstructionRow(projection);
     return projection;
   });
 }
@@ -13205,7 +13361,7 @@ function asEntryProjection(input) {
   }
   return projectLkgEntry(input);
 }
-function outputMessageIsPostAnchor(message, inputIndexById, anchorIndex) {
+function outputMessageIsPostAnchor(message, inputIndexById, anchorIndex, systemIndices) {
   const id = messageId(message);
   if (id !== null) {
     const inputIndex = inputIndexById.get(id);
@@ -13222,6 +13378,12 @@ function outputMessageIsPostAnchor(message, inputIndexById, anchorIndex) {
     }
     return false;
   }
+  if (isCoveredInstructionRow(message.info))
+    return false;
+  if (messageRole(message) === "system") {
+    const index = systemIndices.get(message);
+    return index === undefined ? null : index > anchorIndex;
+  }
   if (!isSyntheticOutput(message))
     return null;
   const linked = ["sourceMessageId", "ownerMessageId", "anchorMessageId"].map((key) => recordValue(message.info, key)).find((value) => typeof value === "string");
@@ -13235,7 +13397,7 @@ function buildLkgPrefix(input, output, completeOutput = false) {
   const anchorIndex = completeOutput && projected.length > 0 ? projected.length - 1 : findLkgAnchor(projected);
   if (anchorIndex === null)
     return null;
-  const ids = projected.map((message) => message.id);
+  const ids = projected.map((message, index) => lkgInputIdentity(message.id, message.role, index));
   if (ids.some((id) => id === null))
     return null;
   const validIds = ids;
@@ -13246,9 +13408,27 @@ function buildLkgPrefix(input, output, completeOutput = false) {
   if (inputContentDigests.some((digest) => digest === null))
     return null;
   const inputIndexById = new Map(validIds.map((id, index) => [id, index]));
+  const systemIndices = new Map;
+  if (!completeOutput) {
+    const inputSystems = projected.flatMap((message, index) => message.id === null && message.role === "system" && !isCoveredInstructionRow(message) ? [{ message, index }] : []);
+    const outputSystems = output.filter((message) => messageId(message) === null && messageRole(message) === "system");
+    const restoredCount = outputSystems.length - inputSystems.length;
+    if (restoredCount < 0 || outputSystems.slice(0, restoredCount).some((message) => !isCoveredInstructionRow(message.info)))
+      return null;
+    for (let index = 0;index < inputSystems.length; index += 1) {
+      const source = inputSystems[index];
+      const message = outputSystems[index + restoredCount];
+      const digest = source.message.contentDigest?.();
+      if (!digest || lkgContentDigest(message) !== digest)
+        return null;
+      if (isCoveredInstructionRow(message.info) && source.index > anchorIndex)
+        return null;
+      systemIndices.set(message, source.index);
+    }
+  }
   const prefix = [];
   for (const message of output) {
-    const postAnchor = completeOutput ? false : outputMessageIsPostAnchor(message, inputIndexById, anchorIndex);
+    const postAnchor = completeOutput ? false : outputMessageIsPostAnchor(message, inputIndexById, anchorIndex, systemIndices);
     if (postAnchor === null)
       return null;
     if (!postAnchor)
@@ -14757,8 +14937,8 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
       startMessageFtsRowidMapBackfill(db).then(async () => {
         if (!readsOpenCodeStore)
           return;
-        const { readRawSessionMessagePage, readRawSessionMessages } = await import("./read-session-chunk-t8bg6wkz.js");
-        const { startMessageTimeBackfill } = await import("./message-time-backfill-j96x1sab.js");
+        const { readRawSessionMessagePage, readRawSessionMessages } = await import("./read-session-chunk-2s8x6xps.js");
+        const { startMessageTimeBackfill } = await import("./message-time-backfill-g9py24yt.js");
         await startMessageTimeBackfill(db, Object.assign(readRawSessionMessages, {
           readPage: readRawSessionMessagePage
         }));
@@ -14766,7 +14946,7 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
         if (isTransientSqliteError(error)) {
           withoutSqliteTransformPass(() => {
             const timer = setTimeout(runBackfills, busyRetryMs);
-            timer.unref();
+            timer.unref?.();
           });
           busyRetryMs = Math.min(30000, busyRetryMs * 2);
           return;
@@ -16249,6 +16429,10 @@ function openDatabase(dbPathOrOptions) {
   lastMigrationOnOpenRefusal = null;
   const existing = databases.get(dbPath);
   if (existing) {
+    if (options?.nativeTurnDeadlines && !hasSqliteTurnDeadlineRouting(existing)) {
+      log("[magic-context] storage unavailable: native turn deadlines must be selected on the first open; restart the host");
+      return null;
+    }
     if (!enforceSchemaFence(existing, dbPath, latestSupportedVersion)) {
       return null;
     }
@@ -16273,7 +16457,7 @@ function openDatabase(dbPathOrOptions) {
           throw error;
       }
     }
-    db = new Database(dbPath);
+    db = options?.nativeTurnDeadlines ? createSqliteTurnDatabase(dbPath) : new Database(dbPath);
     installBootBusyTimeout(db, dbPath, busyTimeoutMs, options?.onBootBusyTimeout);
     if (!enforceSchemaFence(db, dbPath, latestSupportedVersion)) {
       closeQuietly(db);
@@ -16320,6 +16504,10 @@ async function openDatabaseAsync(dbPathOrOptions) {
   lastMigrationOnOpenRefusal = null;
   const existing = databases.get(dbPath);
   if (existing) {
+    if (options?.nativeTurnDeadlines && !hasSqliteTurnDeadlineRouting(existing)) {
+      log("[magic-context] storage unavailable: native turn deadlines must be selected on the first open; restart the host");
+      return null;
+    }
     const startedAt = performance.now();
     const accepted = enforceSchemaFence(existing, dbPath, latestSupportedVersion);
     if (accepted) {
@@ -16335,8 +16523,12 @@ async function openDatabaseAsync(dbPathOrOptions) {
     return accepted ? existing : null;
   }
   const pending = pendingAsyncOpens.get(dbPath);
-  if (pending)
-    return pending;
+  if (pending) {
+    if (!options?.nativeTurnDeadlines)
+      return pending;
+    const opened = await pending;
+    return opened && hasSqliteTurnDeadlineRouting(opened) ? opened : null;
+  }
   const opening = (async () => {
     let db;
     const openStartedAt = performance.now();
@@ -16358,7 +16550,7 @@ async function openDatabaseAsync(dbPathOrOptions) {
             throw error;
         }
       }
-      db = new Database(dbPath);
+      db = options?.nativeTurnDeadlines ? createSqliteTurnDatabase(dbPath) : new Database(dbPath);
       installBootBusyTimeout(db, dbPath, busyTimeoutMs, options?.onBootBusyTimeout);
       openMs = performance.now() - openStartedAt;
       guardStartedAt = performance.now();
@@ -16420,9 +16612,53 @@ function getDatabasePersistenceError(db) {
 }
 // src/features/magic-context/message-index.ts
 import { createHash as createHash13 } from "node:crypto";
-var MESSAGE_HISTORY_ORPHAN_SAFETY_AGE_MS = 24 * 60 * 60 * 1000;
-var MESSAGE_HISTORY_ORPHAN_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;
-var MESSAGE_HISTORY_ORPHAN_UNAVAILABLE_REPROBE_MS = 24 * 60 * 60 * 1000;
+
+// src/shared/search-text.ts
+function removeTaskNotifications(text) {
+  return removeNestedBlocks(text, ["task", "task_cohort"]);
+}
+function cleanSearchText(text) {
+  return removeNestedBlocks(text, ["system-reminder", "task", "task_cohort"]).replace(/\s+/g, " ").trim();
+}
+var QUERY_STOP_WORDS = new Set("a an and are as at be been by can could did do does for from how i in is it me my of on or our please should that the their them there these they this to us was we were what when where which who why will with would you your".split(" "));
+function terms(text) {
+  return [
+    ...new Set((text.toLowerCase().match(/[\p{L}\p{N}_]+/gu) ?? []).filter((term) => !QUERY_STOP_WORDS.has(term)))
+  ];
+}
+function keywordRelevance(query, content) {
+  const needles = terms(query);
+  if (needles.length === 0)
+    return 0;
+  const words = new Set(terms(cleanSearchText(content)));
+  return 0.8 * needles.filter((term) => words.has(term)).length / needles.length;
+}
+function matchedSearchSnippet(content, query, cap = 220) {
+  const text = cleanSearchText(content);
+  const needles = new Set(terms(query));
+  const matches = [...text.matchAll(/[\p{L}\p{N}_]+/gu)].filter((match) => needles.has(match[0].toLowerCase()));
+  if (matches.length === 0)
+    return "";
+  let bestStart = matches[0].index;
+  let bestCoverage = -1;
+  for (const match of matches) {
+    const start = Math.max(0, match.index - Math.floor(cap / 5));
+    const coverage = keywordRelevance(query, text.slice(start, start + cap));
+    if (coverage > bestCoverage) {
+      bestStart = start;
+      bestCoverage = coverage;
+    }
+  }
+  if (bestStart > 0) {
+    const boundary = text.indexOf(" ", bestStart);
+    if (boundary >= 0 && boundary < matches[matches.length - 1].index)
+      bestStart = boundary + 1;
+  }
+  const passage = text.slice(bestStart, bestStart + cap).trim();
+  return `${bestStart > 0 ? "…" : ""}${passage}${bestStart + cap < text.length ? "…" : ""}`;
+}
+
+// src/features/magic-context/message-index.ts
 var lastIndexedStatements = new WeakMap;
 var insertMessageStatements = new WeakMap;
 var upsertProgressStatements = new WeakMap;
@@ -16684,10 +16920,10 @@ function getIndexableContent(role, parts) {
     if (!hasMeaningfulUserText2(parts)) {
       return "";
     }
-    return extractTexts2(parts).map(cleanUserText2).map(normalizeIndexText).filter((text) => text.length > 0).join(" / ");
+    return extractTexts2(parts).map(removeTaskNotifications).map(cleanUserText2).map(normalizeIndexText).filter((text) => text.length > 0).join(" / ");
   }
   if (role === "assistant") {
-    return extractTexts2(parts).map(removeSystemReminders).map(normalizeIndexText).filter((text) => text.length > 0).join(" / ");
+    return extractTexts2(parts).map(removeTaskNotifications).map(removeSystemReminders).map(normalizeIndexText).filter((text) => text.length > 0).join(" / ");
   }
   return "";
 }
@@ -16869,6 +17105,7 @@ function decodePiContentDecision(value) {
 // src/features/magic-context/storage-native-replay.ts
 var NATIVE_TOOL_INPUTS = "native tool inputs";
 var NATIVE_REASONING_IDS = "native reasoning ids";
+var nativeWriteBarriers = new WeakMap;
 function invalidPersistedReplayState(lane, sessionId) {
   return new Error(`invalid persisted ${lane} state for session ${sessionId}`);
 }
@@ -19964,6 +20201,93 @@ function getOpenCodeMessageById(sessionId, messageId) {
   const row = db.prepare(`SELECT id FROM message WHERE session_id = ? AND id = ? LIMIT 1`).get(sessionId, messageId);
   return row ?? null;
 }
+function planCompactionMarker(args, boundary) {
+  const identity = `${args.sessionId}\x00${args.endMessageId}`;
+  return {
+    boundaryMessageId: boundary.id,
+    summaryMessageId: generateMessageId(boundary.timeCreated + 1, 1n, `${identity}\x00summary-message`),
+    compactionPartId: generatePartId(boundary.timeCreated, 1n, `${identity}\x00compaction-part`),
+    summaryPartId: generatePartId(boundary.timeCreated + 1, 2n, `${identity}\x00summary-part`)
+  };
+}
+function withCompactionMarkerPublicationLock(operation) {
+  return runMarkerWriteTransaction(getWritableOpenCodeDb(), "compaction-marker-replace", operation);
+}
+var MARKER_PAIR_FROM = `FROM message m
+    JOIN part p ON +p.session_id = m.session_id
+               AND p.message_id = json_extract(m.data, '$.parentID')
+    WHERE m.session_id = ?
+      AND CASE WHEN json_valid(m.data)
+               THEN COALESCE(json_extract(m.data, '$.summary'), 0) ELSE 0 END = 1
+      AND COALESCE(json_extract(m.data, '$.finish'), '') <> ''
+      AND COALESCE(json_extract(p.data, '$.type'), '') = 'compaction'`;
+var MC_MARKER_IDENTITY = `(COALESCE(json_extract(m.data, '$.providerID'), '') = 'magic-context'
+      OR COALESCE(json_extract(m.data, '$.modelID'), '') = 'magic-context'
+      OR EXISTS (SELECT 1 FROM part t
+                 WHERE t.message_id = m.id AND +t.session_id = m.session_id
+                   AND COALESCE(json_extract(t.data, '$.type'), '') = 'text'
+                   AND COALESCE(json_extract(t.data, '$.text'), '') = ?))`;
+function inspectCompactionMarkerPublication(sessionId, recognized, summaryText) {
+  const db = getWritableOpenCodeDb();
+  const ids = [...new Set(recognized.map((marker) => marker.summaryMessageId))];
+  const placeholders = ids.map(() => "?").join(", ");
+  const rogue = db.prepare(`SELECT 1 ${MARKER_PAIR_FROM}
+      AND ${MC_MARKER_IDENTITY}
+      AND m.id NOT IN (${placeholders})
+      LIMIT 1`).get(sessionId, summaryText, ...ids);
+  if (rogue)
+    return { kind: "ambiguous" };
+  const pairs = db.prepare(`SELECT m.id AS summaryId, p.message_id AS boundaryId, p.id AS partId
+      ${MARKER_PAIR_FROM}
+      AND m.id IN (${placeholders})
+      LIMIT 2`).all(sessionId, ...ids);
+  if (pairs.length > 1)
+    return { kind: "ambiguous" };
+  const rowById = db.prepare(`SELECT 1 FROM message WHERE id = ?
+         UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`);
+  if (pairs.length === 0) {
+    for (const marker of recognized) {
+      if (rowById.get(marker.summaryMessageId, marker.compactionPartId, marker.summaryPartId))
+        return { kind: "ambiguous" };
+    }
+    return { kind: "verified", marker: null };
+  }
+  const pair = pairs[0];
+  const marker = recognized.find((item) => item.summaryMessageId === pair.summaryId && item.boundaryMessageId === pair.boundaryId && item.compactionPartId === pair.partId);
+  if (!marker)
+    return { kind: "ambiguous" };
+  for (const other of recognized) {
+    if (other.summaryMessageId === marker.summaryMessageId && other.compactionPartId === marker.compactionPartId && other.summaryPartId === marker.summaryPartId)
+      continue;
+    if (rowById.get(other.summaryMessageId, other.compactionPartId, other.summaryPartId))
+      return { kind: "ambiguous" };
+  }
+  const row = db.prepare(`SELECT c.data AS compactionData FROM message m
+         JOIN message b ON b.id = ? AND b.session_id = m.session_id
+         JOIN part c ON c.id = ? AND c.message_id = b.id AND c.session_id = m.session_id
+         JOIN part t ON t.id = ? AND t.message_id = m.id AND t.session_id = m.session_id
+         WHERE m.id = ? AND m.session_id = ?
+           AND json_extract(b.data, '$.role') = 'user'
+           AND json_extract(m.data, '$.role') = 'assistant'
+           AND json_extract(m.data, '$.parentID') = b.id
+           AND json_extract(m.data, '$.summary') = 1
+           AND json_extract(m.data, '$.finish') = 'stop'
+           AND json_extract(m.data, '$.error') IS NULL
+           AND json_extract(m.data, '$.providerID') = 'magic-context'
+           AND json_extract(m.data, '$.modelID') = 'magic-context'
+           AND json_extract(t.data, '$.type') = 'text' AND json_extract(t.data, '$.text') = ?
+           AND (SELECT COUNT(*) FROM part p WHERE p.message_id = m.id AND +p.session_id = m.session_id) = 1`).get(marker.boundaryMessageId, marker.compactionPartId, marker.summaryPartId, marker.summaryMessageId, sessionId, summaryText);
+  if (!row || !isMcCanonicalCompactionPartData(JSON.parse(row.compactionData)) || findBoundaryUserMessage(sessionId, marker.boundaryMessageId)?.id !== marker.boundaryMessageId)
+    return { kind: "ambiguous" };
+  return { kind: "verified", marker };
+}
+function isCompactionMarkerIntentAbsent(marker, targetEndMessageId) {
+  if (!targetEndMessageId)
+    return false;
+  const db = getWritableOpenCodeDb();
+  return !db.prepare(`SELECT 1 FROM message WHERE id IN (?, ?)
+        UNION ALL SELECT 1 FROM part WHERE id IN (?, ?) LIMIT 1`).get(targetEndMessageId, marker.summaryMessageId, marker.compactionPartId, marker.summaryPartId);
+}
 function removeLegacyMarkerLineageRows(db, args) {
   const legacySummaries = db.prepare(`SELECT m.id
              FROM message m
@@ -20007,10 +20331,11 @@ function injectCompactionMarker(args) {
     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 {
+    summaryMessageId: summaryMsgId,
+    compactionPartId,
+    summaryPartId
+  } = planCompactionMarker(args, boundary);
   const summaryMsgData = JSON.stringify({
     role: "assistant",
     parentID: boundary.id,
@@ -20148,10 +20473,12 @@ function listSessionCompactionMarkers(sessionId) {
   markers.sort((left, right) => left.timeCreated - right.timeCreated || left.compactionPartId.localeCompare(right.compactionPartId));
   return markers.map(({ timeCreated: _, ...marker }) => marker);
 }
-function removeForeignCompactionMarker(sessionId, marker, protectedSummaryMessageId) {
+function removeForeignCompactionMarker(sessionId, marker, protectedSummaryMessageId, shouldRemove) {
   try {
     const db = getWritableOpenCodeDb("removal");
     runMarkerRemovalTransaction(db, () => {
+      if (shouldRemove && !shouldRemove())
+        return;
       const deletePartsOfMessage = db.prepare("DELETE FROM part WHERE +session_id = ? AND message_id = ?");
       const deleteMessage = db.prepare("DELETE FROM message WHERE session_id = ? AND id = ?");
       for (const summaryMessageId of marker.summaryMessageIds) {
@@ -20332,24 +20659,114 @@ function removeMcOwnedCompactionMarkers(sessionId, summaryText) {
   };
 }
 
-// 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) {
-  let transactionStartedAt = 0;
-  db.transaction(() => {
-    transactionStartedAt = performance.now();
-    setPersistedCompactionMarkerState(db, sessionId, state);
-    if (replacedSummaryMessageId !== null) {
-      dropMarkerSummaryTag(db, sessionId, replacedSummaryMessageId);
+// src/hooks/magic-context/compaction-marker-publication.ts
+function samePair(left, right) {
+  return left.boundaryMessageId === right.boundaryMessageId && left.summaryMessageId === right.summaryMessageId && left.compactionPartId === right.compactionPartId && left.summaryPartId === right.summaryPartId;
+}
+function publishRecoverableCompactionMarker(db, args, targetIsCurrent) {
+  const { sessionId } = args;
+  let raw = "";
+  let previous = null;
+  let oldSummary = null;
+  let intended;
+  let reason = "publication-failed";
+  let recovered;
+  let cut = "uncertain";
+  let writingState = false;
+  const persist = (state) => {
+    writingState = true;
+    db.transaction(() => {
+      raw = compareAndSetCompactionMarkerPublicationState(db, sessionId, raw, state, null);
+      if (previous && previous.summaryMessageId !== state.summaryMessageId) {
+        const tag = getTagNumberByMessageId(db, sessionId, `${previous.summaryMessageId}:p0`);
+        if (tag !== null)
+          updateTagStatus(db, sessionId, tag, "dropped");
+      }
+    }).immediate();
+    writingState = false;
+    previous = state;
+  };
+  try {
+    cut = getCompactionMarkerPublicationState(db, sessionId).pending ? "uncertain" : "definitely-no-cut";
+    const result = withCompactionMarkerPublicationLock(() => {
+      const snapshot = getCompactionMarkerPublicationState(db, sessionId);
+      if (snapshot.pending)
+        cut = "uncertain";
+      raw = snapshot.raw;
+      previous = getPersistedCompactionMarkerState(db, sessionId) ?? getDeferredClearedCompactionMarkerState(db, sessionId);
+      oldSummary = previous?.summaryMessageId ?? null;
+      if (snapshot.pending && (snapshot.pending.boundaryOrdinal > args.endOrdinal || snapshot.pending.boundaryOrdinal === args.endOrdinal && snapshot.pending.targetEndMessageId !== args.endMessageId) && !isCompactionMarkerIntentAbsent(snapshot.pending, snapshot.pending.targetEndMessageId))
+        throw new Error("a newer marker publication intent is pending");
+      const boundary = findBoundaryUserMessage(sessionId, args.endMessageId);
+      if (!targetIsCurrent() || !boundary || boundary.id !== args.resolvedBoundary?.id || boundary.timeCreated !== args.resolvedBoundary.timeCreated)
+        throw new Error("marker publication frontier changed before publication");
+      intended = {
+        ...planCompactionMarker(args, boundary),
+        boundaryOrdinal: args.endOrdinal,
+        targetEndMessageId: args.endMessageId
+      };
+      let pending = snapshot.pending;
+      if (pending) {
+        const pendingTarget = pending.targetEndMessageId;
+        const pendingBoundary = pendingTarget ? findBoundaryUserMessage(sessionId, pendingTarget) : null;
+        const compartments = pendingTarget ? getCompartmentsByEndMessageId(db, sessionId, pendingTarget) : [];
+        const validTarget = pending.targetEndMessageId === args.endMessageId && pending.boundaryOrdinal === args.endOrdinal || compartments.length === 1 && compartments[0].endMessage === pending.boundaryOrdinal;
+        if (!validTarget || !pendingBoundary || !pendingTarget || !samePair(pending, planCompactionMarker({ ...args, endMessageId: pendingTarget }, pendingBoundary)))
+          pending = null;
+      }
+      const inspection = inspectCompactionMarkerPublication(sessionId, [intended, ...previous ? [previous] : [], ...pending ? [pending] : []], args.summaryText);
+      if (inspection.kind === "ambiguous") {
+        reason = "ambiguous-left-alone";
+        return {
+          kind: cut,
+          error: new Error("unverified or ambiguous host marker pairs; left alone")
+        };
+      }
+      cut = "definitely-no-cut";
+      const host = inspection.marker;
+      if (host && (pending && samePair(host, pending) || samePair(host, intended))) {
+        const adopted = pending && samePair(host, pending) ? pending : intended;
+        recovered = adopted === pending ? "pending-intent-recovered" : "adopted-existing-pair";
+        cut = "uncertain";
+        if (samePair(host, intended))
+          return { kind: "committed", marker: host };
+        persist(adopted);
+      }
+      writingState = true;
+      raw = compareAndSetCompactionMarkerPublicationState(db, sessionId, raw, previous, intended);
+      writingState = false;
+      cut = "uncertain";
+      const replacement = replaceCompactionMarker(host, {
+        ...args,
+        resolvedBoundary: boundary
+      });
+      if (recovered && replacement.kind !== "committed")
+        return { kind: "uncertain", error: replacement.error };
+      if (replacement.kind !== "committed")
+        cut = replacement.kind === "uncertain" ? "uncertain" : "definitely-no-cut";
+      return replacement;
+    });
+    if (result.kind === "committed") {
+      if (!intended)
+        throw new Error("committed marker has no publication intent");
+      persist(intended);
+      reason = recovered ?? "published";
     }
-  }).immediate();
-  logSlowWriteTransaction("marker-drain", transactionStartedAt);
+    return result;
+  } catch (error) {
+    if (writingState)
+      reason = "state-write-failed";
+    return {
+      kind: cut,
+      error: error instanceof Error ? error : new Error(String(error))
+    };
+  } finally {
+    sessionLog(sessionId, `compaction-marker publication reason=${reason} oldSummary=${oldSummary ?? "none"} newSummary=${intended?.summaryMessageId ?? "none"} target=${args.endMessageId} at=${Date.now()}`);
+  }
 }
+
+// src/hooks/magic-context/compaction-marker-manager.ts
+var MARKER_SUMMARY_TEXT = "[Compacted by magic-context — session history is managed by the plugin]";
 function validatePendingTarget(db, sessionId, pending) {
   const ocMessage = getOpenCodeMessageById(sessionId, pending.endMessageId);
   if (!ocMessage) {
@@ -20415,35 +20832,47 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory, truste
     stepStartedAt = now;
   };
   try {
+    const unresolvedIntentFailure = () => {
+      if (getCompactionMarkerPublicationState(db, sessionId).pending) {
+        return {
+          kind: "retryable-failure",
+          error: new Error("unresolved marker publication intent; retaining retry state")
+        };
+      }
+      return null;
+    };
     const responseFencesTarget = trustedBoundary !== undefined && Number.isSafeInteger(trustedBoundary.rowVersion) && trustedBoundary.rowVersion > 0 && trustedBoundary.ordinal === pending.ordinal && trustedBoundary.endMessageId === pending.endMessageId;
     const validation = responseFencesTarget ? "ok" : validatePendingTarget(db, sessionId, pending);
     endStep("validate");
     if (validation !== "ok") {
+      const unresolved = unresolvedIntentFailure();
+      if (unresolved)
+        return unresolved;
       sessionLog(sessionId, `compaction-marker drain: stale-skip (${validation}) for ordinal ${pending.ordinal} endMessageId=${pending.endMessageId}`);
       return { kind: "stale-skip", reason: validation };
     }
     const existing = getPersistedCompactionMarkerState(db, sessionId);
     if (existing && existingMarkerAlreadyCoversTarget(sessionId, existing, pending.ordinal, pending.endMessageId)) {
-      return { kind: "already-current" };
+      if (!unresolvedIntentFailure())
+        return { kind: "already-current" };
     }
     const boundary = findBoundaryUserMessage(sessionId, pending.endMessageId);
     endStep("boundary");
     if (!boundary) {
-      return {
+      return unresolvedIntentFailure() ?? {
         kind: "retryable-failure",
         error: new Error(`no user boundary found at or before endMessageId ${pending.endMessageId} (ordinal ${pending.ordinal}); preserving existing marker`)
       };
     }
     endStep("discardCheck");
-    const removedSummaryMessageId = existing?.summaryMessageId ?? null;
-    const replacement = replaceCompactionMarker(existing, {
+    const replacement = publishRecoverableCompactionMarker(db, {
       sessionId,
       endOrdinal: pending.ordinal,
       endMessageId: pending.endMessageId,
       summaryText: MARKER_SUMMARY_TEXT,
       directory: directory ?? process.cwd(),
       resolvedBoundary: boundary
-    });
+    }, () => JSON.stringify(getPersistedCompactionMarkerState(db, sessionId)) === JSON.stringify(existing) && (responseFencesTarget || validatePendingTarget(db, sessionId, pending) === "ok"));
     endStep("replace");
     if (replacement.kind !== "committed") {
       return {
@@ -20451,14 +20880,8 @@ function applyDeferredCompactionMarker(db, sessionId, pending, directory, truste
         error: new Error(`atomic marker replacement failed for ordinal ${pending.ordinal}; will retry`)
       };
     }
-    const result = replacement.marker;
-    persistMarkerStateAndDropReplacedTag(db, sessionId, {
-      ...result,
-      boundaryOrdinal: pending.ordinal,
-      targetEndMessageId: pending.endMessageId
-    }, removedSummaryMessageId);
     endStep("persist");
-    sessionLog(sessionId, `compaction-marker drain: applied at ordinal ${pending.ordinal}, boundary user msg ${result.boundaryMessageId} ${stepMs.join(" ")}`);
+    sessionLog(sessionId, `compaction-marker drain timings: ${stepMs.join(" ")}`);
     return {
       kind: "applied",
       markerOrdinal: pending.ordinal
@@ -20479,8 +20902,7 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
     return false;
   }
   const existing = getPersistedCompactionMarkerState(db, sessionId);
-  const removedSummaryMessageId = existing?.summaryMessageId ?? null;
-  if (existing) {
+  if (existing && !getCompactionMarkerPublicationState(db, sessionId).pending) {
     if (existingMarkerAlreadyCoversTarget(sessionId, existing, lastCompartmentEnd, targetEndMessageId)) {
       return true;
     }
@@ -20490,33 +20912,26 @@ function updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEn
     sessionLog(sessionId, `compaction-marker: no user boundary found at or before endMessageId ${targetEndMessageId} (ordinal ${lastCompartmentEnd}); preserving existing marker`);
     return false;
   }
-  const replacement = replaceCompactionMarker(existing, {
+  const replacement = publishRecoverableCompactionMarker(db, {
     sessionId,
     endOrdinal: lastCompartmentEnd,
     endMessageId: targetEndMessageId,
     summaryText: MARKER_SUMMARY_TEXT,
     directory: directory ?? process.cwd(),
     resolvedBoundary: boundary
-  });
+  }, () => JSON.stringify(getPersistedCompactionMarkerState(db, sessionId)) === JSON.stringify(existing) && getCompartmentEndMessageIdForOrdinal(db, sessionId, lastCompartmentEnd) === targetEndMessageId);
   if (replacement.kind === "committed") {
-    const result = replacement.marker;
-    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;
 }
-function reconcileForkOrphanedCompactionMarkers(db, sessionId) {
-  if (getHarness() !== "opencode") {
+function reconcileForkOrphanedCompactionMarkers(db, sessionId, isCacheBusting) {
+  if (!isCacheBusting || getHarness() !== "opencode") {
     return { removed: 0, failed: false };
   }
   try {
     const owned = getPersistedCompactionMarkerState(db, sessionId);
-    if (!owned) {
+    if (!owned || getCompactionMarkerPublicationState(db, sessionId).pending) {
       return { removed: 0, failed: false };
     }
     const markers = listSessionCompactionMarkers(sessionId);
@@ -20537,7 +20952,15 @@ function reconcileForkOrphanedCompactionMarkers(db, sessionId) {
       if (!currentOwned || marker.compactionPartId === currentOwned.compactionPartId) {
         continue;
       }
-      const ok = removeForeignCompactionMarker(sessionId, marker, currentOwned.summaryMessageId);
+      let protectedByState = false;
+      const ok = removeForeignCompactionMarker(sessionId, marker, currentOwned.summaryMessageId, () => db.transaction(() => {
+        const publication = getCompactionMarkerPublicationState(db, sessionId);
+        const latestOwned = getPersistedCompactionMarkerState(db, sessionId);
+        protectedByState = Boolean(publication.pending || !latestOwned || marker.compactionPartId === latestOwned.compactionPartId || marker.summaryMessageIds.includes(latestOwned.summaryMessageId) || compareOpenCodeMessagesByCanonicalOrder(sessionId, marker.boundaryMessageId, latestOwned.boundaryMessageId) !== 1);
+        return !protectedByState;
+      }).deferred());
+      if (protectedByState)
+        continue;
       if (ok) {
         removed += 1;
         sessionLog(sessionId, `compaction-marker hygiene: removed fork-orphaned marker part=${marker.compactionPartId} boundary=${marker.boundaryMessageId} (outranked owned boundary ${currentOwned.boundaryMessageId})`);
@@ -21151,7 +21574,18 @@ function selectHiddenMessagesAtCompactionSeam(messagesBeforeTrim, skippedVisible
   }
   return markerBoundaryIndex < 0 ? [] : trimmed.slice(markerBoundaryIndex + 1);
 }
-function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, projectPath, injectionBudgetTokens, temporalAwareness) {
+function cutCoveredPrefix(messages, count, coveredInstructions) {
+  const removed = messages.splice(0, count);
+  if (!coveredInstructions)
+    return;
+  for (const message of removed) {
+    if (!isHostRenderedSystemMessage(message))
+      continue;
+    markCoveredInstructionRow(message.info);
+    coveredInstructions.push(message);
+  }
+}
+function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, projectPath, injectionBudgetTokens, temporalAwareness, coveredInstructions) {
   const cached = injectionCache.get(sessionId);
   if (cached && cached.db !== db) {
     clearInjectionCache(sessionId);
@@ -21168,8 +21602,7 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
       if (prepared.compartmentEndMessageId.length > 0) {
         const cutoffIndex = findBoundaryIndex(sessionId, messages, prepared.compartmentEndMessageId);
         if (cutoffIndex >= 0) {
-          const remaining = messages.slice(cutoffIndex + 1);
-          messages.splice(0, messages.length, ...remaining);
+          cutCoveredPrefix(messages, cutoffIndex + 1, coveredInstructions);
         } else {
           sessionLog(sessionId, `compartment injection: cached boundary ${prepared.compartmentEndMessageId} not in messages (already trimmed), reusing cache`);
         }
@@ -21291,13 +21724,12 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
   if (cutoffIndex >= 0) {
     clearDegradedRebuild(sessionId);
     skippedVisibleMessages = cutoffIndex + 1;
-    const remaining = messages.slice(cutoffIndex + 1);
-    messages.splice(0, messages.length, ...remaining);
+    cutCoveredPrefix(messages, cutoffIndex + 1, coveredInstructions);
     resultEndMessageId = trimEndMessageId;
   } else {
     const degradedCount = noteDegradedRebuild(sessionId);
-    if (degradedCount === 1) {
-      reconcileForkOrphanedCompactionMarkers(db, sessionId);
+    if (isCacheBusting) {
+      reconcileForkOrphanedCompactionMarkers(db, sessionId, isCacheBusting);
     }
     let reAnchored = false;
     if (degradedCount >= REANCHOR_MIN_DEGRADED_PASSES && isCacheBusting) {
@@ -21312,8 +21744,7 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
         const reAnchorCutoff = findBoundaryIndex(sessionId, messages, reAnchorCompartment.endMessageId);
         if (reAnchorCutoff >= 0) {
           skippedVisibleMessages = reAnchorCutoff + 1;
-          const remaining = messages.slice(reAnchorCutoff + 1);
-          messages.splice(0, messages.length, ...remaining);
+          cutCoveredPrefix(messages, reAnchorCutoff + 1, coveredInstructions);
           resultEndMessage = reAnchorCompartment.endMessage;
           resultEndMessageId = reAnchorCompartment.endMessageId;
           reAnchored = true;
@@ -22915,7 +23346,7 @@ function trimToPreparedPrefix(options, prepared) {
           for (const [index, message] of options.messages.entries()) {
             const id = message.info.id;
             if (isHostRenderedSystemMessage(message)) {
-              if (lastSourcePosition >= boundaryPosition)
+              if (!sawPersistedRow || lastSourcePosition >= boundaryPosition)
                 retained.push(message);
               continue;
             }
@@ -23185,6 +23616,31 @@ function injectM0M1(options) {
   };
 }
 
+// src/hooks/magic-context/file-token-coverage.ts
+function omitIncompleteFileTokenTotals(db, sessionId, messages, totals) {
+  const filesByMessage = new Map;
+  for (const message of messages) {
+    const count = message.parts.filter(isFilePart).length;
+    if (count > 0 && totals.has(message.id))
+      filesByMessage.set(message.id, count);
+  }
+  if (filesByMessage.size === 0)
+    return totals;
+  const rows = db.prepare(`
+        SELECT o.value AS owner, COUNT(t.id) AS count
+        FROM json_each(?) o LEFT JOIN tags t
+          ON t.session_id = ? AND t.type = 'file'
+          AND t.message_id >= o.value || ':file'
+          AND t.message_id < o.value || ':file;'
+        GROUP BY o.value
+    `).all(JSON.stringify([...filesByMessage.keys()]), sessionId);
+  for (const row of rows) {
+    if (row.count < (filesByMessage.get(row.owner) ?? 0))
+      totals.delete(row.owner);
+  }
+  return totals;
+}
+
 // src/hooks/magic-context/protected-tail-boundary.ts
 function describeBoundaryDiagnostics(snapshot) {
   return `boundaryDiagnostics=${JSON.stringify(snapshot.diagnostics ?? { unavailable: true, boundaryReason: snapshot.boundaryReason })}`;
@@ -23410,7 +23866,7 @@ function resolveProtectedTailBoundary(ctx) {
   const offset = Math.max(1, ctx.lastCompartmentEndOrdinal + 1);
   const absoluteMessageCount = getCachedAbsoluteMessageCount2(ctx.sessionId) ?? getRawSessionMessageOrdinalCount2(ctx.sessionId);
   const messages = readRawSessionMessageRange2(ctx.sessionId, Math.max(1, offset - 1), absoluteMessageCount);
-  const storedTotals = ctx.storedTokenTotals;
+  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id), messages) ?? ctx.storedTokenTotals;
   const index = buildTrueRawTokenIndex(ctx.sessionId, messages, {
     providerShapeVersion: ctx.providerShapeVersion,
     cacheNamespace: ctx.cacheNamespace,
@@ -23676,6 +24132,7 @@ function resolveBoundaryContext(args) {
     providerShapeVersion: args.providerShapeVersion ?? "opencode-v1",
     cacheNamespace: args.cacheNamespace ?? `opencode:${args.sessionId}`,
     storedTokenTotals,
+    storedTokenTotalsForMessages: (_ids, messages = []) => storedTokenTotals && omitIncompleteFileTokenTotals(args.db, args.sessionId, messages, new Map(storedTokenTotals)),
     calibration
   };
 }
@@ -23688,13 +24145,14 @@ function resolveWrapupProtectedTailBoundary(args) {
   const offset = Math.max(1, ctx.lastCompartmentEndOrdinal + 1);
   const absoluteMessageCount = getCachedAbsoluteMessageCount2(ctx.sessionId) ?? getRawSessionMessageOrdinalCount2(ctx.sessionId);
   const messages = readRawSessionMessageRange2(ctx.sessionId, Math.max(1, offset - 1), absoluteMessageCount);
+  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id), messages) ?? ctx.storedTokenTotals;
   const index = buildTrueRawTokenIndex(ctx.sessionId, messages, {
     providerShapeVersion: ctx.providerShapeVersion,
     cacheNamespace: ctx.cacheNamespace,
     calibration: ctx.calibration,
     absoluteMessageCount,
-    storedTotalForMessage: ctx.storedTokenTotals ? (m) => {
-      const value = ctx.storedTokenTotals?.get(m.id);
+    storedTotalForMessage: storedTotals ? (m) => {
+      const value = storedTotals.get(m.id);
       return value === undefined ? null : value;
     } : undefined
   });
@@ -24374,14 +24832,14 @@ function shortErr(error) {
   }
   return extractMessage(error);
 }
-async function attemptOnce(client, args, timeoutMs, signal, callContext, label, transport) {
+async function attemptOnce(client, args, timeoutMs, signal, callContext, label, transport, allowModelSuggestions = true) {
   const originalBody = { ...args.body };
   const attemptArgs = copyPromptArgs(args, originalBody);
   try {
     await promptWithTimeout(client, attemptArgs, timeoutMs, signal, transport);
     return;
   } catch (error) {
-    if (isNonRetryable(error, signal))
+    if (isNonRetryable(error, signal) || !allowModelSuggestions)
       throw error;
     const suggestion = parseModelSuggestion(error);
     if (!suggestion || !originalBody.model) {
@@ -24409,7 +24867,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
   const explicitPrimaryLabel = baseBody.model?.providerID && baseBody.model.modelID ? `${baseBody.model.providerID}/${baseBody.model.modelID}` : "primary";
   let lastError = null;
   try {
-    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel, options.transport);
+    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel, options.transport, options.allowModelSuggestions);
     return;
   } catch (error) {
     lastError = error;
@@ -24435,7 +24893,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
       ...fallback?.qualifier ? { variant: fallback.qualifier } : {}
     });
     try {
-      await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label, options.transport);
+      await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label, options.transport, options.allowModelSuggestions);
       log(`[${callContext}] fallback succeeded with ${label} (attempt ${i + 2}/${fallbacks.length + 1})`);
       return;
     } catch (error) {
@@ -26052,6 +26510,7 @@ function buildHistorianRepairPrompt(originalPrompt, previousOutput, validationEr
     "Return a corrected full XML response for the same existing state and new messages.",
     "Do not skip any displayed raw ordinal or displayed raw range, even if the message looks trivial.",
     "Every displayed message range must belong to exactly one compartment unless it is intentionally left in one trailing suffix marked by <unprocessed_from>.",
+    "If every message in the chunk is covered by a compartment, nothing is unprocessed: set `<unprocessed_from>` to the chunk's last message index + 1.",
     "",
     "Previous invalid XML:",
     previousOutput
@@ -26555,6 +27014,7 @@ async function runHistorianPrompt(args) {
             return executor.attempt(opened, request);
           }, { childSessionId: opened.childSessionId }),
           timeoutMs: timeoutMs ?? DEFAULT_HISTORIAN_TIMEOUT_MS,
+          allowModelSuggestions: false,
           fallbackModels: modelOverride ? undefined : fallbackModels,
           callContext: agentId === HISTORIAN_EDITOR_AGENT ? "historian:editor" : "historian"
         });
@@ -26631,7 +27091,7 @@ async function runFallbackHistorianPass(args) {
   const primary = toModelEntry(args.model);
   for (const candidateInput of [
     ...args.fallbackModels ?? [],
-    ...args.fallbackModelId ? [{ model: args.fallbackModelId }] : []
+    ...!primary && args.fallbackModelId ? [{ model: args.fallbackModelId }] : []
   ]) {
     const candidate = toModelEntry(candidateInput);
     if (!candidate)
@@ -26771,6 +27231,56 @@ function sanitizeDumpName(value) {
   return value.replace(/[^a-zA-Z0-9._-]/g, "-");
 }
 
+// src/hooks/magic-context/historian-history-wait.ts
+var historyWaits = new Map;
+function newestMessageId(snapshot) {
+  try {
+    const count = getRawSessionMessageOrdinalCount2(snapshot.sessionId);
+    const ids = readRawSessionMessageIdOrdinalsForRange2(snapshot.sessionId, count, count);
+    const newest = ids.keys().next().value;
+    if (newest)
+      return newest;
+  } catch {}
+  return snapshot.rawLastMessageIdAtTrigger;
+}
+function recoveryWindow(snapshot, percentage) {
+  return percentage >= escalationBands(snapshot.executeThresholdPercentage).forceMaterializationPercentage || snapshot.emergencyTailScale !== undefined;
+}
+function clearHistorianHistoryWait(sessionId) {
+  historyWaits.delete(sessionId);
+}
+function recordHistorianNoProgress(snapshot, emergency = false) {
+  const newest = newestMessageId(snapshot);
+  if (!newest)
+    return;
+  const previous = historyWaits.get(snapshot.sessionId);
+  const sameHistory = previous?.newestMessageId === newest;
+  historyWaits.set(snapshot.sessionId, {
+    newestMessageId: newest,
+    recoveryAttempted: sameHistory && previous.recoveryAttempted || emergency || recoveryWindow(snapshot, snapshot.usagePercentage)
+  });
+}
+function shouldWaitForNewHistorianHistory(snapshot, options = {}) {
+  const wait = historyWaits.get(snapshot.sessionId);
+  if (!wait)
+    return false;
+  const newest = newestMessageId(snapshot);
+  if (newest && newest !== wait.newestMessageId) {
+    try {
+      const order = compareRawSessionMessageOrder2(snapshot.sessionId, newest, wait.newestMessageId);
+      if (order === null || order > 0)
+        return false;
+    } catch {}
+  }
+  const recovery = options.emergency || recoveryWindow(snapshot, options.usagePercentage ?? snapshot.usagePercentage);
+  if (recovery && !wait.recoveryAttempted) {
+    if (options.claim)
+      wait.recoveryAttempted = true;
+    return false;
+  }
+  return true;
+}
+
 // src/hooks/magic-context/reference-seeds.generated.ts
 var REFERENCE_SEEDS = [
   {
@@ -28843,6 +29353,24 @@ function findDanglingPublicationBoundary(sessionId, compartments, messageExists
   }
   return null;
 }
+function isServingOrdinalDriftSignal(detail) {
+  if (!detail)
+    return false;
+  if (detail === "raw message count shrank")
+    return true;
+  return /(?:offset|protectedTailStart|eligibleEnd) ordinal \d+ id changed$/.test(detail);
+}
+function shouldRefuseStaleSnapshotForDrift(sessionId, detail) {
+  if (hasRawMessageProvider2(sessionId) || !openCodeDbExists())
+    return false;
+  return isServingOrdinalDriftSignal(detail);
+}
+function dropDriftedServingOrdinalRanks(sessionId, detail) {
+  if (hasRawMessageProvider2(sessionId) || !openCodeDbExists())
+    return;
+  withReadOnlySessionDb((reader) => dropRawSessionOrdinalCheckpoints(reader, sessionId));
+  sessionLog(sessionId, `historian: dropped drifted ordinal checkpoints after exact-read disagreement (${detail}); the next run rebuilds them from a full scan`);
+}
 async function runCompartmentAgent(deps) {
   if (shouldSkipHomeProjectMemory(deps.directory ?? process.cwd()))
     return;
@@ -28986,6 +29514,14 @@ async function runCompartmentAgent(deps) {
       snapshot: boundarySnapshot,
       currentContextLimit: deps.currentContextLimit ?? boundarySnapshot.contextLimit
     }) : { ok: true };
+    if (!validation.ok && validation.reason === "stale_snapshot" && shouldRefuseStaleSnapshotForDrift(sessionId, validation.detail)) {
+      dropDriftedServingOrdinalRanks(sessionId, validation.detail ?? validation.reason ?? "stale_snapshot");
+      sessionLog(sessionId, `historian: refusing to publish over a stale protected-tail snapshot (was: ${validation.detail ?? "stale"}); ending the run without publishing`);
+      telemetry.status = "noop";
+      telemetry.failureReason = "stale_snapshot";
+      rollbackDrainReservation();
+      return;
+    }
     if (!validation.ok && validation.reason === "stale_snapshot") {
       const refreshed = deps.refreshBoundarySnapshot ? deps.refreshBoundarySnapshot(boundarySnapshot, validation) : resolveOpenCodeProtectedTailBoundary({
         db,
@@ -29066,6 +29602,14 @@ async function runCompartmentAgent(deps) {
       sessionLog(sessionId, `historian prompt fit: sized to ${producerModel ?? "unknown"} (${describeHistorianPromptTrim(promptFit)}; requestedChunkTokens=${historianChunkTokens})`);
     }
     const perRunCap = selectPerRunCap(boundarySnapshot);
+    if (!deps.forceDrainQuota && shouldWaitForNewHistorianHistory(boundarySnapshot, {
+      emergency: getOverflowState(db, sessionId).needsEmergencyRecovery
+    })) {
+      telemetry.status = "noop";
+      telemetry.failureReason = "waiting for new history after no forward progress";
+      sessionLog(sessionId, "historian no-op: waiting for new history after no forward progress");
+      return;
+    }
     const usable = Math.max(1, Math.round(boundarySnapshot.contextLimit * boundarySnapshot.executeThresholdPercentage / 100));
     const reserve = deps.forceDrainQuota ? { ok: true, reservation: null } : reserveProtectedTailDrainTokens({
       db,
@@ -29170,6 +29714,12 @@ ${chunkText}`,
     const maxExistingSequence = priorCompartments.reduce((max, c) => c.sequence > max ? c.sequence : max, -1);
     const sequenceOffset = priorCompartments.length === 0 ? 0 : maxExistingSequence + 1;
     retainDrainReservationForRetryThrottle = true;
+    if (!deps.forceDrainQuota) {
+      shouldWaitForNewHistorianHistory(boundarySnapshot, {
+        emergency: getOverflowState(db, sessionId).needsEmergencyRecovery,
+        claim: true
+      });
+    }
     const validatedPass = await runValidatedHistorianPass({
       client,
       hiddenCompletionExecutor: deps.hiddenCompletionExecutor,
@@ -29221,7 +29771,11 @@ ${chunkText}`,
       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}`);
       sessionLog(sessionId, "historian output discarded: reason=no_forward_progress");
       const failCount = incrementHistorianFailure(db, sessionId, `no forward progress beyond raw message ${offset - 1}`);
-      await notifyHistorianIssue(buildHistorianFailureNotice(failCount, `historian made no forward progress beyond raw message ${offset - 1}`));
+      try {
+        await notifyHistorianIssue(buildHistorianFailureNotice(failCount, `historian made no forward progress beyond raw message ${offset - 1}`));
+      } finally {
+        recordHistorianNoProgress(boundarySnapshot, inEmergency);
+      }
       return;
     }
     retainDrainReservationForRetryThrottle = false;
@@ -29329,6 +29883,7 @@ ${chunkText}`,
       db.exec("COMMIT");
       published = true;
       publishCommitted = true;
+      clearHistorianHistoryWait(sessionId);
       finishHistorianPublishStage(sessionId, "publish-txn", transactionStartedAt, "completed", `compartments=${persistedCompartments.length}`);
       logSlowWriteTransaction("historian-publish", lockAcquiredAt);
     } catch (error) {
@@ -30361,4 +30916,4 @@ async function executeContextRecomp(deps, options = {}) {
   return (await executeContextRecompWithResult(deps, options)).message;
 }
 
-export { MEMORY_MAINTAINER_A_AGENT, MEMORY_MAINTAINER_B_AGENT, MEMORY_MAINTAINER_A_STEP_CAP, resolveMaintenanceStepCap, MEMORY_MAINTAINER_A_SYSTEM_PROMPT, MEMORY_MAINTAINER_B_SYSTEM_PROMPT, MEMORY_MAINTAINER_FINALIZE_INSTRUCTION, buildMemoryMaintainerStageAPrompt, buildMemoryMaintainerStageBPrompt, getOpenCodeGlobalConfigDir, getOpenCodeConfigDirs, opencodeUserConfigBasePath, mmcProjectConfigBasePath, buildPrimaryLanguageDirective, resolveModelConfigValue, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, PROTECTED_TOKENS_MIN, HISTORIAN_MODEL_RESOLUTION_FIELDS, LEGACY_HARNESS_BLOCK_KEYS, ConfigProfilesSchema, MagicContextConfigSchema, LIVE_RELOAD_CONFIG_PATHS, formatFailClosedBlockingMessage, formatFailClosedBlockingSummary, createFailClosedBlockingError, isFailClosedBlockingError, setHomeProjectPermission, shouldSkipHomeProjectMemory, ProjectIdentityError, takeDubiousOwnershipProjectIdentityWarning, isUserHomeDirectory, describeUnresolvedProjectIdentity, resolveProjectIdentityForSession, normalizeStoredProjectPath, storedPathBelongsToIdentity, parseProviderModel, modelBodyField, toModelEntry, HiddenCompletionRefusal, HIDDEN_HISTORIAN_AGENT, resolveHistorianStepCap, HIDDEN_RUN_DISPOSED_REASON, noteChildOfDisposedInstance, hiddenChildPermissions, registerHiddenChildAgents, HiddenAgentStepLimit, HiddenChildHook, isNonRetryable, V2_MEMORY_CATEGORIES, CATEGORY_PRIORITY, computeNormalizedHash, hasMemoryShareableColumn, hasMemoryClassifiedAtColumn, ModuleMemoryAuthorityError, insertMemory, insertMemoryIdempotent, getMemoryByHash, getMemoriesByProject, getMemoriesByProjects, getMemoryById, getMemoriesByIds, updateMemorySeenCount, updateMemoryRetrievalCount, supersededMemory, mergeMemoryStats, archiveMemory, relaxedFtsQuery, sanitizeFtsQuery, searchMemoriesFTS, searchMemoriesFTSUnion, clearMemoryVerifications, queueMemoryMutation, scheduleAfterBootQuiet, BoundedSessionMap, registerOwnRpcServerInstance, rpcPortDir, rpcPortFilePath, parseRpcPortFile, inspectProcessesAsync, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, getLastIndexedOrdinal, getIndexedMessageIdAtOrdinal, getIndexedMessageCorpusSize, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, clearIndexedMessages, indexMessagesAfterOrdinal, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, ensureSessionMetaRow, clearCachedM0M1, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getAuthorityManagedMarker, getTemporalDecisions, observeTemporalDecisions, freezeTemporalDecisions, MAX_EXECUTE_THRESHOLD, escalationBands, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, readFrozenMergedReasoningParts, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, readEpochFloorSnapshot, getProtectionWindowForSession, ReplayDocumentError, readReplayEnvelope, updateReplayDocument, isEmergencyRecoveryArmed, loadPersistedUsage, loadProtectedTailMeta, resetProtectedTailNoEligibleHead, getWrapupInProgressState, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getProtectedTailDrainBudgetSkip, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getAutoSearchHintDecisions, appendAutoSearchHintDecision, flushAutoSearchHintDecisionRetirement, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getHistorianFailureState, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, addStaleReduceStrippedIds, getProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, providerResponseFailed, isSuccessfulProviderCompletion, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, clearSession, requestPendingMaterialization, pendingMaterializationOrigin, hasPendingMaterializationOrigin, clearPendingMaterialization, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, isHeldHeadForRequest, deferDeliveredSystemRefresh, retirePendingSystemPromptDelivery, lkgProviderInputTotal, beginV2LkgRequest, currentLkgRequestIdentity, noteLkgProviderResponse, clearLkgMeasuredRequest, saveLkgSlotToDb, loadPersistedLkgSlot, pruneStaleLkgSlots, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, replayLkg, noteUncertifiedNormalLkg, lkgDirtyRevision, readLkgRecoveryPrefix, noteLkgHealthyPrefix, beginLkgPass, getInMemorySlot, getSlot, dropSlot, getLkgSlotHeapStats, TOOL_SWEEP_SCOPED_MARKER, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, getSchemaFenceRejection, getMigrationOnOpenRefusal, LATEST_SUPPORTED_VERSION, getPersistedSchemaVersion, openCurrentDatabase, openDatabaseAsync, isDatabasePersisted, getDatabasePersistenceError, getNoteByIdInScope, getNotes, addNote, getSessionNotes, updateNote, dismissNotes, dismissNote, getActivePrimers, saveSourceContent, replaceSourceContent, getSourceContents, resolveWorkspaceShareCategories, resolveWorkspaceIdentitySet, expandWorkspaceIdentitySetWithAliases, resolveStoredPathWorkspaceIdentity, storedPathBelongsToWorkspace, sourceNameForMemory, rebaseSessionCoordinatesAsync, renderUserFacingFailure, userFacingFailureCode, renderCapabilityRefusal, ACTIVE_TOOL_IDS, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, removeMcOwnedCompactionMarkers, MARKER_SUMMARY_TEXT, applyDeferredCompactionMarker, HISTORIAN_AGENT, HISTORIAN_RECOMP_AGENT, HISTORIAN_EDITOR_AGENT, runTokenLog, extractM0Block, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, runCompartmentAgent, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, executeContextRecomp };
+export { MEMORY_MAINTAINER_A_AGENT, MEMORY_MAINTAINER_B_AGENT, MEMORY_MAINTAINER_A_STEP_CAP, resolveMaintenanceStepCap, MEMORY_MAINTAINER_A_SYSTEM_PROMPT, MEMORY_MAINTAINER_B_SYSTEM_PROMPT, MEMORY_MAINTAINER_FINALIZE_INSTRUCTION, buildMemoryMaintainerStageAPrompt, buildMemoryMaintainerStageBPrompt, getOpenCodeGlobalConfigDir, getOpenCodeConfigDirs, opencodeUserConfigBasePath, mmcProjectConfigBasePath, buildPrimaryLanguageDirective, resolveModelConfigValue, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, PROTECTED_TOKENS_MIN, HISTORIAN_MODEL_RESOLUTION_FIELDS, LEGACY_HARNESS_BLOCK_KEYS, ConfigProfilesSchema, MagicContextConfigSchema, LIVE_RELOAD_CONFIG_PATHS, formatFailClosedBlockingMessage, formatFailClosedBlockingSummary, createFailClosedBlockingError, isFailClosedBlockingError, setHomeProjectPermission, shouldSkipHomeProjectMemory, ProjectIdentityError, takeDubiousOwnershipProjectIdentityWarning, isUserHomeDirectory, describeUnresolvedProjectIdentity, resolveProjectIdentityForSession, normalizeStoredProjectPath, storedPathBelongsToIdentity, parseProviderModel, modelBodyField, toModelEntry, HiddenCompletionRefusal, HIDDEN_HISTORIAN_AGENT, resolveHistorianStepCap, HIDDEN_RUN_DISPOSED_REASON, noteChildOfDisposedInstance, hiddenChildPermissions, registerHiddenChildAgents, HiddenAgentStepLimit, HiddenChildHook, isNonRetryable, V2_MEMORY_CATEGORIES, CATEGORY_PRIORITY, computeNormalizedHash, hasMemoryShareableColumn, hasMemoryClassifiedAtColumn, ModuleMemoryAuthorityError, insertMemory, insertMemoryIdempotent, getMemoryByHash, getMemoriesByProject, getMemoriesByProjects, getMemoryById, getMemoriesByIds, updateMemorySeenCount, updateMemoryRetrievalCount, supersededMemory, mergeMemoryStats, archiveMemory, relaxedFtsQuery, sanitizeFtsQuery, searchMemoriesFTS, searchMemoriesFTSUnion, clearMemoryVerifications, queueMemoryMutation, scheduleAfterBootQuiet, cleanSearchText, keywordRelevance, matchedSearchSnippet, getLastIndexedOrdinal, getIndexedMessageIdAtOrdinal, getIndexedMessageCorpusSize, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, clearIndexedMessages, indexMessagesAfterOrdinal, registerOwnRpcServerInstance, rpcPortDir, rpcPortFilePath, parseRpcPortFile, inspectProcessesAsync, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, ensureSessionMetaRow, clearCachedM0M1, clearCachedM0, getTableColumnNames, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getAuthorityManagedMarker, getTemporalDecisions, observeTemporalDecisions, freezeTemporalDecisions, MAX_EXECUTE_THRESHOLD, escalationBands, MERGED_REASONING_PARTS_PREFIX, decodeMergedReasoningParts, readFrozenMergedReasoningParts, HYGIENE_PROVIDER_UNITS_VERSION, sessionDecisionCalibration, transitionSessionHygieneUnits, readEpochFloorSnapshot, getProtectionWindowForSession, ReplayDocumentError, readReplayEnvelope, updateReplayDocument, isEmergencyRecoveryArmed, loadPersistedUsage, loadProtectedTailMeta, resetProtectedTailNoEligibleHead, getWrapupInProgressState, acquireWrapupInProgress, updateWrapupInProgress, releaseWrapupInProgress, resolveCompactionModeRecord, getCompactionModeRecord, setCompactionModeRecord, getProtectedTailDrainBudgetSkip, clearPersistedReasoningWatermark, getEmergencyInputSample, setEmergencyDropSample, clearEmergencyDropSample, getLastNudgeUndropped, setLastNudgeUndropped, getChannel1NudgeState, setChannel1NudgeState, markChannel1PostReduceGracePending, captureChannel1PostReduceGraceBaseline, getChannel2NudgeState, setChannel2NudgeState, casChannel2NudgeState, claimChannel2NudgeState, casChannel2NudgeClaim, getAutoSearchHintDecisions, appendAutoSearchHintDecision, flushAutoSearchHintDecisionRetirement, getPersistedTodoPermissionDenied, setPersistedTodoPermissionDenied, getPersistedTodoSyntheticAnchor, setPersistedTodoSyntheticAnchor, clearPersistedTodoSyntheticAnchor, getHistorianFailureState, clearHistorianFailureState, getOverflowState, loadTransformPassStateSnapshot, recordOverflowDetected, recordDetectedContextLimit, clearEmergencyRecovery, clearDetectedContextLimit, getPersistedCompactionMarkerState, clearCompactionMarkerPublicationIntent, setPersistedCompactionMarkerState, getDeferredClearedCompactionMarkerState, retireDeferredClearedCompactionMarkerState, applyStrippedPlaceholderDelta, THINKING_BINDING_RECOVERY_FROZEN_PREFIX, thinkingBindingRecoveryFrozenId, getThinkingBindingRecoveryTarget, clearThinkingBindingRecoveryIf, getMergedReasoningStrippedIds, addMergedReasoningStrippedIds, getTrailingBlankDecisions, addTrailingBlankDecisions, demoteTrailingBlankKeepDecisions, addStaleReduceStrippedIds, getProcessedImageMarkers, addProcessedImageStrippedIds, getPendingCompactionMarkerState, getCompactionMarkerHealth, loadPostprocessReplaySnapshot, clearPendingCompactionMarkerStateIf, getPendingPiCompactionMarkerState, clearPendingPiCompactionMarkerStateIf, logPiCompactionMarkerClear, setSessionWorkMetrics, getObservedEpochFloor, resolveEpochFloorForPass, providerResponseFailed, isSuccessfulProviderCompletion, dirtyLkgRecoveryRevision, ownsLkgDirtyFence, invalidateCleanLkgRecoveryFence, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, gaDatabasePath, RAW_MESSAGE_TYPES, V2StoreReaderPool, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, clearSession, requestPendingMaterialization, pendingMaterializationOrigin, hasPendingMaterializationOrigin, clearPendingMaterialization, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, isHeldHeadForRequest, deferDeliveredSystemRefresh, retirePendingSystemPromptDelivery, lkgProviderInputTotal, beginV2LkgRequest, currentLkgRequestIdentity, noteLkgProviderResponse, clearLkgMeasuredRequest, saveLkgSlotToDb, loadPersistedLkgSlot, pruneStaleLkgSlots, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, replayLkg, noteUncertifiedNormalLkg, lkgDirtyRevision, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgInputIdentity, beginLkgPass, getInMemorySlot, getSlot, dropSlot, getLkgSlotHeapStats, TOOL_SWEEP_SCOPED_MARKER, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, getSchemaFenceRejection, getMigrationOnOpenRefusal, LATEST_SUPPORTED_VERSION, getPersistedSchemaVersion, openCurrentDatabase, openDatabaseAsync, isDatabasePersisted, getDatabasePersistenceError, getNoteByIdInScope, getNotes, addNote, getSessionNotes, updateNote, dismissNotes, dismissNote, getActivePrimers, saveSourceContent, replaceSourceContent, getSourceContents, resolveWorkspaceShareCategories, resolveWorkspaceIdentitySet, expandWorkspaceIdentitySetWithAliases, resolveStoredPathWorkspaceIdentity, storedPathBelongsToWorkspace, sourceNameForMemory, rebaseSessionCoordinatesAsync, renderUserFacingFailure, userFacingFailureCode, renderCapabilityRefusal, ACTIVE_TOOL_IDS, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, removeMcOwnedCompactionMarkers, MARKER_SUMMARY_TEXT, applyDeferredCompactionMarker, HISTORIAN_AGENT, HISTORIAN_RECOMP_AGENT, HISTORIAN_EDITOR_AGENT, runTokenLog, shouldWaitForNewHistorianHistory, extractM0Block, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, omitIncompleteFileTokenTotals, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, runCompartmentAgent, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, executeContextRecomp };