npm - @cortexkit/opencode-magic-context - Versions diffs - 0.37.0 → 0.38.1 - Mend

@cortexkit/opencode-magic-context 0.37.0 → 0.38.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (150) hide show

package/dist/index.js CHANGED Viewed

@@ -14,9 +14,12 @@ import {
   AdmissionClass,
   BoundedSessionMap,
   CATEGORY_PRIORITY,
+  CHANNEL1_FLOOR_TOKENS,
+  CHANNEL1_SENTINEL,
   COMPARTMENT_AGENT_SYSTEM_PROMPT,
   COMPARTMENT_LEASE_RENEWAL_MS,
   COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT,
+  CTX_REDUCE_KEEP,
   DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE,
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DEFAULT_LOCAL_EMBEDDING_MODEL,
@@ -48,6 +51,7 @@ import {
   StaleRouteHandleError,
   SubcClient,
   SynapseEmbeddingProvider,
+  ToolMutationBatch,
   USER_MEMORY_CANDIDATE_TTL_MS,
   V2_MEMORY_CATEGORIES,
   acquireCompartmentLease,
@@ -65,25 +69,34 @@ import {
   applyMirroredNoteCompileFields,
   applyStrippedPlaceholderDelta,
   archiveMemory,
+  assertTailHygieneContentUnchanged,
   backfillTagTokenCounts,
   beginBootQuietPeriod,
   bootQuietRemainingMs,
+  buildChannel1Reminder,
+  buildChannel2Reminder,
+  buildFileSourceContent,
+  buildInMemoryTailRawMessages,
   buildPrimaryLanguageDirective,
+  buildSyntheticTodoPart,
   buildWorkspaceMemorySqlFilter,
   bumpProjectMemoryEpoch,
   bumpProjectUserProfileVersion,
+  byteSize,
   captureSlot,
   casChannel2NudgeClaim,
   casChannel2NudgeState,
   checkCompactionMarkerConsistency,
   checksumAuthoritySeedRows,
   claimChannel2NudgeState,
+  cleanUserText,
   clearDeferredExecutePendingIfMatches,
   clearDetectedContextLimit,
   clearEmergencyDropSample,
   clearEmergencyRecovery,
   clearHistorianFailureState,
   clearHookInitFailure,
+  clearIndexedMessages,
   clearInjectionCache,
   clearMemoryVerifications,
   clearNoteNudgeTriggerAndCooldown,
@@ -95,6 +108,7 @@ import {
   clearRecompStaging,
   computeCueContentHash,
   computeNormalizedHash,
+  computeSyntheticCallId,
   computeWorkspaceEpochFingerprint,
   connectionFileExists,
   contentSha256,
@@ -108,6 +122,9 @@ import {
   createPrimer,
   createPromptSurfaceGuidanceEpochCache,
   createPromptSurfaceRuntime,
+  createToolDropTarget,
+  decideChannel1,
+  deleteIndexedMessage,
   deleteTagsByMessageId,
   deleteUserMemoryCandidates,
   deriveTagLoadFloor,
@@ -117,6 +134,7 @@ import {
   drainAuthority,
   drainCommitBacklogForProject,
   dropSlot,
+  effectiveTailHygiene,
   embedBatchForProject,
   embedItemsForProject,
   embedSessionCompartmentChunks,
@@ -129,14 +147,22 @@ import {
   ensureContextStoreUuid,
   ensureMemoryEmbeddings,
   escalationBands,
+  estimateEmergencyDropReclaimTokens,
+  estimateImageTokensFromDataUrl,
+  estimateTokens,
+  estimateTrueRawMessageTokens,
+  evaluateChannel2,
   expandWorkspaceIdentitySetWithAliases,
   exports_external,
+  extractInMemoryMessageViews,
   extractLatestAssistantText,
   extractM0Block,
+  extractTexts,
+  extractToolCallObservation,
+  extractToolCallSummaries,
   formatDate,
   getActiveCompartmentRun,
   getActivePrimers,
-  getActiveTagTokenAggregate,
   getActiveTagTokenTotalsByMessage,
   getActiveTagsBySession,
   getActiveToolTagsForAgeReclaim,
@@ -157,9 +183,11 @@ import {
   getEmergencyInputSample,
   getEmergencyRecoveryArmedAt,
   getHistorianFailureState,
+  getIndexedMessageCorpusSize,
   getLastCompartmentEndMessage,
   getLastCompartmentEndMessageId,
   getLastHookInitFailure,
+  getLastIndexedOrdinal,
   getLastNudgeLevel,
   getLastNudgeUndropped,
   getLatestIndexedCommitTimeMs,
@@ -178,6 +206,8 @@ import {
   getMemoryMutationsForRenderByProjects,
   getMemoryVerifications,
   getMergedReasoningStrippedIds,
+  getMessageIndexReconciliationStartOrdinal,
+  getMessageIndexSourceIdentity,
   getMigrationOnOpenRefusal,
   getMirrorCursor,
   getModuleNoteEvaluationBridge,
@@ -206,6 +236,7 @@ import {
   getProjectEmbeddings,
   getProjectState,
   getRawHistoryEligibility,
+  getRawSessionStoredMessageCount,
   getReadySmartNotes,
   getSchemaFenceRejection,
   getSessionNotes,
@@ -218,6 +249,7 @@ import {
   getTagNumberByMessageId,
   getTagsByNumbers,
   getTagsBySession,
+  getTailHygieneTags,
   getToolTagNumberByOwner,
   getTrailingBlankDecisions,
   getTriggerTagTokenUpperBound,
@@ -227,11 +259,14 @@ import {
   getVisibleMemoryIds,
   getWrapupInProgressState,
   hasLengthCappedOutput,
+  hasMeaningfulUserText,
   hasMemoryClassifiedAtColumn,
   hasMemoryShareableColumn,
   hasMuralCueColumns,
   hasRunnableCompartmentWindow,
   incrementalLkgContentDigests,
+  indexMessagesAfterOrdinal,
+  indexSingleMessage,
   injectM0M1,
   injectTemporalMarkers,
   insertMemory,
@@ -241,14 +276,25 @@ import {
   insertUserMemoryCandidates,
   invalidateMemory,
   invalidateProject,
+  invalidateTrueRawTokenCache,
   isConsumerReconnectTransient,
   isDatabasePersisted,
+  isEditTool,
   isEmbeddingEnabled,
   isEmergencyRecoveryArmed,
   isFailClosedBlockingError,
+  isFilePart,
   isLinkedGitWorktree,
+  isMessageIndexReconciledThrough,
+  isMessageIndexSourceCurrent,
   isPidAlive,
   isProviderOverflowReconfirmed,
+  isRawCompactionSummaryInfo,
+  isRecord,
+  isSyntheticTodoPart,
+  isTextPart,
+  isThinkingPart,
+  isToolPartWithOutput,
   lkgContentDigest,
   loadCompartmentChunkEmbeddingsForSearch,
   loadPersistedUsage,
@@ -269,6 +315,8 @@ import {
   nextOccurrence,
   normalizeSDKResponse,
   normalizeStoredProjectPath,
+  normalizeText,
+  normalizeTodoStateJson,
   normalizeVerificationFiles,
   noteEntry,
   onNoteTrigger,
@@ -277,12 +325,18 @@ import {
   parkGitSweepNonIndexable,
   parseCron,
   parseRpcPortFile,
+  partHasCompletedResult,
   peekDeferredExecutePending,
   peekNoteNudgeText,
   peekProjectEmbeddings,
   pickNearestPriorOwner,
+  planEmergencyDrop,
+  preloadTokenizer,
   prepareAuthority,
   prepareCompartmentInjection,
+  prependTag,
+  primeInMemoryTailRawMessageCache,
+  primeTailRawMessageCache,
   primerOccurrenceKey,
   primerOccurrenceUtcDay,
   promptSurfaceConfigIdentity,
@@ -298,6 +352,12 @@ import {
   readGitFileChangeTimesSince,
   readGitHead,
   readNewMemoriesForM1Union,
+  readRawSessionMessageById,
+  readRawSessionMessageOrdinalById,
+  readRawSessionMessageOrdinalPage,
+  readRawSessionMessagePartsById,
+  readRawSessionMessages,
+  readSessionChunk,
   reconcileAuthorityProject,
   recordChildInvocation,
   recordDetectedContextLimit,
@@ -310,6 +370,7 @@ import {
   recordOverflowDetected,
   recordSessionProjectIdentity,
   recordToolDefinition,
+  refreshTailHygieneBaseline,
   registerActiveCompartmentRun,
   registerModuleNoteEvaluationBridge,
   registerProjectEmbedding,
@@ -355,6 +416,7 @@ import {
   runManagedRecomp,
   runManagedUpgrade,
   runSqliteOptimize,
+  sameTailHygieneStructuralSignature,
   sanitizeFtsQuery,
   saveCommitEmbedding,
   saveEmbeddingIfHashMatches,
@@ -376,6 +438,7 @@ import {
   setPersistedReasoningWatermark,
   setPersistedTodoPermissionDenied,
   setPersistedTodoSyntheticAnchor,
+  setRawMessageProvider,
   setRecompStarting,
   setRecompTerminal,
   setSessionWorkMetrics,
@@ -387,10 +450,16 @@ import {
   startCompartmentAgent,
   storedPathBelongsToIdentity,
   storedPathBelongsToWorkspace,
+  stripPersistedAssistantText,
+  stripTagPrefix,
   supersededMemory,
+  sweepOrphanedOpenCodeMessageIndexes,
   sweepStaleEmbeddingIdentitiesForProject,
   tagTokenCountIsNull,
+  tailHygieneStructuralSignature,
   takeDubiousOwnershipProjectIdentityWarning,
+  textMentionsRecentCommit,
+  toolOutputTokens,
   trimMemoriesToBudgetV2,
   updateCavemanDepth,
   updateMemoryRetrievalCount,
@@ -406,8 +475,9 @@ import {
   updateWrapupInProgress,
   upsertCommits,
   verificationFileExists,
-  withContentLanguageDirective
-} from "./index-0ze9p983.js";
+  withContentLanguageDirective,
+  withRawSessionMessageCache
+} from "./index-5znjkjws.js";
 import {
   deriveHistorianChunkTokens,
   deriveTriggerBudget,
@@ -422,7 +492,7 @@ import {
   setStoragePrivatePermissionEnforcement,
   setWindowOverlayPath,
   shouldEnforcePrivateStoragePermissions
-} from "./index-q0t189ay.js";
+} from "./index-mg1yx1ph.js";
 import {
   modelBodyField,
   resolveFallbackChain
@@ -434,69 +504,19 @@ import {
   getErrorMessage,
   sendIgnoredMessage,
   sendUserPrompt
-} from "./index-4cz5nfxf.js";
+} from "./index-btj2qhmc.js";
 import {
-  ToolMutationBatch,
   advanceToolReclaimWatermark,
-  buildFileSourceContent,
-  buildInMemoryTailRawMessages,
-  byteSize,
-  cleanUserText,
-  clearIndexedMessages,
   clearSession,
-  createToolDropTarget,
-  deleteIndexedMessage,
-  estimateTokens,
-  estimateTrueRawMessageTokens,
-  extractInMemoryMessageViews,
-  extractTexts,
-  extractToolCallObservation,
-  extractToolCallSummaries,
-  getIndexedMessageCorpusSize,
-  getLastIndexedOrdinal,
-  getMessageIndexReconciliationStartOrdinal,
-  getMessageIndexSourceIdentity,
   getOrCreateSessionMeta,
-  getRawSessionStoredMessageCount,
-  hasMeaningfulUserText,
-  indexMessagesAfterOrdinal,
-  indexSingleMessage,
-  invalidateTrueRawTokenCache,
-  isEditTool,
-  isFilePart,
-  isMessageIndexReconciledThrough,
-  isMessageIndexSourceCurrent,
-  isRawCompactionSummaryInfo,
-  isRecord,
-  isTextPart,
-  isThinkingPart,
-  isToolPartWithOutput,
   markSessionCleanupPending,
-  normalizeText,
-  partHasCompletedResult,
-  preloadTokenizer,
-  prependTag,
-  primeInMemoryTailRawMessageCache,
-  primeTailRawMessageCache,
-  readRawSessionMessageById,
-  readRawSessionMessageOrdinalById,
-  readRawSessionMessageOrdinalPage,
-  readRawSessionMessagePartsById,
-  readRawSessionMessages,
-  readSessionChunk,
   retryPendingSessionCleanups,
-  setRawMessageProvider,
-  stripPersistedAssistantText,
-  stripTagPrefix,
-  sweepOrphanedOpenCodeMessageIndexes,
-  textMentionsRecentCommit,
-  updateSessionMeta,
-  withRawSessionMessageCache
-} from "./index-crke4z5j.js";
+  updateSessionMeta
+} from "./index-22mw8km4.js";
 import {
   modelRefLookupOrder,
   piModelRefToCanonical
-} from "./index-cgyfn1s2.js";
+} from "./index-2wchnyk6.js";
 import {
   Database,
   closeQuietly,
@@ -511,7 +531,7 @@ import {
   detectConflicts,
   resolveCompactionForBoot,
   sendConflictWarning
-} from "./index-cae89eas.js";
+} from "./index-1h9t9xb5.js";
 import {
   detectConfigFile,
   isPrototypePollutionKey,
@@ -553,10 +573,10 @@ import {
   __commonJS,
   __require,
   __toESM
-} from "./index-wckvcay0.js";
+} from "./index-1yh8g550.js";
 // ../../node_modules/.bun/esprima@4.0.1/node_modules/esprima/dist/esprima.js
-var require_esprima = __commonJS((exports, module) => {
+var require_esprima = __commonJS(function(exports, module) {
   (function webpackUniversalModuleDefinition(root, factory) {
     if (typeof exports === "object" && typeof module === "object")
       module.exports = factory();
@@ -6696,7 +6716,7 @@ var require_esprima = __commonJS((exports, module) => {
 });
 // ../../node_modules/.bun/array-timsort@1.0.3/node_modules/array-timsort/src/index.js
-var require_src = __commonJS((exports, module) => {
+var require_src = __commonJS(function(exports, module) {
   var DEFAULT_MIN_MERGE = 32;
   var DEFAULT_MIN_GALLOPING = 7;
   var DEFAULT_TMP_STORAGE_LENGTH = 256;
@@ -7339,7 +7359,7 @@ var require_src = __commonJS((exports, module) => {
 });
 // ../../node_modules/.bun/comment-json@5.0.0/node_modules/comment-json/src/common.js
-var require_common = __commonJS((exports, module) => {
+var require_common = __commonJS(function(exports, module) {
   var PREFIX_BEFORE = "before";
   var PREFIX_AFTER_PROP = "after-prop";
   var PREFIX_AFTER_COLON = "after-colon";
@@ -7625,7 +7645,7 @@ var require_common = __commonJS((exports, module) => {
 });
 // ../../node_modules/.bun/comment-json@5.0.0/node_modules/comment-json/src/array.js
-var require_array = __commonJS((exports, module) => {
+var require_array = __commonJS(function(exports, module) {
   var { sort } = require_src();
   var {
     PROP_SYMBOL_PREFIXES,
@@ -7783,7 +7803,7 @@ var require_array = __commonJS((exports, module) => {
 });
 // ../../node_modules/.bun/comment-json@5.0.0/node_modules/comment-json/src/parse.js
-var require_parse = __commonJS((exports, module) => {
+var require_parse = __commonJS(function(exports, module) {
   var esprima = require_esprima();
   var {
     CommentArray
@@ -8149,7 +8169,7 @@ var require_parse = __commonJS((exports, module) => {
 });
 // ../../node_modules/.bun/comment-json@5.0.0/node_modules/comment-json/src/stringify.js
-var require_stringify = __commonJS((exports, module) => {
+var require_stringify = __commonJS(function(exports, module) {
   var {
     PREFIX_BEFORE_ALL,
     PREFIX_BEFORE,
@@ -8357,7 +8377,7 @@ var require_stringify = __commonJS((exports, module) => {
 });
 // ../../node_modules/.bun/comment-json@5.0.0/node_modules/comment-json/src/index.js
-var require_src2 = __commonJS((exports, module) => {
+var require_src2 = __commonJS(function(exports, module) {
   var { parse, tokenize } = require_parse();
   var stringify = require_stringify();
   var { CommentArray } = require_array();
@@ -11051,8 +11071,8 @@ function getCurrentRuntimePackageJsonPath(currentModuleUrl = import.meta.url) {
     return null;
   }
 }
-function findPluginEntry(directory) {
-  const winner = getWinningConfig(directory, "server");
+function findPluginEntry(directory, surface = "server") {
+  const winner = getWinningConfig(directory, surface);
   if (!winner)
     return null;
   const entry = winner.entries.find((value) => value === PACKAGE_NAME || value.startsWith(`${PACKAGE_NAME}@`));
@@ -11066,13 +11086,21 @@ function findPluginEntry(directory) {
     configPath: winner.path
   };
 }
+function hasExplicitNonExactPluginVersion(spec) {
+  if (!spec.startsWith(`${PACKAGE_NAME}@`))
+    return false;
+  return !isValidSemver(spec.slice(PACKAGE_NAME.length + 1));
+}
+function isExactOrBarePluginSpec(spec) {
+  return spec === PACKAGE_NAME || spec.startsWith(`${PACKAGE_NAME}@`) && !hasExplicitNonExactPluginVersion(spec);
+}
 function configUpdateContent(content, version) {
   const parsed = parseJsonConfig(content);
   if (!parsed)
     return null;
   const entries = getPluginEntries(parsed);
   const current = entries.find((entry) => entry === PACKAGE_NAME || entry.startsWith(`${PACKAGE_NAME}@`));
-  if (!current)
+  if (!current || !isExactOrBarePluginSpec(current))
     return null;
   const escaped = current.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const entryRegex = new RegExp(`(["'])${escaped}\\1`);
@@ -11390,6 +11418,12 @@ async function runBackgroundUpdateCheck(ctx, options) {
     log("[auto-update-checker] Plugin not found in config");
     return;
   }
+  if (hasExplicitNonExactPluginVersion(pluginInfo.entry)) {
+    if (pluginInfo.entry === `${PACKAGE_NAME}@latest`) {
+      log("[auto-update-checker] Explicit @latest leaves the active package unpinned; OpenCode may delete it mid-session.");
+    }
+    return;
+  }
   const cachedVersion = getCachedVersion(pluginInfo.entry);
   const currentVersion = cachedVersion ?? pluginInfo.pinnedVersion;
   if (!currentVersion) {
@@ -11445,6 +11479,7 @@ function createLiveSessionState() {
     liveModelBySession: new Map,
     variantBySession: new Map,
     agentBySession: new Map,
+    channel1StateBySession: new Map,
     historyRefreshSessions: new Set,
     deferredHistoryRefreshSessions: new Set,
     systemPromptRefreshSessions: new Set,
@@ -12218,6 +12253,7 @@ function releaseLease(db, holderId, leaseKey = DREAMING_LEASE_KEY) {
 }
 // src/features/magic-context/dreamer/retrospective-orphan-sweep.ts
+var HISTORIAN_CHILD_TITLE = "magic-context-compartment";
 var RETROSPECTIVE_CHILD_TITLE = "magic-context-dream-retrospective";
 var USER_MEMORIES_CHILD_TITLE = "magic-context-dream-user-memories";
 var CURATE_CHILD_TITLE = "magic-context-dream-curate";
@@ -12243,16 +12279,34 @@ var PRIVACY_SENSITIVE_CHILD_TITLE_MATCHES = {
   ],
   prefixes: [SMART_NOTE_COMPILE_CHILD_TITLE_PREFIX, SMART_NOTE_CONFIRM_CHILD_TITLE_PREFIX]
 };
+var HISTORIAN_CHILD_TITLE_MATCHES = {
+  exact: [HISTORIAN_CHILD_TITLE],
+  prefixes: []
+};
+var INTERNAL_CHILD_TITLE_MATCHES = {
+  exact: [HISTORIAN_CHILD_TITLE, ...PRIVACY_SENSITIVE_CHILD_TITLE_MATCHES.exact],
+  prefixes: PRIVACY_SENSITIVE_CHILD_TITLE_MATCHES.prefixes
+};
 function retrospectiveOrphanStaleMs(taskTimeoutMinutes) {
   const timeoutCandidates = Array.isArray(taskTimeoutMinutes) ? taskTimeoutMinutes : [taskTimeoutMinutes];
   const maxTimeoutMinutes = Math.max(...timeoutCandidates.map((minutes) => Math.max(1, minutes ?? 20)), 20);
   const timeoutMs = maxTimeoutMinutes * 60000;
   return Math.max(60 * 60000, timeoutMs * 3);
 }
+var HISTORIAN_OUTER_ATTEMPTS = 3;
+var HISTORIAN_MODEL_SUGGESTION_ATTEMPTS = 2;
+var HISTORIAN_MAX_RETRY_BACKOFF_MS = 11000;
+var HISTORIAN_DETACHED_WRITER_GRACE_MS = 15 * 60000;
+function historianOrphanStaleMs(timeoutMs, fallbackModelCount) {
+  const timeout = Math.max(60000, timeoutMs);
+  const fallbackCount = Math.max(0, Math.floor(fallbackModelCount));
+  const fullAttemptBudget = timeout * HISTORIAN_OUTER_ATTEMPTS * HISTORIAN_MODEL_SUGGESTION_ATTEMPTS * (fallbackCount + 1);
+  return Math.max(60 * 60000, fullAttemptBudget + HISTORIAN_MAX_RETRY_BACKOFF_MS + HISTORIAN_DETACHED_WRITER_GRACE_MS);
+}
 async function sweepOrphanedRetrospectiveChildren(args) {
   const { opencodeDb, client, sessionDirectory, staleMs } = args;
-  const titleMatches = args.titleMatches ?? PRIVACY_SENSITIVE_CHILD_TITLE_MATCHES;
-  if (!opencodeDb)
+  const titleMatches = args.titleMatches ?? INTERNAL_CHILD_TITLE_MATCHES;
+  if (!opencodeDb || args.keepSubagents === true)
     return 0;
   const now = args.now ?? Date.now();
   const cutoff = now - staleMs;
@@ -12275,7 +12329,7 @@ async function sweepOrphanedRetrospectiveChildren(args) {
                   ORDER BY time_created ASC
                   LIMIT 200`).all(...titleParams, sessionDirectory, cutoff);
   } catch (error) {
-    log(`[dreamer] retrospective orphan sweep: read skipped (${String(error)})`);
+    log(`[magic-context] internal child orphan sweep: read skipped (${String(error)})`);
     return 0;
   }
   if (rows.length === 0)
@@ -12290,7 +12344,7 @@ async function sweepOrphanedRetrospectiveChildren(args) {
     }
   }
   if (deleted > 0) {
-    log(`[dreamer] swept ${deleted} crash-orphaned privacy-sensitive child session(s)`);
+    log(`[magic-context] swept ${deleted} stale internal child session(s)`);
   }
   return deleted;
 }
@@ -12723,6 +12777,34 @@ function assertManifestCoversExactly(ids, expectedIds, rootName) {
       throw new Error(`${rootName} manifest missing id ${id}`);
   }
 }
+var OPEN_TAG_RE = /<([A-Za-z][\w:-]*)\b/;
+function describeUnrecognizedManifestShape(text, expectedRoot, expectedEntry) {
+  const expected = `expected <${expectedRoot}> with <${expectedEntry}> entries`;
+  const trimmed = text.trim();
+  if (trimmed.startsWith("[") || trimmed.startsWith("{")) {
+    return `JSON ${trimmed.startsWith("[") ? "array" : "object"} unrecognized; ${expected}`;
+  }
+  const firstTag = OPEN_TAG_RE.exec(trimmed)?.[1];
+  if (firstTag && firstTag.toLowerCase() !== expectedRoot.toLowerCase()) {
+    return `root <${firstTag}> unrecognized; ${expected}`;
+  }
+  const escapedRoot = expectedRoot.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const bodyMatch = new RegExp(`<${escapedRoot}\\b[^>]*>([\\s\\S]*?)<\\/${escapedRoot}>`, "i").exec(text);
+  const body = (bodyMatch?.[1] ?? "").trim();
+  if (body.startsWith("[") || body.startsWith("{")) {
+    return `JSON ${body.startsWith("[") ? "array" : "object"} unrecognized; ${expected}`;
+  }
+  const innerTag = OPEN_TAG_RE.exec(body)?.[1];
+  if (innerTag && innerTag.toLowerCase() !== expectedEntry.toLowerCase()) {
+    return `root <${innerTag}> unrecognized; ${expected}`;
+  }
+  return `parsed zero entries; ${expected}`;
+}
+function assertParsedManifestNonEmpty(parsedCount, expectedCount, text, expectedRoot, expectedEntry) {
+  if (expectedCount > 0 && parsedCount === 0) {
+    throw new Error(describeUnrecognizedManifestShape(text, expectedRoot, expectedEntry));
+  }
+}
 // src/features/magic-context/dreamer/module-apply.ts
 class DreamerModuleBusyError extends Error {
@@ -13754,9 +13836,19 @@ ${renderAnchors(args.anchors ?? [])}### Memory pool to classify
 ${renderPool2(args.memories)}`;
 }
 var SCOPES = new Set(["project", "ecosystem", "universe"]);
+function classifyBody(text) {
+  try {
+    return extractCompleteManifestBody(text, "classify");
+  } catch (error) {
+    const described = describeUnrecognizedManifestShape(text, "classify", "memory");
+    if (!described.startsWith("parsed zero entries"))
+      throw new Error(described);
+    throw error;
+  }
+}
 function parseClassifyManifest(text) {
   const out = [];
-  const body = extractCompleteManifestBody(text, "classify");
+  const body = classifyBody(text);
   for (const m of body.matchAll(/<memory\b([^>]*)\/?>/g)) {
     const attrs = m[1];
     const idMatch = attrs.match(/\bid\s*=\s*"(\d+)"/);
@@ -13789,9 +13881,18 @@ function parseClassifyManifest(text) {
     }
     out.push(entry);
   }
+  if (out.length === 0 && body.trim().length > 0) {
+    throw new Error(describeUnrecognizedManifestShape(text, "classify", "memory"));
+  }
   assertNoDuplicateManifestIds(out.map((entry) => entry.id), "classify");
   return out;
 }
+function validateClassifyManifest(text, expectedIds) {
+  const parsed = parseClassifyManifest(text);
+  assertParsedManifestNonEmpty(parsed.length, expectedIds.size, text, "classify", "memory");
+  assertManifestCoversExactly(parsed.map((entry) => entry.id), expectedIds, "classify");
+  return parsed;
+}
 // src/features/magic-context/dreamer/classify.ts
 var MIN_POOL_TO_CLASSIFY = 10;
@@ -13990,7 +14091,7 @@ async function classifyOneChunk(args, chunk, anchors, sliceMs, signal) {
         if (!text)
           throw new Error("classify returned no output");
         try {
-          parseClassifyManifest(text);
+          validateClassifyManifest(text, new Set(chunk.map((candidate) => candidate.id)));
         } catch (error) {
           const providerFailure = providerOutputFailureFromInvalidManifest(messages, text);
           if (providerFailure)
@@ -14058,8 +14159,7 @@ async function runClassifyThroughModule(args, chunk, anchors, signal) {
   if (result.truncated === true) {
     throw new Error("classify returned length-capped output");
   }
-  const parsed = parseClassifyManifest(manifestText);
-  assertManifestCoversExactly(parsed.map((entry) => entry.id), new Set(chunk.map((candidate) => candidate.id)), "classify");
+  const parsed = validateClassifyManifest(manifestText, new Set(chunk.map((candidate) => candidate.id)));
   const rows = parsed.map((entry) => {
     const candidate = chunk.find((item) => item.id === entry.id);
     if (!candidate)
@@ -14739,8 +14839,8 @@ var asyncModulePromise = null;
 function getAsyncModule() {
   asyncModulePromise ??= (async () => {
     const [{ default: singlefileAsyncifyVariant }, { newQuickJSAsyncWASMModuleFromVariant }] = await Promise.all([
-      import("./index-ayd60xnw.js").then((m)=>__toESM(m.default,1)),
-      import("./index-ygcng9t8.js")
+      import("./index-rgdqj8nj.js").then((m)=>__toESM(m.default,1)),
+      import("./index-rpgg35ms.js")
     ]);
     return newQuickJSAsyncWASMModuleFromVariant(singlefileAsyncifyVariant);
   })();
@@ -16088,11 +16188,33 @@ For each memory below, find the repo file(s) it makes a claim about, or mark it
 ${list}
 </memories>`;
 }
+var MEMORY_ELEMENT_PATTERN = "<memory\\b([^>]*)(?:\\/>|>([\\s\\S]*?)<\\/memory>)";
+var NESTED_FILE_PATTERN = "<file\\b([^>]*)\\/?>";
+function extractNestedFilePaths(inner) {
+  const files = [];
+  for (const match of inner.matchAll(new RegExp(NESTED_FILE_PATTERN, "gi"))) {
+    const pathMatch = match[1].match(/\bpath\s*=\s*"([^"]+)"/);
+    if (pathMatch)
+      files.push(pathMatch[1].trim());
+  }
+  return files.filter(Boolean);
+}
+function mappingsBody(text) {
+  try {
+    return extractCompleteManifestBody(text, "mappings");
+  } catch (error) {
+    const described = describeUnrecognizedManifestShape(text, "mappings", "memory");
+    if (!described.startsWith("parsed zero entries"))
+      throw new Error(described);
+    throw error;
+  }
+}
 function parseMapMemoriesManifest(text) {
   const out = [];
-  const body = extractCompleteManifestBody(text, "mappings");
-  for (const m of body.matchAll(/<memory\b([^>]*)\/?>/g)) {
+  const body = mappingsBody(text);
+  for (const m of body.matchAll(new RegExp(MEMORY_ELEMENT_PATTERN, "gi"))) {
     const attrs = m[1];
+    const inner = m[2];
     const idMatch = attrs.match(/\bid\s*=\s*"(\d+)"/);
     if (!idMatch)
       throw new Error("mappings manifest entry missing numeric id");
@@ -16101,24 +16223,67 @@ function parseMapMemoriesManifest(text) {
       throw new Error("mappings manifest entry missing numeric id");
     const independent = /\bindependent\s*=\s*"(?:true|1)"/i.test(attrs);
     const filesMatch = attrs.match(/\bfiles\s*=\s*"([^"]*)"/);
-    const files = filesMatch ? filesMatch[1].split(",").map((f) => f.trim()).filter(Boolean) : [];
-    out.push({ id, files, independent: independent || files.length === 0 });
+    const attrFiles = filesMatch ? filesMatch[1].split(",").map((f) => f.trim()).filter(Boolean) : [];
+    const nestedFiles = inner ? extractNestedFilePaths(inner) : [];
+    const files = attrFiles.length > 0 ? attrFiles : nestedFiles;
+    if (!independent && files.length === 0) {
+      throw new Error(`mappings manifest entry ${id} has neither files nor independent="true"`);
+    }
+    out.push({
+      id,
+      files: independent && files.length === 0 ? [] : files,
+      independent: independent && files.length === 0
+    });
+  }
+  if (out.length === 0 && body.trim().length > 0) {
+    throw new Error(describeUnrecognizedManifestShape(text, "mappings", "memory"));
   }
   assertNoDuplicateManifestIds(out.map((entry) => entry.id), "mappings");
   return out;
 }
+function validateMapMemoriesManifest(text, expectedIds) {
+  const parsed = parseMapMemoriesManifest(text);
+  assertParsedManifestNonEmpty(parsed.length, expectedIds.size, text, "mappings", "memory");
+  assertManifestCoversExactly(parsed.map((entry) => entry.id), expectedIds, "mappings");
+  return parsed;
+}
 // src/features/magic-context/dreamer/map-memories.ts
 var MAP_BATCH_SIZE = 80;
-function loadUnmappedInputs(db, projectIdentity, repoDir) {
+var MAX_INDEPENDENT_REQUEUE_PER_RUN = MAP_BATCH_SIZE;
+function shouldRequeueIndependentMapping(state, content, repoDir) {
+  if (!state.hasSentinel || state.files.length > 0)
+    return false;
+  return extractMemoryCandidatePaths(content, repoDir).length > 0;
+}
+function toMapInput(memory, repoDir) {
+  return {
+    id: memory.id,
+    category: memory.category,
+    content: memory.content,
+    candidates: extractMemoryCandidatePaths(memory.content, repoDir)
+  };
+}
+function selectMapMemoryInputs(db, projectIdentity, repoDir) {
   const active = getMemoriesByProject(db, projectIdentity);
-  const unmapped = new Set(getUnmappedMemoryIds(db, active.map((m) => m.id)));
-  return active.filter((m) => unmapped.has(m.id)).map((m) => ({
-    id: m.id,
-    category: m.category,
-    content: m.content,
-    candidates: extractMemoryCandidatePaths(m.content, repoDir)
-  }));
+  const activeIds = active.map((m) => m.id);
+  const unmapped = new Set(getUnmappedMemoryIds(db, activeIds));
+  const verifications = getMemoryVerifications(db, activeIds);
+  const unmappedInputs = active.filter((m) => unmapped.has(m.id)).map((m) => toMapInput(m, repoDir));
+  const requeue = [];
+  for (const memory of active) {
+    if (unmapped.has(memory.id))
+      continue;
+    const state = verifications.get(memory.id);
+    if (!state)
+      continue;
+    if (!shouldRequeueIndependentMapping(state, memory.content, repoDir))
+      continue;
+    requeue.push(toMapInput(memory, repoDir));
+    if (requeue.length >= MAX_INDEPENDENT_REQUEUE_PER_RUN)
+      break;
+  }
+  return [...unmappedInputs, ...requeue];
 }
 async function mapMemories(args) {
   const result = {
@@ -16128,7 +16293,7 @@ async function mapMemories(args) {
     remaining: 0,
     complete: true
   };
-  const inputs = loadUnmappedInputs(args.db, args.projectIdentity, args.sessionDirectory);
+  const inputs = selectMapMemoryInputs(args.db, args.projectIdentity, args.sessionDirectory);
   if (inputs.length === 0)
     return result;
   const batches = [];
@@ -16207,7 +16372,7 @@ async function mapOneBatch(args, batch, sliceMs, signal) {
         const text = extractLatestAssistantText(messages);
         if (!text)
           throw new Error("map-memories returned no output");
-        parseMapMemoriesManifest(text);
+        validateMapMemoriesManifest(text, new Set(batch.map((memory) => memory.id)));
         return text;
       }
     });
@@ -16241,10 +16406,13 @@ async function applyBatchMappings(args, batch, manifestText) {
     return { mapped: 0, independent: 0 };
   const planned = [];
   for (const p of parsed) {
-    if (p.independent || p.files.length === 0) {
+    if (p.independent) {
       planned.push({ id: p.id, files: [], independent: true });
       continue;
     }
+    if (p.files.length === 0) {
+      throw new Error(`mapping entry ${p.id} has no files and no independent sentinel`);
+    }
     const normalized = await normalizeVerificationFiles({
       cwd: args.sessionDirectory,
       files: p.files
@@ -17389,9 +17557,22 @@ function attrOf(s, name) {
 function filesOf(s) {
   return (attrOf(s, "files") ?? "").split(",").map((f) => f.trim()).filter(Boolean);
 }
+function verifyIds(parsed) {
+  return [...parsed.verified, ...parsed.updated, ...parsed.archived].map((entry) => entry.id);
+}
+function verifyBody(text) {
+  try {
+    return extractCompleteManifestBody(text, "verify");
+  } catch (error) {
+    const described = describeUnrecognizedManifestShape(text, "verify", "verified");
+    if (!described.startsWith("parsed zero entries"))
+      throw new Error(described);
+    throw error;
+  }
+}
 function parseVerifyManifest(text) {
   const out = { verified: [], updated: [], archived: [] };
-  const body = extractCompleteManifestBody(text, "verify");
+  const body = verifyBody(text);
   for (const m of body.matchAll(/<verified\b([^>]*)\/?>/g)) {
     const id = Number.parseInt(attrOf(m[1], "id") ?? "", 10);
     if (!Number.isInteger(id))
@@ -17410,9 +17591,19 @@ function parseVerifyManifest(text) {
       throw new Error("verify manifest entry missing numeric id");
     out.archived.push({ id, reason: attrOf(m[1], "reason") ?? "" });
   }
-  assertNoDuplicateManifestIds([...out.verified, ...out.updated, ...out.archived].map((entry) => entry.id), "verify");
+  if (verifyIds(out).length === 0 && body.trim().length > 0) {
+    throw new Error(describeUnrecognizedManifestShape(text, "verify", "verified"));
+  }
+  assertNoDuplicateManifestIds(verifyIds(out), "verify");
   return out;
 }
+function validateVerifyManifest(text, expectedIds) {
+  const parsed = parseVerifyManifest(text);
+  const ids = verifyIds(parsed);
+  assertParsedManifestNonEmpty(ids.length, expectedIds.size, text, "verify", "verified");
+  assertManifestCoversExactly(ids, expectedIds, "verify");
+  return parsed;
+}
 // src/features/magic-context/dreamer/verify.ts
 var VERIFY_BATCH_SIZE = 50;
@@ -17564,7 +17755,7 @@ async function verifyOneBatch(args, batch, sliceMs, signal) {
         if (!text)
           throw new Error("verify returned no output");
         try {
-          parseVerifyManifest(text);
+          validateVerifyManifest(text, new Set(batch.map((memory) => memory.id)));
         } catch (error) {
           const providerFailure = providerOutputFailureFromInvalidManifest(messages, text);
           if (providerFailure)
@@ -17784,6 +17975,18 @@ function loadActiveMemoryPromptMemories(db, projectIdentity) {
   const verificationById = getMemoryVerifications(db, memories.map((memory) => memory.id));
   return memories.map((memory) => toCuratePromptMemory(memory, verificationById));
 }
+var TEXTUAL_CURATE_TOOL_CALL_PATTERNS = [
+  /\[\s*historical tool call\s*\][\s\S]*?(?:^|\n)\s*name\s*:\s*ctx_memory\b[\s\S]*?(?:^|\n)\s*arguments\s*:/im,
+  /(?:^|\n)\s*name\s*:\s*ctx_memory\b[\s\S]*?(?:^|\n)\s*arguments\s*:/im,
+  /(?:^|\n)\s*(?:```[^\n]*\n\s*)?ctx_memory\s*\(\s*action\s*=/im,
+  /["']name["']\s*:\s*["']ctx_memory["'][\s\S]*?["']arguments["']\s*:/i
+];
+function validateCurateAssistantText(text) {
+  if (TEXTUAL_CURATE_TOOL_CALL_PATTERNS.some((pattern) => pattern.test(text))) {
+    throw new Error("Curate returned an unresolved textual ctx_memory tool call.");
+  }
+  return text;
+}
 function createDreamTaskExecutor(deps) {
   let parentSessionIdPromise;
   const resolveParentSessionId = () => {
@@ -17854,7 +18057,8 @@ function createDreamTaskExecutor(deps) {
               name: config.task,
               durationMs: Date.now() - startedAt,
               resultChars: 0,
-              ...error ? { error } : {},
+              ...status === "failed" && error ? { error } : {},
+              ...extra?.progress ? { progress: extra.progress } : {},
               backlog: (() => {
                 const end = extra?.backlogAfter ?? getDreamTaskBacklog(db, projectIdentity, config.task);
                 const processed = processedDreamTaskItems(backlogAtStart.pending, end.pending);
@@ -17997,11 +18201,12 @@ function createDreamTaskExecutor(deps) {
         const backlogAfter = config.task === "verify-broad" ? { pending: result.remaining, total: backlogAtStart.total } : undefined;
         if (!result.complete) {
           if (broadProgress && processed > 0) {
-            recordRun("completed", broadProgress, {
+            recordRun("completed", null, {
+              progress: broadProgress,
               memoryChanges: computeMemoryDelta(memoryBefore),
               backlogAfter
             });
-            return { status: "completed", error: broadProgress };
+            return { status: "completed" };
           }
           const error = incompleteMessage(result.remaining);
           recordRun("failed", error, {
@@ -18010,11 +18215,12 @@ function createDreamTaskExecutor(deps) {
           });
           return { status: "failed", transient: true, error };
         }
-        recordRun("completed", broadProgress, {
+        recordRun("completed", null, {
+          progress: broadProgress,
           memoryChanges: computeMemoryDelta(memoryBefore),
           backlogAfter
         });
-        return broadProgress ? { status: "completed", error: broadProgress } : { status: "completed" };
+        return { status: "completed" };
       }
       if (config.task === "classify-memories") {
         let moduleArgs;
@@ -18481,7 +18687,7 @@ async function runAgenticTask(config, ctx, helpers) {
         const text = extractLatestAssistantText(messages);
         if (!text)
           throw new Error("Dreamer returned no assistant output.");
-        return text;
+        return task === "curate" ? validateCurateAssistantText(text) : text;
       }
     });
     if (leaseLost)
@@ -19260,7 +19466,7 @@ function scheduleInitialProjectRun(reg, db) {
   startupTimers.set(reg.directory, timer);
 }
 async function runProjectMaintenance(reg, origin, db) {
-  const projectMaintenanceEnabled = Boolean(reg.dreamerConfig && reg.dreamerConfig.disable !== true) || reg.memoryEnabled === true || reg.gitCommitIndexing?.enabled === true;
+  const projectMaintenanceEnabled = Boolean(reg.dreamerConfig && reg.dreamerConfig.disable !== true) || reg.memoryEnabled === true || reg.gitCommitIndexing?.enabled === true || reg.historianChildSweep !== undefined;
   if (!projectMaintenanceEnabled)
     return;
   await reg.ensureRegistered(reg.directory, db);
@@ -19297,6 +19503,7 @@ async function sweepProject(reg, origin, db, gitCommitEnabled) {
   if (gcDeleted > 0) {
     log(`[magic-context] GC'd ${gcDeleted} stale embedding row(s) for ${reg.projectIdentity} ` + `(memory=${gc.memoryRowsDeleted} commit=${gc.commitRowsDeleted} chunk=${gc.chunkRowsDeleted})`);
   }
+  await sweepOrphanedHistorianChildren(reg);
   const dreamerConfig = reg.dreamerConfig;
   const dreamingEnabled = Boolean(dreamerConfig && dreamerConfig.disable !== true);
   if (commitIndexingEnabled && reg.gitCommitIndexing) {
@@ -19360,6 +19567,27 @@ async function sweepProject(reg, origin, db, gitCommitEnabled) {
     log(`[dreamer] timer-triggered task scheduling failed for ${reg.projectIdentity}:`, error);
   }
 }
+async function sweepOrphanedHistorianChildren(reg) {
+  const config = reg.historianChildSweep;
+  if (!config || config.keepSubagents)
+    return;
+  const ocDb = openOpenCodeDb();
+  if (!ocDb)
+    return;
+  try {
+    await sweepOrphanedRetrospectiveChildren({
+      opencodeDb: ocDb,
+      client: reg.client,
+      sessionDirectory: reg.directory,
+      staleMs: historianOrphanStaleMs(config.timeoutMs, config.fallbackModelCount),
+      titleMatches: HISTORIAN_CHILD_TITLE_MATCHES
+    });
+  } catch (error) {
+    log(`[magic-context] historian child orphan sweep failed for ${reg.projectIdentity}:`, error);
+  } finally {
+    closeQuietly(ocDb);
+  }
+}
 async function runCompiledSmartNoteSweep(reg, db) {
   const leaseKey = leaseKeyFor("evaluate-smart-notes", reg.projectIdentity);
   const holderId = crypto.randomUUID();
@@ -20358,6 +20586,44 @@ function createTagger() {
 // src/hooks/magic-context/command-handler.ts
 import { randomUUID as randomUUID2 } from "node:crypto";
+// src/shared/tail-hygiene-status.ts
+function finiteNumber(value, fallback = 0) {
+  return typeof value === "number" && Number.isFinite(value) ? value : fallback;
+}
+function resolveTailHygieneStatus(tsBaseline, rustBaseline) {
+  if (rustBaseline !== undefined && rustBaseline !== null) {
+    const t2 = Math.max(0, finiteNumber(rustBaseline.t));
+    const u2 = Math.min(t2, Math.max(0, finiteNumber(rustBaseline.u)));
+    return {
+      u: u2,
+      t: t2,
+      severity: Math.min(1, Math.max(0, finiteNumber(rustBaseline.severity, u2 / Math.max(t2, 1)))),
+      evaluable: rustBaseline.evaluable === true,
+      generationInvalidated: rustBaseline.generation_invalidated === true,
+      baselineGeneration: Math.max(0, finiteNumber(rustBaseline.baseline_generation)),
+      computedAt: Math.max(0, finiteNumber(rustBaseline.computed_at_ms))
+    };
+  }
+  if (tsBaseline === undefined)
+    return;
+  const t = Math.max(0, tsBaseline.baselineT + tsBaseline.turnDeltaT);
+  const u = Math.min(t, Math.max(0, tsBaseline.baselineU + tsBaseline.turnDeltaU));
+  return {
+    u,
+    t,
+    severity: Math.min(1, Math.max(0, u / Math.max(t, 1))),
+    evaluable: tsBaseline.evaluable && !tsBaseline.generationInvalidated,
+    generationInvalidated: tsBaseline.generationInvalidated,
+    baselineGeneration: Math.max(0, tsBaseline.baselineGeneration),
+    computedAt: Math.max(0, tsBaseline.computedAt)
+  };
+}
+function formatTailHygiene(status) {
+  const percentage = (status.severity * 100).toFixed(1);
+  const state = status.evaluable ? "" : " · held until baseline refresh";
+  return `${percentage}% · ${status.u.toLocaleString()} / ${status.t.toLocaleString()} tok${state}`;
+}
 // src/hooks/magic-context/execute-flush.ts
 function executeFlush(db, sessionId) {
   try {
@@ -20798,7 +21064,7 @@ function formatExecuteThreshold(detail, contextLimit) {
   }
   return `${percentage}%${clampNote}`;
 }
-function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageConfig = DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, liveModelKey, historyBudgetPercentage, commitClusterTrigger, executeThresholdTokens, contextLimit, dreamer, windowGeometry) {
+function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageConfig = DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, liveModelKey, historyBudgetPercentage, commitClusterTrigger, executeThresholdTokens, contextLimit, dreamer, windowGeometry, tailHygiene) {
   const thresholdDetail = resolveExecuteThresholdDetail(executeThresholdPercentageConfig, liveModelKey, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, {
     tokensConfig: executeThresholdTokens,
     contextLimit,
@@ -20843,7 +21109,7 @@ function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageC
       "### Cache TTL",
       `- Configured: ${meta.cacheTtl}`,
       `- Last response: ${meta.lastResponseTime > 0 ? `${Math.round(elapsed / 1000)}s ago` : "never"}`,
-      `- Remaining: ${cacheExpired ? "expired" : ttlMs === Number.POSITIVE_INFINITY ? "never expires (always-warm lane)" : `${Math.round(remainingMs / 1000)}s`}`,
+      `- Remaining: ${cacheExpired ? "expired" : ttlMs === Number.POSITIVE_INFINITY ? "never (MC never assumes expiry — external cache-keep)" : `${Math.round(remainingMs / 1000)}s`}`,
       `- Queue will auto-execute: ${cacheExpired ? "yes (cache expired)" : ttlMs === Number.POSITIVE_INFINITY ? `when context >= ${executeThresholdPercentage}%` : `when TTL expires or context >= ${executeThresholdPercentage}%`}`,
       "",
       "### Execute Threshold",
@@ -20853,6 +21119,9 @@ function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageC
       `**Protected tags:** ${protectedTags}`,
       `**Subagent session:** ${meta.isSubagent}`
     ];
+    if (tailHygiene !== undefined) {
+      lines.push("", "### Tail Hygiene", `- Reclaimable / eligible: ${formatTailHygiene(tailHygiene)}`, "- Reasoning is excluded from both terms.");
+    }
     if (dreamer?.backlog && Object.keys(dreamer.backlog).length > 0) {
       lines.push("", "### Dreamer", ...dreamer.progress ? [
         `- Running: ${dreamer.progress.task} — ${dreamer.progress.processed}/${dreamer.progress.total} processed`
@@ -21329,10 +21598,12 @@ Embedding status is unavailable.`;
         const liveContextLimit = deps.getContextLimit?.(sessionId);
         const modelSlash = liveModelKey?.indexOf("/") ?? -1;
         const windowGeometry = liveModelKey && modelSlash > 0 ? resolveContextWindowGeometry(liveModelKey.slice(0, modelSlash), liveModelKey.slice(modelSlash + 1), { db: deps.db, sessionID: sessionId }) : undefined;
+        const rustTailHygiene = rustStatus?.tail_hygiene;
+        const tailHygiene = resolveTailHygieneStatus(deps.getTailHygiene?.(sessionId), rustTailHygiene && typeof rustTailHygiene === "object" ? rustTailHygiene : undefined);
         const statusOutput = executeStatus(deps.db, sessionId, deps.protectedTags, deps.executeThresholdPercentage, liveModelKey, deps.historyBudgetPercentage, deps.commitClusterTrigger, deps.executeThresholdTokens, liveContextLimit, deps.dreamer ? {
           backlog: readDreamTaskBacklogsSafely(deps.db, deps.dreamer.projectPath, CANONICAL_DREAM_TASKS),
           progress: deps.getDreamerProgress?.() ?? null
-        } : undefined, windowGeometry);
+        } : undefined, windowGeometry, tailHygiene);
         const moduleStatus = rustStatus ? `
 ${formatRustStatusText(rustStatus)}` : "";
@@ -21985,6 +22256,10 @@ function writeRustTransformDecision(args) {
     decision: mapped.decision,
     materialized: mapped.materialized,
     materializeReason: args.materializeReason,
+    systemHashPrev: null,
+    systemHashNew: null,
+    m0ModelKeyPrev: null,
+    m0ModelKeyNew: null,
     emergency: false,
     droppedTokens: 0,
     droppedCount: 0,
@@ -22076,10 +22351,16 @@ function writeTransformDecisionRow(dbPath, row) {
 function writeTransformDecisionRowOnDatabase(db, row, configureBusyTimeout) {
   if (configureBusyTimeout)
     db.exec("PRAGMA busy_timeout=0");
+  const systemHashPrev = row.materialized ? row.systemHashPrev : null;
+  const systemHashNew = row.materialized ? row.systemHashNew : null;
+  const m0ModelKeyPrev = row.materialized ? row.m0ModelKeyPrev : null;
+  const m0ModelKeyNew = row.materialized ? row.m0ModelKeyNew : null;
   db.prepare(`INSERT OR REPLACE INTO transform_decisions (
                 session_id, harness, message_id, ts_ms, decision, materialized,
-                materialize_reason, emergency, dropped_tokens, dropped_count, input_tokens
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(row.sessionId, row.harness, row.messageId, row.tsMs, row.decision, row.materialized ? 1 : 0, row.materializeReason, row.emergency ? 1 : 0, Math.max(0, Math.floor(row.droppedTokens)), Math.max(0, Math.floor(row.droppedCount)), Math.max(0, Math.floor(row.inputTokens)));
+                materialize_reason, system_hash_prev, system_hash_new,
+                m0_model_key_prev, m0_model_key_new, emergency, dropped_tokens,
+                dropped_count, input_tokens
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(row.sessionId, row.harness, row.messageId, row.tsMs, row.decision, row.materialized ? 1 : 0, row.materializeReason, systemHashPrev, systemHashNew, m0ModelKeyPrev, m0ModelKeyNew, row.emergency ? 1 : 0, Math.max(0, Math.floor(row.droppedTokens)), Math.max(0, Math.floor(row.droppedCount)), Math.max(0, Math.floor(row.inputTokens)));
   db.prepare(`DELETE FROM transform_decisions
              WHERE session_id = ? AND harness = ?
                AND rowid NOT IN (
@@ -22363,185 +22644,6 @@ function captureWindowReport(input) {
 // src/hooks/magic-context/channel2-delivery.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
-// src/hooks/magic-context/ctx-reduce-nudge.ts
-var CHANNEL1_SENTINEL = "<system-reminder>";
-var TOKENS_PER_BYTE = 0.25;
-var CHANNEL1_FLOOR_TOKENS = 1e4;
-var CHANNEL1_REFIRE_FLOOR_TOKENS = 1e4;
-function channel1RefireTokens(workingWindowTokens) {
-  const scaled = Math.round(0.05 * Math.max(0, workingWindowTokens));
-  return Math.max(CHANNEL1_REFIRE_FLOOR_TOKENS, scaled);
-}
-var S_GENTLE = 0.2;
-var S_FIRM = 0.4;
-var S_URGENT = 0.65;
-var CHANNEL1_PRESSURE_FLOOR = 0.8;
-var LEVEL_RANK = { gentle: 1, firm: 2, urgent: 3 };
-var DROP_SENTINELS = ["[dropped", "[truncated"];
-function isDroppedToolOutput(output) {
-  const head = output.slice(0, 16);
-  return DROP_SENTINELS.some((s) => head.startsWith(s));
-}
-function isToolPartWithStringOutput(part) {
-  if (part === null || typeof part !== "object")
-    return false;
-  const p = part;
-  if (p.type !== "tool" && p.type !== "tool-invocation")
-    return false;
-  const state = p.state;
-  return typeof state?.output === "string";
-}
-function toolOutputTokens(output) {
-  return Math.round(byteSize(output) * TOKENS_PER_BYTE);
-}
-function stringTokens(value) {
-  return Math.round(byteSize(value) * TOKENS_PER_BYTE);
-}
-function unknownJsonTokens(value) {
-  if (value === undefined || value === null)
-    return 0;
-  try {
-    return stringTokens(JSON.stringify(value));
-  } catch {
-    return 0;
-  }
-}
-function textFromPart(part) {
-  if (part === null || typeof part !== "object")
-    return "";
-  const p = part;
-  if (typeof p.text === "string")
-    return p.text;
-  if (typeof p.content === "string")
-    return p.content;
-  if (typeof p.thinking === "string")
-    return p.thinking;
-  return "";
-}
-function computeTailTokenEstimate(messages) {
-  let toolOutputTokensTotal = 0;
-  let toolCallTokensTotal = 0;
-  let conversationTokens = 0;
-  for (const message of messages) {
-    for (const part of message.parts) {
-      if (isToolPartWithStringOutput(part)) {
-        const outputTokens = isDroppedToolOutput(part.state.output) ? 0 : toolOutputTokens(part.state.output);
-        const inputTokens = unknownJsonTokens(part.state?.input);
-        toolOutputTokensTotal += outputTokens;
-        toolCallTokensTotal += outputTokens + inputTokens;
-        continue;
-      }
-      conversationTokens += stringTokens(textFromPart(part));
-    }
-  }
-  return {
-    tailToolTokens: toolOutputTokensTotal,
-    liveTailTokens: conversationTokens + toolCallTokensTotal
-  };
-}
-function decideChannel1(input) {
-  const { undroppedTokens, workingWindowTokens, hasRecentReduce } = input;
-  const pressure = Math.min(1, Math.max(0, input.pressure));
-  const resetCycle = hasRecentReduce || undroppedTokens < input.lastNudgeUndropped;
-  const lastNudge = resetCycle ? 0 : input.lastNudgeUndropped;
-  const lastLevel = resetCycle ? "" : input.lastNudgeLevel;
-  const quiet = () => ({
-    fire: false,
-    level: "gentle",
-    undroppedTokens,
-    nextLastNudge: lastNudge,
-    nextLastNudgeLevel: lastLevel
-  });
-  if (hasRecentReduce)
-    return quiet();
-  if (undroppedTokens < CHANNEL1_FLOOR_TOKENS)
-    return quiet();
-  if (pressure < CHANNEL1_PRESSURE_FLOOR)
-    return quiet();
-  const denom = Math.max(input.estimatedInputTokens, 1);
-  const severity = Math.min(1, undroppedTokens / denom);
-  if (severity < S_GENTLE)
-    return quiet();
-  let level;
-  if (severity >= S_URGENT)
-    level = "urgent";
-  else if (severity >= S_FIRM)
-    level = "firm";
-  else
-    level = "gentle";
-  if (lastLevel === "") {
-    if (undroppedTokens < lastNudge + channel1RefireTokens(workingWindowTokens)) {
-      return quiet();
-    }
-  } else if (LEVEL_RANK[level] <= LEVEL_RANK[lastLevel]) {
-    return quiet();
-  }
-  return {
-    fire: true,
-    level,
-    undroppedTokens,
-    nextLastNudge: undroppedTokens,
-    nextLastNudgeLevel: level
-  };
-}
-function computePressure(input) {
-  const { lastInputTokens, turnToolTokens, contextLimit, executeThresholdPercentage } = input;
-  if (contextLimit <= 0 || executeThresholdPercentage <= 0)
-    return 0;
-  const estimatedInput = lastInputTokens + turnToolTokens;
-  const usagePercentage = estimatedInput / contextLimit * 100;
-  return usagePercentage / executeThresholdPercentage;
-}
-function approxThousands(tokens) {
-  return `${Math.round(tokens / 1000)}k`;
-}
-function formatOldestReclaimableHint(hint) {
-  if (!hint || hint.length === 0)
-    return "";
-  const rendered = hint.slice(0, 4).map((tag) => `§${tag.tagNumber}§ ${tag.toolName ?? "tool"}`).join(" · ");
-  return rendered.length > 0 ? `
-oldest reclaimable: ${rendered}.` : "";
-}
-var CHANNEL2_USABLE_FRACTION = 1 / 3;
-var CHANNEL2_MIN_RECLAIMABLE = 1e4;
-function shouldTriggerChannel2(input) {
-  if (input.reclaimableTokens < CHANNEL2_MIN_RECLAIMABLE)
-    return false;
-  if (input.usableTokens <= 0)
-    return true;
-  return input.reclaimableTokens >= input.usableTokens * CHANNEL2_USABLE_FRACTION;
-}
-function buildChannel2Reminder(undroppedTokens, hint) {
-  const amount = approxThousands(undroppedTokens);
-  const hintText = formatOldestReclaimableHint(hint);
-  return `<system-reminder>
-` + `Routine context housekeeping is near: a large span of this session will be comparted soon, ` + `and ~${amount} tokens of tool output remain unreduced. Drop spent outputs with ctx_reduce ` + `first so the archived span is the part that matters.${hintText}
-` + `</system-reminder>`;
-}
-function buildChannel1Reminder(level, undroppedTokens, hint) {
-  const amount = approxThousands(undroppedTokens);
-  const hintText = formatOldestReclaimableHint(hint);
-  let body;
-  switch (level) {
-    case "gentle":
-      body = `You have ~${amount} tokens of tool output you have not reduced. ` + `When you are done with earlier outputs, dropping them with ctx_reduce keeps context lean.`;
-      break;
-    case "firm":
-      body = `~${amount} tokens of unreduced tool output has built up. ` + `At your next natural stopping point, consider dropping what you have already processed with ctx_reduce.`;
-      break;
-    case "urgent":
-      body = `~${amount} tokens of unreduced tool output remain, and a large span of this session will be comparted before long. ` + `Consider dropping spent outputs with ctx_reduce so the archived span is the part that matters.`;
-      break;
-  }
-  return `
-<system-reminder>
-${body}${hintText}
-</system-reminder>`;
-}
-// src/hooks/magic-context/channel2-delivery.ts
 function subagentRunIsActive(deps, sessionId) {
   try {
     const meta = getOrCreateSessionMeta(deps.db, sessionId);
@@ -22584,19 +22686,18 @@ async function maybeDeliverChannel2(sessionId, deps) {
     clearPendingChannel2Intent(deps.db, sessionId);
     return false;
   }
-  if (deps.directiveText === undefined && (deps.reclaimableTokens === undefined || deps.usableTokens === undefined)) {
+  const evaluation = evaluateChannel2(deps.baseline);
+  if (deps.directiveText === undefined && !evaluation.evaluable) {
     return false;
   }
-  if (deps.directiveText === undefined && !shouldTriggerChannel2({
-    reclaimableTokens: deps.reclaimableTokens,
-    usableTokens: deps.usableTokens
-  })) {
+  if (deps.directiveText === undefined && !evaluation.shouldTrigger) {
     try {
       casChannel2NudgeState(deps.db, sessionId, "pending", "");
-      sessionLog(sessionId, `channel2 intent cleared pre-delivery (reclaimable ${deps.reclaimableTokens}, usable ${deps.usableTokens} — trigger no longer holds; re-armable)`);
+      sessionLog(sessionId, `channel2 intent cleared pre-delivery (U ${evaluation.reclaimableTokens}, T ${evaluation.tailTokens} — trigger no longer holds; re-armable)`);
     } catch {}
     return false;
   }
+  const effectiveU = evaluation.reclaimableTokens;
   const client = deps.client;
   if (!client)
     return false;
@@ -22610,7 +22711,7 @@ async function maybeDeliverChannel2(sessionId, deps) {
   }
   try {
     const promptContext = await resolvePromptContext(client, sessionId);
-    const reminder = deps.directiveText ?? buildChannel2Reminder(deps.reclaimableTokens, deps.oldestReclaimableToolTags);
+    const reminder = deps.directiveText ?? buildChannel2Reminder(effectiveU, deps.oldestReclaimableToolTags);
     const body = {
       noReply: false,
       parts: [{ type: "text", text: reminder, synthetic: true }]
@@ -23296,156 +23397,6 @@ class EmergencyFailClosedError extends Error {
   }
 }
-// src/hooks/magic-context/image-token-estimate.ts
-var IMAGE_TOKEN_DIVISOR = 750;
-var IMAGE_FALLBACK_TOKENS = 1200;
-var IMAGE_TOKEN_CAP = 4500;
-function estimateImageTokensFromDataUrl(url) {
-  const comma = url.indexOf(",");
-  if (comma < 0)
-    return IMAGE_FALLBACK_TOKENS;
-  const header = url.slice(0, comma);
-  const payload = url.slice(comma + 1);
-  const sliceLen = Math.min(512, payload.length);
-  const preview = payload.slice(0, sliceLen);
-  let bytes;
-  try {
-    bytes = base64Decode(preview);
-  } catch {
-    return IMAGE_FALLBACK_TOKENS;
-  }
-  if (header.includes("image/png")) {
-    const dims = parsePngDimensions(bytes);
-    if (dims)
-      return clampImageTokens(Math.ceil(dims.w * dims.h / IMAGE_TOKEN_DIVISOR));
-  } else if (header.includes("image/jpeg") || header.includes("image/jpg")) {
-    const dims = parseJpegDimensions(bytes);
-    if (dims)
-      return clampImageTokens(Math.ceil(dims.w * dims.h / IMAGE_TOKEN_DIVISOR));
-  } else if (header.includes("image/webp")) {
-    const dims = parseWebpDimensions(bytes);
-    if (dims)
-      return clampImageTokens(Math.ceil(dims.w * dims.h / IMAGE_TOKEN_DIVISOR));
-  } else if (header.includes("image/gif")) {
-    const dims = parseGifDimensions(bytes);
-    if (dims)
-      return clampImageTokens(Math.ceil(dims.w * dims.h / IMAGE_TOKEN_DIVISOR));
-  }
-  return IMAGE_FALLBACK_TOKENS;
-}
-function clampImageTokens(n) {
-  if (n < 1)
-    return 1;
-  if (n > IMAGE_TOKEN_CAP)
-    return IMAGE_TOKEN_CAP;
-  return n;
-}
-function base64Decode(b64) {
-  const pad = b64.length % 4;
-  const padded = pad === 0 ? b64 : b64 + "=".repeat(4 - pad);
-  const binary = atob(padded);
-  const out = new Uint8Array(binary.length);
-  for (let i = 0;i < binary.length; i++)
-    out[i] = binary.charCodeAt(i);
-  return out;
-}
-function parsePngDimensions(b) {
-  if (b.length < 24)
-    return null;
-  if (b[0] !== 137 || b[1] !== 80 || b[2] !== 78 || b[3] !== 71 || b[4] !== 13 || b[5] !== 10 || b[6] !== 26 || b[7] !== 10)
-    return null;
-  const w = readUint32BE(b, 16);
-  const h = readUint32BE(b, 20);
-  if (!w || !h)
-    return null;
-  return { w, h };
-}
-function parseJpegDimensions(b) {
-  if (b.length < 4 || b[0] !== 255 || b[1] !== 216)
-    return null;
-  let i = 2;
-  while (i < b.length - 8) {
-    if (b[i] !== 255) {
-      i++;
-      continue;
-    }
-    const marker = b[i + 1];
-    if (marker === undefined)
-      break;
-    if (isSofMarker(marker)) {
-      const h = b[i + 5] << 8 | b[i + 6];
-      const w = b[i + 7] << 8 | b[i + 8];
-      if (w && h)
-        return { w, h };
-      return null;
-    }
-    if (marker === 216 || marker === 217 || marker === 1) {
-      i += 2;
-      continue;
-    }
-    const segLen = b[i + 2] << 8 | b[i + 3];
-    if (segLen < 2)
-      return null;
-    i += 2 + segLen;
-  }
-  return null;
-}
-function isSofMarker(m) {
-  if (m >= 192 && m <= 195)
-    return true;
-  if (m >= 197 && m <= 199)
-    return true;
-  if (m >= 201 && m <= 203)
-    return true;
-  if (m >= 205 && m <= 207)
-    return true;
-  return false;
-}
-function parseWebpDimensions(b) {
-  if (b.length < 30)
-    return null;
-  if (b[0] !== 82 || b[1] !== 73 || b[2] !== 70 || b[3] !== 70)
-    return null;
-  if (b[8] !== 87 || b[9] !== 69 || b[10] !== 66 || b[11] !== 80)
-    return null;
-  const variant = String.fromCharCode(b[12], b[13], b[14], b[15]);
-  if (variant === "VP8 ") {
-    const w = (b[26] | b[27] << 8) & 16383;
-    const h = (b[28] | b[29] << 8) & 16383;
-    if (w && h)
-      return { w, h };
-  } else if (variant === "VP8L") {
-    const b0 = b[21];
-    const b1 = b[22];
-    const b2 = b[23];
-    const b3 = b[24];
-    const w = 1 + ((b0 | b1 << 8) & 16383);
-    const h = 1 + ((b1 >> 6 | b2 << 2 | b3 << 10) & 16383);
-    if (w && h)
-      return { w, h };
-  } else if (variant === "VP8X") {
-    const w = 1 + (b[24] | b[25] << 8 | b[26] << 16);
-    const h = 1 + (b[27] | b[28] << 8 | b[29] << 16);
-    if (w && h)
-      return { w, h };
-  }
-  return null;
-}
-function parseGifDimensions(b) {
-  if (b.length < 10)
-    return null;
-  if (b[0] !== 71 || b[1] !== 73 || b[2] !== 70)
-    return null;
-  const w = b[6] | b[7] << 8;
-  const h = b[8] | b[9] << 8;
-  if (!w || !h)
-    return null;
-  return { w, h };
-}
-function readUint32BE(b, offset) {
-  return (b[offset] << 24 | b[offset + 1] << 16 | b[offset + 2] << 8 | b[offset + 3]) >>> 0;
-}
 // src/hooks/magic-context/tokenizer-calibration.ts
 var CALIBRATION_TABLE = [
   { prefix: "anthropic/claude-opus-4-8", systemRatio: 1.51, toolsRatio: 1.57 },
@@ -24294,7 +24245,7 @@ function createPassOutcome() {
 }
 // src/hooks/magic-context/rust-mode-transform.ts
-import { createHash as createHash13 } from "node:crypto";
+import { createHash as createHash12 } from "node:crypto";
 // src/hooks/magic-context/module-state-sync.ts
 import { createHmac, randomUUID as randomUUID5 } from "node:crypto";
@@ -25764,121 +25715,6 @@ class RawFallbackContextLimitError extends Error {
   }
 }
-// src/hooks/magic-context/todo-view.ts
-import { createHash as createHash11 } from "node:crypto";
-var TODO_STATUS_PENDING = "pending";
-var TODO_STATUS_IN_PROGRESS = "in_progress";
-var TODO_STATUS_COMPLETED = "completed";
-var TODO_STATUS_CANCELLED = "cancelled";
-var TODO_PRIORITY_HIGH = "high";
-var TODO_PRIORITY_MEDIUM = "medium";
-var TODO_PRIORITY_LOW = "low";
-var TODO_STATUSES = [
-  TODO_STATUS_PENDING,
-  TODO_STATUS_IN_PROGRESS,
-  TODO_STATUS_COMPLETED,
-  TODO_STATUS_CANCELLED
-];
-var TODO_PRIORITIES = [
-  TODO_PRIORITY_HIGH,
-  TODO_PRIORITY_MEDIUM,
-  TODO_PRIORITY_LOW
-];
-var TODO_STATUS_SET = new Set(TODO_STATUSES);
-var TODO_PRIORITY_SET = new Set(TODO_PRIORITIES);
-var TERMINAL_STATUSES = new Set([
-  TODO_STATUS_COMPLETED,
-  TODO_STATUS_CANCELLED
-]);
-var TITLE_DONE_STATUSES = new Set([TODO_STATUS_COMPLETED]);
-var SYNTHETIC_CALL_ID_PREFIX = "mc_synthetic_todo_";
-function normalizeTodoStateJson(todos) {
-  if (!Array.isArray(todos))
-    return null;
-  const normalized = [];
-  for (const todo of todos) {
-    if (!isTodoItem(todo))
-      return null;
-    normalized.push({
-      content: todo.content,
-      status: todo.status,
-      priority: todo.priority ?? TODO_PRIORITY_MEDIUM
-    });
-  }
-  return JSON.stringify(normalized);
-}
-function buildSyntheticTodoPart(stateJson) {
-  const todos = parseTodoState(stateJson);
-  if (todos === null || todos.length === 0)
-    return null;
-  if (todos.every((t) => TERMINAL_STATUSES.has(t.status)))
-    return null;
-  const callID = computeSyntheticCallId(stateJson);
-  const activeCount = todos.filter((t) => !TITLE_DONE_STATUSES.has(t.status)).length;
-  const output = JSON.stringify(todos, null, 2);
-  const ts = 0;
-  return {
-    type: "tool",
-    callID,
-    tool: "todowrite",
-    state: {
-      status: "completed",
-      input: { todos },
-      output,
-      title: `${activeCount} todos`,
-      metadata: { todos, truncated: false },
-      time: { start: ts, end: ts }
-    },
-    syntheticTodoMarker: true
-  };
-}
-function computeSyntheticCallId(stateJson) {
-  const hash = createHash11("sha256").update(stateJson).digest("hex").slice(0, 16);
-  return `${SYNTHETIC_CALL_ID_PREFIX}${hash}`;
-}
-function isSyntheticTodoPart(part) {
-  if (part === null || typeof part !== "object")
-    return false;
-  const p = part;
-  if (p.syntheticTodoMarker === true)
-    return true;
-  return p.type === "tool" && p.tool === "todowrite" && typeof p.callID === "string" && p.callID.startsWith(SYNTHETIC_CALL_ID_PREFIX);
-}
-function parseTodoState(stateJson) {
-  if (stateJson.length === 0)
-    return null;
-  try {
-    const parsed = JSON.parse(stateJson);
-    if (!Array.isArray(parsed))
-      return null;
-    const result = [];
-    for (const item of parsed) {
-      if (!isTodoItem(item))
-        return null;
-      result.push({
-        content: item.content,
-        status: item.status,
-        priority: item.priority ?? TODO_PRIORITY_MEDIUM
-      });
-    }
-    return result;
-  } catch {
-    return null;
-  }
-}
-function isTodoStatus(value) {
-  return typeof value === "string" && TODO_STATUS_SET.has(value);
-}
-function isTodoPriority(value) {
-  return typeof value === "string" && TODO_PRIORITY_SET.has(value);
-}
-function isTodoItem(value) {
-  if (value === null || typeof value !== "object")
-    return false;
-  const todo = value;
-  return typeof todo.content === "string" && isTodoStatus(todo.status) && (todo.priority === undefined || isTodoPriority(todo.priority));
-}
 // src/hooks/magic-context/transform-context-state.ts
 function loadPersistedUsageWatermark(db, sessionId) {
   const result = db.prepare("SELECT last_response_time FROM session_meta WHERE session_id = ?").get(sessionId);
@@ -25982,7 +25818,7 @@ function containsProbeVerbatim(text, probes) {
 }
 // src/features/magic-context/search-measurement.ts
-import { createHash as createHash12 } from "node:crypto";
+import { createHash as createHash11 } from "node:crypto";
 function resultId(result) {
   switch (result.source) {
     case "memory":
@@ -26069,7 +25905,7 @@ async function recordShadowMeasurement(args) {
   }
 }
 function sha256(value) {
-  return createHash12("sha256").update(value).digest("hex");
+  return createHash11("sha256").update(value).digest("hex");
 }
 // src/features/magic-context/search.ts
@@ -27458,6 +27294,21 @@ ${hintText}`;
 }
 function clearAutoSearchForSession(_sessionId) {}
+// src/hooks/magic-context/channel2-cycle.ts
+function rearmChannel2AfterCoverageAdvancingHardFold(input) {
+  if (input.compactionOff || !input.foldExecuted || input.previousCoverage === null || input.currentCoverage === null || input.currentCoverage <= input.previousCoverage) {
+    return false;
+  }
+  return casChannel2NudgeState(input.db, input.sessionId, "delivered", "");
+}
+function rearmChannel2AfterMeasuredCollapse(input) {
+  if (!input.baseline.evaluable || input.baseline.generationInvalidated)
+    return false;
+  if (effectiveTailHygiene(input.baseline).u >= CHANNEL1_FLOOR_TOKENS)
+    return false;
+  return casChannel2NudgeState(input.db, input.sessionId, "delivered", "");
+}
 // src/hooks/magic-context/drop-stale-reduce-calls.ts
 var STALE_TOOL_NAMES = new Set(["ctx_reduce"]);
 function isReduceToolPart(part) {
@@ -27535,126 +27386,9 @@ function dropStaleReduceCalls(messages, frozenIds, options = {}) {
   return { didDrop, newlyStrippedIds };
 }
-// src/hooks/magic-context/emergency-drop.ts
-var TARGET_FRACTION = 0.3;
-var TIER_RECENCY_RESERVE = 0.2;
-var EMERGENCY_REARM_MIN_TOKENS = 2000;
-var T1_TOOLS = new Set(["read", "todowrite", "task", "aft_outline", "aft_zoom"]);
-var T2_TOOLS = new Set(["edit", "write", "apply_patch", "grep", "glob", "aft_search"]);
-function normalizeToolName(toolName) {
-  if (!toolName)
-    return "";
-  let name = toolName.toLowerCase();
-  if (name.startsWith("mcp_"))
-    name = name.slice(4);
-  return name;
-}
-function resolveToolTier(toolName) {
-  const name = normalizeToolName(toolName);
-  if (T1_TOOLS.has(name))
-    return 1;
-  if (T2_TOOLS.has(name))
-    return 2;
-  return 3;
-}
-function tagReclaimBytes(tag) {
-  return tag.byteSize + tag.inputByteSize + tag.reasoningByteSize;
-}
-function estimateEmergencyDropReclaimTokens(tag) {
-  return Math.round(tagReclaimBytes(tag) * TOKENS_PER_BYTE);
-}
-function planEmergencyDrop(input) {
-  const {
-    tags,
-    floorTags,
-    maxTag,
-    protectedTags,
-    currentTotalInputTokens,
-    ceilingTokens,
-    priorInputSample,
-    hasPriorDrop
-  } = input;
-  const noop = (reason) => ({
-    shouldDrop: false,
-    tagNumbers: [],
-    reclaimTokens: 0,
-    reason
-  });
-  if (!Number.isFinite(ceilingTokens) || ceilingTokens <= 0) {
-    return noop("unknown-ceiling");
-  }
-  if (!Number.isFinite(currentTotalInputTokens) || currentTotalInputTokens <= 0) {
-    return noop("unknown-usage");
-  }
-  if (hasPriorDrop && currentTotalInputTokens === priorInputSample) {
-    return noop("same-input-sample (awaiting fresh usage after prior drop)");
-  }
-  let tailTokens = 0;
-  for (const tag of floorTags) {
-    if (tag.status !== "active")
-      continue;
-    tailTokens += estimateEmergencyDropReclaimTokens(tag);
-  }
-  const fixedFloor = Math.max(currentTotalInputTokens - tailTokens, 0);
-  const workingSpan = Math.max(ceilingTokens - fixedFloor, 0);
-  const target = fixedFloor + TARGET_FRACTION * workingSpan;
-  const reclaimTokens = Math.round(currentTotalInputTokens - target);
-  if (reclaimTokens <= EMERGENCY_REARM_MIN_TOKENS) {
-    return noop(`reclaim<=min (${reclaimTokens} <= ${EMERGENCY_REARM_MIN_TOKENS})`);
-  }
-  const protectedCutoff = maxTag - protectedTags;
-  const tierActive = { 1: [], 2: [] };
-  for (const tag of tags) {
-    if (tag.status !== "active" || tag.type !== "tool")
-      continue;
-    const tier = resolveToolTier(tag.toolName);
-    if (tier === 1 || tier === 2)
-      tierActive[tier].push(tag.tagNumber);
-  }
-  const reserved = new Set;
-  for (const tier of [1, 2]) {
-    const nums = tierActive[tier];
-    if (nums.length === 0)
-      continue;
-    nums.sort((a, b) => b - a);
-    const reserveCount = Math.ceil(TIER_RECENCY_RESERVE * nums.length);
-    for (let i = 0;i < reserveCount && i < nums.length; i++) {
-      reserved.add(nums[i]);
-    }
-  }
-  const byTier = { 1: [], 2: [], 3: [] };
-  for (const tag of tags) {
-    if (tag.status !== "active" || tag.type !== "tool")
-      continue;
-    if (tag.tagNumber > protectedCutoff)
-      continue;
-    const tier = resolveToolTier(tag.toolName);
-    if ((tier === 1 || tier === 2) && reserved.has(tag.tagNumber))
-      continue;
-    byTier[tier].push(tag);
-  }
-  const selected = [];
-  let reclaimed = 0;
-  outer:
-    for (const tier of [3, 2, 1]) {
-      const group = byTier[tier];
-      group.sort((a, b) => a.tagNumber - b.tagNumber);
-      for (const tag of group) {
-        selected.push(tag.tagNumber);
-        reclaimed += estimateEmergencyDropReclaimTokens(tag);
-        if (reclaimed >= reclaimTokens)
-          break outer;
-      }
-    }
-  if (selected.length === 0) {
-    return noop("no-candidates");
-  }
-  return {
-    shouldDrop: true,
-    tagNumbers: selected,
-    reclaimTokens,
-    reason: `tiered drop: ${selected.length} tags, reclaim≈${reclaimed}/${reclaimTokens} tokens (floor≈${fixedFloor}, ceiling=${Math.round(ceilingTokens)})`
-  };
+// src/hooks/magic-context/fold-execution-gate.ts
+function foldExecutesThisPass(foldDue, materialized) {
+  return foldDue && materialized;
 }
 // src/hooks/magic-context/system-injection-stripper.ts
@@ -28305,6 +28039,7 @@ function planMergedAssistantReasoningStrip(messages, mutationExemptMessage) {
   }
   return plan;
 }
+var MAX_FROZEN_TRAILING_BLANKS = 1e4;
 var CANONICAL_BLANK_PART = { type: "text", text: "" };
 function isSentinelInvisibleTextPart(part) {
   return isRecord(part) && part.type === "text" && typeof part.text === "string" && part.text.trim() === "";
@@ -28312,18 +28047,37 @@ function isSentinelInvisibleTextPart(part) {
 function isCanonicalBlankPart(part) {
   return isRecord(part) && Object.keys(part).length === 2 && part.type === "text" && part.text === "";
 }
-function findTrailingBlankDecisionCandidates(messages, frozenDecisions) {
+function trailingBlankKeepCount(decision) {
+  if (decision === "keep")
+    return 1;
+  if (!decision.startsWith("keep:"))
+    return;
+  const countText = decision.slice("keep:".length);
+  if (!/^[1-9]\d*$/.test(countText))
+    return;
+  const count = Number(countText);
+  return Number.isSafeInteger(count) && count > 0 && count <= MAX_FROZEN_TRAILING_BLANKS ? count : undefined;
+}
+function findTrailingBlankDecisionCandidates(messages, frozenDecisions, options) {
   const decisions = [];
   for (const message of messages) {
     const id = message.info.id;
-    if (message.info.role !== "assistant" || typeof id !== "string" || id.length === 0 || frozenDecisions.has(id)) {
+    if (message.info.role !== "assistant" || typeof id !== "string" || id.length === 0) {
       continue;
     }
-    const last = message.parts.at(-1);
-    decisions.push([
-      id,
-      message.parts.length === 0 || isSentinelInvisibleTextPart(last) ? "keep" : "strip"
-    ]);
+    let trailingCount = 0;
+    while (trailingCount < message.parts.length && isSentinelInvisibleTextPart(message.parts[message.parts.length - trailingCount - 1])) {
+      trailingCount += 1;
+    }
+    if (trailingCount > MAX_FROZEN_TRAILING_BLANKS && trailingCount < message.parts.length) {
+      continue;
+    }
+    const decision = message.parts.length === 0 || trailingCount === message.parts.length ? "keep" : trailingCount === 0 ? "strip" : trailingCount === 1 ? "keep" : `keep:${trailingCount}`;
+    const frozen = frozenDecisions.get(id);
+    if (frozen !== undefined && (id !== options?.refreshMessageId || frozen === decision)) {
+      continue;
+    }
+    decisions.push([id, decision]);
   }
   return decisions;
 }
@@ -28341,24 +28095,26 @@ function applyFrozenTrailingBlankDecisions(messages, newestAssistantId, frozenDe
     while (lastMeaningfulIndex >= 0 && isSentinelInvisibleTextPart(message.parts[lastMeaningfulIndex])) {
       lastMeaningfulIndex -= 1;
     }
-    const replaceParts = (start, deleteCount, insertBlank) => {
+    const replaceParts = (start, deleteCount, insertBlankCount) => {
       message = { ...message, parts: [...message.parts] };
       messages[messageIndex] = message;
-      message.parts.splice(start, deleteCount, ...insertBlank ? [{ ...CANONICAL_BLANK_PART }] : []);
+      message.parts.splice(start, deleteCount, ...Array.from({ length: insertBlankCount }, () => ({ ...CANONICAL_BLANK_PART })));
     };
     if (lastMeaningfulIndex < 0) {
       if (message.parts.length !== 1 || !isCanonicalBlankPart(message.parts[0])) {
         mutations += Math.max(1, message.parts.length);
-        replaceParts(0, message.parts.length, true);
+        replaceParts(0, message.parts.length, 1);
       }
       continue;
     }
     const trailingCount = message.parts.length - lastMeaningfulIndex - 1;
-    if (decision === "keep") {
+    const keepCount = trailingBlankKeepCount(decision);
+    if (keepCount !== undefined) {
       const blankIndex = lastMeaningfulIndex + 1;
-      if (trailingCount !== 1 || !isCanonicalBlankPart(message.parts[blankIndex])) {
-        mutations += Math.max(1, trailingCount);
-        replaceParts(blankIndex, trailingCount, true);
+      const suffixIsCanonical = trailingCount === keepCount && message.parts.slice(blankIndex).every(isCanonicalBlankPart);
+      if (!suffixIsCanonical) {
+        mutations += Math.max(1, trailingCount, keepCount);
+        replaceParts(blankIndex, trailingCount, keepCount);
       }
       continue;
     }
@@ -28369,12 +28125,12 @@ function applyFrozenTrailingBlankDecisions(messages, newestAssistantId, frozenDe
       const blankIndex = lastMeaningfulIndex + 1;
       if (trailingCount !== 1 || !isCanonicalBlankPart(message.parts[blankIndex])) {
         mutations += Math.max(1, trailingCount);
-        replaceParts(blankIndex, trailingCount, true);
+        replaceParts(blankIndex, trailingCount, 1);
       }
       continue;
     }
     mutations += trailingCount;
-    replaceParts(lastMeaningfulIndex + 1, trailingCount, false);
+    replaceParts(lastMeaningfulIndex + 1, trailingCount, 0);
   }
   return mutations;
 }
@@ -28451,7 +28207,6 @@ function stripProcessedImages(messages, frozenIds, options) {
 // src/hooks/magic-context/supersession-reclaim.ts
 var TODOWRITE_KEEP = 1;
-var CTX_REDUCE_KEEP = 5;
 var ZERO_VALUE_META_TOOLS = new Set(["bash_status", "bash_kill"]);
 var CTX_NOTE_ZERO_VALUE_ACTIONS = new Set(["read", "dismiss"]);
 function buildSupersessionReclaimOps(input) {
@@ -29509,7 +29264,7 @@ async function runPostTransformPhase(args) {
   const deferredMaterialize = args.canConsumeDeferredLate && deferredMaterializationWasPending;
   const materializationRequested = isExplicitFlush || deferredMaterialize;
   const m0M1EnabledForFold = args.m0M1 !== undefined && (!!args.m0M1.projectPath || !!args.m0M1.projectDirectory) && (args.fullFeatureMode || compactionOff);
-  const m0HardFoldThisPass = m0M1EnabledForFold && args.m0M1 ? mustMaterialize({
+  const foldDueDecision = m0M1EnabledForFold && args.m0M1 ? mustMaterialize({
     db: args.db,
     sessionId: args.sessionId,
     state: args.sessionMeta,
@@ -29520,13 +29275,59 @@ async function runPostTransformPhase(args) {
     memoryInjectionBudgetTokens: args.m0M1.memoryInjectionBudgetTokens,
     historyBudgetTokens: args.m0M1.historyBudgetTokens,
     hardSignals: args.m0M1.hardSignals
-  }).value : false;
-  const bypassCompartmentGate = forceMaterialization || m0HardFoldThisPass;
-  const shouldReadPendingOps = !compactionOff && (materializationRequested || args.schedulerDecision === "execute" || forceMaterialization || m0HardFoldThisPass || compartmentRunning);
+  }) : { value: false, reason: null };
+  let foldExecutedThisPass = false;
+  let m0RematerializedThisPass = false;
+  const m0CoverageBeforeFold = args.sessionMeta.cachedM0Bytes === null ? -1 : args.sessionMeta.cachedM0MaxCompartmentSeq;
+  let m0MaterializeReason = null;
+  let m0ComparisonDecision = null;
+  if (foldDueDecision.value && args.m0M1) {
+    try {
+      const foldResult = injectM0M1({
+        db: args.db,
+        sessionId: args.sessionId,
+        state: args.sessionMeta,
+        projectPath: args.m0M1.projectPath,
+        projectDirectory: args.m0M1.projectDirectory,
+        injectDocs: args.m0M1.injectDocs,
+        memoryInjectionBudgetTokens: args.m0M1.memoryInjectionBudgetTokens,
+        historyBudgetTokens: args.m0M1.historyBudgetTokens,
+        temporalAwareness: args.m0M1.temporalAwareness,
+        isCacheBustingPass: true,
+        hardSignals: args.m0M1.hardSignals,
+        muralEnabled: args.m0M1.muralEnabled,
+        compactionOff
+      });
+      foldExecutedThisPass = foldExecutesThisPass(foldDueDecision.value, foldResult.m0RematerializedThisPass);
+      m0RematerializedThisPass = foldResult.m0RematerializedThisPass;
+      m0MaterializeReason = foldResult.decision.reason;
+      if (foldResult.m0RematerializedThisPass) {
+        m0ComparisonDecision = foldResult.decision;
+      }
+      try {
+        rearmChannel2AfterCoverageAdvancingHardFold({
+          db: args.db,
+          sessionId: args.sessionId,
+          foldExecuted: foldExecutedThisPass,
+          compactionOff,
+          previousCoverage: m0CoverageBeforeFold,
+          currentCoverage: args.sessionMeta.cachedM0MaxCompartmentSeq
+        });
+      } catch (error) {
+        sessionLog(args.sessionId, "channel2 fold-cycle reset failed (ignored):", error);
+      }
+    } catch (error) {
+      args.passOutcome?.record("m0-m1-fold-preexecution-degradation");
+      sessionLog(args.sessionId, "transform: m[0] HARD fold pre-execution failed:", getErrorMessage(error));
+    }
+    sessionLog(args.sessionId, `m[0] HARD fold decision: reason=${foldDueDecision.reason ?? "unknown"} executed=${foldExecutedThisPass}`);
+  }
+  const bypassCompartmentGate = forceMaterialization || foldExecutedThisPass;
+  const shouldReadPendingOps = !compactionOff && (materializationRequested || args.schedulerDecision === "execute" || forceMaterialization || foldExecutedThisPass || compartmentRunning);
   const pendingOps = shouldReadPendingOps ? getPendingOps(args.db, args.sessionId) : [];
   const hasPendingUserOps = pendingOps.length > 0;
-  const shouldApplyPendingOps = !compactionOff && (args.schedulerDecision === "execute" || materializationRequested || forceMaterialization || m0HardFoldThisPass) && (!compartmentRunning || bypassCompartmentGate);
-  const shouldRunHeuristics = !compactionOff && (!compartmentRunning || bypassCompartmentGate) && (materializationRequested || forceMaterialization || m0HardFoldThisPass || emergencyDropEligible || args.schedulerDecision === "execute" && (!alreadyRanThisTurn || !args.fullFeatureMode));
+  const shouldApplyPendingOps = !compactionOff && (args.schedulerDecision === "execute" || materializationRequested || forceMaterialization || foldExecutedThisPass) && (!compartmentRunning || bypassCompartmentGate);
+  const shouldRunHeuristics = !compactionOff && (!compartmentRunning || bypassCompartmentGate) && (materializationRequested || forceMaterialization || foldExecutedThisPass || emergencyDropEligible || args.schedulerDecision === "execute" && (!alreadyRanThisTurn || !args.fullFeatureMode));
   const isCacheBustingPass = shouldApplyPendingOps || shouldRunHeuristics;
   if (isCacheBustingPass && args.client && args.ctxReduceAvailability.callable && !hasLoggedCtxReducePermissionDeny(args.sessionId)) {
     try {
@@ -29542,7 +29343,7 @@ async function runPostTransformPhase(args) {
   const canUseEmptySentinels = modelAcceptsEmptyContent(args.resolvedProviderID);
   if (shouldRunHeuristics) {
     const subagentRerun = !args.fullFeatureMode && alreadyRanThisTurn && args.schedulerDecision === "execute" && !isExplicitFlush && !forceMaterialization;
-    const reason = isExplicitFlush ? "explicit_flush" : deferredMaterialize ? "deferred_materialization" : forceMaterialization ? `force_materialization (${args.contextUsage.percentage.toFixed(1)}% >= ${args.forceMaterializationPercentage}%)` : m0HardFoldThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into known m[0] bust, scheduler=${args.schedulerDecision})` : subagentRerun ? `scheduler_execute_subagent_rerun (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})` : `scheduler_execute (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})`;
+    const reason = isExplicitFlush ? "explicit_flush" : deferredMaterialize ? "deferred_materialization" : forceMaterialization ? `force_materialization (${args.contextUsage.percentage.toFixed(1)}% >= ${args.forceMaterializationPercentage}%)` : foldExecutedThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : subagentRerun ? `scheduler_execute_subagent_rerun (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})` : `scheduler_execute (pendingOps=${pendingOps.length}, scheduler=${args.schedulerDecision})`;
     sessionLog(args.sessionId, `heuristics WILL RUN — reason=${reason}, context=${args.contextUsage.percentage.toFixed(1)}%, turn=${args.currentTurnId}`);
   }
   if (alreadyRanThisTurn && args.schedulerDecision === "execute" && !materializationRequested && args.fullFeatureMode) {
@@ -29566,8 +29367,6 @@ async function runPostTransformPhase(args) {
   const droppedTokens = 0;
   let emergencyReclaimedTokens = 0;
   let emergency = false;
-  let m0RematerializedThisPass = false;
-  let m0MaterializeReason = null;
   let m0M1InjectedThisPass = false;
   let prependedMessageCount = 0;
   const reasoningMutatedMessages = new Set;
@@ -29583,7 +29382,7 @@ async function runPostTransformPhase(args) {
   let autoReclaimDidMutateThisPass = false;
   try {
     if (shouldApplyPendingOps) {
-      const applyReason = isExplicitFlush ? "explicit_flush" : deferredMaterialize ? "deferred_materialization" : `scheduler_execute (scheduler=${args.schedulerDecision})`;
+      const applyReason = isExplicitFlush ? "explicit_flush" : deferredMaterialize ? "deferred_materialization" : foldExecutedThisPass && args.schedulerDecision !== "execute" ? `m0_hard_fold (drain folded into executed m[0] bust, scheduler=${args.schedulerDecision})` : `scheduler_execute (scheduler=${args.schedulerDecision})`;
       sessionLog(args.sessionId, `pending ops WILL APPLY — reason=${applyReason}, pendingOps=${pendingOps.length}, context=${args.contextUsage.percentage.toFixed(1)}%`);
       const tApply = performance.now();
       pendingOpsDidMutate = applyPendingOperations(args.sessionId, args.db, args.targets, args.protectedTags, undefined, pendingOps);
@@ -29800,6 +29599,9 @@ async function runPostTransformPhase(args) {
         prependedMessageCount += result.prependedMessageCount;
         m0RematerializedThisPass ||= result.m0RematerializedThisPass;
         m0MaterializeReason = result.decision.reason ?? m0MaterializeReason;
+        if (result.m0RematerializedThisPass) {
+          m0ComparisonDecision = result.decision;
+        }
         sessionLog(args.sessionId, `transform: injected m[0]/m[1] (rematerialized=${result.m0RematerializedThisPass}, reason=${result.decision.reason ?? "cache_hit"})`);
       }
     } catch (error) {
@@ -30081,6 +29883,7 @@ async function runPostTransformPhase(args) {
       sessionLog(args.sessionId, "transform failed loading trailing blank decisions:", error);
     }
   }
+  const newestAssistantId = typeof reasoningMutationExemptMessage?.info.id === "string" ? reasoningMutationExemptMessage.info.id : undefined;
   const tFinalRepresentation = performance.now();
   const finalRepresentation = finalizeMessageRepresentation(args.messages, args.resolvedProviderID, {
     prependedMessageCount,
@@ -30091,11 +29894,14 @@ async function runPostTransformPhase(args) {
     skipMergedReasoningStrip: compactionOff,
     skipTrailingWhitespaceStrip: compactionOff
   });
-  if (canUseEmptySentinels && !compactionOff && isCacheBustingPass) {
-    const candidates = findTrailingBlankDecisionCandidates(args.messages, trailingBlankDecisions);
+  if (canUseEmptySentinels && !compactionOff) {
+    const detectedCandidates = findTrailingBlankDecisionCandidates(args.messages, trailingBlankDecisions, { refreshMessageId: newestAssistantId });
+    const candidates = isCacheBustingPass ? detectedCandidates : detectedCandidates.filter(([id]) => id === newestAssistantId);
     if (candidates.length > 0) {
       try {
-        const persisted = addTrailingBlankDecisions(args.db, args.sessionId, candidates);
+        const persisted = addTrailingBlankDecisions(args.db, args.sessionId, candidates, {
+          overwriteMessageId: newestAssistantId
+        });
         if (persisted) {
           const committed = getTrailingBlankDecisions(args.db, args.sessionId);
           const newlyFrozen = new Map;
@@ -30106,8 +29912,9 @@ async function runPostTransformPhase(args) {
             trailingBlankDecisions.set(id, decision);
             newlyFrozen.set(id, decision);
           }
-          applyFrozenTrailingBlankDecisions(args.messages, typeof reasoningMutationExemptMessage?.info.id === "string" ? reasoningMutationExemptMessage.info.id : undefined, newlyFrozen);
-          bustedThisPass = true;
+          applyFrozenTrailingBlankDecisions(args.messages, newestAssistantId, newlyFrozen);
+          if (isCacheBustingPass)
+            bustedThisPass = true;
         } else {
           args.passOutcome?.record("trailing-blank-decision-persistence-failure");
           sessionLog(args.sessionId, "trailing blank decision: persistence failed; leaving newly observed assistants intact");
@@ -30120,12 +29927,80 @@ async function runPostTransformPhase(args) {
   }
   sessionLog(args.sessionId, `final representation: clearedParts=${finalRepresentation.clearedParts} mergedReasoningParts=${finalRepresentation.mergedReasoningParts}`);
   logTransformTiming(args.sessionId, "finalizeMessageRepresentation", tFinalRepresentation, `clearedParts=${finalRepresentation.clearedParts} mergedReasoningParts=${finalRepresentation.mergedReasoningParts}`);
+  let assertedBaseline;
+  if (args.channel1StateBySession) {
+    if (args.ctxReduceAvailability.callable && !compactionOff) {
+      try {
+        const tags = getTailHygieneTags(args.db, args.sessionId);
+        const previous = args.channel1StateBySession.get(args.sessionId);
+        const baseline = refreshTailHygieneBaseline({
+          messages: args.messages,
+          tags,
+          protectedTags: args.protectedTags,
+          cacheBusting: bustedThisPass,
+          previous
+        });
+        const structuralSignature = tailHygieneStructuralSignature(args.messages);
+        args.channel1StateBySession.set(args.sessionId, {
+          ...baseline,
+          reducedSinceRefresh: baseline.baselineGeneration !== previous?.baselineGeneration ? false : previous?.reducedSinceRefresh ?? false,
+          oldestReclaimableToolTags: getOldestActiveUnprotectedToolTags(args.db, args.sessionId, args.protectedTags)
+        });
+        try {
+          rearmChannel2AfterMeasuredCollapse({
+            db: args.db,
+            sessionId: args.sessionId,
+            baseline
+          });
+        } catch (error) {
+          sessionLog(args.sessionId, "channel2 U-collapse reset failed (ignored):", error);
+        }
+        assertedBaseline = {
+          tags,
+          protectedTags: args.protectedTags,
+          contentSignature: baseline.contentSignature,
+          structuralSignature
+        };
+      } catch (error) {
+        const stale = args.channel1StateBySession.get(args.sessionId);
+        if (stale) {
+          stale.evaluable = false;
+          stale.generationInvalidated = true;
+        }
+        sessionLog(args.sessionId, "tail hygiene baseline refresh failed (held):", error);
+      }
+    } else {
+      args.channel1StateBySession.delete(args.sessionId);
+    }
+  }
+  if (assertedBaseline) {
+    try {
+      const servedSignature = tailHygieneStructuralSignature(args.messages);
+      if (!sameTailHygieneStructuralSignature(assertedBaseline.structuralSignature, servedSignature)) {
+        sessionLog(args.sessionId, `ERROR [tail-hygiene-last-writer-mismatch]: served messages changed after tail-hygiene baseline refresh (expected messages=${assertedBaseline.structuralSignature.messageCount}, parts=[${assertedBaseline.structuralSignature.partCounts.join(",")}], bytes=${assertedBaseline.structuralSignature.totalBytes}; actual messages=${servedSignature.messageCount}, parts=[${servedSignature.partCounts.join(",")}], bytes=${servedSignature.totalBytes})`);
+      }
+    } catch (error) {
+      sessionLog(args.sessionId, "ERROR [tail-hygiene-last-writer-check-failed]: structural production guard failed open:", error);
+    }
+    if (true) {
+      assertTailHygieneContentUnchanged({
+        messages: args.messages,
+        tags: assertedBaseline.tags,
+        protectedTags: assertedBaseline.protectedTags,
+        expectedSignature: assertedBaseline.contentSignature
+      });
+    }
+  }
   return {
     explicitMaterializedSuccessfully,
     deferredMaterializedSuccessfully,
     materialized,
     historianFoldMaterializedThisPass: historyWasConsumedThisPass,
     materializeReason,
+    systemHashPrev: m0RematerializedThisPass ? m0ComparisonDecision?.systemHashPrev ?? null : null,
+    systemHashNew: m0RematerializedThisPass ? m0ComparisonDecision?.systemHashNew ?? null : null,
+    m0ModelKeyPrev: m0RematerializedThisPass ? m0ComparisonDecision?.m0ModelKeyPrev ?? null : null,
+    m0ModelKeyNew: m0RematerializedThisPass ? m0ComparisonDecision?.m0ModelKeyNew ?? null : null,
     droppedTokens,
     emergencyReclaimedTokens,
     droppedCount,
@@ -30341,10 +30216,10 @@ function messageCacheSignature(message) {
   const parts = Array.isArray(message.parts) ? message.parts : [];
   const serializedParts = JSON.stringify(parts) ?? "null";
   const serializedMessage = JSON.stringify(message) ?? "null";
-  return `${messageIdOf(message) ?? ""}:${parts.length}:${Buffer.byteLength(serializedParts)}:${createHash13("sha256").update(serializedMessage).digest("hex")}`;
+  return `${messageIdOf(message) ?? ""}:${parts.length}:${Buffer.byteLength(serializedParts)}:${createHash12("sha256").update(serializedMessage).digest("hex")}`;
 }
 function advanceWireFingerprint(previous, encoded) {
-  return createHash13("sha256").update(previous).update("\\0").update(JSON.stringify(encoded) ?? "null").digest("hex");
+  return createHash12("sha256").update(previous).update("\\0").update(JSON.stringify(encoded) ?? "null").digest("hex");
 }
 function buildWireFingerprint(encoded) {
   let fingerprint = "rust-wire-v1";
@@ -30603,7 +30478,7 @@ function canonicalizeForChecksum(value) {
   return Object.fromEntries(Object.keys(value).sort().map((key) => [key, canonicalizeForChecksum(value[key])]));
 }
 function checksumSeedRows(rows) {
-  return createHash13("sha256").update(JSON.stringify(rows.map(canonicalizeForChecksum))).digest("hex");
+  return createHash12("sha256").update(JSON.stringify(rows.map(canonicalizeForChecksum))).digest("hex");
 }
 function authoritySeedRows(db, projectPath, domain) {
   const snapshots = domain === "memories" ? db.prepare("SELECT * FROM memories WHERE project_path = ? ORDER BY id ASC").all(projectPath) : db.prepare(`SELECT n.*
@@ -30773,7 +30648,14 @@ function mirrorRustSyntheticTodoAnchor(args) {
     clearPersistedTodoSyntheticAnchor(args.db, args.sessionId);
   }
 }
-function applyNativeMessagesVerbatim(output, response) {
+function hasNativeResponseContent(response) {
+  if (typeof response.native_messages === "string" || Array.isArray(response.native_messages)) {
+    return true;
+  }
+  const delta = response.native_messages_delta;
+  return isRecord3(delta) && Array.isArray(delta.messages);
+}
+function applyNativeMessagesVerbatim(output, response, previous) {
   const nativeMessages = response.native_messages;
   if (typeof nativeMessages === "string") {
     const parsed = JSON.parse(nativeMessages);
@@ -30781,10 +30663,21 @@ function applyNativeMessagesVerbatim(output, response) {
       throw new Error("rust transform native_messages string was not an array");
     return replaceMessagesInPlace(output, parsed);
   }
-  if (!Array.isArray(nativeMessages)) {
+  if (Array.isArray(nativeMessages)) {
+    return replaceMessagesInPlace(output, nativeMessages);
+  }
+  const delta = response.native_messages_delta;
+  if (!isRecord3(delta) || !Array.isArray(delta.messages)) {
     throw new Error("rust transform response omitted native_messages");
   }
-  return replaceMessagesInPlace(output, nativeMessages);
+  const replaceFrom = delta.replace_from;
+  if (!previous || delta.after !== previous.fingerprint || typeof replaceFrom !== "number" || !Number.isSafeInteger(replaceFrom) || replaceFrom < 0 || replaceFrom > previous.messages.length) {
+    throw new Error("rust transform native_messages_delta did not match the acknowledged output");
+  }
+  return replaceMessagesInPlace(output, [
+    ...previous.messages.slice(0, replaceFrom),
+    ...delta.messages
+  ]);
 }
 function muralInputForWire(mural) {
   if (!mural?.enabled || !mural.supportsVision || typeof mural.dataUrl !== "string" || mural.dataUrl.length === 0) {
@@ -30988,14 +30881,13 @@ function createRustModeTransform(deps, options) {
     sessionLog(sessionId, "lkg_replay_served");
     return true;
   };
-  const prepareRustCapture = (state, sessionId, input, inputSnapshots, response, responseRowVersion) => {
+  const prepareRustCapture = (state, sessionId, input, inputSnapshots, nativeMessages, responseRowVersion) => {
     state.lkgCaptureSequence += 1;
     const inputIds = input.map((message) => message.info.id);
     if (inputIds.some((id) => typeof id !== "string") || new Set(inputIds).size !== inputIds.length || inputIds.length === 0 || inputSnapshots.length !== inputIds.length) {
       return null;
     }
-    const native = response.native_messages;
-    const jsonPrefix = typeof native === "string" ? native : JSON.stringify(native);
+    const jsonPrefix = JSON.stringify(nativeMessages);
     if (typeof jsonPrefix !== "string")
       return null;
     const keys = resolveLkgModelKeys(input);
@@ -31166,7 +31058,7 @@ function createRustModeTransform(deps, options) {
           const value = timings2[name];
           return typeof value === "number" && Number.isFinite(value) ? value.toFixed(1) : "n/a";
         };
-        sessionLog(sessionId, `rust module stages: handler=${stage("handler_total")} apply_once=${stage("total")} ` + `request_to_handler=${stage("request_observed_to_handler")} ` + `projection=${stage("projection")} selection=${stage("selection")} ` + `build_output=${stage("build_output")} store_commit=${stage("store_commit")} ` + `post_attach=${stage("post_attach")} response_encode=${stage("response_encode")} ` + `native_cache_reused=${stage("native_cache_reused_messages")} ` + `native_cache_encoded=${stage("native_cache_encoded_messages")}`);
+        sessionLog(sessionId, `rust module stages: handler=${stage("handler_total")} apply_once=${stage("total")} ` + `request_to_handler=${stage("request_observed_to_handler")} delta_expand=${stage("delta_expand")} ` + `projection_cache_lookup=${stage("projection_cache_lookup")} projection=${stage("projection")} ` + `selection=${stage("selection")} build_output=${stage("build_output")} ` + `store_commit=${stage("store_commit")} trigger=${stage("trigger_ms")} ` + `trigger_boundary=${stage("trigger_boundary_build")} trigger_eval=${stage("trigger_eval")} ` + `projection_cache_store=${stage("projection_cache_store")} native_attach=${stage("native_attach")} ` + `retained_size=${stage("retained_size")} snapshot_store=${stage("snapshot_store")} ` + `post_attach=${stage("post_attach")} response_encode=${stage("response_encode")} ` + `response_meta_encode=${stage("response_meta_encode")} response_splice=${stage("response_splice")} ` + `native_cache_reused=${stage("native_cache_reused_messages")} ` + `native_cache_encoded=${stage("native_cache_encoded_messages")}`);
       }
       if (timings2 && moduleElapsedMs >= 1000) {
         const detail = Object.entries(timings2).filter(([key, value]) => key !== "total" && key !== "handler_total" && typeof value === "number").map(([key, value]) => `${key}:${value.toFixed(1)}`).join(" ");
@@ -31542,8 +31434,14 @@ function createRustModeTransform(deps, options) {
       let response = await sendTransformSeriesWithSingleRestart(body);
       let servedFinalWireEstimate;
       captureResponseTelemetry(response);
-      if (isNeedFullSync(response)) {
-        options.moduleClient.invalidateStateSyncCapabilities?.();
+      const needFullSync = isNeedFullSync(response);
+      const nativeContentOmitted = !hasNativeResponseContent(response);
+      if (needFullSync || nativeContentOmitted) {
+        if (needFullSync) {
+          options.moduleClient.invalidateStateSyncCapabilities?.();
+        } else {
+          sessionLog(sessionId, "native_delta_fallback_reason=adapter_response_omitted_native_content retry=full");
+        }
         state.forceFullWire = true;
         if (wireDelta) {
           const retryOrdinalStartedAt = performance.now();
@@ -31629,6 +31527,9 @@ function createRustModeTransform(deps, options) {
         if (isNeedFullSync(response)) {
           throw new Error("rust module still requires full sync after a full-array send");
         }
+        if (!hasNativeResponseContent(response)) {
+          throw new Error("rust module omitted native content after a full-array retry");
+        }
       }
       const deliveryPassIds = noteDeliveryPassIds(response);
       const sendNoteDeliveryDisposition = async (method) => {
@@ -31652,7 +31553,11 @@ function createRustModeTransform(deps, options) {
       let appliedMessages;
       const applyStartedAt = performance.now();
       try {
-        appliedMessages = applyNativeMessagesVerbatim({ messages: [] }, response);
+        appliedMessages = applyNativeMessagesVerbatim({ messages: [] }, response, previousWireCache?.nativeOutput ? {
+          messages: previousWireCache.nativeOutput,
+          fingerprint: previousWireCache.fingerprint
+        } : undefined);
+        pendingWireCache.nativeOutput = appliedMessages;
         runRustModePostprocess({
           db: deps.db,
           sessionId,
@@ -31689,7 +31594,7 @@ function createRustModeTransform(deps, options) {
         if (cacheBustingPass) {
           dropSlot(sessionId, "lkg_cache_bust_pending_capture");
         }
-        const capturePlan = prepareRustCapture(state, sessionId, messages, pendingWireCache.rawContentSnapshots, response, rowVersion);
+        const capturePlan = prepareRustCapture(state, sessionId, messages, pendingWireCache.rawContentSnapshots, appliedMessages, rowVersion);
         let captureMode = "async";
         const captureFailed = (mode, error) => {
           if (states.get(sessionId) !== state || capturePlan && capturePlan.captureSequence !== state.lkgCaptureSequence) {
@@ -31801,35 +31706,39 @@ function createRustModeTransform(deps, options) {
       }
       wireCaches.set(sessionId, pendingWireCache);
       appliedAt = performance.now();
-      if (options.moduleClient.mirrorPull) {
-        const mirrorPullStartedAt = performance.now();
-        try {
-          await pullMemoryMirrorOnce({
-            db: deps.db,
-            module: options.moduleClient
-          });
-        } catch (error) {
-          sessionLog(sessionId, "rust memory mirror-back failed (ignored):", error);
-        } finally {
-          logStage(sessionId, "mirrorPull", mirrorPullStartedAt, timings);
-        }
-      }
       const getCompartmentsAfter = options.moduleClient.getCompartmentsAfter;
-      if (getCompartmentsAfter) {
-        const compartmentMirrorStartedAt = performance.now();
-        try {
-          await mirrorModuleCompartments({
-            db: deps.db,
-            sessionId,
-            reader: {
-              getCompartmentsAfter: (mirroredSessionId, afterSequence) => getCompartmentsAfter.call(options.moduleClient, mirroredSessionId, afterSequence)
+      if (options.moduleClient.mirrorPull || getCompartmentsAfter) {
+        (async () => {
+          if (options.moduleClient.mirrorPull) {
+            const mirrorPullStartedAt = performance.now();
+            try {
+              await pullMemoryMirrorOnce({
+                db: deps.db,
+                module: options.moduleClient
+              });
+            } catch (error) {
+              sessionLog(sessionId, "rust memory mirror-back failed (ignored):", error);
+            } finally {
+              logStage(sessionId, "mirrorPull", mirrorPullStartedAt, timings);
             }
-          });
-        } catch (error) {
-          sessionLog(sessionId, "rust compartment mirror-back failed (ignored):", error);
-        } finally {
-          logStage(sessionId, "compartmentMirror", compartmentMirrorStartedAt, timings);
-        }
+          }
+          if (getCompartmentsAfter) {
+            const compartmentMirrorStartedAt = performance.now();
+            try {
+              await mirrorModuleCompartments({
+                db: deps.db,
+                sessionId,
+                reader: {
+                  getCompartmentsAfter: (mirroredSessionId, afterSequence) => getCompartmentsAfter.call(options.moduleClient, mirroredSessionId, afterSequence)
+                }
+              });
+            } catch (error) {
+              sessionLog(sessionId, "rust compartment mirror-back failed (ignored):", error);
+            } finally {
+              logStage(sessionId, "compartmentMirror", compartmentMirrorStartedAt, timings);
+            }
+          }
+        })();
       }
       finishPass(true);
     } catch (error) {
@@ -32888,6 +32797,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       messageTagNumbers,
       tagger: deps.tagger,
       ctxReduceAvailability,
+      channel1StateBySession: deps.channel1StateBySession,
       todowriteAvailability,
       client: deps.client,
       activeAgent,
@@ -33029,6 +32939,10 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         decision: schedulerDecision,
         materialized: postTransformResult.materialized,
         materializeReason: normalizeMaterializeReason("opencode", postTransformResult.materializeReason, postTransformResult.materialized),
+        systemHashPrev: postTransformResult.systemHashPrev,
+        systemHashNew: postTransformResult.systemHashNew,
+        m0ModelKeyPrev: postTransformResult.m0ModelKeyPrev,
+        m0ModelKeyNew: postTransformResult.m0ModelKeyNew,
         emergency: postTransformResult.emergency,
         droppedTokens: postTransformResult.droppedTokens,
         droppedCount: postTransformResult.droppedCount,
@@ -33080,59 +32994,22 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         sessionLog(sessionId, "conversation_tokens UPDATE failed:", error);
       }
     }
-    if (ctxReduceCallable && !compactionOff && deps.channel1StateBySession) {
-      try {
-        const resolvedExecuteThresholdPct = resolveExecuteThreshold(deps.executeThresholdPercentage ?? 65, deps.getModelKey?.(sessionId), 65, {
-          tokensConfig: deps.executeThresholdTokens,
-          contextLimit: resolvedContextLimit ?? 0
-        });
-        let tailToolTokens;
-        let liveTailTokens;
+    const channelBaseline = deps.channel1StateBySession?.get(sessionId);
+    if (ctxReduceCallable && !compactionOff && channelBaseline) {
+      const measuredU = Math.min(Math.max(0, channelBaseline.baselineT + channelBaseline.turnDeltaT), Math.max(0, channelBaseline.baselineU + channelBaseline.turnDeltaU));
+      resetLastNudgeCycleIfTailShrank(db, sessionId, measuredU);
+      if (channelBaseline.evaluable && !channelBaseline.generationInvalidated && !channelBaseline.reducedSinceRefresh) {
+        const channel2Evaluation = evaluateChannel2(channelBaseline);
         try {
-          const agg = getActiveTagTokenAggregate(db, sessionId, deps.protectedTags);
-          tailToolTokens = agg.toolOutput;
-          liveTailTokens = agg.conversation + agg.toolCall;
-        } catch {
-          const estimate = computeTailTokenEstimate(messages);
-          tailToolTokens = estimate.tailToolTokens;
-          liveTailTokens = estimate.liveTailTokens;
-        }
-        const executeThresholdTokens = Math.round((resolvedContextLimit ?? 0) * resolvedExecuteThresholdPct / 100);
-        const usableTokens = Math.max(0, executeThresholdTokens - contextUsage.inputTokens + liveTailTokens);
-        resetLastNudgeCycleIfTailShrank(db, sessionId, tailToolTokens);
-        const oldestReclaimableToolTags = getOldestActiveUnprotectedToolTags(db, sessionId, deps.protectedTags);
-        deps.channel1StateBySession.set(sessionId, {
-          tailToolTokens,
-          historyBudgetTokens: historyBudgetTokens ?? 0,
-          contextLimit: resolvedContextLimit ?? 0,
-          executeThresholdPercentage: resolvedExecuteThresholdPct,
-          lastInputTokens: contextUsage.inputTokens,
-          turnToolTokens: 0,
-          usableTokens,
-          reducedSinceRefresh: false,
-          oldestReclaimableToolTags
-        });
-        const channel2MetricsKnown = resolvedContextLimit !== undefined && resolvedContextLimit > 0 && resolvedExecuteThresholdPct > 0;
-        if (channel2MetricsKnown) {
-          const channel2ShouldTrigger = shouldTriggerChannel2({
-            reclaimableTokens: tailToolTokens,
-            usableTokens
-          });
-          try {
-            if (channel2ShouldTrigger) {
-              casChannel2NudgeState(db, sessionId, "", "pending");
-            } else {
-              casChannel2NudgeState(db, sessionId, "pending", "");
-            }
-          } catch (error) {
-            sessionLog(sessionId, "channel2 trigger CAS failed (ignored):", error);
+          if (channel2Evaluation.shouldTrigger) {
+            casChannel2NudgeState(db, sessionId, "", "pending");
+          } else {
+            casChannel2NudgeState(db, sessionId, "pending", "");
           }
+        } catch (error) {
+          sessionLog(sessionId, "channel2 trigger CAS failed (ignored):", error);
         }
-      } catch (error) {
-        sessionLog(sessionId, "channel1 baseline snapshot failed (ignored):", error);
       }
-    } else {
-      deps.channel1StateBySession?.delete(sessionId);
     }
     const elapsed = (performance.now() - startTime).toFixed(1);
     sessionLog(sessionId, `transform completed in ${elapsed}ms (${messages.length} messages, ${targets.size} targets, watermark: ${watermark})`);
@@ -33190,8 +33067,7 @@ async function deliverChannel2IfPending(deps, sessionId) {
       db: deps.db,
       client: deps.client,
       directiveText: deps.channel2DirectiveTextBySession?.get(sessionId),
-      reclaimableTokens: baseline ? baseline.tailToolTokens + baseline.turnToolTokens : undefined,
-      usableTokens: baseline?.usableTokens,
+      baseline,
       oldestReclaimableToolTags: baseline?.oldestReclaimableToolTags
     });
     if (delivered || getChannel2NudgeState(deps.db, sessionId) !== "pending") {
@@ -34000,6 +33876,23 @@ function clearSidebarSnapshotCache(sessionId) {
   cache.delete(sessionId);
 }
+// src/hooks/magic-context/empty-task-output.ts
+var EMPTY_TASK_OUTPUT_SENTINEL = "<magic-context-empty-task-output>";
+var EMPTY_COMPLETED_TASK_RESULT = /^<task\b[^>]*\bstate="completed"[^>]*>[\s\S]*<task_result>\s*<\/task_result>\s*<\/task>\s*$/;
+function annotateEmptyTaskOutput(tool, output) {
+  if (tool !== "task" || !isRecord(output))
+    return;
+  if (typeof output.output !== "string")
+    return;
+  if (output.output.includes(EMPTY_TASK_OUTPUT_SENTINEL))
+    return;
+  if (!EMPTY_COMPLETED_TASK_RESULT.test(output.output))
+    return;
+  Reflect.set(output, "output", `${output.output}
+${EMPTY_TASK_OUTPUT_SENTINEL}
+The subagent completed without a final text response. Context-fill truncation may have omitted its final output, or its provider may have emitted reasoning only; inspect the child session and retry with a low-reasoning model or variant.`);
+}
 // src/hooks/magic-context/hook-handlers.ts
 function getLiveNotificationParams(sessionId, liveModelBySession, variantBySession, agentBySession, toastDurationMs) {
   const model = liveModelBySession.get(sessionId);
@@ -34133,26 +34026,19 @@ function maybeInjectChannel1Nudge(args, sessionId, tool, output) {
     return;
   if (out.output.includes(CHANNEL1_SENTINEL))
     return;
-  const thisTurnTokens = toolOutputTokens(out.output);
-  state.turnToolTokens += thisTurnTokens;
+  state.turnDeltaT += toolOutputTokens(out.output);
   if (state.reducedSinceRefresh)
     return;
-  const undroppedTokens = state.tailToolTokens + state.turnToolTokens;
-  const pressure = computePressure({
-    lastInputTokens: state.lastInputTokens,
-    turnToolTokens: state.turnToolTokens,
-    contextLimit: state.contextLimit,
-    executeThresholdPercentage: state.executeThresholdPercentage
-  });
-  const workingWindowTokens = Math.round(state.contextLimit * state.executeThresholdPercentage / 100);
   const decision = decideChannel1({
-    undroppedTokens,
-    pressure,
-    estimatedInputTokens: state.lastInputTokens + state.turnToolTokens,
-    workingWindowTokens,
+    baselineU: state.baselineU,
+    baselineT: state.baselineT,
+    turnDeltaU: state.turnDeltaU,
+    turnDeltaT: state.turnDeltaT,
     lastNudgeUndropped: getLastNudgeUndropped(args.db, sessionId),
     lastNudgeLevel: getLastNudgeLevel(args.db, sessionId),
-    hasRecentReduce: false
+    hasRecentReduce: false,
+    evaluable: state.evaluable,
+    generationInvalidated: state.generationInvalidated
   });
   setLastNudgeUndropped(args.db, sessionId, decision.nextLastNudge);
   setLastNudgeLevel(args.db, sessionId, decision.nextLastNudgeLevel);
@@ -34168,10 +34054,14 @@ function createToolExecuteAfterHook(args) {
       return;
     }
     await flushIgnoredMessages(typedInput.sessionID);
+    annotateEmptyTaskOutput(typedInput.tool, output);
     if (typedInput.tool === "ctx_reduce") {
       const state = args.channel1StateBySession.get(typedInput.sessionID);
-      if (state)
+      if (state) {
         state.reducedSinceRefresh = true;
+        state.evaluable = false;
+        state.generationInvalidated = true;
+      }
       try {
         resetLastNudgeCycle(args.db, typedInput.sessionID);
       } catch (error) {
@@ -34237,7 +34127,7 @@ function createToolExecuteAfterHook(args) {
 }
 // src/hooks/magic-context/system-prompt-hash.ts
-import { createHash as createHash14 } from "node:crypto";
+import { createHash as createHash13 } from "node:crypto";
 // src/agents/magic-context-prompt.ts
 var LONG_TERM_PARTNER_FRAME = `### You are the user's long-term partner on this project — not a one-off hire
@@ -34396,6 +34286,9 @@ Prefer many small targeted operations over one large blanket operation, and keep
 // src/hooks/magic-context/system-prompt-hash.ts
 var MAGIC_CONTEXT_MARKER = "## Magic Context";
+var SYSTEM_PROMPT_GUIDANCE_SEPARATOR = `
+`;
 function clearSystemPromptHashSession(sessionId, handleMaps) {
   handleMaps.stickyDateBySession.delete(sessionId);
   handleMaps.cachedDocsBySession.delete(sessionId);
@@ -34457,7 +34350,7 @@ function createSystemPromptHashHandler(deps) {
 `);
     if (fullPrompt.length > 0 && !fullPrompt.includes(MAGIC_CONTEXT_MARKER) && !skipGuidanceForDisabledSubagent) {
       const guidance = buildMagicContextSection(null, deps.protectedTags, effectiveCtxReduceEnabled, deps.dreamerEnabled, deps.experimentalTemporalAwareness, deps.experimentalCavemanTextCompression, subagentReduceMode, deps.language, deps.memoryEnabled !== false, promptSurface.preset, promptSurface.primaryOverride);
-      output.system.push(guidance);
+      output.system[0] = `${output.system[0]}${SYSTEM_PROMPT_GUIDANCE_SEPARATOR}${guidance}`;
       sessionLog(sessionId, `injected generic guidance into system prompt (ctxReduce=${effectiveCtxReduceEnabled}, subagent=${isSubagentSession2}, subagentReduceMode=${subagentReduceMode})`);
     }
     const isCacheBusting = deps.systemPromptRefreshSessions.has(sessionId);
@@ -34480,7 +34373,7 @@ function createSystemPromptHashHandler(deps) {
     }
     const stickyDate = stickyDateBySession.get(sessionId);
     const stableCandidate = currentDate && stickyDate && currentDate !== stickyDate ? liveSystemContent.replace(DATE_PATTERN_ALL, stickyDate) : liveSystemContent;
-    const stableCandidateHash = createHash14("md5").update(promptSurfaceHashMaterial(stableCandidate, promptSurface.preset)).digest("hex");
+    const stableCandidateHash = createHash13("md5").update(promptSurfaceHashMaterial(stableCandidate, promptSurface.preset)).digest("hex");
     const contentOrPresetChanged = hasPersistedHash && stableCandidateHash !== previousHash;
     const dateMayAdvance = isCacheBusting || contentOrPresetChanged;
     if (currentDate && !stickyDate) {
@@ -34500,7 +34393,7 @@ function createSystemPromptHashHandler(deps) {
 `);
     if (!availability.frozen || !modelKey)
       return;
-    const currentHash = createHash14("md5").update(promptSurfaceHashMaterial(systemContent, promptSurface.preset)).digest("hex");
+    const currentHash = createHash13("md5").update(promptSurfaceHashMaterial(systemContent, promptSurface.preset)).digest("hex");
     if (!sessionMetaEarly) {
       return;
     }
@@ -34719,7 +34612,7 @@ function createMagicContextHook(deps) {
       log("[magic-context] disabling feature because persistent storage is unavailable:", reason);
       notifyMagicContextDisabled(deps.client, reason);
       const migration = getMigrationOnOpenRefusal();
-      const blockingProcesses = migration?.serverPids.map((pid) => ({ harness: "OpenCode server", pid })) ?? [];
+      const blockingProcesses = migration?.blockingProcesses ?? migration?.serverPids.map((pid) => ({ kind: "process", pid })) ?? [];
       const fence = getSchemaFenceRejection();
       recordHookInitFailure({
         type: "storage",
@@ -34795,7 +34688,7 @@ function createMagicContextHook(deps) {
   const internalChildSessions = deps.liveSessionState?.internalChildSessions ?? new Set;
   const recompProgressBySession = deps.liveSessionState?.recompProgressBySession ?? new Map;
   const dreamerProgressByProject = deps.liveSessionState?.dreamerProgressByProject ?? new Map;
-  const channel1StateBySession = new Map;
+  const channel1StateBySession = deps.liveSessionState?.channel1StateBySession ?? new Map;
   const channel2DirectiveTextBySession = new Map;
   const resolveLiveModel = (sessionId) => {
     const cached = liveModelBySession.get(sessionId);
@@ -34826,6 +34719,7 @@ function createMagicContextHook(deps) {
     db,
     liveSessionState: {
       liveModelBySession,
+      channel1StateBySession,
       variantBySession,
       agentBySession,
       historyRefreshSessions,
@@ -35423,6 +35317,7 @@ function createMagicContextHook(deps) {
       return model ? `${model.providerID}/${model.modelID}` : undefined;
     },
     getDreamerProgress: () => dreamerProgressByProject.get(projectPath) ?? null,
+    getTailHygiene: (sessionId) => channel1StateBySession.get(sessionId),
     getContextLimit: (sessionId) => {
       const model = resolveLiveModel(sessionId);
       if (!model)
@@ -35657,8 +35552,27 @@ function replaceMessagesInPlace2(output, next) {
   if (output.messages !== next)
     output.messages.splice(0, output.messages.length, ...next);
 }
+function preserveUserTerminatedTail(messages, inputTail) {
+  if (inputTail?.info.role !== "user" || messages.at(-1)?.info.role !== "assistant")
+    return;
+  let userIndex = messages.lastIndexOf(inputTail);
+  if (userIndex < 0) {
+    const inputId = inputTail.info.id;
+    for (let index = messages.length - 1;index >= 0; index -= 1) {
+      const message = messages[index];
+      if (message.info.role === "user" && message.info.id === inputId) {
+        userIndex = index;
+        break;
+      }
+    }
+  }
+  const trailingUser = userIndex >= 0 ? messages[userIndex] : inputTail;
+  if (userIndex >= 0)
+    messages.splice(userIndex, 1);
+  messages.push(trailingUser);
+}
 function createMessagesTransformHandler(args) {
-  return async (input, output) => {
+  const run = async (input, output) => {
     const sessionId = resolveSessionId2(output);
     const agent = resolveAgentNameFromMessages(output.messages);
     const isInternalChild = typeof sessionId === "string" && sessionId.length > 0 && args.internalChildSessions?.has(sessionId) === true;
@@ -35779,6 +35693,14 @@ function createMessagesTransformHandler(args) {
     restoreCompactionOffInput();
     return output.messages;
   };
+  return async (input, output) => {
+    const inputTail = output.messages.at(-1);
+    try {
+      return await run(input, output);
+    } finally {
+      preserveUserTerminatedTail(output.messages, inputTail);
+    }
+  };
 }
 function resolveSessionId2(output) {
   for (const message of output.messages) {
@@ -36167,6 +36089,7 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
     }) : contextLimit;
     const nativeContextUsagePercentage = nativeContextLimit > 0 ? effectiveInputTokens / nativeContextLimit * 100 : undefined;
     const calibration = resolveModelCalibration(activeProviderID, activeModelID);
+    const tailHygiene = resolveTailHygieneStatus(liveSessionState?.channel1StateBySession.get(sessionId), moduleStatus?.tail_hygiene);
     const calibrated = calibrateBuckets({
       inputTokens: effectiveInputTokens,
       systemLocal: systemPromptTokens,
@@ -36211,6 +36134,7 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
       conversationTokens: calibrated.conversationTokens,
       toolCallTokens: calibrated.toolCallTokens,
       toolDefinitionTokens: calibrated.toolDefinitionTokens,
+      ...tailHygiene === undefined ? {} : { tailHygiene },
       executeThreshold,
       executeThresholdClamped,
       boundaryPresent: moduleStatus?.boundary_present,
@@ -36447,9 +36371,9 @@ function registerRpcHandlers(rpcServer, args) {
     }
   });
   const buildManagedCtx = async (db) => {
-    const { deriveHistorianChunkTokens: deriveHistorianChunkTokens2, resolveHistorianContextLimit: resolveHistorianContextLimit2 } = await import("./derive-budgets-0f8xpyw2.js");
-    const { resolveFallbackChain: resolveFallbackChain2 } = await import("./resolve-fallbacks-5n5tvge1.js");
-    const { userMemoryCollectionEnabled: userMemoryCollectionEnabled2 } = await import("./task-config-gbp7r23g.js");
+    const { deriveHistorianChunkTokens: deriveHistorianChunkTokens2, resolveHistorianContextLimit: resolveHistorianContextLimit2 } = await import("./derive-budgets-xk8cy5e6.js");
+    const { resolveFallbackChain: resolveFallbackChain2 } = await import("./resolve-fallbacks-qf0ekmz9.js");
+    const { userMemoryCollectionEnabled: userMemoryCollectionEnabled2 } = await import("./task-config-at3adc59.js");
     const DEFAULT_HISTORIAN_TIMEOUT_MS2 = 600000;
     return {
       client: args.client,
@@ -36474,8 +36398,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp: runManagedRecomp2 } = await import("./recomp-orchestrator-c3ff16k7.js");
-    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-dxske5zm.js");
+    const { runManagedRecomp: runManagedRecomp2 } = await import("./recomp-orchestrator-p030kxtc.js");
+    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-6v5b72b4.js");
     log(`[rpc] recomp requested for session ${sessionId}`);
     const ctx = await buildManagedCtx(db);
     runManagedRecomp2(ctx, sessionId).then((message) => {
@@ -36490,8 +36414,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedUpgrade: runManagedUpgrade2 } = await import("./recomp-orchestrator-c3ff16k7.js");
-    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-dxske5zm.js");
+    const { runManagedUpgrade: runManagedUpgrade2 } = await import("./recomp-orchestrator-p030kxtc.js");
+    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-6v5b72b4.js");
     log(`[rpc] session-upgrade requested for session ${sessionId}`);
     const ctx = await buildManagedCtx(db);
     runManagedUpgrade2(ctx, sessionId).then((message) => {
@@ -36507,7 +36431,7 @@ function registerRpcHandlers(rpcServer, args) {
     if (!db)
       return { ok: false, error: "db unavailable" };
     try {
-      const { updateSessionMeta: updateSessionMeta2 } = await import("./storage-meta-session-mk4gsnke.js");
+      const { updateSessionMeta: updateSessionMeta2 } = await import("./storage-meta-session-2306t3j7.js");
       updateSessionMeta2(db, sessionId, { upgradeRemindedAt: Date.now() });
       return { ok: true };
     } catch (error) {
@@ -38340,7 +38264,7 @@ Mark discardable once processed: large outputs you've summarized, repeated or re
 Keep: user messages, unresolved errors, raw evidence you haven't extracted yet, and outputs whose exact wording may matter later.
 Never blanket-mark large ranges (e.g. "1-50") — review what each tag holds first.`;
 // src/tools/ctx-reduce/tools.ts
-import { createHash as createHash15 } from "node:crypto";
+import { createHash as createHash14 } from "node:crypto";
 import { tool as tool4 } from "@opencode-ai/plugin";
 // src/features/magic-context/range-parser.ts
@@ -38410,11 +38334,11 @@ function createCtxReduceTool(deps) {
       const stableId = `oc-${sessionId}-${callId}`;
       if (Buffer.byteLength(stableId) <= 128)
         return stableId;
-      return `oc-${createHash15("sha256").update(stableId).digest("hex")}`;
+      return `oc-${createHash14("sha256").update(stableId).digest("hex")}`;
     }
     fallbackCommandSequence += 1;
     const monotonicId = `oc-${sessionId}-${fallbackCommandSequence}`;
-    return Buffer.byteLength(monotonicId) <= 128 ? monotonicId : `oc-${createHash15("sha256").update(monotonicId).digest("hex")}`;
+    return Buffer.byteLength(monotonicId) <= 128 ? monotonicId : `oc-${createHash14("sha256").update(monotonicId).digest("hex")}`;
   };
   return tool4({
     description: CTX_REDUCE_DESCRIPTION,
@@ -38954,6 +38878,7 @@ class MagicContextRpcServer {
         port: this.port,
         pid: process.pid,
         started_at: this.startedAt,
+        kind: "OpenCode server",
         token: this.token,
         instance_id: this.instanceId
       }), enforcePrivatePermissions ? { encoding: "utf-8", mode: 384 } : { encoding: "utf-8" });
@@ -39169,7 +39094,7 @@ var server = async (ctx) => {
 `);
     setTimeout(async () => {
       try {
-        const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-dxske5zm.js");
+        const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-6v5b72b4.js");
         const clientWithSessions = ctx.client;
         const sessions = await Promise.resolve(clientWithSessions.session?.list?.()).catch(() => null);
         const sessionList = Array.isArray(sessions) ? sessions : sessions?.data;
@@ -39317,6 +39242,11 @@ var server = async (ctx) => {
         embeddingConfig: pluginConfig.embedding,
         memoryEnabled: pluginConfig.memory?.enabled === true,
         memoryInjectionBudgetTokens: pluginConfig.memory?.injection_budget_tokens,
+        historianChildSweep: {
+          timeoutMs: pluginConfig.historian_timeout_ms,
+          fallbackModelCount: resolveFallbackChain(pluginConfig.historian?.fallback_models).length,
+          keepSubagents: pluginConfig.keep_subagents === true
+        },
         mural: pluginConfig.mural,
         retinaHandoff: pluginConfig.smart_notes.retina_handoff,
         gitCommitIndexing: pluginConfig.memory.git_commit_indexing?.enabled ? {
@@ -39356,7 +39286,7 @@ var server = async (ctx) => {
   {
     const fence = getSchemaFenceRejection();
     if (fence) {
-      import("./conflict-warning-hook-an4fxhwf.js").then(({ sendSchemaFenceWarning }) => sendSchemaFenceWarning(ctx.client, ctx.directory, fence));
+      import("./conflict-warning-hook-f406ggbw.js").then(({ sendSchemaFenceWarning }) => sendSchemaFenceWarning(ctx.client, ctx.directory, fence));
     }
   }
   if (conflictResult?.hasConflict) {
@@ -39374,10 +39304,10 @@ var server = async (ctx) => {
         ANNOUNCEMENT_FEATURES: ANNOUNCEMENT_FEATURES2,
         ANNOUNCEMENT_FOOTER: ANNOUNCEMENT_FOOTER2,
         markAnnouncementSeen: markAnnouncementSeen2
-      } = await import("./announcement-6c1g4es4.js");
+      } = await import("./announcement-5eg4t64s.js");
       if (shouldShowAnnouncement2()) {
         setTimeout(() => {
-          import("./conflict-warning-hook-an4fxhwf.js").then(({ sendStartupAnnouncement }) => sendStartupAnnouncement(ctx.client, ctx.directory, ANNOUNCEMENT_VERSION2, ANNOUNCEMENT_FEATURES2, ANNOUNCEMENT_FOOTER2, markAnnouncementSeen2)).catch(() => {});
+          import("./conflict-warning-hook-f406ggbw.js").then(({ sendStartupAnnouncement }) => sendStartupAnnouncement(ctx.client, ctx.directory, ANNOUNCEMENT_VERSION2, ANNOUNCEMENT_FEATURES2, ANNOUNCEMENT_FOOTER2, markAnnouncementSeen2)).catch(() => {});
         }, 8000);
       }
     } catch {}