@cortexkit/opencode-magic-context 0.36.1 → 0.38.0

package/dist/index.js

@@ -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,
@@ -53,9 +56,11 @@ import {
   acquireCompartmentLease,
   acquireGitSweepLease,
   acquireWrapupInProgress,
+  addMergedReasoningStrippedIds,
   addNote,
   addProcessedImageStrippedIds,
   addStaleReduceStrippedIds,
+  addTrailingBlankDecisions,
   adoptNullOwnerToolTag,
   appendAutoSearchHintDecision,
   applyDeferredCompactionMarker,
@@ -63,10 +68,14 @@ import {
   applyMirroredNoteCompileFields,
   applyStrippedPlaceholderDelta,
   archiveMemory,
+  assertTailHygieneContentUnchanged,
   backfillTagTokenCounts,
   beginBootQuietPeriod,
   bootQuietRemainingMs,
+  buildChannel1Reminder,
+  buildChannel2Reminder,
   buildPrimaryLanguageDirective,
+  buildSyntheticTodoPart,
   buildWorkspaceMemorySqlFilter,
   bumpProjectMemoryEpoch,
   bumpProjectUserProfileVersion,
@@ -93,7 +102,9 @@ import {
   clearRecompStaging,
   computeCueContentHash,
   computeNormalizedHash,
+  computeSyntheticCallId,
   computeWorkspaceEpochFingerprint,
+  connectionFileExists,
   contentSha256,
   cortexKitProjectConfigBasePath,
   cortexKitUserConfigBasePath,
@@ -105,6 +116,7 @@ import {
   createPrimer,
   createPromptSurfaceGuidanceEpochCache,
   createPromptSurfaceRuntime,
+  decideChannel1,
   deleteTagsByMessageId,
   deleteUserMemoryCandidates,
   deriveTagLoadFloor,
@@ -114,6 +126,7 @@ import {
   drainAuthority,
   drainCommitBacklogForProject,
   dropSlot,
+  effectiveTailHygiene,
   embedBatchForProject,
   embedItemsForProject,
   embedSessionCompartmentChunks,
@@ -126,6 +139,9 @@ import {
   ensureContextStoreUuid,
   ensureMemoryEmbeddings,
   escalationBands,
+  estimateEmergencyDropReclaimTokens,
+  estimateImageTokensFromDataUrl,
+  evaluateChannel2,
   expandWorkspaceIdentitySetWithAliases,
   exports_external,
   extractLatestAssistantText,
@@ -133,7 +149,6 @@ import {
   formatDate,
   getActiveCompartmentRun,
   getActivePrimers,
-  getActiveTagTokenAggregate,
   getActiveTagTokenTotalsByMessage,
   getActiveTagsBySession,
   getActiveToolTagsForAgeReclaim,
@@ -174,6 +189,7 @@ import {
   getMemoryCountsByStatus,
   getMemoryMutationsForRenderByProjects,
   getMemoryVerifications,
+  getMergedReasoningStrippedIds,
   getMigrationOnOpenRefusal,
   getMirrorCursor,
   getModuleNoteEvaluationBridge,
@@ -214,7 +230,9 @@ import {
   getTagNumberByMessageId,
   getTagsByNumbers,
   getTagsBySession,
+  getTailHygieneTags,
   getToolTagNumberByOwner,
+  getTrailingBlankDecisions,
   getTriggerTagTokenUpperBound,
   getUnclassifiedMemoryIds,
   getUnmappedMemoryIds,
@@ -226,6 +244,7 @@ import {
   hasMemoryShareableColumn,
   hasMuralCueColumns,
   hasRunnableCompartmentWindow,
+  incrementalLkgContentDigests,
   injectM0M1,
   injectTemporalMarkers,
   insertMemory,
@@ -240,10 +259,11 @@ import {
   isEmbeddingEnabled,
   isEmergencyRecoveryArmed,
   isFailClosedBlockingError,
+  isLinkedGitWorktree,
   isPidAlive,
   isProviderOverflowReconfirmed,
+  isSyntheticTodoPart,
   lkgContentDigest,
-  lkgContentDigestFromFields,
   loadCompartmentChunkEmbeddingsForSearch,
   loadPersistedUsage,
   loadProjectCommitEmbeddings,
@@ -263,6 +283,7 @@ import {
   nextOccurrence,
   normalizeSDKResponse,
   normalizeStoredProjectPath,
+  normalizeTodoStateJson,
   normalizeVerificationFiles,
   noteEntry,
   onNoteTrigger,
@@ -275,6 +296,7 @@ import {
   peekNoteNudgeText,
   peekProjectEmbeddings,
   pickNearestPriorOwner,
+  planEmergencyDrop,
   prepareAuthority,
   prepareCompartmentInjection,
   primerOccurrenceKey,
@@ -304,6 +326,7 @@ import {
   recordOverflowDetected,
   recordSessionProjectIdentity,
   recordToolDefinition,
+  refreshTailHygieneBaseline,
   registerActiveCompartmentRun,
   registerModuleNoteEvaluationBridge,
   registerProjectEmbedding,
@@ -333,6 +356,7 @@ import {
   resolveLegacyConfigSources,
   resolveLegacyConfigSourcesForHarness,
   resolveModelConfigOrDefault,
+  resolveMuralWire,
   resolveOpenCodeProtectedTailBoundary,
   resolveProjectIdentity,
   resolveProjectIdentityForSession,
@@ -348,6 +372,7 @@ import {
   runManagedRecomp,
   runManagedUpgrade,
   runSqliteOptimize,
+  sameTailHygieneStructuralSignature,
   sanitizeFtsQuery,
   saveCommitEmbedding,
   saveEmbeddingIfHashMatches,
@@ -383,7 +408,9 @@ import {
   supersededMemory,
   sweepStaleEmbeddingIdentitiesForProject,
   tagTokenCountIsNull,
+  tailHygieneStructuralSignature,
   takeDubiousOwnershipProjectIdentityWarning,
+  toolOutputTokens,
   trimMemoriesToBudgetV2,
   updateCavemanDepth,
   updateMemoryRetrievalCount,
@@ -400,19 +427,22 @@ import {
   upsertCommits,
   verificationFileExists,
   withContentLanguageDirective
-} from "./index-1skzp4dc.js";
+} from "./index-mmvhrqqb.js";
 import {
   deriveHistorianChunkTokens,
   deriveTriggerBudget,
+  formatWindowDerivationLine,
   getSdkContextLimit,
+  getSdkWindowGeometry,
   isSaneLimit,
   refreshModelLimitsAfterAuthOnce,
   refreshModelLimitsFromApi,
   resolveHistorianContextLimit,
   setOutputReserveConfig,
   setStoragePrivatePermissionEnforcement,
+  setWindowOverlayPath,
   shouldEnforcePrivateStoragePermissions
-} from "./index-wgvxkqpx.js";
+} from "./index-9zhhvr4w.js";
 import {
   modelBodyField,
   resolveFallbackChain
@@ -424,7 +454,7 @@ import {
   getErrorMessage,
   sendIgnoredMessage,
   sendUserPrompt
-} from "./index-nsx2n9eg.js";
+} from "./index-4cz5nfxf.js";
 import {
   ToolMutationBatch,
   advanceToolReclaimWatermark,
@@ -482,7 +512,11 @@ import {
   textMentionsRecentCommit,
   updateSessionMeta,
   withRawSessionMessageCache
-} from "./index-3zqcdwqr.js";
+} from "./index-crke4z5j.js";
+import {
+  modelRefLookupOrder,
+  piModelRefToCanonical
+} from "./index-cgyfn1s2.js";
 import {
   Database,
   closeQuietly,
@@ -491,12 +525,13 @@ import {
   isMidTurn,
   openCodeDbExists,
   withReadOnlySessionDb
-} from "./index-3tnkymva.js";
+} from "./index-sw8gnq34.js";
 import {
   cleanupConflictWarnings,
   detectConflicts,
+  resolveCompactionForBoot,
   sendConflictWarning
-} from "./index-zp6x6s6a.js";
+} from "./index-cae89eas.js";
 import {
   detectConfigFile,
   isPrototypePollutionKey,
@@ -519,11 +554,12 @@ import {
   pushNotification,
   registerNotificationSink
 } from "./index-d62ypazr.js";
-import"./index-tsgs7td8.js";
+import"./index-pck9vadr.js";
 import {
+  getLoggerDiagnostics,
   log,
   sessionLog
-} from "./index-f1tnb3vm.js";
+} from "./index-8pqfcghm.js";
 import {
   getDataDir,
   getHarness,
@@ -9125,6 +9161,11 @@ function stripUnsafeProjectConfigFields(projectRaw) {
     delete projectRaw.output_reserve;
     warnings.push("Ignoring output_reserve from project config (security: output-token reservation only honors user-level config).");
   }
+  const models = projectRaw.models;
+  if (isPlainObject(models) && "window_overlay_path" in models) {
+    delete models.window_overlay_path;
+    warnings.push("Ignoring models.window_overlay_path from project config (security: only user-level config may select model geometry metadata).");
+  }
   if ("language" in projectRaw) {
     delete projectRaw.language;
     warnings.push("Ignoring language from project config (security: output language is a user-level setting).");
@@ -9787,6 +9828,7 @@ function loadPluginConfigDetailed(directory) {
   const recoveredTopLevelKeys = [];
   const config = parsePluginConfig(mergedRaw, recoveredTopLevelKeys);
   setOutputReserveConfig(config.output_reserve);
+  setWindowOverlayPath(config.models?.window_overlay_path);
   if (config.configWarnings?.length) {
     allWarnings.push(...config.configWarnings.map((w) => {
       if (userLoaded && projectLoaded)
@@ -11029,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}@`));
@@ -11044,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`);
@@ -11368,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) {
@@ -11423,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,
@@ -11566,6 +11623,7 @@ class SubcModuleTransport {
     return error;
   }
   async beforeDeadline(operation, deadlineMs, detail) {
+    operation.catch(() => {});
     const remainingMs = deadlineMs - Date.now();
     if (remainingMs <= 0)
       throw this.deadlineError(detail);
@@ -12700,6 +12758,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 {
@@ -13731,9 +13817,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+)"/);
@@ -13766,9 +13862,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;
@@ -13967,7 +14072,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)
@@ -14035,8 +14140,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)
@@ -15327,6 +15431,63 @@ function backoffMs(failureCount) {
   return minutes * 60 * 1000;
 }
 
+// src/features/magic-context/smart-notes/wake-plane.ts
+import { join as join5 } from "node:path";
+var WAKE_PLANE_CAPABILITY = "wake.create";
+var WAKE_PLANE_STATUS_TTL_MS = 5 * 60 * 1000;
+var WAKE_PLANE_HANDSHAKE_TIMEOUT_MS = 2000;
+var cachedStatus = null;
+var inFlightProbe = null;
+var catalogProbe = probeWakePlaneCatalog;
+var now = () => Date.now();
+function connectionFile() {
+  return join5(getDataDir(), "cortexkit", "run", "subc-connection.json");
+}
+async function probeWakePlaneCatalog() {
+  const file = connectionFile();
+  if (!await connectionFileExists(file)) {
+    throw new Error("subc connection is not configured");
+  }
+  const client = await SubcClient.connect({
+    connectionFile: file,
+    handshakeTimeoutMs: WAKE_PLANE_HANDSHAKE_TIMEOUT_MS
+  });
+  try {
+    return await client.catalogList();
+  } finally {
+    client.close();
+  }
+}
+function catalogHasWakePlane(entries) {
+  return entries.some((entry) => Array.isArray(entry.control_ops) && entry.control_ops.includes(WAKE_PLANE_CAPABILITY));
+}
+async function probeStatus() {
+  try {
+    return catalogHasWakePlane(await catalogProbe()) ? "present" : "absent";
+  } catch {
+    return "unknown";
+  }
+}
+async function wakePlaneStatus() {
+  const cached = cachedStatus;
+  if (cached && now() < cached.expiresAt)
+    return cached.status;
+  if (inFlightProbe)
+    return await inFlightProbe;
+  const startedAt = now();
+  const probe = probeStatus().then((status) => {
+    cachedStatus = { status, expiresAt: startedAt + WAKE_PLANE_STATUS_TTL_MS };
+    return status;
+  });
+  inFlightProbe = probe;
+  try {
+    return await probe;
+  } finally {
+    if (inFlightProbe === probe)
+      inFlightProbe = null;
+  }
+}
+
 // src/features/magic-context/smart-notes/runner.ts
 function inferEvaluateSmartNotesLeaseHeld(db, projectIdentity) {
   const leaseKey = leaseKeyFor("evaluate-smart-notes", projectIdentity);
@@ -15339,9 +15500,12 @@ var DEFAULT_MAX_CHECKS = 10;
 var DEFAULT_SWEEP_BUDGET_MS = 15000;
 var MAX_FAILURES_BEFORE_REAUTHOR = 3;
 async function runDueCompiledSmartNoteChecks(args) {
+  if (await wakePlaneStatus() === "present") {
+    return { ran: 0, surfaced: 0, failed: 0, networkFailed: 0 };
+  }
   const startedAt = Date.now();
-  const now = args.now ?? startedAt;
-  const due = getDueCompiledSmartNoteChecks(args.db, args.projectIdentity, now, args.maxChecks ?? DEFAULT_MAX_CHECKS, args.retinaHandoff);
+  const now2 = args.now ?? startedAt;
+  const due = getDueCompiledSmartNoteChecks(args.db, args.projectIdentity, now2, args.maxChecks ?? DEFAULT_MAX_CHECKS, args.retinaHandoff);
   let ran = 0;
   let surfaced = 0;
   let failed = 0;
@@ -15468,6 +15632,11 @@ function createPromptAbortSignal(parent, timeoutMs, timeoutMessage) {
   };
 }
 async function evaluateSmartNotes(args) {
+  if (await wakePlaneStatus() === "present") {
+    const pending = getPendingSmartNotes(args.db, args.projectIdentity).length;
+    log("[dreamer] evaluate-smart-notes: skipped (wake plane active)");
+    return { surfaced: 0, pending, ran: false };
+  }
   const projectRoot = args.sessionDirectory ?? args.projectIdentity;
   const moduleBridge = getModuleNoteEvaluationBridge(args.projectIdentity);
   await moduleBridge?.sync();
@@ -15559,7 +15728,7 @@ async function evaluateSmartNotes(args) {
       assertLeaseHeld("fallback start");
       didWork = true;
       const met = await confirmReadOnly(args, note.id, note.content, note.surfaceCondition, leaseAbortController.signal);
-      const now = Date.now();
+      const now2 = Date.now();
       assertLeaseHeld("fallback commit");
       const committed = commitSmartNoteState(args.db, {
         phase: "fallback",
@@ -15570,7 +15739,7 @@ async function evaluateSmartNotes(args) {
             markNoteReady(args.db, note.id, `Smart note #${note.id}: read-only confirmation evaluator returned met=true`);
           } else {
             markNoteChecked(args.db, note.id);
-            markSmartNoteCheckStatus(args.db, note.id, "fallback", now);
+            markSmartNoteCheckStatus(args.db, note.id, "fallback", now2);
           }
         }
       });
@@ -15601,7 +15770,7 @@ async function compileNote(args, note, projectRoot, assertLeaseHeld, leaseHeld,
       model: args.model,
       fallbackModels: args.fallbackModels
     });
-    const now = Date.now();
+    const now2 = Date.now();
     assertLeaseHeld("compile commit");
     if (!result.ok) {
       if (result.cancelled)
@@ -15612,13 +15781,13 @@ async function compileNote(args, note, projectRoot, assertLeaseHeld, leaseHeld,
         expected: sourceRevisionExpectation(note),
         leaseHeld,
         write: () => {
-          markSmartNoteCompilationFailure(args.db, note.id, now, MAX_COMPILATION_FAILURES);
+          markSmartNoteCompilationFailure(args.db, note.id, now2, MAX_COMPILATION_FAILURES);
         }
       });
       return false;
     }
     const nextDueAt = nextSmartNoteCheckDueAt(result.checkCron, {
-      now,
+      now: now2,
       noteId: note.id,
       hash: result.checkHash
     });
@@ -15634,12 +15803,12 @@ async function compileNote(args, note, projectRoot, assertLeaseHeld, leaseHeld,
           checkHash: result.checkHash,
           checkCron: result.checkCron,
           nextDueAt,
-          now
+          now: now2
         });
         if (result.dryRun.met) {
           markNoteReady(args.db, note.id, `Smart note #${note.id}: compiled check returned met=true`);
         } else {
-          markCompiledCheckFalse(args.db, note.id, nextDueAt, now);
+          markCompiledCheckFalse(args.db, note.id, nextDueAt, now2);
         }
       }
     });
@@ -15660,9 +15829,9 @@ async function runLivenessCheck(args, note, projectRoot, assertLeaseHeld, leaseH
   });
   if (!result.ok && result.cancelled)
     return false;
-  const now = Date.now();
+  const now2 = Date.now();
   const nextDueAt = result.ok && !result.result.met ? nextSmartNoteCheckDueAt(note.checkCron, {
-    now,
+    now: now2,
     noteId: note.id,
     hash: note.checkHash
   }) : null;
@@ -15672,13 +15841,13 @@ async function runLivenessCheck(args, note, projectRoot, assertLeaseHeld, leaseH
     expected: compiledCheckExpectation(note, compiledCheck),
     leaseHeld,
     write: () => {
-      markSmartNoteLivenessChecked(args.db, note.id, now);
+      markSmartNoteLivenessChecked(args.db, note.id, now2);
       if (result.ok && result.result.met) {
         markNoteReady(args.db, note.id, `Smart note #${note.id}: max-staleness liveness check returned met=true`);
       } else if (result.ok && nextDueAt !== null) {
-        markCompiledCheckFalse(args.db, note.id, nextDueAt, now);
+        markCompiledCheckFalse(args.db, note.id, nextDueAt, now2);
       } else if (!result.ok && !result.network) {
-        markSmartNoteCheckStatus(args.db, note.id, "failing", now);
+        markSmartNoteCheckStatus(args.db, note.id, "failing", now2);
       }
     }
   });
@@ -15804,7 +15973,7 @@ Output exactly JSON: {"met": false}`;
 
 // src/features/magic-context/dreamer/maintain-docs-protected-enforcement.ts
 import { existsSync as existsSync7, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "node:fs";
-import { join as join5 } from "node:path";
+import { join as join6 } from "node:path";
 
 // src/features/magic-context/dreamer/protected-regions.ts
 var PROTECTED_START_TOKEN = "mc:protected START";
@@ -15905,7 +16074,7 @@ var MAINTAIN_DOCS_SNAPSHOT_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 function snapshotMaintainDocsFiles(docsDir) {
   const snapshot = new Map;
   for (const name of MAINTAIN_DOCS_SNAPSHOT_FILES) {
-    const path3 = join5(docsDir, name);
+    const path3 = join6(docsDir, name);
     try {
       if (existsSync7(path3)) {
         snapshot.set(name, readFileSync5(path3, "utf8"));
@@ -15916,7 +16085,7 @@ function snapshotMaintainDocsFiles(docsDir) {
 }
 function enforceMaintainDocsProtectedRegions(args) {
   for (const [fileName, original] of args.snapshot) {
-    const path3 = join5(args.docsDir, fileName);
+    const path3 = join6(args.docsDir, fileName);
     try {
       const current = readFileSync5(path3, "utf8");
       const { text, violated } = enforceProtectedRegions(original, current);
@@ -16000,11 +16169,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");
@@ -16013,24 +16204,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 = {
@@ -16040,7 +16274,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 = [];
@@ -16119,7 +16353,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;
       }
     });
@@ -16153,10 +16387,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
@@ -16212,10 +16449,10 @@ async function applyBatchMappings(args, batch, manifestText) {
     }
     return { mapped, independent };
   }
-  const now = Date.now();
+  const now2 = Date.now();
   runLeaseGuardedWrite(args.db, args.holderId, args.leaseKey, () => {
     for (const item of planned) {
-      recordMemoryMapping(args.db, item.id, item.files, now);
+      recordMemoryMapping(args.db, item.id, item.files, now2);
       item.independent ? independent += 1 : mapped += 1;
     }
   });
@@ -16387,7 +16624,7 @@ async function embedMissingCandidates(args, assertLeaseHeld) {
     updatePrimerCandidateEmbedding(args.db, candidates[i].id, vector, batch.modelId);
   }
 }
-function pruneExpiredPrimerCandidatesForProject(db, projectIdentity, now = Date.now(), ttlMs = PRIMER_CANDIDATE_TTL_MS, maxAgeMs = PRIMER_CANDIDATE_MAX_AGE_MS) {
+function pruneExpiredPrimerCandidatesForProject(db, projectIdentity, now2 = Date.now(), ttlMs = PRIMER_CANDIDATE_TTL_MS, maxAgeMs = PRIMER_CANDIDATE_MAX_AGE_MS) {
   const protectedIds = new Set;
   for (const primer of getActivePrimers(db, projectIdentity)) {
     for (const id of primer.sourceCandidateIds)
@@ -16395,8 +16632,8 @@ function pruneExpiredPrimerCandidatesForProject(db, projectIdentity, now = Date.
   }
   const oldRows = db.prepare(`SELECT id, source_message_time
                FROM primer_candidates
-              WHERE project_path = ? AND source_message_time < ?`).all(projectIdentity, now - ttlMs);
-  const toDelete = oldRows.filter((row) => !protectedIds.has(row.id) || row.source_message_time < now - maxAgeMs).map((row) => row.id);
+              WHERE project_path = ? AND source_message_time < ?`).all(projectIdentity, now2 - ttlMs);
+  const toDelete = oldRows.filter((row) => !protectedIds.has(row.id) || row.source_message_time < now2 - maxAgeMs).map((row) => row.id);
   if (toDelete.length === 0)
     return 0;
   const stmt = db.prepare("DELETE FROM primer_candidates WHERE id = ? AND project_path = ?");
@@ -17301,9 +17538,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))
@@ -17322,9 +17572,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;
@@ -17476,7 +17736,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)
@@ -17511,7 +17771,7 @@ async function applyVerifyManifest(args, batch, manifestText) {
   const batchIds = new Set(batch.map((m) => m.id));
   const parsed = parseVerifyManifest(manifestText);
   assertManifestCoversExactly([...parsed.verified, ...parsed.updated, ...parsed.archived].map((entry) => entry.id), batchIds, "verify");
-  const now = Date.now();
+  const now2 = Date.now();
   const writes = [];
   for (const v of parsed.verified) {
     const files = await normalizeFiles(args, v.files);
@@ -17598,7 +17858,7 @@ async function applyVerifyManifest(args, batch, manifestText) {
       if (!isPrimaryMutable(memory))
         continue;
       if (w.kind === "verify") {
-        recordMemoryVerifications(args.db, w.id, w.files, now);
+        recordMemoryVerifications(args.db, w.id, w.files, now2);
         verified += 1;
       } else if (w.kind === "update") {
         rewriteMemoryContent(args.db, memory, w.content, w.hash);
@@ -17696,6 +17956,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 = () => {
@@ -17766,7 +18038,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);
@@ -17909,11 +18182,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, {
@@ -17922,11 +18196,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;
@@ -18393,7 +18668,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)
@@ -18431,17 +18706,17 @@ async function runAgenticTask(config, ctx, helpers) {
 
 // src/features/magic-context/dreamer/task-scheduler.ts
 var MAX_TASK_RETRIES = 3;
-function ensureSeeded(db, projectIdentity, config, now) {
+function ensureSeeded(db, projectIdentity, config, now2) {
   if (getTaskScheduleState(db, projectIdentity, config.task))
     return;
   const legacy = getDreamState(db, `last_dream_at:${projectIdentity}`);
   const legacyLastRun = legacy ? Number(legacy) : null;
   const lastRunAt = legacyLastRun && Number.isFinite(legacyLastRun) ? legacyLastRun : null;
-  const nextDueAt = nextDueAtMs(config.schedule, now);
+  const nextDueAt = nextDueAtMs(config.schedule, now2);
   seedTaskScheduleState(db, projectIdentity, config.task, nextDueAt, lastRunAt, config.schedule);
 }
-function reconcileSchedule(db, projectIdentity, config, now) {
-  ensureSeeded(db, projectIdentity, config, now);
+function reconcileSchedule(db, projectIdentity, config, now2) {
+  ensureSeeded(db, projectIdentity, config, now2);
   const stored = getTaskScheduleState(db, projectIdentity, config.task);
   if (!stored || stored.schedule === config.schedule)
     return;
@@ -18456,22 +18731,22 @@ function reconcileSchedule(db, projectIdentity, config, now) {
   writeTaskScheduleState(db, {
     ...stored,
     schedule: config.schedule,
-    nextDueAt: nextDueAtMs(config.schedule, now),
+    nextDueAt: nextDueAtMs(config.schedule, now2),
     retryCount: 0
   });
 }
-function planDueTasks(db, projectIdentity, tasks, now) {
+function planDueTasks(db, projectIdentity, tasks, now2) {
   const pruned = pruneNonCanonicalTaskRows(db, projectIdentity, tasks.map((t) => t.task));
   if (pruned > 0) {
     log(`[dreamer] pruned ${pruned} retired task row(s) for ${projectIdentity}`);
   }
   const due = [];
   for (const config of tasks) {
-    reconcileSchedule(db, projectIdentity, config, now);
+    reconcileSchedule(db, projectIdentity, config, now2);
     const state = getTaskScheduleState(db, projectIdentity, config.task);
     if (!state || state.nextDueAt === null)
       continue;
-    if (now >= state.nextDueAt) {
+    if (now2 >= state.nextDueAt) {
       due.push({ config, scheduledAt: state.nextDueAt });
     }
   }
@@ -18593,7 +18868,7 @@ async function runDomainGroup(deps, group, cb) {
   }
 }
 async function runManualDream(deps) {
-  const now = Date.now();
+  const now2 = Date.now();
   const result = {
     ran: [],
     skippedNoWork: [],
@@ -18620,8 +18895,8 @@ async function runManualDream(deps) {
   result.backlogBefore = getDreamTaskBacklogs(deps.db, deps.projectIdentity, selectedTaskNames);
   result.backlogAfter = { ...result.backlogBefore };
   for (const cfg of selected)
-    ensureSeeded(deps.db, deps.projectIdentity, cfg, now);
-  const dueAll = selected.map((config) => ({ config, scheduledAt: now }));
+    ensureSeeded(deps.db, deps.projectIdentity, cfg, now2);
+  const dueAll = selected.map((config) => ({ config, scheduledAt: now2 }));
   const gated = [];
   for (const d of dueAll) {
     if (forceGate) {
@@ -18666,8 +18941,8 @@ async function runManualDream(deps) {
   return result;
 }
 async function runDueTasksForProject(deps) {
-  const now = deps.now ?? Date.now();
-  const due = planDueTasks(deps.db, deps.projectIdentity, deps.tasks, now);
+  const now2 = deps.now ?? Date.now();
+  const due = planDueTasks(deps.db, deps.projectIdentity, deps.tasks, now2);
   if (due.length === 0)
     return 0;
   const gated = [];
@@ -18682,7 +18957,7 @@ async function runDueTasksForProject(deps) {
     if (pass) {
       gated.push(d);
     } else {
-      advanceAfterRun(deps.db, deps.projectIdentity, d, now, "skipped", null);
+      advanceAfterRun(deps.db, deps.projectIdentity, d, now2, "skipped", null);
     }
   }
   if (gated.length === 0)
@@ -19669,6 +19944,26 @@ function createCompactionHandler() {
 
 // src/hooks/magic-context/event-resolvers.ts
 var DEFAULT_CONTEXT_LIMIT = 128000;
+function resolveContextWindowGeometry(providerID, modelID, ctx) {
+  if (!providerID || !modelID)
+    return;
+  const modelKey = resolveModelKey(providerID, modelID);
+  let detected;
+  let detectedLimitProvenance = "unknown";
+  if (ctx?.db && ctx.sessionID) {
+    try {
+      const overflow = getOverflowState(ctx.db, ctx.sessionID, modelKey);
+      if (overflow.detectedContextLimit > 0) {
+        detected = overflow.detectedContextLimit;
+        detectedLimitProvenance = overflow.detectedContextLimitProvenance;
+      }
+    } catch {}
+  }
+  return getSdkWindowGeometry(providerID, modelID, detected, {
+    detectedLimitProvenance,
+    harness: "opencode"
+  });
+}
 function resolveContextLimit(providerID, modelID, ctx) {
   const modelKey = resolveModelKey(providerID, modelID);
   let detected;
@@ -19711,7 +20006,7 @@ function resolveTrustedContextLimit(providerID, modelID, ctx) {
   if (modelKey && ctx?.db && ctx.sessionID) {
     try {
       const persisted = loadPersistedUsage(ctx.db, ctx.sessionID);
-      if (persisted?.lastObservedModelKey === modelKey && isSaneLimit(persisted.lastUsageContextLimit)) {
+      if (persisted !== null && piModelRefToCanonical(persisted.lastObservedModelKey ?? "") === piModelRefToCanonical(modelKey) && isSaneLimit(persisted.lastUsageContextLimit)) {
         return persisted.lastUsageContextLimit;
       }
     } catch {}
@@ -19730,11 +20025,13 @@ function isFinitePositive(v) {
 }
 function* modelKeyLookupOrder(modelKey) {
   const slash = modelKey.indexOf("/");
-  const provider = slash >= 0 ? modelKey.slice(0, slash) : "";
+  const providerRefs = slash >= 0 ? modelRefLookupOrder(modelKey) : [];
   let modelId = slash >= 0 ? modelKey.slice(slash + 1) : modelKey;
   while (modelId.length > 0) {
-    if (provider)
-      yield `${provider}/${modelId}`;
+    for (const providerRef of providerRefs) {
+      const providerSlash = providerRef.indexOf("/");
+      yield `${providerRef.slice(0, providerSlash)}/${modelId}`;
+    }
     yield modelId;
     const lastDash = modelId.lastIndexOf("-");
     if (lastDash <= 0)
@@ -19852,7 +20149,7 @@ function resolveModelKey(providerID, modelID) {
   if (!providerID || !modelID) {
     return;
   }
-  return `${providerID}/${modelID}`;
+  return piModelRefToCanonical(`${providerID}/${modelID}`);
 }
 function resolveSessionId(properties) {
   if (typeof properties?.sessionID === "string") {
@@ -20248,6 +20545,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 {
@@ -20688,7 +21023,7 @@ function formatExecuteThreshold(detail, contextLimit) {
   }
   return `${percentage}%${clampNote}`;
 }
-function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageConfig = DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, liveModelKey, historyBudgetPercentage, commitClusterTrigger, executeThresholdTokens, contextLimit, dreamer) {
+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,
@@ -20743,13 +21078,16 @@ 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`
       ] : [], ...formatDreamTaskBacklogs(dreamer.backlog).split("\\n"));
     }
     if (meta.lastContextPercentage > 0 || meta.lastInputTokens > 0) {
-      lines.push("", "### Context Usage", `- Last percentage: ${meta.lastContextPercentage.toFixed(1)}%`, `- Last input tokens: ${meta.lastInputTokens.toLocaleString()}`, `- Resolved context limit: ${displayContextLimit > 0 ? displayContextLimit.toLocaleString() : "unknown"}`, `- Proactive compartment evaluation: ${proactiveCompartmentTrigger}%`, `- Post-drop target for historian: ${(executeThresholdPercentage * POST_DROP_TARGET_RATIO).toFixed(0)}% (${executeThresholdPercentage}% * ${POST_DROP_TARGET_RATIO})`, `- Commit cluster trigger: ${commitClusterTrigger?.enabled !== false ? `enabled (min ${commitClusterTrigger?.min_clusters ?? 3} clusters)` : "disabled"}, tail-size trigger: > 3x compartment budget`);
+      lines.push("", "### Context Usage", `- Last percentage: ${meta.lastContextPercentage.toFixed(1)}%`, `- Last input tokens: ${meta.lastInputTokens.toLocaleString()}`, `- Resolved context limit: ${displayContextLimit > 0 ? displayContextLimit.toLocaleString() : "unknown"}`, ...windowGeometry ? [`- ${formatWindowDerivationLine(meta.lastInputTokens, windowGeometry)}`] : [], `- Proactive compartment evaluation: ${proactiveCompartmentTrigger}%`, `- Post-drop target for historian: ${(executeThresholdPercentage * POST_DROP_TARGET_RATIO).toFixed(0)}% (${executeThresholdPercentage}% * ${POST_DROP_TARGET_RATIO})`, `- Commit cluster trigger: ${commitClusterTrigger?.enabled !== false ? `enabled (min ${commitClusterTrigger?.min_clusters ?? 3} clusters)` : "disabled"}, tail-size trigger: > 3x compartment budget`);
     }
     const compartments = getCompartments(db, sessionId);
     let historyBlockTokens = 0;
@@ -20907,6 +21245,10 @@ ${summary || "Nothing to compact."}`;
         return `## Magic Wrapup — Skipped
 
 /ctx-wrapup is already running for this session${rounds > 0 ? ` (${rounds} round${rounds === 1 ? "" : "s"} complete)` : ""}. Wait for it to finish, then run /ctx-wrapup again if more history remains.`;
+      case "retryable":
+        return `## Magic Wrapup — Partial
+
+${summary || "Wrapup made progress but stopped before the keep watermark."} Run /ctx-wrapup again to continue.`;
       default:
         return `## Magic Wrapup — Failed
 
@@ -21213,10 +21555,14 @@ Embedding status is unavailable.`;
         }
         const liveModelKey = deps.getLiveModelKey?.(sessionId);
         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);
+        } : undefined, windowGeometry, tailHygiene);
         const moduleStatus = rustStatus ? `
 
 ${formatRustStatusText(rustStatus)}` : "";
@@ -21239,7 +21585,7 @@ ${combinedStatus}` : combinedStatus;
 
 ${parsed.message}`;
         } else if (rustMode) {
-          const keep = Math.min(100, Math.max(5, parsed.messagesToKeep));
+          const keep = parsed.messagesToKeep;
           await deps.sendNotification(sessionId, `## Magic Wrapup
 
 Starting wrapup…`, {});
@@ -21300,8 +21646,8 @@ ${error instanceof Error ? error.message : String(error)}`;
         } else {
           const argsKey = parsedArgs.kind === "partial" ? `${parsedArgs.range.start}-${parsedArgs.range.end}` : "";
           const lastConfirmation = recompConfirmationBySession.get(sessionId);
-          const now = Date.now();
-          const confirmationValid = lastConfirmation && now - lastConfirmation.timestamp < RECOMP_CONFIRMATION_WINDOW_MS && lastConfirmation.argsKey === argsKey;
+          const now2 = Date.now();
+          const confirmationValid = lastConfirmation && now2 - lastConfirmation.timestamp < RECOMP_CONFIRMATION_WINDOW_MS && lastConfirmation.argsKey === argsKey;
           if (confirmationValid) {
             recompConfirmationBySession.delete(sessionId);
             if (parsedArgs.kind === "partial") {
@@ -21319,7 +21665,7 @@ Historian recomp started. Rebuilding compartments and facts from raw session his
             }
           } else {
             recompConfirmationBySession.set(sessionId, {
-              timestamp: now,
+              timestamp: now2,
               argsKey
             });
             const compartments = getCompartments(deps.db, sessionId);
@@ -21974,187 +22320,279 @@ function writeTransformDecisionRowOnDatabase(db, row, configureBusyTimeout) {
                )`).run(row.sessionId, row.harness, row.sessionId, row.harness, retentionOverrideForTests ?? TRANSFORM_DECISIONS_RETENTION);
 }
 
-// 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);
+// src/features/magic-context/window-report-ledger.ts
+import * as fs from "node:fs";
+import * as path5 from "node:path";
+var WINDOW_REPORTS_FILE = "window-reports.jsonl";
+var ROTATED_WINDOW_REPORTS_FILE = `${WINDOW_REPORTS_FILE}.1`;
+var WINDOW_REPORTS_ROTATION_BYTES = 16 * 1024 * 1024;
+var FORWARDING_PROVIDER_IDS = new Set([
+  "302ai",
+  "abacus",
+  "ai-router",
+  "aiand",
+  "aihubmix",
+  "alibaba-cn",
+  "alibaba-coding-plan",
+  "alibaba-coding-plan-cn",
+  "alibaba-token-plan",
+  "alibaba-token-plan-cn",
+  "ambient",
+  "anyapi",
+  "auriko",
+  "azure",
+  "azure-cognitive-services",
+  "baseten",
+  "berget",
+  "blueclaw",
+  "chutes",
+  "clarifai",
+  "cline-pass",
+  "cloudferro-sherlock",
+  "cloudflare-ai-gateway",
+  "cloudflare-workers-ai",
+  "coralbricks",
+  "cortecs",
+  "crof",
+  "crossmodel",
+  "daoxe",
+  "deepinfra",
+  "digitalocean",
+  "dinference",
+  "drun",
+  "empiriolabs",
+  "evroc",
+  "fastrouter",
+  "fireworks-ai",
+  "freemodel",
+  "friendli",
+  "frogbot",
+  "github-copilot",
+  "gmicloud",
+  "google-vertex",
+  "greenpt",
+  "groq",
+  "helicone",
+  "hetzner",
+  "hpc-ai",
+  "huggingface",
+  "hyper",
+  "iflowcn",
+  "impossibl",
+  "inceptron",
+  "inference",
+  "inferx",
+  "infomaniak",
+  "io-net",
+  "jiekou",
+  "kenari",
+  "kilo",
+  "lilac",
+  "llmgateway",
+  "lmstudio",
+  "meganova",
+  "merge-gateway",
+  "mixlayer",
+  "modal",
+  "model-oracle-ai",
+  "modelis",
+  "modelscope",
+  "moonshotai-cn",
+  "nano-gpt",
+  "nearai",
+  "nebius",
+  "neon",
+  "neuralwatt",
+  "novita-ai",
+  "nvidia",
+  "ofox",
+  "opencode",
+  "opencode-go",
+  "openrouter",
+  "orcarouter",
+  "ovhcloud",
+  "perplexity-agent",
+  "pioneer",
+  "poe",
+  "poolside",
+  "privatemode-ai",
+  "qihang-ai",
+  "qiniu-ai",
+  "qvac",
+  "regolo-ai",
+  "requesty",
+  "routing-run",
+  "salad-cloud",
+  "sap-ai-core",
+  "scaleway",
+  "siliconflow",
+  "siliconflow-cn",
+  "snowflake-cortex",
+  "stackit",
+  "subconscious",
+  "submodel",
+  "synthetic",
+  "tencent-coding-plan",
+  "tensorx",
+  "thinkingmachines",
+  "tinfoil",
+  "togetherai",
+  "unorouter",
+  "venice",
+  "vercel",
+  "vivgrid",
+  "vultr",
+  "wandb",
+  "watsonx",
+  "xpersona",
+  "zai",
+  "zai-coding-plan",
+  "zenifra",
+  "zenmux",
+  "zhipuai",
+  "zhipuai-coding-plan"
+]);
+var swallowedWriteCount = 0;
+var lastErrorMessage = null;
+function getWindowReportsPath() {
+  return path5.join(getMagicContextStorageDir(), WINDOW_REPORTS_FILE);
 }
-function unknownJsonTokens(value) {
-  if (value === undefined || value === null)
-    return 0;
+function recordSwallowedWrite(error) {
   try {
-    return stringTokens(JSON.stringify(value));
-  } catch {
-    return 0;
-  }
+    swallowedWriteCount++;
+    lastErrorMessage = error instanceof Error ? error.message : String(error);
+    log("[magic-context] window report ledger write failed:", error);
+  } catch {}
 }
-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 positiveFiniteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : undefined;
 }
-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));
+function observedStatus(error) {
+  if (!error || typeof error !== "object")
+    return;
+  const candidate = error;
+  for (const value of [candidate.status, candidate.statusCode]) {
+    if (typeof value === "number" && Number.isInteger(value) && value >= 100 && value <= 599) {
+      return value;
     }
   }
-  return {
-    tailToolTokens: toolOutputTokensTotal,
-    liveTailTokens: conversationTokens + toolCallTokensTotal
-  };
+  const nested = candidate.response;
+  if (nested && typeof nested === "object") {
+    return observedStatus(nested);
+  }
+  return;
 }
-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();
+function observedHeaderHint(headers) {
+  if (!headers || typeof headers !== "object")
+    return;
+  const values = headers;
+  for (const key of ["x-served-by", "x-upstream", "x-backend"]) {
+    const fromGet = typeof values.get === "function" ? values.get(key) : undefined;
+    const value = fromGet ?? values[key] ?? values[key.toUpperCase()];
+    if (typeof value === "string" && value.trim())
+      return value.trim();
   }
-  return {
-    fire: true,
-    level,
-    undroppedTokens,
-    nextLastNudge: undroppedTokens,
-    nextLastNudgeLevel: level
-  };
+  return;
 }
-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 observedErrorBodyHint(error) {
+  if (!error || typeof error !== "object")
+    return;
+  const message = error.message;
+  const body = typeof message === "string" ? message : undefined;
+  const match = body?.match(/(?:served by|upstream|backend)\s*[:=]?\s*([a-z0-9._-]+)/i);
+  return match?.[1];
+}
+function observedErrorHint(error) {
+  if (!error || typeof error !== "object")
+    return;
+  const candidate = error;
+  const direct = candidate.served_by ?? candidate.servedBy ?? candidate.upstream ?? candidate.backend;
+  if (typeof direct === "string" && direct.trim())
+    return direct.trim();
+  const headerHint = observedHeaderHint(candidate.headers);
+  if (headerHint)
+    return headerHint;
+  const bodyHint = observedErrorBodyHint(error);
+  if (bodyHint)
+    return bodyHint;
+  const response = candidate.response;
+  if (response && typeof response === "object")
+    return observedErrorHint(response);
+  return;
 }
-function approxThousands(tokens) {
-  return `${Math.round(tokens / 1000)}k`;
+function observedModelVendorHint(modelID) {
+  if (!modelID)
+    return;
+  const slash = modelID.indexOf("/");
+  return slash > 0 ? modelID.slice(0, slash) : undefined;
 }
-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;
+function readLargestSuccess(db, sessionId, providerID, modelID) {
+  if (!sessionId || !providerID || !modelID)
+    return;
+  const meta = getOrCreateSessionMeta(db, sessionId);
+  return piModelRefToCanonical(meta.lastObservedModelKey ?? "") === piModelRefToCanonical(`${providerID}/${modelID}`) ? positiveFiniteNumber(meta.observedSafeInputTokens) : undefined;
+}
+function buildWindowReport(input) {
+  const report = {
+    access_path: "api",
+    geometry: input.reportedLimitProvenance ?? "unknown",
+    observed_at_ms: input.observedAtMs ?? Date.now(),
+    ...input.providerID && FORWARDING_PROVIDER_IDS.has(input.providerID) ? { path_may_forward: true } : {}
+  };
+  if (input.providerID)
+    report.provider_id = input.providerID;
+  if (input.modelID)
+    report.model_id = input.modelID;
+  if (input.matchedPattern)
+    report.matched_pattern = input.matchedPattern;
+  const limit = positiveFiniteNumber(input.reportedLimit);
+  if (limit) {
+    report.extracted_limit = limit;
+    report.extracted_limit_units = "provider";
+  }
+  const attempted = positiveFiniteNumber(input.attemptedTokens);
+  if (attempted) {
+    report.attempted_tokens = attempted;
+    report.attempted_tokens_units = "estimate";
+  }
+  const status = observedStatus(input.error);
+  if (status)
+    report.status = status;
+  const largestSuccess = readLargestSuccess(input.db, input.sessionID, input.providerID, input.modelID);
+  if (largestSuccess) {
+    report.largest_success = largestSuccess;
+    report.largest_success_units = "estimate";
+  }
+  const servedByHint = observedErrorHint(input.error) ?? observedModelVendorHint(input.modelID);
+  if (servedByHint)
+    report.served_by_hint = servedByHint;
+  return report;
+}
+function appendWindowReport(report) {
+  try {
+    const reportPath = getWindowReportsPath();
+    fs.mkdirSync(path5.dirname(reportPath), { recursive: true });
+    if (fs.existsSync(reportPath) && fs.statSync(reportPath).size > WINDOW_REPORTS_ROTATION_BYTES) {
+      const rotatedPath = path5.join(path5.dirname(reportPath), ROTATED_WINDOW_REPORTS_FILE);
+      fs.rmSync(rotatedPath, { force: true });
+      fs.renameSync(reportPath, rotatedPath);
+    }
+    fs.appendFileSync(reportPath, `${JSON.stringify(report)}
+`);
+  } catch (error) {
+    recordSwallowedWrite(error);
+  }
+}
+function captureWindowReport(input) {
+  try {
+    appendWindowReport(buildWindowReport(input));
+  } catch (error) {
+    recordSwallowedWrite(error);
   }
-  return `
-
-<system-reminder>
-${body}${hintText}
-</system-reminder>`;
 }
 
 // src/hooks/magic-context/channel2-delivery.ts
+import { randomUUID as randomUUID3 } from "node:crypto";
 function subagentRunIsActive(deps, sessionId) {
   try {
     const meta = getOrCreateSessionMeta(deps.db, sessionId);
@@ -22197,19 +22635,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;
@@ -22223,7 +22660,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 }]
@@ -22755,7 +23192,7 @@ function replayCavemanCompression(sessionId, db, targets, tags) {
 }
 
 // src/hooks/magic-context/compaction-off-transition.ts
-import { existsSync as existsSync10 } from "node:fs";
+import { existsSync as existsSync11 } from "node:fs";
 var loggedUnverifiedMarkerCleanupRetry = false;
 var COMPACTION_OFF_FLIP_NOTICE = [
   "## Magic Context — compaction-off mode is now active",
@@ -22790,7 +23227,7 @@ function clearCachedM0Baseline(db, sessionId) {
   return (result.changes ?? 0) > 0;
 }
 function cleanupOffMarkers(sessionId) {
-  if (!existsSync10(getOpenCodeDbPath())) {
+  if (!existsSync11(getOpenCodeDbPath())) {
     return { verified: true, removedLineages: 0, removedRows: 0, retainedLineages: 0 };
   }
   return removeMcOwnedCompactionMarkers(sessionId, MARKER_SUMMARY_TEXT);
@@ -22909,156 +23346,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 },
@@ -23433,6 +23720,14 @@ function assertOpenAiCompatAdjacency(messages) {
 }
 
 // src/hooks/magic-context/lkg-replay.ts
+function canonicalLkgModelKeys(modelKey, providerKey) {
+  const canonicalModelKey = modelKey ? piModelRefToCanonical(modelKey) : null;
+  const slash = canonicalModelKey?.indexOf("/") ?? -1;
+  return {
+    modelKey: canonicalModelKey,
+    providerKey: slash > 0 && canonicalModelKey ? canonicalModelKey.slice(0, slash) : providerKey
+  };
+}
 function resolveLkgModelKeys(messages) {
   for (let index = messages.length - 1;index >= 0; index -= 1) {
     const info = messages[index]?.info;
@@ -23441,13 +23736,13 @@ function resolveLkgModelKeys(messages) {
       const provider2 = nested.providerID;
       const model2 = nested.modelID;
       if (typeof provider2 === "string" && typeof model2 === "string") {
-        return { modelKey: `${provider2}/${model2}`, providerKey: provider2 };
+        return canonicalLkgModelKeys(`${provider2}/${model2}`, provider2);
       }
     }
     const provider = info?.providerID;
     const model = info?.modelID;
     if (info?.role === "assistant" && typeof provider === "string" && typeof model === "string") {
-      return { modelKey: `${provider}/${model}`, providerKey: provider };
+      return canonicalLkgModelKeys(`${provider}/${model}`, provider);
     }
   }
   return { modelKey: null, providerKey: null };
@@ -23643,13 +23938,14 @@ function captureLkgSlot(args) {
   const built = buildLkgPrefix(args.input, args.output);
   if (!built)
     return false;
+  const modelKeys = canonicalLkgModelKeys(args.modelKey, args.providerKey);
   return captureSlot(args.sessionId, {
     jsonPrefix: built.jsonPrefix,
     inputIdSeq: built.inputIdSeq,
     inputContentDigests: built.inputContentDigests,
     lastInputMessageId: built.anchorMessageId,
-    modelKey: args.modelKey,
-    providerKey: args.providerKey,
+    modelKey: modelKeys.modelKey,
+    providerKey: modelKeys.providerKey,
     capturedAt: args.capturedAt ?? Date.now()
   });
 }
@@ -23830,7 +24126,9 @@ function replayLkg(args) {
   const slot = getSlot(args.sessionId);
   if (!slot)
     return { ok: false, reason: "lkg_invalidated_reshape" };
-  if (slot.modelKey !== args.modelKey || slot.providerKey !== args.providerKey) {
+  const requestedModelKeys = canonicalLkgModelKeys(args.modelKey, args.providerKey);
+  const capturedModelKeys = canonicalLkgModelKeys(slot.modelKey, slot.providerKey);
+  if (capturedModelKeys.modelKey !== requestedModelKeys.modelKey || capturedModelKeys.providerKey !== requestedModelKeys.providerKey) {
     dropSlot(args.sessionId, "lkg_model_mismatch");
     return { ok: false, reason: "lkg_model_mismatch" };
   }
@@ -23858,13 +24156,13 @@ function replayLkg(args) {
       dropSlot(args.sessionId, "lkg_unsafe_seam");
       return { ok: false, reason: "lkg_unsafe_seam" };
     }
-    if (!validateLkgSeam(prefix, entry.pristineTail, args.providerKey)) {
+    if (!validateLkgSeam(prefix, entry.pristineTail, requestedModelKeys.providerKey)) {
       dropSlot(args.sessionId, "lkg_seam_invalid");
       return { ok: false, reason: "lkg_seam_invalid" };
     }
   }
   const replayed = [...prefix, ...entry.pristineTail];
-  if (args.providerKey === "anthropic" && !validateAnthropicReasoningRuns(replayed)) {
+  if (requestedModelKeys.providerKey === "anthropic" && !validateAnthropicReasoningRuns(replayed)) {
     dropSlot(args.sessionId, "lkg_anthropic_reasoning_run_invalid");
     return { ok: false, reason: "lkg_anthropic_reasoning_run_invalid" };
   }
@@ -23896,7 +24194,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";
@@ -24076,8 +24374,9 @@ function moduleWireBodyBytes(payload) {
   return Buffer.byteLength(JSON.stringify(toFlatModuleWireBody(payload)));
 }
 function buildPagedModuleTransformPayloads(body) {
-  if (Buffer.byteLength(JSON.stringify(body)) <= MODULE_PAGE_MAX_BYTES)
-    return [body];
+  const unpagedBytes = Buffer.byteLength(JSON.stringify(body));
+  if (unpagedBytes <= MODULE_PAGE_MAX_BYTES)
+    return [{ page: body, bytes: unpagedBytes }];
   const arrayFields = [
     "input",
     "messages",
@@ -24111,7 +24410,7 @@ function buildPagedModuleTransformPayloads(body) {
     };
     if (args.complete)
       Object.assign(page, scalarFields);
-    return page;
+    return { page, bytes: Buffer.byteLength(JSON.stringify(page)) };
   };
   const hasItems = (arrays) => Object.values(arrays).some((values) => values.length > 0);
   const serializedItemBytes = (value) => Buffer.byteLength(JSON.stringify(value) ?? "null");
@@ -24213,12 +24512,7 @@ function buildPagedModuleTransformPayloads(body) {
       complete: true,
       arrays: current
     });
-    if (pageByteLength({
-      index: pages.length,
-      total: assumedTotal,
-      complete: true,
-      arrayBytes: currentBytes
-    }) > MODULE_PAGE_MAX_BYTES) {
+    if (finalPage.bytes > MODULE_PAGE_MAX_BYTES) {
       if (!hasItems(current)) {
         throw new Error("module transform scalar tail exceeds the 512 KiB page limit");
       }
@@ -24236,12 +24530,7 @@ function buildPagedModuleTransformPayloads(body) {
         complete: true,
         arrays: current
       });
-      if (pageByteLength({
-        index: pages.length,
-        total: assumedTotal,
-        complete: true,
-        arrayBytes: currentBytes
-      }) > MODULE_PAGE_MAX_BYTES) {
+      if (finalPage.bytes > MODULE_PAGE_MAX_BYTES) {
         throw new Error("module transform scalar tail exceeds the 512 KiB page limit");
       }
     }
@@ -24272,7 +24561,7 @@ function moduleRawBlockMappings(message) {
       blockIndex += 1;
       continue;
     }
-    if (type === "reasoning") {
+    if (["reasoning", "thinking", "redacted_thinking"].includes(type)) {
       mappings.push({ blockIndex, partIndex, kind: "reasoning" });
       blockIndex += 1;
       continue;
@@ -24332,12 +24621,31 @@ function encodeOpenCodeMessagesToCk(messages) {
         content.push({
           kind: { type: "text", text: typeof part.text === "string" ? part.text : "" }
         });
-      } else if (type === "reasoning") {
+      } else if (type === "reasoning" || type === "thinking") {
+        const signature = typeof part.signature === "string" ? part.signature : undefined;
         content.push({
           kind: {
             type: "reasoning",
-            text: typeof part.text === "string" ? part.text : typeof part.thinking === "string" ? part.thinking : ""
-          }
+            text: typeof part.text === "string" ? part.text : typeof part.thinking === "string" ? part.thinking : "",
+            ...signature ? { signature } : {}
+          },
+          ...part.cache_control !== undefined ? {
+            provider_extras: {
+              opencode: { cache_control: part.cache_control }
+            }
+          } : {}
+        });
+      } else if (type === "redacted_thinking") {
+        content.push({
+          kind: {
+            type: "redacted_reasoning",
+            data: typeof part.data === "string" ? part.data : typeof part.redacted === "string" ? part.redacted : ""
+          },
+          ...part.cache_control !== undefined ? {
+            provider_extras: {
+              opencode: { cache_control: part.cache_control }
+            }
+          } : {}
         });
       } else if (type === "tool") {
         const state = part.state !== null && typeof part.state === "object" ? part.state : {};
@@ -24393,21 +24701,54 @@ function encodeOpenCodeMessagesToCk(messages) {
 }
 
 // src/hooks/magic-context/module-state-sync.ts
-async function mirrorModuleCompartments(args) {
+var compartmentMirrorCursors = new Map;
+function clearCompartmentMirrorCursor(sessionId) {
+  compartmentMirrorCursors.delete(sessionId);
+}
+function validateMirrorRow(compartment, afterSequence, maxSequence) {
+  if (!Number.isSafeInteger(compartment.sequence) || compartment.sequence <= afterSequence || compartment.sequence > maxSequence || !Number.isSafeInteger(compartment.start_message) || !Number.isSafeInteger(compartment.end_message) || typeof compartment.start_message_id !== "string" || typeof compartment.end_message_id !== "string" || typeof compartment.title !== "string" || typeof compartment.content !== "string") {
+    throw new Error("module compartment mirror returned an invalid authoritative row");
+  }
+}
+function validateMirrorPage(published, maxSequence) {
+  if (!Number.isSafeInteger(published.max_sequence) || published.max_sequence < -1 || maxSequence !== null && published.max_sequence !== maxSequence) {
+    throw new Error("module compartment mirror changed while its authoritative set was read");
+  }
+}
+function compartmentMirrorSetChanged(published, cursor) {
+  if (published.set_changed === true)
+    return true;
+  if (published.revert_epoch !== undefined && cursor.lastRevertEpoch !== undefined && published.revert_epoch !== cursor.lastRevertEpoch) {
+    return true;
+  }
+  if (published.compartment_count === 0 && cursor.lastMaxSequence >= 0 && published.compartments.length === 0) {
+    return true;
+  }
+  if (published.compartment_count !== undefined && published.compartments.length === 0 && published.max_sequence === cursor.lastMaxSequence && published.compartment_count !== (cursor.lastCompartmentCount ?? cursor.lastMaxSequence)) {
+    return true;
+  }
+  return false;
+}
+function rememberCompartmentMirrorCursor(sessionId, maxSequence, published, authoritativeCount) {
+  compartmentMirrorCursors.set(sessionId, {
+    lastMaxSequence: maxSequence,
+    lastCompartmentCount: published.compartment_count ?? authoritativeCount,
+    lastRevertEpoch: published.revert_epoch
+  });
+}
+async function resyncModuleCompartmentsFromAuthoritative(args) {
   const authoritative = [];
   let afterSequence = -1;
   let maxSequence = null;
+  let lastPublished;
   for (;; ) {
     const published = await args.reader.getCompartmentsAfter(args.sessionId, afterSequence);
-    if (!Number.isSafeInteger(published.max_sequence) || published.max_sequence < -1 || maxSequence !== null && published.max_sequence !== maxSequence) {
-      throw new Error("module compartment mirror changed while its authoritative set was read");
-    }
+    validateMirrorPage(published, maxSequence);
     maxSequence ??= published.max_sequence;
+    lastPublished = published;
     let pageAdvanced = false;
     for (const compartment of published.compartments) {
-      if (!Number.isSafeInteger(compartment.sequence) || compartment.sequence <= afterSequence || compartment.sequence > maxSequence || !Number.isSafeInteger(compartment.start_message) || !Number.isSafeInteger(compartment.end_message) || typeof compartment.start_message_id !== "string" || typeof compartment.end_message_id !== "string" || typeof compartment.title !== "string" || typeof compartment.content !== "string") {
-        throw new Error("module compartment mirror returned an invalid authoritative row");
-      }
+      validateMirrorRow(compartment, afterSequence, maxSequence);
       authoritative.push(compartment);
       afterSequence = compartment.sequence;
       pageAdvanced = true;
@@ -24446,17 +24787,36 @@ async function mirrorModuleCompartments(args) {
              legacy = excluded.legacy,
              created_at = excluded.created_at,
              harness = excluded.harness`);
-  const now = Date.now();
+  const now2 = Date.now();
   args.db.transaction(() => {
     if (divergentSequence !== undefined) {
       args.db.prepare("DELETE FROM compartments WHERE session_id = ? AND sequence >= ?").run(args.sessionId, divergentSequence);
     }
     for (const compartment of authoritative) {
-      upsert.run(args.sessionId, compartment.sequence, compartment.start_message, compartment.end_message, compartment.start_message_id, compartment.end_message_id, compartment.title, compartment.content, compartment.p1 ?? null, compartment.p2 ?? null, compartment.p3 ?? null, compartment.p4 ?? null, compartment.importance ?? 50, compartment.episode_type ?? null, compartment.legacy ?? (compartment.p1 ? 0 : 1), compartment.created_at ?? now, getHarness());
+      upsert.run(args.sessionId, compartment.sequence, compartment.start_message, compartment.end_message, compartment.start_message_id, compartment.end_message_id, compartment.title, compartment.content, compartment.p1 ?? null, compartment.p2 ?? null, compartment.p3 ?? null, compartment.p4 ?? null, compartment.importance ?? 50, compartment.episode_type ?? null, compartment.legacy ?? (compartment.p1 ? 0 : 1), compartment.created_at ?? now2, getHarness());
     }
   })();
+  rememberCompartmentMirrorCursor(args.sessionId, maxSequence, lastPublished ?? { max_sequence: maxSequence, compartments: [] }, authoritative.length);
   return maxSequence;
 }
+async function mirrorModuleCompartments(args) {
+  const cursor = compartmentMirrorCursors.get(args.sessionId);
+  if (cursor !== undefined) {
+    const published = await args.reader.getCompartmentsAfter(args.sessionId, cursor.lastMaxSequence);
+    validateMirrorPage(published, null);
+    for (const compartment of published.compartments) {
+      validateMirrorRow(compartment, cursor.lastMaxSequence, published.max_sequence);
+    }
+    const firstNew = published.compartments[0];
+    const hasGap = firstNew !== undefined && firstNew.sequence !== cursor.lastMaxSequence + 1;
+    const regressed = published.max_sequence < cursor.lastMaxSequence;
+    const setChanged = compartmentMirrorSetChanged(published, cursor);
+    if (!regressed && !hasGap && !setChanged && published.compartments.length === 0 && published.max_sequence === cursor.lastMaxSequence) {
+      return published.max_sequence;
+    }
+  }
+  return resyncModuleCompartmentsFromAuthoritative(args);
+}
 function stableHash(value) {
   return createHmac("sha256", "magic-context-shadow-watermark").update(value).digest("hex");
 }
@@ -25304,121 +25664,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);
@@ -25522,7 +25767,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":
@@ -25609,7 +25854,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
@@ -26998,6 +27243,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) {
@@ -27075,126 +27335,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
@@ -27784,10 +27927,8 @@ var REASONING_IGNORED_PART_TYPES = new Set([
   "compaction"
 ]);
 var REASONING_PART_TYPES = new Set(["reasoning", "thinking", "redacted_thinking"]);
-function stripReasoningFromMergedAssistants(messages, providerID, options) {
-  if (providerID !== "anthropic")
-    return 0;
-  let stripped = 0;
+function planMergedAssistantReasoningStrip(messages, mutationExemptMessage) {
+  const plan = [];
   let prevRole;
   let keptReasoningInRun = false;
   for (const message of messages) {
@@ -27800,7 +27941,7 @@ function stripReasoningFromMergedAssistants(messages, providerID, options) {
     const firstInRun = prevRole !== "assistant";
     if (firstInRun)
       keptReasoningInRun = false;
-    if (message === options?.mutationExemptMessage) {
+    if (message === mutationExemptMessage) {
       prevRole = role;
       continue;
     }
@@ -27817,27 +27958,157 @@ function stripReasoningFromMergedAssistants(messages, providerID, options) {
           continue;
         if (isSentinel(part))
           continue;
+        if (partType === "text" && typeof part.text === "string" && part.text.trim() === "") {
+          continue;
+        }
         if (REASONING_PART_TYPES.has(partType)) {
           keepIndex = i;
         }
         break;
       }
     }
+    const stripIndices = [];
     for (let i = 0;i < message.parts.length; i++) {
       const part = message.parts[i];
       if (!isRecord(part))
         continue;
       if (!REASONING_PART_TYPES.has(part.type))
         continue;
+      if (part.cache_control !== undefined)
+        continue;
       if (i === keepIndex) {
         keptReasoningInRun = true;
         continue;
       }
-      message.parts[i] = makeSentinel(part);
-      stripped++;
+      stripIndices.push(i);
     }
+    if (stripIndices.length > 0)
+      plan.push({ message, stripIndices });
     prevRole = role;
   }
+  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() === "";
+}
+function isCanonicalBlankPart(part) {
+  return isRecord(part) && Object.keys(part).length === 2 && part.type === "text" && part.text === "";
+}
+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) {
+      continue;
+    }
+    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;
+}
+function applyFrozenTrailingBlankDecisions(messages, newestAssistantId, frozenDecisions) {
+  let mutations = 0;
+  for (let messageIndex = 0;messageIndex < messages.length; messageIndex += 1) {
+    let message = messages[messageIndex];
+    const id = message.info.id;
+    if (message.info.role !== "assistant" || typeof id !== "string")
+      continue;
+    const decision = frozenDecisions.get(id);
+    if (!decision)
+      continue;
+    let lastMeaningfulIndex = message.parts.length - 1;
+    while (lastMeaningfulIndex >= 0 && isSentinelInvisibleTextPart(message.parts[lastMeaningfulIndex])) {
+      lastMeaningfulIndex -= 1;
+    }
+    const replaceParts = (start, deleteCount, insertBlankCount) => {
+      message = { ...message, parts: [...message.parts] };
+      messages[messageIndex] = message;
+      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, 1);
+      }
+      continue;
+    }
+    const trailingCount = message.parts.length - lastMeaningfulIndex - 1;
+    const keepCount = trailingBlankKeepCount(decision);
+    if (keepCount !== undefined) {
+      const blankIndex = lastMeaningfulIndex + 1;
+      const suffixIsCanonical = trailingCount === keepCount && message.parts.slice(blankIndex).every(isCanonicalBlankPart);
+      if (!suffixIsCanonical) {
+        mutations += Math.max(1, trailingCount, keepCount);
+        replaceParts(blankIndex, trailingCount, keepCount);
+      }
+      continue;
+    }
+    if (id === newestAssistantId || trailingCount === 0)
+      continue;
+    const lastMeaningfulPart = message.parts[lastMeaningfulIndex];
+    if (isRecord(lastMeaningfulPart) && REASONING_PART_TYPES.has(lastMeaningfulPart.type)) {
+      const blankIndex = lastMeaningfulIndex + 1;
+      if (trailingCount !== 1 || !isCanonicalBlankPart(message.parts[blankIndex])) {
+        mutations += Math.max(1, trailingCount);
+        replaceParts(blankIndex, trailingCount, 1);
+      }
+      continue;
+    }
+    mutations += trailingCount;
+    replaceParts(lastMeaningfulIndex + 1, trailingCount, 0);
+  }
+  return mutations;
+}
+function findMergedReasoningStripCandidateIds(messages, providerID, options) {
+  if (providerID !== "anthropic")
+    return [];
+  const ids = new Set;
+  for (const entry of planMergedAssistantReasoningStrip(messages, options?.mutationExemptMessage)) {
+    const id = entry.message.info.id;
+    if (typeof id === "string" && id.length > 0)
+      ids.add(id);
+  }
+  return [...ids];
+}
+function stripReasoningFromMergedAssistants(messages, providerID, options) {
+  if (providerID !== "anthropic")
+    return 0;
+  let stripped = 0;
+  for (const entry of planMergedAssistantReasoningStrip(messages, options?.mutationExemptMessage)) {
+    if (options?.frozenMessageIds) {
+      const id = entry.message.info.id;
+      if (typeof id !== "string" || !options.frozenMessageIds.has(id))
+        continue;
+    }
+    for (const index of entry.stripIndices) {
+      entry.message.parts[index] = makeSentinel(entry.message.parts[index]);
+      stripped++;
+    }
+  }
   return stripped;
 }
 function stripProcessedImages(messages, frozenIds, options) {
@@ -27885,7 +28156,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) {
@@ -28629,8 +28899,6 @@ function resetDegradedCacheCount(sessionId) {
   degradedCacheCountBySession.delete(sessionId);
 }
 function isSyntheticHeadMessage(message) {
-  if (message.info.syntheticHead !== true)
-    return false;
   if (message.info.id !== undefined)
     return false;
   if (message.info.role !== "user")
@@ -28747,11 +29015,17 @@ async function applyTodoSynthesis(args) {
   return 0;
 }
 function runRustModePostprocess(args) {
-  if (!args.fullFeatureMode)
+  if (!args.fullFeatureMode || args.compactionOff)
     return;
   if (args.messages.some((message) => !message || typeof message !== "object" || !isRecord(message.info))) {
     return;
   }
+  reconcileMarkerRepresentation(args.messages, getPersistedCompactionMarkerState(args.db, args.sessionId), {
+    db: args.db,
+    sessionId: args.sessionId,
+    tagger: args.tagger,
+    ctxReduceAvailability: args.ctxReduceAvailability
+  });
   for (const anchor of getNoteNudgeAnchors(args.db, args.sessionId)) {
     appendReminderToUserMessageById(args.messages, anchor.messageId, anchor.text);
   }
@@ -28898,9 +29172,23 @@ function finalizeMessageRepresentation(messages, resolvedProviderID, options) {
       clearedParts = stripClearedReasoning(targetedMessages);
     }
   }
-  const mergedReasoningParts = stripReasoningFromMergedAssistants(messages, resolvedProviderID, {
-    mutationExemptMessage: options?.reasoningMutationExemptMessage
+  let newestAssistant = options?.reasoningMutationExemptMessage;
+  if (!newestAssistant) {
+    for (let index = messages.length - 1;index >= 0; index -= 1) {
+      const message = messages[index];
+      if (message.info.role !== "assistant")
+        continue;
+      newestAssistant = message;
+      break;
+    }
+  }
+  const mergedReasoningParts = options?.skipMergedReasoningStrip ? 0 : stripReasoningFromMergedAssistants(messages, resolvedProviderID, {
+    mutationExemptMessage: options?.reasoningMutationExemptMessage,
+    frozenMessageIds: options?.mergedReasoningStrippedIds
   });
+  if (!options?.skipTrailingWhitespaceStrip && modelAcceptsEmptyContent(resolvedProviderID)) {
+    applyFrozenTrailingBlankDecisions(messages, typeof newestAssistant?.info.id === "string" ? newestAssistant.info.id : undefined, options?.trailingBlankDecisions ?? new Map);
+  }
   return { clearedParts, mergedReasoningParts };
 }
 async function runPostTransformPhase(args) {
@@ -28925,7 +29213,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,
@@ -28936,13 +29224,55 @@ 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;
+  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;
+      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 {
@@ -28958,7 +29288,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) {
@@ -28982,8 +29312,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;
@@ -28999,7 +29327,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);
@@ -29444,7 +29772,7 @@ async function runPostTransformPhase(args) {
   }
   const materializeReason = m0MaterializeReason ?? (explicitMaterializedSuccessfully ? "explicit_flush" : null);
   const materialized = m0RematerializedThisPass || explicitMaterializedSuccessfully || deferredMaterializedSuccessfully;
-  const bustedThisPass = args.didMutateFromFlushedStatuses || pendingOpsDidMutate || heuristicOrReasoningDidMutate || autoReclaimDidMutateThisPass || m0RematerializedThisPass || m0M1InjectedThisPass && historyWasConsumedThisPass || historyWasConsumedThisPass;
+  let bustedThisPass = args.didMutateFromFlushedStatuses || pendingOpsDidMutate || heuristicOrReasoningDidMutate || autoReclaimDidMutateThisPass || m0RematerializedThisPass || m0M1InjectedThisPass && historyWasConsumedThisPass || historyWasConsumedThisPass;
   if (reasoningMutationTargetUnknown) {
     const reasoningCandidates = args.reasoningByMessage.size > 0 ? args.reasoningByMessage.keys() : args.messages;
     for (const message of reasoningCandidates) {
@@ -29460,14 +29788,151 @@ async function runPostTransformPhase(args) {
         reasoningMutatedMessages.add(message);
     }
   }
+  const mergedReasoningStrippedIds = new Set;
+  if (canUseEmptySentinels && !compactionOff) {
+    try {
+      for (const id of getMergedReasoningStrippedIds(args.db, args.sessionId)) {
+        mergedReasoningStrippedIds.add(id);
+      }
+      if (isCacheBustingPass) {
+        const candidates = findMergedReasoningStripCandidateIds(args.messages, args.resolvedProviderID, { mutationExemptMessage: reasoningMutationExemptMessage });
+        const newlyDetectedIds = candidates.filter((id) => !mergedReasoningStrippedIds.has(id));
+        if (newlyDetectedIds.length > 0) {
+          const persisted = addMergedReasoningStrippedIds(args.db, args.sessionId, newlyDetectedIds);
+          if (persisted) {
+            for (const id of newlyDetectedIds)
+              mergedReasoningStrippedIds.add(id);
+            bustedThisPass = true;
+          } else {
+            args.passOutcome?.record("merged-reasoning-strip-persistence-failure");
+            sessionLog(args.sessionId, "merged reasoning strip: persistence failed; leaving newly detected assistants intact");
+          }
+        }
+      }
+    } catch (error) {
+      args.passOutcome?.record("merged-reasoning-strip-exception");
+      sessionLog(args.sessionId, "transform failed freezing merged reasoning strip:", error);
+    }
+  }
+  const trailingBlankDecisions = new Map;
+  if (canUseEmptySentinels && !compactionOff) {
+    try {
+      for (const [id, decision] of getTrailingBlankDecisions(args.db, args.sessionId)) {
+        trailingBlankDecisions.set(id, decision);
+      }
+    } catch (error) {
+      args.passOutcome?.record("trailing-blank-decision-load-exception");
+      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,
     reasoningMutatedMessages,
-    reasoningMutationExemptMessage
+    reasoningMutationExemptMessage,
+    mergedReasoningStrippedIds,
+    trailingBlankDecisions,
+    skipMergedReasoningStrip: compactionOff,
+    skipTrailingWhitespaceStrip: compactionOff
   });
+  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, {
+          overwriteMessageId: newestAssistantId
+        });
+        if (persisted) {
+          const committed = getTrailingBlankDecisions(args.db, args.sessionId);
+          const newlyFrozen = new Map;
+          for (const [id] of candidates) {
+            const decision = committed.get(id);
+            if (!decision)
+              continue;
+            trailingBlankDecisions.set(id, decision);
+            newlyFrozen.set(id, decision);
+          }
+          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");
+        }
+      } catch (error) {
+        args.passOutcome?.record("trailing-blank-decision-exception");
+        sessionLog(args.sessionId, "transform failed freezing trailing blank decision:", error);
+      }
+    }
+  }
   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,
@@ -29506,6 +29971,29 @@ var RUST_PARK_RETRY_INTERVAL = 5;
 var RUST_EMERGENCY_WALL_PCT = 95;
 var RUST_PARK_PROBE_PRESSURE_BYPASS_PCT = 90;
 var RUST_SEND_TIMEOUT_MS = 15000;
+function activeAgentFromMessages(messages) {
+  for (let index = messages.length - 1;index >= 0; index -= 1) {
+    const info = messages[index]?.info;
+    if (info?.role !== "user")
+      continue;
+    return typeof info.agent === "string" && info.agent.length > 0 ? info.agent : undefined;
+  }
+  return;
+}
+async function resolveCombinedTodowriteVerdict(deps, sessionId, messages, availability) {
+  if (!availability.frozen || !availability.callable || deps.compactionOff === true)
+    return false;
+  let permissionDenied = cachedToolPermissionDenied(sessionId, "todowrite") ?? getPersistedTodoPermissionDenied(deps.db, sessionId) ?? false;
+  if (deps.client) {
+    try {
+      permissionDenied = await todowritePermissionDenied(deps.client, sessionId, activeAgentFromMessages(messages));
+      setPersistedTodoPermissionDenied(deps.db, sessionId, permissionDenied);
+    } catch (error) {
+      sessionLog(sessionId, "todowrite permission read failed; retaining the last successful verdict:", error);
+    }
+  }
+  return !permissionDenied;
+}
 var RAW_FALLBACK_BYTES_PER_CONTEXT_TOKEN = 4;
 function rawFallbackSerializedBytes(messages) {
   try {
@@ -29666,10 +30154,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";
@@ -29700,7 +30188,9 @@ function emptyRustPassTimings() {
     transportPages: 0,
     transportBytes: 0,
     apply: 0,
-    lkgSnapshot: 0
+    lkgSnapshot: 0,
+    mirrorPull: 0,
+    compartmentMirror: 0
   };
 }
 function formatRustPassLog(args) {
@@ -29708,7 +30198,7 @@ function formatRustPassLog(args) {
   const measured = timings.prefixGuard + timings.ordinalResolve + timings.stateSync + timings.clone + timings.wireBuild + timings.transport + timings.apply + timings.lkgSnapshot;
   const unattributed = Math.max(0, args.elapsedMs - measured);
   const rowVersion = Number.isSafeInteger(args.rowVersion) ? args.rowVersion : 0;
-  return `rust pass: decision=${args.decision} reason=${args.reason} served_from=${args.servedFrom} in=${args.inputCount} out=${args.outputCount} applied=${args.applied} row_version=${rowVersion} elapsed=${args.elapsedMs.toFixed(1)} ms module=${args.moduleElapsedMs.toFixed(1)} ms stages=prefix_guard:${timings.prefixGuard.toFixed(1)} ordinal_resolve:${timings.ordinalResolve.toFixed(1)} state_sync:${timings.stateSync.toFixed(1)} clone:${timings.clone.toFixed(1)} wire_build:${timings.wireBuild.toFixed(1)} wire_messages:${timings.wireMessages} transport:${timings.transport.toFixed(1)} transport_pages:${timings.transportPages} transport_bytes:${timings.transportBytes} apply:${timings.apply.toFixed(1)} lkg_snapshot:${timings.lkgSnapshot.toFixed(1)} other:${unattributed.toFixed(1)}`;
+  return `rust pass: decision=${args.decision} reason=${args.reason} served_from=${args.servedFrom} in=${args.inputCount} out=${args.outputCount} applied=${args.applied} row_version=${rowVersion} elapsed=${args.elapsedMs.toFixed(1)} ms module=${args.moduleElapsedMs.toFixed(1)} ms stages=prefix_guard:${timings.prefixGuard.toFixed(1)} ordinal_resolve:${timings.ordinalResolve.toFixed(1)} state_sync:${timings.stateSync.toFixed(1)} clone:${timings.clone.toFixed(1)} wire_build:${timings.wireBuild.toFixed(1)} wire_messages:${timings.wireMessages} transport:${timings.transport.toFixed(1)} transport_pages:${timings.transportPages} transport_bytes:${timings.transportBytes} apply:${timings.apply.toFixed(1)} lkg_snapshot:${timings.lkgSnapshot.toFixed(1)} mirror_pull:${timings.mirrorPull.toFixed(1)} compartment_mirror:${timings.compartmentMirror.toFixed(1)} other:${unattributed.toFixed(1)}`;
 }
 function isSyntheticUserMessage(message) {
   if (!message || messageInfo2(message).role !== "user" || !Array.isArray(message.parts)) {
@@ -29738,7 +30228,13 @@ function assertNativeBoundary(output, sessionId, boundaryId) {
   const synthetic = parts.length > 0 && parts.every((part) => isRecord3(part) && part.synthetic === true);
   if (info.role === "user" && info.sessionID === sessionId && synthetic)
     return;
-  throw new Error(`rust transform wire invariant failed: boundary=${boundaryId} expected a synthetic m0 user message scoped to session ${sessionId}`);
+  const headSummary = output.slice(0, 3).map((message) => {
+    const mi = messageInfo2(message);
+    const mParts = isRecord3(message) && Array.isArray(message.parts) ? message.parts : [];
+    const partDesc = mParts.slice(0, 5).map((part) => isRecord3(part) ? `${String(part.type)}${part.synthetic === true ? "" : "!"}` : "?").join(",");
+    return `role=${String(mi.role)} sid=${mi.sessionID === sessionId ? "ok" : String(mi.sessionID ?? "absent")} id=${String(mi.id ?? "-").slice(0, 24)} parts=[${partDesc}]`;
+  });
+  throw new Error(`rust transform wire invariant failed: boundary=${boundaryId} expected a synthetic m0 user message scoped to session ${sessionId}; head: ${headSummary.join(" | ")}`);
 }
 function responseValue(response) {
   if (isRecord3(response) && isRecord3(response.result))
@@ -29747,6 +30243,20 @@ function responseValue(response) {
     return response;
   throw new Error("module transform returned a non-object response");
 }
+function isTransformPageAttemptMismatch(error) {
+  let current = error;
+  const seen = new Set;
+  while (isRecord3(current) && !seen.has(current)) {
+    seen.add(current);
+    const code = typeof current.code === "string" ? current.code : "";
+    const message = typeof current.message === "string" ? current.message : "";
+    if (code === "attempt_mismatch" || code === "authority_transform_page_attempt_mismatch" || /\b(?:authority_transform_page_)?attempt_mismatch\b/.test(message)) {
+      return true;
+    }
+    current = current.cause;
+  }
+  return false;
+}
 function mirrorRustRenderedMemoryIds(args) {
   if (!("rendered_memory_ids" in args.response))
     return;
@@ -29856,6 +30366,27 @@ function passUsage(usage, limit) {
     context_limit_tokens: limit
   };
 }
+function transformGeometryForWire(geometry) {
+  if (!geometry)
+    return;
+  const { window, reserve } = geometry.derivation;
+  let derivation;
+  if (geometry.geometry === "separate" && geometry.usableSoft < geometry.usableHard) {
+    derivation = `s1-pre-carve/input=${geometry.usableSoft}`;
+  } else if (geometry.geometry === "separate") {
+    derivation = `s1-separate/context=${window}`;
+  } else {
+    derivation = `s1-shared/context-output/context=${window}/output=${reserve}` + `/mode=${geometry.geometry}/usable-hard=${geometry.usableHard}`;
+  }
+  return {
+    usable_soft: geometry.usableSoft,
+    usable_hard: geometry.usableHard,
+    derivation
+  };
+}
+function hardWallUsagePercentage(usage, geometry) {
+  return geometry && geometry.usable_hard > 0 && usage.inputTokens > 0 ? usage.inputTokens / geometry.usable_hard * 100 : usage.percentage;
+}
 function shouldDisarmRustEmergencyRecovery(input) {
   if (input.finalWireEstimate?.trusted === true && input.providerProvenLimitTokens > 0 && input.finalWireEstimate.tokens < input.providerProvenLimitTokens * 0.8) {
     return "trusted-final-wire";
@@ -29885,7 +30416,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.*
@@ -30055,7 +30586,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);
@@ -30063,10 +30601,32 @@ 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) {
+    return;
+  }
+  return {
+    enabled: true,
+    supports_vision: true,
+    data_url: mural.dataUrl,
+    content_hash: mural.contentHash
+  };
 }
 function buildTransformBody(args) {
   return {
@@ -30096,6 +30656,7 @@ function buildTransformBody(args) {
       }
     } : {},
     usage: args.usage,
+    ...args.geometry ? { geometry: args.geometry } : {},
     provider_error: args.passInputs.provider_error,
     mid_turn: args.midTurn,
     prev_response_completed_at_ms: args.prevResponseCompletedAtMs,
@@ -30113,7 +30674,12 @@ function buildTransformBody(args) {
     prompt_surface_model_key: args.passInputs.prompt_surface_model_key,
     prompt_surface_config_identity: args.passInputs.prompt_surface_config_identity,
     prompt_surface_tool_descriptions: args.passInputs.prompt_surface_tool_descriptions ?? {},
+    prompt_surface_guidance_override: args.passInputs.prompt_surface_guidance_override,
+    mural: args.passInputs.mural,
     effective_execute_threshold: args.passInputs.effective_execute_threshold,
+    auto_search_enabled: args.passInputs.auto_search_enabled === true,
+    auto_search_score_threshold: args.passInputs.auto_search_score_threshold,
+    auto_search_min_prompt_chars: args.passInputs.auto_search_min_prompt_chars,
     history_budget_tokens: args.passInputs.history_budget_tokens,
     clear_reasoning_age: args.passInputs.clear_reasoning_age,
     caveman_enabled: args.passInputs.caveman_enabled === true,
@@ -30253,14 +30819,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);
@@ -30280,11 +30845,22 @@ function createRustModeTransform(deps, options) {
     if (states.get(plan.sessionId) !== state || plan.captureSequence !== state.lkgCaptureSequence || plan.rowVersion < state.lkgLastCapturedRowVersion) {
       return "superseded";
     }
-    const inputContentDigests = plan.inputSnapshots.map((snapshot) => lkgContentDigestFromFields(snapshot.fields));
+    const prior = getSlot(plan.sessionId);
+    const inputContentSignatures = plan.inputSnapshots.map((snapshot) => snapshot.signature);
+    const { digests: inputContentDigests } = incrementalLkgContentDigests(plan.inputIds.map((id, index) => ({
+      id,
+      signature: inputContentSignatures[index] ?? "",
+      fields: plan.inputSnapshots[index]?.fields ?? []
+    })), prior?.inputContentSignatures ? {
+      ids: prior.inputIdSeq,
+      signatures: prior.inputContentSignatures,
+      digests: prior.inputContentDigests
+    } : undefined);
     const captured = captureSlot(plan.sessionId, {
       jsonPrefix: plan.jsonPrefix,
       inputIdSeq: plan.inputIds,
       inputContentDigests,
+      inputContentSignatures,
       lastInputMessageId: plan.inputIds[plan.inputIds.length - 1],
       modelKey: plan.modelKey,
       providerKey: plan.providerKey,
@@ -30330,14 +30906,16 @@ function createRustModeTransform(deps, options) {
         preflightError = error;
       }
     }
-    const modelKey = model ? resolveModelKey(model.providerID, model.modelID) : null;
+    const modelKey = model ? piModelRefToCanonical(resolveModelKey(model.providerID, model.modelID) ?? "") : null;
     let resolvedContextLimit;
+    let resolvedWindowGeometry;
     if (model) {
       try {
         resolvedContextLimit = resolveTrustedContextLimit(model.providerID, model.modelID, {
           db: deps.db,
           sessionID: sessionId
         });
+        resolvedWindowGeometry = resolveContextWindowGeometry(model.providerID, model.modelID, { db: deps.db, sessionID: sessionId });
       } catch (error) {
         preflightError ??= error;
       }
@@ -30348,14 +30926,16 @@ function createRustModeTransform(deps, options) {
     } catch (error) {
       preflightError ??= error;
     }
-    emergencyFailClosed = passUsageSnapshot.percentage >= RUST_EMERGENCY_WALL_PCT && resolvedContextLimit !== undefined && resolvedContextLimit > 0;
+    const transformGeometry = transformGeometryForWire(resolvedWindowGeometry);
+    const hasTrustedEmergencyWall = transformGeometry ? transformGeometry.usable_hard > 0 : resolvedContextLimit !== undefined && resolvedContextLimit > 0;
+    emergencyFailClosed = hardWallUsagePercentage(passUsageSnapshot, transformGeometry) >= RUST_EMERGENCY_WALL_PCT && hasTrustedEmergencyWall;
     if (overflowState) {
-      const detectedLimitMatchesModel = overflowState.detectedContextLimitModelKey === null || overflowState.detectedContextLimitModelKey === modelKey;
+      const detectedLimitMatchesModel = overflowState.detectedContextLimitModelKey === null || piModelRefToCanonical(overflowState.detectedContextLimitModelKey) === piModelRefToCanonical(modelKey ?? "");
       const hasProviderProof = overflowState.detectedContextLimit > 0 && detectedLimitMatchesModel || isProviderOverflowReconfirmed(sessionId);
       emergencyFailClosed ||= overflowState.needsEmergencyRecovery && overflowState.emergencyRecoveryOrigin === "provider_overflow" && hasProviderProof;
     }
     const serveRawFallback = (cause) => {
-      const contextLimit = resolvedContextLimit ?? (overflowState && overflowState.detectedContextLimit > 0 ? overflowState.detectedContextLimit : undefined);
+      const contextLimit = transformGeometry?.usable_hard ?? resolvedContextLimit ?? (overflowState && overflowState.detectedContextLimit > 0 ? overflowState.detectedContextLimit : undefined);
       if (contextLimit !== undefined) {
         let estimate;
         try {
@@ -30416,7 +30996,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(" ");
@@ -30448,7 +31028,7 @@ function createRustModeTransform(deps, options) {
     resolveTodowriteAvailabilityFromMessages(sessionId, messages);
     const todoAvailability = resolveTodowriteAvailability(sessionId);
     const toolPresent = reduceAvailability.frozen && reduceAvailability.callable;
-    const todoToolPresent = todoAvailability.frozen ? todoAvailability.callable : undefined;
+    const todoToolPresent = await resolveCombinedTodowriteVerdict(deps, sessionId, messages, todoAvailability);
     try {
       if (preflightError)
         throw preflightError;
@@ -30465,13 +31045,20 @@ function createRustModeTransform(deps, options) {
       const midTurn = isMidTurn(deps, sessionId);
       const requestObservedAtMs = Date.now();
       const recoveryNoHeadEscape = overflowState.needsEmergencyRecovery && loadProtectedTailMeta(deps.db, sessionId).recoveryNoEligibleHeadCount >= RECOVERY_NO_HEAD_LIMIT;
-      const promptSurface = resolvePromptSurface(deps.promptSurface, modelKey ?? undefined);
+      const promptSurfaceGuidance = deps.promptSurfaceRuntime?.resolveGuidance(deps.promptSurface, modelKey ?? undefined);
+      const promptSurface = promptSurfaceGuidance ?? resolvePromptSurface(deps.promptSurface, modelKey ?? undefined);
+      const resolvedMural = !sessionMeta.isSubagent && deps.muralEnabled === true ? resolveMuralWire(deps.db, deps.projectPath, modelKey ?? undefined, true, deps.memoryConfig?.injectionBudgetTokens) : undefined;
+      const mural = muralInputForWire(resolvedMural);
       const passInputs = {
         now_ms: requestObservedAtMs,
         model_key: modelKey,
         provider_id: model?.providerID ?? null,
         usage: passUsage(usage, contextLimit),
+        geometry: transformGeometry,
         effective_execute_threshold: threshold,
+        auto_search_enabled: deps.autoSearch?.enabled ?? true,
+        auto_search_score_threshold: deps.autoSearch?.scoreThreshold ?? 0.6,
+        auto_search_min_prompt_chars: deps.autoSearch?.minPromptChars ?? 20,
         history_budget_tokens: historyBudgetTokens,
         clear_reasoning_age: deps.clearReasoningAge,
         caveman_enabled: !sessionMeta.isSubagent && deps.cavemanTextCompression?.enabled === true,
@@ -30487,6 +31074,8 @@ function createRustModeTransform(deps, options) {
         prompt_surface_model_key: modelKey,
         prompt_surface_config_identity: promptSurfaceConfigIdentity(deps.promptSurface),
         prompt_surface_tool_descriptions: deps.promptSurface?.tool_descriptions ?? {},
+        prompt_surface_guidance_override: promptSurfaceGuidance?.primaryOverride,
+        mural,
         protected_tags: deps.protectedTags ?? DEFAULT_PROTECTED_TAGS,
         temporal_awareness: deps.experimentalTemporalAwareness === true,
         channel2_nudge_state: getChannel2NudgeState(deps.db, sessionId),
@@ -30702,6 +31291,7 @@ function createRustModeTransform(deps, options) {
           final_wire_input_tokens: finalWireEstimate?.tokens ?? 0,
           final_wire_trusted: finalWireEstimate?.trusted === true
         },
+        geometry: transformGeometry,
         modelKey: modelKey ?? null,
         providerId: model?.providerID ?? null,
         systemPromptHash: sessionMeta.systemPromptHash ?? "",
@@ -30712,27 +31302,84 @@ function createRustModeTransform(deps, options) {
         channel2NudgeState: String(passInputs.channel2_nudge_state ?? ""),
         emergencyRecoveryArmed: passInputs.emergency_recovery_armed === true
       });
-      const pages = buildPagedModuleTransformPayloads(body);
       logStage(sessionId, "wireBuild", wireBuildStartedAt, timings, wireDelta ? `mode=tail_delta input=${encodedInput.length}` : "mode=full");
-      let response;
+      const sendTransformSeries = async (payload, detail = "") => {
+        const pages = buildPagedModuleTransformPayloads(payload);
+        const paged = pages.some((entry) => typeof entry.page.transform_page_id === "string");
+        let response2;
+        for (const [index, { page, bytes }] of pages.entries()) {
+          const transportStartedAt = performance.now();
+          let moduleResponse;
+          try {
+            moduleResponse = await callModule({
+              sessionId,
+              projectRoot,
+              method: "transform",
+              body: page,
+              generationSensitive: paged && index > 0
+            });
+          } catch (error) {
+            if (paged && isTransformPageAttemptMismatch(error)) {
+              return {
+                restart: {
+                  reason: "attempt_mismatch",
+                  pages: pages.length,
+                  atPage: index
+                }
+              };
+            }
+            throw error;
+          }
+          if (paged && isModuleTransportGenerationChangedResult(moduleResponse)) {
+            return {
+              restart: { reason: "reconnect", pages: pages.length, atPage: index }
+            };
+          }
+          if (paged && isTransformPageAttemptMismatch(moduleResponse)) {
+            return {
+              restart: {
+                reason: "attempt_mismatch",
+                pages: pages.length,
+                atPage: index
+              }
+            };
+          }
+          response2 = responseValue(moduleResponse);
+          timings.transportBytes += bytes;
+          timings.transportPages += 1;
+          logStage(sessionId, "transport", transportStartedAt, timings, `page=${index + 1}/${pages.length}${detail}`);
+        }
+        if (!response2)
+          throw new Error("rust module returned no transform response");
+        return { response: response2 };
+      };
+      let transformSeriesRestarted = false;
+      const sendTransformSeriesWithSingleRestart = async (payload, detail = "") => {
+        let result = await sendTransformSeries(payload, detail);
+        if (!("restart" in result))
+          return result.response;
+        if (transformSeriesRestarted) {
+          throw new Error(`rust transform page series restart exhausted: reason=${result.restart.reason}`);
+        }
+        transformSeriesRestarted = true;
+        sessionLog(sessionId, `transform_series_restart reason=${result.restart.reason} pages=${result.restart.pages} at_page=${result.restart.atPage}`);
+        result = await sendTransformSeries(payload, `${detail} restart=series`);
+        if ("restart" in result) {
+          throw new Error(`rust transform page series restart exhausted: reason=${result.restart.reason}`);
+        }
+        return result.response;
+      };
+      let response = await sendTransformSeriesWithSingleRestart(body);
       let servedFinalWireEstimate;
-      for (const [index, page] of pages.entries()) {
-        timings.transportBytes += Buffer.byteLength(JSON.stringify(page));
-        const transportStartedAt = performance.now();
-        response = responseValue(await callModule({
-          sessionId,
-          projectRoot,
-          method: "transform",
-          body: page
-        }));
-        timings.transportPages += 1;
-        logStage(sessionId, "transport", transportStartedAt, timings, `page=${index + 1}/${pages.length}`);
-      }
-      if (!response)
-        throw new Error("rust module returned no transform response");
       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();
@@ -30798,6 +31445,7 @@ function createRustModeTransform(deps, options) {
               final_wire_input_tokens: finalWireEstimate?.tokens ?? 0,
               final_wire_trusted: finalWireEstimate?.trusted === true
             },
+            geometry: transformGeometry,
             modelKey: modelKey ?? null,
             providerId: model?.providerID ?? null,
             systemPromptHash: sessionMeta.systemPromptHash ?? "",
@@ -30810,28 +31458,16 @@ function createRustModeTransform(deps, options) {
           });
           logStage(sessionId, "wireBuild", retryWireBuildStartedAt2, timings, "retry=full");
         }
-        response = undefined;
         const retryWireBuildStartedAt = performance.now();
-        const retryPages = buildPagedModuleTransformPayloads(body);
+        response = await sendTransformSeriesWithSingleRestart(body, " retry=full");
         logStage(sessionId, "wireBuild", retryWireBuildStartedAt, timings, "retry=full");
-        for (const [index, page] of retryPages.entries()) {
-          timings.transportBytes += Buffer.byteLength(JSON.stringify(page));
-          const transportStartedAt = performance.now();
-          response = responseValue(await callModule({
-            sessionId,
-            projectRoot,
-            method: "transform",
-            body: page
-          }));
-          timings.transportPages += 1;
-          logStage(sessionId, "transport", transportStartedAt, timings, `page=${index + 1}/${retryPages.length} retry=full`);
-        }
-        if (!response)
-          throw new Error("rust module returned no retry transform response");
         captureResponseTelemetry(response);
         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) => {
@@ -30855,13 +31491,20 @@ 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,
           messages: appliedMessages,
           projectPath: memoryProjectPath,
-          fullFeatureMode: !sessionMeta.isSubagent
+          fullFeatureMode: !sessionMeta.isSubagent,
+          compactionOff: deps.compactionOff,
+          tagger: deps.tagger,
+          ctxReduceAvailability: reduceAvailability
         });
         const boundaryId = response.boundary_id;
         if (typeof boundaryId === "string" && boundaryId.length > 0) {
@@ -30889,7 +31532,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) {
@@ -30983,30 +31626,6 @@ function createRustModeTransform(deps, options) {
           sessionLog(sessionId, "rust channel2 pending-intent CAS failed (ignored):", error);
         }
       }
-      if (options.moduleClient.mirrorPull) {
-        try {
-          await pullMemoryMirrorOnce({
-            db: deps.db,
-            module: options.moduleClient
-          });
-        } catch (error) {
-          sessionLog(sessionId, "rust memory mirror-back failed (ignored):", error);
-        }
-      }
-      const getCompartmentsAfter = options.moduleClient.getCompartmentsAfter;
-      if (getCompartmentsAfter) {
-        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);
-        }
-      }
       const currentOverflowState = getOverflowState(deps.db, sessionId, modelKey);
       const disarmEvidence = currentOverflowState.needsEmergencyRecovery ? shouldDisarmRustEmergencyRecovery({
         materialized: materializeReason !== "none",
@@ -31025,6 +31644,40 @@ function createRustModeTransform(deps, options) {
       }
       wireCaches.set(sessionId, pendingWireCache);
       appliedAt = performance.now();
+      const getCompartmentsAfter = options.moduleClient.getCompartmentsAfter;
+      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);
+            }
+          }
+          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) {
       if (error instanceof Error && error.message.startsWith("rust transform wire invariant failed")) {
@@ -31061,6 +31714,7 @@ function createRustModeTransform(deps, options) {
       dropSlot(sessionId, "session-deleted");
       states.delete(sessionId);
       wireCaches.delete(sessionId);
+      clearCompartmentMirrorCursor(sessionId);
       if (projectRoot && options.moduleClient.deleteSession) {
         options.moduleClient.deleteSession(sessionId, projectRoot).catch((error) => {
           sessionLog(sessionId, "rust module session deletion failed:", error);
@@ -31306,7 +31960,7 @@ function clearMessageTokensCache(sessionId, messageId2) {
     cache.delete(messageId2);
 }
 var recordedSessionProjectIdentity = new BoundedSessionMap(MESSAGE_TOKENS_CACHE_MAX);
-function activeAgentFromMessages(messages) {
+function activeAgentFromMessages2(messages) {
   for (let index = messages.length - 1;index >= 0; index -= 1) {
     const info = messages[index]?.info;
     if (info?.role !== "user")
@@ -31321,7 +31975,7 @@ function deriveTaggerLoadFloor(messages, sessionId, db) {
       yield message.info?.id;
   }());
 }
-function computeHardCacheExpired(cacheTtl, lastResponseTime, now, onInvalid) {
+function computeHardCacheExpired(cacheTtl, lastResponseTime, now2, onInvalid) {
   let ttlMs;
   try {
     ttlMs = parseCacheTtl(cacheTtl);
@@ -31329,7 +31983,7 @@ function computeHardCacheExpired(cacheTtl, lastResponseTime, now, onInvalid) {
     onInvalid?.(error);
     ttlMs = 5 * 60 * 1000;
   }
-  return lastResponseTime > 0 && now - lastResponseTime > ttlMs;
+  return lastResponseTime > 0 && now2 - lastResponseTime > ttlMs;
 }
 function findLastAssistantModel(messages) {
   for (let i = messages.length - 1;i >= 0; i--) {
@@ -31421,6 +32075,8 @@ async function recoverTsAuthorityProject(args) {
 function scheduleTsAuthorityRecovery(args) {
   if (!getAuthorityManagedMarker(args.db, args.projectPath))
     return;
+  if ((args.isLinkedWorktree ?? isLinkedGitWorktree)(args.projectRoot))
+    return;
   if (tsAuthorityRecoveryStateByProject.has(args.projectPath))
     return;
   const module = args.module;
@@ -31483,7 +32139,7 @@ function createTransform(deps) {
     }
     const tUserMsg = performance.now();
     const currentTurnId = findLastUserMessageId(messages);
-    const activeAgent = activeAgentFromMessages(messages);
+    const activeAgent = activeAgentFromMessages2(messages);
     logTransformTiming(sessionId, "findLastUserMessageId", tUserMsg);
     const tMeta = performance.now();
     let sessionMeta;
@@ -31541,8 +32197,6 @@ function createTransform(deps) {
       sessionLog(sessionId, "compaction mode transition failed (retrying next pass):", error);
     }
     if (deps.transformMode === "rust") {
-      if (compactionOff)
-        return;
       if (!rustModeTransform) {
         sessionLog(sessionId, "rust transform unavailable; using raw passthrough");
         return;
@@ -31589,7 +32243,7 @@ function createTransform(deps) {
         deps.liveModelBySession.set(sessionId, currentOutgoingModel);
         const outgoingModelKey = resolveModelKey(currentOutgoingModel.providerID, currentOutgoingModel.modelID);
         const lastUsageModelKey = persistedUsageBeforeResets?.lastObservedModelKey ?? null;
-        if (lastUsageModelKey != null && outgoingModelKey != null && lastUsageModelKey !== outgoingModelKey) {
+        if (lastUsageModelKey != null && outgoingModelKey != null && piModelRefToCanonical(lastUsageModelKey) !== piModelRefToCanonical(outgoingModelKey)) {
           dropSlot(sessionId, "model-change");
           sessionLog(sessionId, `transform: model change since last usage (${lastUsageModelKey} -> ${outgoingModelKey}), clearing stale per-model state`);
           updateSessionMeta(db, sessionId, {
@@ -31647,7 +32301,7 @@ function createTransform(deps) {
         const lastMeasuredInput = armSnapshot?.usage.inputTokens ?? sessionMeta?.lastInputTokens ?? 0;
         const lastMeasuredModelKey = armSnapshot?.lastObservedModelKey ?? null;
         const armCatalogLimit = armModel ? getSdkContextLimit(armModel.providerID, armModel.modelID) : undefined;
-        if (!sessionMeta?.isSubagent && armModel && typeof armCatalogLimit === "number" && armCatalogLimit > 0 && lastMeasuredInput > armCatalogLimit && lastMeasuredModelKey != null && armModelKey != null && lastMeasuredModelKey !== armModelKey && !getOverflowState(db, sessionId).needsEmergencyRecovery) {
+        if (!sessionMeta?.isSubagent && armModel && typeof armCatalogLimit === "number" && armCatalogLimit > 0 && lastMeasuredInput > armCatalogLimit && lastMeasuredModelKey != null && armModelKey != null && piModelRefToCanonical(lastMeasuredModelKey) !== piModelRefToCanonical(armModelKey) && !getOverflowState(db, sessionId).needsEmergencyRecovery) {
           sessionLog(sessionId, `transform: last input ${lastMeasuredInput} (model ${lastMeasuredModelKey}) exceeds new model ${armModelKey} catalog limit ${armCatalogLimit}; arming overflow recovery proactively for the shrinking switch`);
           dropSlot(sessionId, "overflow-recovery-arm");
           recordOverflowDetected(db, sessionId, undefined, armModelKey, "proactive_model_shrink");
@@ -31691,6 +32345,11 @@ function createTransform(deps) {
       db,
       sessionID: sessionId
     }) : undefined;
+    const windowGeometry = modelForBudget ? resolveContextWindowGeometry(modelForBudget.providerID, modelForBudget.modelID, {
+      db,
+      sessionID: sessionId
+    }) : undefined;
+    const emergencyUsagePercentageEarly = usagePercentageSynthetic ? Math.max(95, contextUsageEarly.percentage) : windowGeometry?.usableHard && contextUsageEarly.inputTokens > 0 ? contextUsageEarly.inputTokens / windowGeometry.usableHard * 100 : contextUsageEarly.percentage;
     const currentModelKeyForBoundary = deps.getModelKey?.(sessionId);
     const thresholdContextLimit = resolvedContextLimit && resolvedContextLimit > 0 ? resolvedContextLimit : contextUsageEarly.percentage > 0 ? contextUsageEarly.inputTokens / (contextUsageEarly.percentage / 100) : undefined;
     const effectiveExecuteThresholdPercentage = resolveExecuteThreshold(deps.executeThresholdPercentage ?? 65, currentModelKeyForBoundary, 65, {
@@ -31699,7 +32358,7 @@ function createTransform(deps) {
       sessionId
     });
     const { forceMaterializationPercentage } = escalationBands(effectiveExecuteThresholdPercentage);
-    const persistedUsageFreshForBoundary = persistedUsageBeforeResets && Date.now() - persistedUsageBeforeResets.updatedAt <= 10 * 60 * 1000 && (persistedUsageBeforeResets.lastObservedModelKey === null || currentModelKeyForBoundary === undefined || persistedUsageBeforeResets.lastObservedModelKey === currentModelKeyForBoundary) && (resolvedContextLimit === undefined || persistedUsageBeforeResets.lastUsageContextLimit === 0 || persistedUsageBeforeResets.lastUsageContextLimit === resolvedContextLimit) ? persistedUsageBeforeResets.usage : null;
+    const persistedUsageFreshForBoundary = persistedUsageBeforeResets && Date.now() - persistedUsageBeforeResets.updatedAt <= 10 * 60 * 1000 && (persistedUsageBeforeResets.lastObservedModelKey === null || currentModelKeyForBoundary === undefined || piModelRefToCanonical(persistedUsageBeforeResets.lastObservedModelKey) === piModelRefToCanonical(currentModelKeyForBoundary)) && (resolvedContextLimit === undefined || persistedUsageBeforeResets.lastUsageContextLimit === 0 || persistedUsageBeforeResets.lastUsageContextLimit === resolvedContextLimit) ? persistedUsageBeforeResets.usage : null;
     const boundaryUsageForProtectedTail = persistedUsageFreshForBoundary ?? contextUsageEarly;
     const boundaryUsageSource = persistedUsageFreshForBoundary ? "persisted" : "live";
     const historyBudgetTokens = resolveHistoryBudgetTokens(deps.historyBudgetPercentage, contextUsageEarly, deps.executeThresholdPercentage, deps.getModelKey?.(sessionId), deps.executeThresholdTokens, resolvedContextLimit);
@@ -31776,7 +32435,7 @@ function createTransform(deps) {
     };
     let skipCompartmentAwaitForThisPass = false;
     const startRecoveryRun = () => {
-      const scale = contextUsageEarly.percentage >= 95 ? 0.25 : 0.5;
+      const scale = emergencyUsagePercentageEarly >= 95 ? 0.25 : 0.5;
       let boundarySnapshot = getRunnableBoundaryForCompartment();
       if (!boundarySnapshot || !hasRunnableCompartmentWindow(boundarySnapshot)) {
         boundarySnapshot = getRunnableBoundaryForCompartment(scale);
@@ -31817,12 +32476,12 @@ function createTransform(deps) {
       skipCompartmentAwaitForThisPass = true;
       return true;
     };
-    if (fullFeatureMode && !compactionOff && historianFailureState.failureCount > 0 && contextUsageEarly.percentage >= 95 && !recoveryNoHeadEscapeActive) {
+    if (fullFeatureMode && !compactionOff && historianFailureState.failureCount > 0 && emergencyUsagePercentageEarly >= 95 && !recoveryNoHeadEscapeActive) {
       skipCompartmentAwaitForThisPass = true;
       const emergencyPercentage = contextUsageEarly.percentage.toFixed(1);
       const recoveryStarted = startRecoveryRun();
       if (!recoveryStarted && !getEligibleHistoryForCompartment()) {
-        const noHeadSnapshot = getRunnableBoundaryForCompartment(contextUsageEarly.percentage >= 95 ? 0.25 : 0.5) ?? getRunnableBoundaryForCompartment();
+        const noHeadSnapshot = getRunnableBoundaryForCompartment(emergencyUsagePercentageEarly >= 95 ? 0.25 : 0.5) ?? getRunnableBoundaryForCompartment();
         if (noHeadSnapshot) {
           recordHighPressureNoEligibleHead(db, noHeadSnapshot);
         }
@@ -32076,6 +32735,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       messageTagNumbers,
       tagger: deps.tagger,
       ctxReduceAvailability,
+      channel1StateBySession: deps.channel1StateBySession,
       todowriteAvailability,
       client: deps.client,
       activeAgent,
@@ -32131,7 +32791,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const finalWireTail = describeFinalWireTail(messages);
     let finalWireEstimate;
     if (!compactionOff) {
-      finalWireEstimate = contextUsage.percentage >= 95 ? estimateFinalWireInputTokens({
+      const emergencyUsagePercentage = usagePercentageSynthetic ? Math.max(95, contextUsage.percentage) : windowGeometry?.usableHard && contextUsage.inputTokens > 0 ? contextUsage.inputTokens / windowGeometry.usableHard * 100 : contextUsage.percentage;
+      finalWireEstimate = emergencyUsagePercentage >= 95 ? estimateFinalWireInputTokens({
         messages,
         systemPromptTokens: sessionMeta.systemPromptTokens,
         providerID: modelForBudget?.providerID,
@@ -32143,9 +32804,9 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       }
       const currentModelKeyForRecovery = deps.getModelKey?.(sessionId);
       const overflowStateForFinalWire = getOverflowState(db, sessionId, currentModelKeyForRecovery);
-      const providerProvenLimitTokens = typeof currentModelKeyForRecovery === "string" && currentModelKeyForRecovery.length > 0 && overflowStateForFinalWire.detectedContextLimit > 0 && overflowStateForFinalWire.detectedContextLimitModelKey === currentModelKeyForRecovery ? overflowStateForFinalWire.detectedContextLimit : undefined;
+      const providerProvenLimitTokens = typeof currentModelKeyForRecovery === "string" && currentModelKeyForRecovery.length > 0 && overflowStateForFinalWire.detectedContextLimit > 0 && piModelRefToCanonical(overflowStateForFinalWire.detectedContextLimitModelKey ?? "") === piModelRefToCanonical(currentModelKeyForRecovery) ? overflowStateForFinalWire.detectedContextLimit : undefined;
       const emergencyFailClosed = evaluateEmergencyFailClosed({
-        usagePercentage: contextUsage.percentage,
+        usagePercentage: emergencyUsagePercentage,
         emergencyRecoveryArmed,
         emergencyRecoveryOrigin,
         foldMaterializedThisPass: postTransformResult.historianFoldMaterializedThisPass,
@@ -32267,59 +32928,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})`);
@@ -32361,9 +32985,9 @@ function formatTokens(value) {
   return value.toLocaleString();
 }
 function evictExpiredUsageEntries(contextUsageMap) {
-  const now = Date.now();
+  const now2 = Date.now();
   for (const [sessionId, entry] of contextUsageMap) {
-    if (now - entry.updatedAt > CONTEXT_USAGE_TTL_MS) {
+    if (now2 - entry.updatedAt > CONTEXT_USAGE_TTL_MS) {
       contextUsageMap.delete(sessionId);
     }
   }
@@ -32377,8 +33001,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") {
@@ -32453,6 +33076,14 @@ function createEventHandler2(deps) {
         if (!detection.isOverflow) {
           return;
         }
+        captureWindowReport({
+          db: deps.db,
+          sessionID: errInfo.sessionID,
+          matchedPattern: detection.matchedPattern,
+          reportedLimit: detection.reportedLimit,
+          reportedLimitProvenance: detection.reportedLimitProvenance,
+          error: errInfo.error
+        });
         const sessionMeta = getOrCreateSessionMeta(deps.db, errInfo.sessionID);
         if (sessionMeta.isSubagent) {
           if (typeof detection.reportedLimit === "number" && detection.reportedLimit > 0) {
@@ -32509,6 +33140,17 @@ function createEventHandler2(deps) {
         if (detection.isOverflow) {
           messageHadOverflowError = true;
           try {
+            captureWindowReport({
+              db: deps.db,
+              sessionID: info.sessionID,
+              providerID: info.providerID,
+              modelID: info.modelID,
+              matchedPattern: detection.matchedPattern,
+              reportedLimit: detection.reportedLimit,
+              reportedLimitProvenance: detection.reportedLimitProvenance,
+              attemptedTokens: (info.tokens?.input ?? 0) + (info.tokens?.cache?.read ?? 0) + (info.tokens?.cache?.write ?? 0),
+              error: info.error
+            });
             const overflowModelKey = resolveModelKey(info.providerID, info.modelID);
             const metaForOverflow = getOrCreateSessionMeta(deps.db, info.sessionID);
             if (metaForOverflow.isSubagent) {
@@ -32532,7 +33174,7 @@ function createEventHandler2(deps) {
           }
         }
       }
-      const now = Date.now();
+      const now2 = Date.now();
       const usageTokens = [
         info.tokens?.input,
         info.tokens?.cache?.read,
@@ -32557,7 +33199,7 @@ function createEventHandler2(deps) {
       try {
         const modelKey = resolveModelKey(info.providerID, info.modelID);
         const updates = {
-          lastResponseTime: now
+          lastResponseTime: now2
         };
         if (typeof deps.config.cache_ttl === "string") {
           updates.cacheTtl = resolveCacheTtl(deps.config.cache_ttl, modelKey);
@@ -32603,8 +33245,8 @@ function createEventHandler2(deps) {
               percentage,
               inputTokens: totalInputTokens
             },
-            updatedAt: now,
-            lastResponseTime: now,
+            updatedAt: now2,
+            lastResponseTime: now2,
             hasUsageTokens: true
           });
           updates.lastContextPercentage = percentage;
@@ -32907,6 +33549,7 @@ async function runOneWrapupIteration(args) {
     historianTwoPass: ctx.historianTwoPass,
     memoryEnabled: ctx.memoryEnabled,
     autoPromote: ctx.autoPromote,
+    experimentalUserMemories: ctx.userMemoriesEnabled,
     ensureProjectRegistered: ctx.ensureProjectRegistered,
     getNotificationParams: () => ctx.getNotificationParams(sessionId),
     preserveInjectionCacheUntilConsumed: true,
@@ -33129,16 +33772,16 @@ var MAX_CACHED_SESSIONS = 100;
 var STALE_SNAPSHOT_AGE_MS = 5 * 60 * 1000;
 var cache = new BoundedSessionMap(MAX_CACHED_SESSIONS);
 function applyStickySnapshotCache(sessionId, fresh) {
-  const now = Date.now();
+  const now2 = Date.now();
   if (fresh.inputTokens > 0) {
-    cache.set(sessionId, { snapshot: fresh, cachedAt: now });
+    cache.set(sessionId, { snapshot: fresh, cachedAt: now2 });
     return fresh;
   }
   const cached = cache.peek(sessionId);
   if (!cached) {
     return fresh;
   }
-  if (now - cached.cachedAt > STALE_SNAPSHOT_AGE_MS) {
+  if (now2 - cached.cachedAt > STALE_SNAPSHOT_AGE_MS) {
     cache.delete(sessionId);
     return fresh;
   }
@@ -33300,26 +33943,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);
@@ -33337,8 +33973,11 @@ function createToolExecuteAfterHook(args) {
     await flushIgnoredMessages(typedInput.sessionID);
     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) {
@@ -33404,7 +34043,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
@@ -33563,6 +34202,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);
@@ -33618,13 +34260,13 @@ function createSystemPromptHashHandler(deps) {
     const skipGuidanceForDisabledSubagent = isSubagentSession2 && !ctxReduceCallable;
     const inputModel = input.model;
     const liveModel = inputModel?.providerID && inputModel.modelID ? { providerID: inputModel.providerID, modelID: inputModel.modelID } : deps.resolveModel?.(sessionId);
-    const modelKey = liveModel?.providerID && liveModel.modelID ? `${liveModel.providerID}/${liveModel.modelID}` : undefined;
+    const modelKey = liveModel?.providerID && liveModel.modelID ? piModelRefToCanonical(`${liveModel.providerID}/${liveModel.modelID}`) : undefined;
     const promptSurface = guidanceEpochs.resolve(sessionId, deps.promptSurface, modelKey);
     const fullPrompt = output.system.join(`
 `);
     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);
@@ -33647,7 +34289,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) {
@@ -33667,7 +34309,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;
     }
@@ -33793,8 +34435,8 @@ async function maybeSendUpgradeReminder(deps, sessionId) {
     remindedThisProcess.add(sessionId);
     return;
   }
-  const now = Date.now();
-  if (meta.upgradeReminderCount >= MAX_UPGRADE_REMINDERS_PER_SESSION || meta.upgradeReminderLastSentAt !== null && now - meta.upgradeReminderLastSentAt < UPGRADE_REMINDER_COOLDOWN_MS) {
+  const now2 = Date.now();
+  if (meta.upgradeReminderCount >= MAX_UPGRADE_REMINDERS_PER_SESSION || meta.upgradeReminderLastSentAt !== null && now2 - meta.upgradeReminderLastSentAt < UPGRADE_REMINDER_COOLDOWN_MS) {
     remindedThisProcess.add(sessionId);
     return;
   }
@@ -33803,7 +34445,7 @@ async function maybeSendUpgradeReminder(deps, sessionId) {
   const recordDelivery = () => {
     try {
       updateSessionMeta(deps.db, sessionId, {
-        upgradeReminderLastSentAt: now,
+        upgradeReminderLastSentAt: now2,
         upgradeReminderCount: meta.upgradeReminderCount + 1
       });
     } catch {}
@@ -33886,7 +34528,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",
@@ -33962,7 +34604,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);
@@ -33993,6 +34635,7 @@ function createMagicContextHook(deps) {
     db,
     liveSessionState: {
       liveModelBySession,
+      channel1StateBySession,
       variantBySession,
       agentBySession,
       historyRefreshSessions,
@@ -34217,7 +34860,15 @@ function createMagicContextHook(deps) {
         const record = value && typeof value === "object" ? value : {};
         const compartments = "compartments" in record && Array.isArray(record.compartments) ? record.compartments : [];
         const maxSequence = "max_sequence" in record && typeof record.max_sequence === "number" ? record.max_sequence : afterSequence;
-        return { max_sequence: maxSequence, compartments };
+        const compartmentCount = "compartment_count" in record && typeof record.compartment_count === "number" ? record.compartment_count : undefined;
+        const revertEpoch = "revert_epoch" in record && typeof record.revert_epoch === "number" ? record.revert_epoch : undefined;
+        return {
+          max_sequence: maxSequence,
+          compartments,
+          ...compartmentCount !== undefined ? { compartment_count: compartmentCount } : {},
+          ...revertEpoch !== undefined ? { revert_epoch: revertEpoch } : {},
+          ..."set_changed" in record && record.set_changed === true ? { set_changed: true } : {}
+        };
       }
     };
     return client;
@@ -34454,13 +35105,13 @@ function createMagicContextHook(deps) {
     historianTwoPass: deps.config.historian?.two_pass === true,
     liveModelBySession,
     sessionDirectoryBySession,
-    autoSearch: deps.config.memory?.auto_search?.enabled ? {
-      enabled: true,
-      scoreThreshold: deps.config.memory?.auto_search.score_threshold,
-      minPromptChars: deps.config.memory?.auto_search.min_prompt_chars,
+    autoSearch: {
+      enabled: deps.config.memory?.auto_search?.enabled ?? true,
+      scoreThreshold: deps.config.memory?.auto_search?.score_threshold ?? 0.6,
+      minPromptChars: deps.config.memory?.auto_search?.min_prompt_chars ?? 20,
       directory: deps.directory,
       ensureProjectRegistered: ensureProjectRegisteredFromOpenCodeDirectory
-    } : undefined,
+    },
     cavemanTextCompression: compactionOff ? undefined : deps.config.caveman_text_compression?.enabled === true ? {
       enabled: true,
       minChars: deps.config.caveman_text_compression.min_chars ?? 500
@@ -34468,6 +35119,7 @@ function createMagicContextHook(deps) {
     maybeAutoEmbedSession,
     transformMode: deps.config.transform_mode,
     promptSurface: deps.config.prompt_surface,
+    promptSurfaceRuntime: deps.promptSurfaceRuntime,
     rustModeModuleClient,
     tsAuthorityRecoveryModuleClient: authorityRecoveryModuleClient,
     rustMemorySyncRequestedSessions,
@@ -34528,11 +35180,11 @@ function createMagicContextHook(deps) {
     if (!dreaming || dreaming.disable === true) {
       return;
     }
-    const now = Date.now();
-    if (now - lastScheduleCheckMs < DREAM_SCHEDULE_CHECK_INTERVAL_MS) {
+    const now2 = Date.now();
+    if (now2 - lastScheduleCheckMs < DREAM_SCHEDULE_CHECK_INTERVAL_MS) {
       return;
     }
-    lastScheduleCheckMs = now;
+    lastScheduleCheckMs = now2;
     const runtimeConfigs = buildDreamTaskRuntimeConfigs(dreaming, deps.config.language);
     const executor = createDreamTaskExecutor({
       client: deps.client,
@@ -34581,6 +35233,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)
@@ -34804,9 +35457,9 @@ async function createSessionHooksAsync(args) {
 }
 
 // src/plugin/instance-disposal.ts
-import path5 from "node:path";
+import path6 from "node:path";
 function isDisposedInstanceDirectory(ownDirectory, disposedDirectory) {
-  return path5.resolve(disposedDirectory) === path5.resolve(ownDirectory);
+  return path6.resolve(disposedDirectory) === path6.resolve(ownDirectory);
 }
 
 // src/plugin/messages-transform.ts
@@ -34815,8 +35468,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;
@@ -34937,6 +35609,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) {
@@ -35325,6 +36005,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,
@@ -35369,6 +36050,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,
@@ -35432,6 +36114,7 @@ function buildStatusDetail(db, sessionId, directory, modelKey, config, liveSessi
     compressionUsage: null,
     toastDurationMs: 5000,
     mural: undefined,
+    loggerDiagnostics: getLoggerDiagnostics(),
     storage_versions: {
       context_db_schema_version: null,
       plugin_supported_version: LATEST_SUPPORTED_VERSION
@@ -35470,6 +36153,10 @@ function buildStatusDetail(db, sessionId, directory, modelKey, config, liveSessi
       const ops = db.prepare("SELECT tag_id, operation FROM pending_ops WHERE session_id = ? LIMIT 100").all(sessionId);
       detail.pendingOps = ops.map((o) => ({ tagId: o.tag_id, operation: o.operation }));
     } catch {}
+    const modelSlash = modelKey?.indexOf("/") ?? -1;
+    if (modelKey && modelSlash > 0) {
+      detail.windowGeometry = resolveContextWindowGeometry(modelKey.slice(0, modelSlash), modelKey.slice(modelSlash + 1), { db, sessionID: sessionId });
+    }
     const contextLimitForTokens = base.contextLimit > 0 ? base.contextLimit : base.usagePercentage > 0 ? Math.round(base.inputTokens / (base.usagePercentage / 100)) : 0;
     if (config) {
       const pctCfg = config.execute_threshold_percentage;
@@ -35600,7 +36287,7 @@ function registerRpcHandlers(rpcServer, args) {
     }
   });
   const buildManagedCtx = async (db) => {
-    const { deriveHistorianChunkTokens: deriveHistorianChunkTokens2, resolveHistorianContextLimit: resolveHistorianContextLimit2 } = await import("./derive-budgets-88mxk2w1.js");
+    const { deriveHistorianChunkTokens: deriveHistorianChunkTokens2, resolveHistorianContextLimit: resolveHistorianContextLimit2 } = await import("./derive-budgets-da4yg3tz.js");
     const { resolveFallbackChain: resolveFallbackChain2 } = await import("./resolve-fallbacks-5n5tvge1.js");
     const { userMemoryCollectionEnabled: userMemoryCollectionEnabled2 } = await import("./task-config-gbp7r23g.js");
     const DEFAULT_HISTORIAN_TIMEOUT_MS2 = 600000;
@@ -35627,8 +36314,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp: runManagedRecomp2 } = await import("./recomp-orchestrator-a0g9b52q.js");
-    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-bgtf4853.js");
+    const { runManagedRecomp: runManagedRecomp2 } = await import("./recomp-orchestrator-jsde4ygw.js");
+    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-dxske5zm.js");
     log(`[rpc] recomp requested for session ${sessionId}`);
     const ctx = await buildManagedCtx(db);
     runManagedRecomp2(ctx, sessionId).then((message) => {
@@ -35643,8 +36330,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = getDb();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedUpgrade: runManagedUpgrade2 } = await import("./recomp-orchestrator-a0g9b52q.js");
-    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-bgtf4853.js");
+    const { runManagedUpgrade: runManagedUpgrade2 } = await import("./recomp-orchestrator-jsde4ygw.js");
+    const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-dxske5zm.js");
     log(`[rpc] session-upgrade requested for session ${sessionId}`);
     const ctx = await buildManagedCtx(db);
     runManagedUpgrade2(ctx, sessionId).then((message) => {
@@ -35660,7 +36347,7 @@ function registerRpcHandlers(rpcServer, args) {
     if (!db)
       return { ok: false, error: "db unavailable" };
     try {
-      const { updateSessionMeta: updateSessionMeta2 } = await import("./storage-meta-session-df9tstzr.js");
+      const { updateSessionMeta: updateSessionMeta2 } = await import("./storage-meta-session-mk4gsnke.js");
       updateSessionMeta2(db, sessionId, { upgradeRemindedAt: Date.now() });
       return { ok: true };
     } catch (error) {
@@ -36059,13 +36746,22 @@ function normalizeCategory(category) {
   const trimmed = category?.trim();
   return trimmed ? trimmed : undefined;
 }
-function moduleMemoryText(response) {
+function memoryAuthorityRefusal(args) {
+  const readiness = "Rust memory authority is not ready.";
+  if ((args.action === "write" || args.action === "update" || args.action === "merge") && typeof args.content === "string") {
+    return `Error: ${readiness} Write REFUSED and NOT saved; RESEND after authority is ready.
+Content to resend:
+${args.content}`;
+  }
+  return `Error: ${readiness} Request REFUSED and NOT applied; RESEND after authority is ready.`;
+}
+function moduleMemoryText(response, args) {
   let value = response;
   if (value !== null && typeof value === "object" && "result" in value) {
     value = value.result;
   }
   if (isRustAuthorityDrainingError(value)) {
-    return "Error: Rust memory authority is not ready; TypeScript fallback is disabled.";
+    return memoryAuthorityRefusal(args);
   }
   if (typeof value === "string")
     return value;
@@ -36298,17 +36994,17 @@ function createCtxMemoryTool(deps) {
               category: args.category,
               ids: args.ids,
               reason: args.reason
-            }));
+            }), args);
             return text ?? "Error: Rust module returned an invalid ctx_memory response.";
           } catch (error) {
             if (isRustAuthorityDrainingError(error)) {
-              return "Error: Rust memory authority is not ready; TypeScript fallback is disabled.";
+              return memoryAuthorityRefusal(args);
             }
             return `Error: Rust module ctx_memory failed. ${error instanceof Error ? error.message : String(error)}`;
           }
         }
         if (marker || authorityState === "PREPARING" || authorityState === "DRAINING") {
-          return "Error: Rust memory authority is not ready; TypeScript fallback is disabled.";
+          return memoryAuthorityRefusal(args);
         }
       }
       const workspaceIdentitySet = resolveWorkspaceIdentitySet(deps.db, projectPath);
@@ -36618,13 +37314,13 @@ Example: ctx_note(action="write", content="Re-run the perf benchmark once the bo
 import { tool as tool3 } from "@opencode-ai/plugin";
 
 // src/features/magic-context/smart-notes/condition-compiler.ts
-import { existsSync as existsSync11 } from "node:fs";
+import { existsSync as existsSync12 } from "node:fs";
 import { isAbsolute as isAbsolute4 } from "node:path";
 
 // ../retina-local-fs/src/path-fence.ts
 import { lstat as lstat2, readlink, realpath as realpath2 } from "node:fs/promises";
 import { homedir as homedir4 } from "node:os";
-import { basename, dirname as dirname4, isAbsolute as isAbsolute3, join as join6, relative, resolve as resolve3, sep } from "node:path";
+import { basename, dirname as dirname5, isAbsolute as isAbsolute3, join as join8, relative, resolve as resolve3, sep } from "node:path";
 
 // ../retina-local-fs/src/errors.ts
 class ProviderError extends Error {
@@ -36639,7 +37335,7 @@ class ProviderError extends Error {
 // ../retina-local-fs/src/path-fence.ts
 async function resolveAndFenceProviderPath(configuredPath, options) {
   const { home, dataDirectory } = await resolveFenceRoots(options);
-  const expanded = configuredPath.startsWith("~/") ? join6(home, configuredPath.slice(2)) : configuredPath === "~" ? home : configuredPath;
+  const expanded = configuredPath.startsWith("~/") ? join8(home, configuredPath.slice(2)) : configuredPath === "~" ? home : configuredPath;
   const absolute = isAbsolute3(expanded) ? resolve3(expanded) : resolve3(options.cwd ?? process.cwd(), expanded);
   const canonical = await canonicalPath(absolute, options.allowMissing);
   if (isFencedPath(canonical, home, dataDirectory)) {
@@ -36655,50 +37351,50 @@ async function resolveFenceRoots(options) {
   } catch (error) {
     throw fsError(configuredHomePath, error);
   }
-  const configuredDataDirectory = resolve3(options.dataDirectory ?? process.env.XDG_DATA_HOME ?? join6(home, ".local", "share"));
+  const configuredDataDirectory = resolve3(options.dataDirectory ?? process.env.XDG_DATA_HOME ?? join8(home, ".local", "share"));
   const dataDirectory = await canonicalPath(configuredDataDirectory, true);
   return { home, dataDirectory };
 }
-async function canonicalPath(path6, allowMissing) {
+async function canonicalPath(path7, allowMissing) {
   try {
-    return await realpath2(path6);
+    return await realpath2(path7);
   } catch (error) {
     if (!allowMissing || !isMissingError(error)) {
-      throw fsError(path6, error);
+      throw fsError(path7, error);
     }
     const suffix = [];
-    let candidate = path6;
+    let candidate = path7;
     while (true) {
       try {
         const metadata = await lstat2(candidate);
         if (metadata.isSymbolicLink()) {
           const target = await readlink(candidate);
-          const resolvedTarget = resolve3(dirname4(candidate), target);
-          return canonicalPath(join6(resolvedTarget, ...suffix), true);
+          const resolvedTarget = resolve3(dirname5(candidate), target);
+          return canonicalPath(join8(resolvedTarget, ...suffix), true);
         }
       } catch (candidateError) {
         if (!isMissingError(candidateError)) {
-          throw fsError(path6, candidateError);
+          throw fsError(path7, candidateError);
         }
       }
-      const parent = dirname4(candidate);
+      const parent = dirname5(candidate);
       if (parent === candidate) {
-        throw fsError(path6, error);
+        throw fsError(path7, error);
       }
       suffix.unshift(basename(candidate));
       candidate = parent;
       try {
-        return join6(await realpath2(candidate), ...suffix);
+        return join8(await realpath2(candidate), ...suffix);
       } catch (parentError) {
         if (!isMissingError(parentError)) {
-          throw fsError(path6, parentError);
+          throw fsError(path7, parentError);
         }
       }
     }
   }
 }
-function isFencedPath(canonicalPath2, homeDirectory, dataDirectory = process.env.XDG_DATA_HOME ?? join6(resolve3(homeDirectory), ".local", "share")) {
-  const cortexkitRoot = join6(resolve3(dataDirectory), "cortexkit");
+function isFencedPath(canonicalPath2, homeDirectory, dataDirectory = process.env.XDG_DATA_HOME ?? join8(resolve3(homeDirectory), ".local", "share")) {
+  const cortexkitRoot = join8(resolve3(dataDirectory), "cortexkit");
   const relativeToCortexkit = relative(cortexkitRoot, canonicalPath2);
   const insideCortexkit = relativeToCortexkit !== "" && relativeToCortexkit !== ".." && !relativeToCortexkit.startsWith(`..${sep}`) && !isAbsolute3(relativeToCortexkit);
   const parts = insideCortexkit ? relativeToCortexkit.split(sep) : [];
@@ -36716,9 +37412,9 @@ function isFencedPath(canonicalPath2, homeDirectory, dataDirectory = process.env
   const plexusStore = insideCortexkit && parts[0] === "plexus" && name.startsWith("store.db");
   return inFencedRoot || fencedBasename || plexusStore;
 }
-function fsError(path6, error) {
+function fsError(path7, error) {
   const message = error instanceof Error ? error.message : String(error);
-  return new ProviderError("unreadable_path", `Could not read ${path6}: ${message}`);
+  return new ProviderError("unreadable_path", `Could not read ${path7}: ${message}`);
 }
 function isMissingError(error) {
   return error !== null && typeof error === "object" && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
@@ -36867,20 +37563,20 @@ async function compileSurfaceCondition(surfaceCondition, options) {
   const parsed = parseCondition(surfaceCondition, options.projectPath);
   if (parsed === null)
     return { status: "plain" };
-  const now = (options.now ?? Date.now)();
-  const resolvePath = options.resolvePath ?? (async (path6) => {
-    const resolved = await resolveAndFenceProviderPath(path6, {
+  const now2 = (options.now ?? Date.now)();
+  const resolvePath = options.resolvePath ?? (async (path7) => {
+    const resolved = await resolveAndFenceProviderPath(path7, {
       allowMissing: true,
       homeDirectory: options.homeDirectory,
       cwd: options.projectPath
     });
-    return { path: resolved, exists: existsSync11(resolved) };
+    return { path: resolved, exists: existsSync12(resolved) };
   });
   let predicates;
   try {
     predicates = [];
     for (const predicate of parsed) {
-      predicates.push(await resolvePredicate(predicate, resolvePath, now));
+      predicates.push(await resolvePredicate(predicate, resolvePath, now2));
     }
   } catch (error) {
     const code = error !== null && typeof error === "object" && "code" in error ? error.code : undefined;
@@ -36901,7 +37597,7 @@ async function compileSurfaceCondition(surfaceCondition, options) {
     status: "compiled",
     provider: RETINA_LOCAL_FS_PROVIDER,
     config: validation.config,
-    compiledAt: now
+    compiledAt: now2
   };
 }
 function conditionCompileStorageFields(result) {
@@ -36947,13 +37643,13 @@ function parseCondition(surfaceCondition, projectPath) {
 function parseAtomicCondition(text, projectPath) {
   const fileContains = text.match(new RegExp(`^(?:when\\s+)?file\\s+(${VALUE})\\s+(no longer contains|contains)\\s+(${VALUE})$`, "i"));
   if (fileContains) {
-    const path6 = unquote(fileContains[1]);
+    const path7 = unquote(fileContains[1]);
     const needle = unquote(fileContains[3].trim());
-    if (path6 === null || needle === null)
+    if (path7 === null || needle === null)
       return null;
     return {
       kind: "file_contains",
-      path: path6,
+      path: path7,
       needle,
       ...fileContains[2].toLowerCase() === "no longer contains" ? { absent: true } : {}
     };
@@ -36985,28 +37681,28 @@ function parseAtomicCondition(text, projectPath) {
   }
   const mtime = text.match(new RegExp(`^(?:when\\s+)?(?:file\\s+)?(${VALUE})\\s+(changes|is rebuilt|mtime moves)$`, "i"));
   if (mtime) {
-    const path6 = unquote(mtime[1]);
-    if (path6 === null)
+    const path7 = unquote(mtime[1]);
+    if (path7 === null)
       return null;
     return {
       kind: "mtime_after",
-      path: path6
+      path: path7
     };
   }
   const pathExists = text.match(new RegExp(`^(?:when\\s+)?(?:path\\s+)?(${VALUE})\\s+(exists|is gone)$`, "i"));
   if (pathExists) {
-    const path6 = unquote(pathExists[1]);
-    if (path6 === null)
+    const path7 = unquote(pathExists[1]);
+    if (path7 === null)
       return null;
     return {
       kind: "path_exists",
-      path: path6,
+      path: path7,
       ...pathExists[2].toLowerCase() === "is gone" ? { gone: true } : {}
     };
   }
   return null;
 }
-async function resolvePredicate(predicate, resolvePath, now) {
+async function resolvePredicate(predicate, resolvePath, now2) {
   const configuredPath = "repo_path" in predicate ? predicate.repo_path : predicate.path;
   const resolved = await resolvePath(configuredPath);
   const sourceIsResolvable = isAbsolute4(configuredPath) || configuredPath === "~" || configuredPath.startsWith("~/");
@@ -37017,7 +37713,7 @@ async function resolvePredicate(predicate, resolvePath, now) {
     case "path_exists":
       return { ...predicate, path: resolved.path, ...audit };
     case "mtime_after":
-      return { kind: predicate.kind, path: resolved.path, since_ms: now, ...audit };
+      return { kind: predicate.kind, path: resolved.path, since_ms: now2, ...audit };
     case "git_commit_after":
       return { ...predicate, repo_path: resolved.path, ...audit };
     case "git_tag_matching":
@@ -37207,13 +37903,22 @@ ${footer}` : ""}`);
   }
   return sections;
 }
-function moduleNoteText(response) {
+function noteAuthorityRefusal(args, action) {
+  const readiness = "Rust notes authority is not ready.";
+  if ((action === "write" || action === "update") && typeof args.content === "string") {
+    return `Error: ${readiness} Write REFUSED and NOT saved; RESEND after authority is ready.
+Content to resend:
+${args.content}`;
+  }
+  return `Error: ${readiness} Request REFUSED and NOT applied; RESEND after authority is ready.`;
+}
+function moduleNoteText(response, args, action) {
   let value = response;
   if (value !== null && typeof value === "object" && "result" in value) {
     value = value.result;
   }
   if (isRustAuthorityDrainingError(value)) {
-    return "Error: Rust notes authority is not ready; TypeScript fallback is disabled.";
+    return noteAuthorityRefusal(args, action);
   }
   if (typeof value === "string")
     return value;
@@ -37264,6 +37969,8 @@ function createCtxNoteTool(deps) {
       });
       const sessionId = toolContext.sessionID;
       const action = args.action ?? (args.content?.trim() ? "write" : "read");
+      const wakePlaneActive = action === "write" && Boolean(args.surface_condition?.trim()) && await wakePlaneStatus() === "present";
+      const surfaceCondition = wakePlaneActive ? undefined : args.surface_condition?.trim();
       const projectIdentity = deps.resolveProjectPath?.(toolContext.directory);
       const marker = projectIdentity ? getAuthorityManagedMarker(deps.db, projectIdentity) : null;
       let notesAuthority = null;
@@ -37285,7 +37992,6 @@ function createCtxNoteTool(deps) {
         if (!rustNote || !projectIdentity) {
           return "Error: Rust notes authority is active, but this module transport does not support ctx_note.";
         }
-        const surfaceCondition = args.surface_condition?.trim();
         let compilation;
         if ((action === "write" || action === "update") && surfaceCondition) {
           if (deps.rustToolBackends?.noteEvaluationAvailable?.(projectIdentity) !== true) {
@@ -37312,23 +38018,28 @@ function createCtxNoteTool(deps) {
           noteId: args.note_id
         };
         try {
-          const text = moduleNoteText(await rustNote(request2));
+          const text = moduleNoteText(await rustNote(request2), args, action);
           if (text === null) {
             return "Error: Rust module returned an invalid ctx_note response.";
           }
-          if (compilation && !text.startsWith("Error:")) {
-            return text + conditionCompileReplySuffix(compilation);
+          if (text.startsWith("Error:"))
+            return text;
+          if (wakePlaneActive) {
+            return `${text}
+wake plane active — create a scheduled wake instead; stored as a plain note.`;
           }
+          if (compilation)
+            return text + conditionCompileReplySuffix(compilation);
           return text;
         } catch (error) {
           if (isRustAuthorityDrainingError(error)) {
-            return "Error: Rust notes authority is not ready; TypeScript fallback is disabled.";
+            return noteAuthorityRefusal(args, action);
           }
           return `Error: Rust module ctx_note failed. ${error instanceof Error ? error.message : String(error)}`;
         }
       }
       if (marker || notesAuthority === "PREPARING" || notesAuthority === "DRAINING") {
-        return "Error: Rust notes authority is not ready; TypeScript fallback is disabled.";
+        return noteAuthorityRefusal(args, action);
       }
       if (action === "write") {
         const content = args.content?.trim();
@@ -37337,27 +38048,36 @@ function createCtxNoteTool(deps) {
         }
         const anchorOrdinal = captureAnchorOrdinal(deps.db, sessionId);
         if (args.surface_condition?.trim()) {
+          if (wakePlaneActive) {
+            const note3 = addNote(deps.db, "session", {
+              sessionId,
+              content,
+              anchorOrdinal
+            });
+            return `Saved session note #${note3.id}.
+wake plane active — create a scheduled wake instead; stored as a plain note.`;
+          }
           if (!deps.dreamerEnabled) {
             return "Error: Smart notes require dreamer to be enabled. Enable dreamer in magic-context.jsonc to use surface_condition.";
           }
           if (!projectIdentity) {
             return "Error: Could not resolve project identity for smart note.";
           }
-          const surfaceCondition = args.surface_condition.trim();
-          const compilation = await compileSurfaceCondition(surfaceCondition, {
+          const smartSurfaceCondition = args.surface_condition.trim();
+          const compilation = await compileSurfaceCondition(smartSurfaceCondition, {
             projectPath: toolContext.directory
           });
           const note2 = addNote(deps.db, "smart", {
             content,
             projectPath: projectIdentity,
             sessionId,
-            surfaceCondition,
+            surfaceCondition: smartSurfaceCondition,
             anchorOrdinal,
             ...conditionCompileStorageFields(compilation)
           });
           return `Created smart note #${note2.id}. Dreamer will evaluate the condition during nightly runs:
 - Content: ${content}
-- Condition: ${surfaceCondition}${conditionCompileReplySuffix(compilation)}`;
+- Condition: ${smartSurfaceCondition}${conditionCompileReplySuffix(compilation)}`;
         }
         const note = addNote(deps.db, "session", { sessionId, content, anchorOrdinal });
         return `Saved session note #${note.id}.`;
@@ -37386,9 +38106,9 @@ function createCtxNoteTool(deps) {
           updates.content = args.content.trim();
         let compilation;
         if (args.surface_condition?.trim()) {
-          const surfaceCondition = args.surface_condition.trim();
-          updates.surfaceCondition = surfaceCondition;
-          compilation = await compileSurfaceCondition(surfaceCondition, {
+          const surfaceCondition2 = args.surface_condition.trim();
+          updates.surfaceCondition = surfaceCondition2;
+          compilation = await compileSurfaceCondition(surfaceCondition2, {
             projectPath: toolContext.directory
           });
           Object.assign(updates, conditionCompileStorageFields(compilation));
@@ -37460,7 +38180,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
@@ -37530,11 +38250,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,
@@ -37609,9 +38329,9 @@ function createCtxReduceTool(deps) {
       }
       try {
         deps.db.transaction(() => {
-          const now = Date.now();
+          const now2 = Date.now();
           for (const id of dropIds) {
-            queuePendingOp(deps.db, sessionId, id, "drop", now);
+            queuePendingOp(deps.db, sessionId, id, "drop", now2);
           }
         })();
       } catch (error) {
@@ -37974,15 +38694,15 @@ function unregisterExitAbort(controller) {
 import { randomBytes, timingSafeEqual } from "node:crypto";
 import {
   chmodSync,
-  mkdirSync as mkdirSync2,
+  mkdirSync as mkdirSync3,
   readdirSync,
   readFileSync as readFileSync6,
-  renameSync as renameSync3,
-  rmSync as rmSync2,
+  renameSync as renameSync4,
+  rmSync as rmSync3,
   unlinkSync,
   writeFileSync as writeFileSync4
 } from "node:fs";
-import { dirname as dirname5 } from "node:path";
+import { dirname as dirname6 } from "node:path";
 var MAX_BODY_BYTES = 1048576;
 var WS_AUTH_TIMEOUT_MS = 5000;
 var WS_CLOSE_UNAUTHORIZED = 4401;
@@ -38056,28 +38776,29 @@ class MagicContextRpcServer {
     this.port = server.port ?? 0;
     try {
       this.warnIfOtherLiveInstance();
-      const dir = dirname5(this.portFilePath);
+      const dir = dirname6(this.portFilePath);
       const enforcePrivatePermissions = shouldEnforcePrivateStoragePermissions();
       if (enforcePrivatePermissions) {
-        mkdirSync2(dir, { recursive: true, mode: 448 });
+        mkdirSync3(dir, { recursive: true, mode: 448 });
         try {
           chmodSync(dir, 448);
         } catch {}
       } else {
-        mkdirSync2(dir, { recursive: true });
+        mkdirSync3(dir, { recursive: true });
       }
       const tmpPath = `${this.portFilePath}.tmp`;
       try {
-        rmSync2(tmpPath, { force: true });
+        rmSync3(tmpPath, { force: true });
       } catch {}
       writeFileSync4(tmpPath, JSON.stringify({
         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" });
-      renameSync3(tmpPath, this.portFilePath);
+      renameSync4(tmpPath, this.portFilePath);
       if (enforcePrivatePermissions) {
         try {
           chmodSync(this.portFilePath, 384);
@@ -38289,7 +39010,7 @@ var server = async (ctx) => {
 `);
     setTimeout(async () => {
       try {
-        const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-bgtf4853.js");
+        const { sendIgnoredMessage: sendIgnoredMessage2 } = await import("./send-session-notification-dxske5zm.js");
         const clientWithSessions = ctx.client;
         const sessions = await Promise.resolve(clientWithSessions.session?.list?.()).catch(() => null);
         const sessionList = Array.isArray(sessions) ? sessions : sessions?.data;
@@ -38302,8 +39023,13 @@ var server = async (ctx) => {
   }
   let conflictResult = null;
   if (pluginConfig.enabled) {
+    const resolvedCompaction = await resolveCompactionForBoot(ctx.client);
+    if (resolvedCompaction === null) {
+      log("[magic-context] resolved-config fetch failed; using file-based compaction detection (the running server's resolved config may differ — `opencode debug config` is authoritative)");
+    }
     conflictResult = detectConflicts(ctx.directory, {
-      compactionEnabled: isCompactionEnabled(pluginConfig)
+      compactionEnabled: isCompactionEnabled(pluginConfig),
+      resolvedCompaction: resolvedCompaction ?? undefined
     });
     if (conflictResult.hasConflict) {
       pluginConfig.enabled = false;
@@ -38471,7 +39197,7 @@ var server = async (ctx) => {
   {
     const fence = getSchemaFenceRejection();
     if (fence) {
-      import("./conflict-warning-hook-mt0ttc4x.js").then(({ sendSchemaFenceWarning }) => sendSchemaFenceWarning(ctx.client, ctx.directory, fence));
+      import("./conflict-warning-hook-an4fxhwf.js").then(({ sendSchemaFenceWarning }) => sendSchemaFenceWarning(ctx.client, ctx.directory, fence));
     }
   }
   if (conflictResult?.hasConflict) {
@@ -38492,7 +39218,7 @@ var server = async (ctx) => {
       } = await import("./announcement-6c1g4es4.js");
       if (shouldShowAnnouncement2()) {
         setTimeout(() => {
-          import("./conflict-warning-hook-mt0ttc4x.js").then(({ sendStartupAnnouncement }) => sendStartupAnnouncement(ctx.client, ctx.directory, ANNOUNCEMENT_VERSION2, ANNOUNCEMENT_FEATURES2, ANNOUNCEMENT_FOOTER2, markAnnouncementSeen2)).catch(() => {});
+          import("./conflict-warning-hook-an4fxhwf.js").then(({ sendStartupAnnouncement }) => sendStartupAnnouncement(ctx.client, ctx.directory, ANNOUNCEMENT_VERSION2, ANNOUNCEMENT_FEATURES2, ANNOUNCEMENT_FOOTER2, markAnnouncementSeen2)).catch(() => {});
         }, 8000);
       }
     } catch {}