@cortexkit/opencode-magic-context 0.36.1 → 0.37.0

package/dist/index.js

@@ -53,9 +53,11 @@ import {
   acquireCompartmentLease,
   acquireGitSweepLease,
   acquireWrapupInProgress,
+  addMergedReasoningStrippedIds,
   addNote,
   addProcessedImageStrippedIds,
   addStaleReduceStrippedIds,
+  addTrailingBlankDecisions,
   adoptNullOwnerToolTag,
   appendAutoSearchHintDecision,
   applyDeferredCompactionMarker,
@@ -94,6 +96,7 @@ import {
   computeCueContentHash,
   computeNormalizedHash,
   computeWorkspaceEpochFingerprint,
+  connectionFileExists,
   contentSha256,
   cortexKitProjectConfigBasePath,
   cortexKitUserConfigBasePath,
@@ -174,6 +177,7 @@ import {
   getMemoryCountsByStatus,
   getMemoryMutationsForRenderByProjects,
   getMemoryVerifications,
+  getMergedReasoningStrippedIds,
   getMigrationOnOpenRefusal,
   getMirrorCursor,
   getModuleNoteEvaluationBridge,
@@ -215,6 +219,7 @@ import {
   getTagsByNumbers,
   getTagsBySession,
   getToolTagNumberByOwner,
+  getTrailingBlankDecisions,
   getTriggerTagTokenUpperBound,
   getUnclassifiedMemoryIds,
   getUnmappedMemoryIds,
@@ -226,6 +231,7 @@ import {
   hasMemoryShareableColumn,
   hasMuralCueColumns,
   hasRunnableCompartmentWindow,
+  incrementalLkgContentDigests,
   injectM0M1,
   injectTemporalMarkers,
   insertMemory,
@@ -240,10 +246,10 @@ import {
   isEmbeddingEnabled,
   isEmergencyRecoveryArmed,
   isFailClosedBlockingError,
+  isLinkedGitWorktree,
   isPidAlive,
   isProviderOverflowReconfirmed,
   lkgContentDigest,
-  lkgContentDigestFromFields,
   loadCompartmentChunkEmbeddingsForSearch,
   loadPersistedUsage,
   loadProjectCommitEmbeddings,
@@ -333,6 +339,7 @@ import {
   resolveLegacyConfigSources,
   resolveLegacyConfigSourcesForHarness,
   resolveModelConfigOrDefault,
+  resolveMuralWire,
   resolveOpenCodeProtectedTailBoundary,
   resolveProjectIdentity,
   resolveProjectIdentityForSession,
@@ -400,19 +407,22 @@ import {
   upsertCommits,
   verificationFileExists,
   withContentLanguageDirective
-} from "./index-1skzp4dc.js";
+} from "./index-0ze9p983.js";
 import {
   deriveHistorianChunkTokens,
   deriveTriggerBudget,
+  formatWindowDerivationLine,
   getSdkContextLimit,
+  getSdkWindowGeometry,
   isSaneLimit,
   refreshModelLimitsAfterAuthOnce,
   refreshModelLimitsFromApi,
   resolveHistorianContextLimit,
   setOutputReserveConfig,
   setStoragePrivatePermissionEnforcement,
+  setWindowOverlayPath,
   shouldEnforcePrivateStoragePermissions
-} from "./index-wgvxkqpx.js";
+} from "./index-q0t189ay.js";
 import {
   modelBodyField,
   resolveFallbackChain
@@ -424,7 +434,7 @@ import {
   getErrorMessage,
   sendIgnoredMessage,
   sendUserPrompt
-} from "./index-nsx2n9eg.js";
+} from "./index-4cz5nfxf.js";
 import {
   ToolMutationBatch,
   advanceToolReclaimWatermark,
@@ -482,7 +492,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 +505,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 +534,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 +9141,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 +9808,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)
@@ -11566,6 +11588,7 @@ class SubcModuleTransport {
     return error;
   }
   async beforeDeadline(operation, deadlineMs, detail) {
+    operation.catch(() => {});
     const remainingMs = deadlineMs - Date.now();
     if (remainingMs <= 0)
       throw this.deadlineError(detail);
@@ -15327,6 +15350,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 +15419,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 +15551,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 +15647,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 +15658,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 +15689,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 +15700,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 +15722,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 +15748,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 +15760,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 +15892,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 +15993,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 +16004,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);
@@ -16212,10 +16300,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 +16475,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 +16483,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 = ?");
@@ -17511,7 +17599,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 +17686,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);
@@ -18431,17 +18519,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 +18544,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 +18681,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 +18708,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 +18754,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 +18770,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 +19757,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 +19819,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 +19838,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 +19962,7 @@ function resolveModelKey(providerID, modelID) {
   if (!providerID || !modelID) {
     return;
   }
-  return `${providerID}/${modelID}`;
+  return piModelRefToCanonical(`${providerID}/${modelID}`);
 }
 function resolveSessionId(properties) {
   if (typeof properties?.sessionID === "string") {
@@ -20688,7 +20798,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) {
   const thresholdDetail = resolveExecuteThresholdDetail(executeThresholdPercentageConfig, liveModelKey, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, {
     tokensConfig: executeThresholdTokens,
     contextLimit,
@@ -20749,7 +20859,7 @@ function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageC
       ] : [], ...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 +21017,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 +21327,12 @@ 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 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);
         const moduleStatus = rustStatus ? `
 
 ${formatRustStatusText(rustStatus)}` : "";
@@ -21239,7 +21355,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 +21416,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 +21435,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,6 +22090,277 @@ function writeTransformDecisionRowOnDatabase(db, row, configureBusyTimeout) {
                )`).run(row.sessionId, row.harness, row.sessionId, row.harness, retentionOverrideForTests ?? TRANSFORM_DECISIONS_RETENTION);
 }
 
+// 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 recordSwallowedWrite(error) {
+  try {
+    swallowedWriteCount++;
+    lastErrorMessage = error instanceof Error ? error.message : String(error);
+    log("[magic-context] window report ledger write failed:", error);
+  } catch {}
+}
+function positiveFiniteNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : undefined;
+}
+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;
+    }
+  }
+  const nested = candidate.response;
+  if (nested && typeof nested === "object") {
+    return observedStatus(nested);
+  }
+  return;
+}
+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;
+}
+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 observedModelVendorHint(modelID) {
+  if (!modelID)
+    return;
+  const slash = modelID.indexOf("/");
+  return slash > 0 ? modelID.slice(0, slash) : undefined;
+}
+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);
+  }
+}
+
 // src/hooks/magic-context/channel2-delivery.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
 
@@ -22755,7 +23142,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 +23177,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);
@@ -23433,6 +23820,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 +23836,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 +24038,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 +24226,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 +24256,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" };
   }
@@ -24076,8 +24474,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 +24510,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 +24612,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 +24630,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 +24661,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 +24721,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 +24801,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 +24887,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");
 }
@@ -27784,10 +28244,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 +28258,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 +28275,135 @@ 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 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 findTrailingBlankDecisionCandidates(messages, frozenDecisions) {
+  const decisions = [];
+  for (const message of messages) {
+    const id = message.info.id;
+    if (message.info.role !== "assistant" || typeof id !== "string" || id.length === 0 || frozenDecisions.has(id)) {
+      continue;
+    }
+    const last = message.parts.at(-1);
+    decisions.push([
+      id,
+      message.parts.length === 0 || isSentinelInvisibleTextPart(last) ? "keep" : "strip"
+    ]);
+  }
+  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, insertBlank) => {
+      message = { ...message, parts: [...message.parts] };
+      messages[messageIndex] = message;
+      message.parts.splice(start, deleteCount, ...insertBlank ? [{ ...CANONICAL_BLANK_PART }] : []);
+    };
+    if (lastMeaningfulIndex < 0) {
+      if (message.parts.length !== 1 || !isCanonicalBlankPart(message.parts[0])) {
+        mutations += Math.max(1, message.parts.length);
+        replaceParts(0, message.parts.length, true);
+      }
+      continue;
+    }
+    const trailingCount = message.parts.length - lastMeaningfulIndex - 1;
+    if (decision === "keep") {
+      const blankIndex = lastMeaningfulIndex + 1;
+      if (trailingCount !== 1 || !isCanonicalBlankPart(message.parts[blankIndex])) {
+        mutations += Math.max(1, trailingCount);
+        replaceParts(blankIndex, trailingCount, true);
+      }
+      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, true);
+      }
+      continue;
+    }
+    mutations += trailingCount;
+    replaceParts(lastMeaningfulIndex + 1, trailingCount, false);
+  }
+  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) {
@@ -28629,8 +29195,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 +29311,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 +29468,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) {
@@ -29444,7 +30028,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,12 +30044,80 @@ 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 tFinalRepresentation = performance.now();
   const finalRepresentation = finalizeMessageRepresentation(args.messages, args.resolvedProviderID, {
     prependedMessageCount,
     reasoningMutatedMessages,
-    reasoningMutationExemptMessage
+    reasoningMutationExemptMessage,
+    mergedReasoningStrippedIds,
+    trailingBlankDecisions,
+    skipMergedReasoningStrip: compactionOff,
+    skipTrailingWhitespaceStrip: compactionOff
   });
+  if (canUseEmptySentinels && !compactionOff && isCacheBustingPass) {
+    const candidates = findTrailingBlankDecisionCandidates(args.messages, trailingBlankDecisions);
+    if (candidates.length > 0) {
+      try {
+        const persisted = addTrailingBlankDecisions(args.db, args.sessionId, candidates);
+        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, typeof reasoningMutationExemptMessage?.info.id === "string" ? reasoningMutationExemptMessage.info.id : undefined, newlyFrozen);
+          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}`);
   return {
@@ -29506,6 +30158,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 {
@@ -29700,7 +30375,9 @@ function emptyRustPassTimings() {
     transportPages: 0,
     transportBytes: 0,
     apply: 0,
-    lkgSnapshot: 0
+    lkgSnapshot: 0,
+    mirrorPull: 0,
+    compartmentMirror: 0
   };
 }
 function formatRustPassLog(args) {
@@ -29708,7 +30385,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 +30415,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 +30430,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 +30553,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";
@@ -30068,6 +30786,17 @@ function applyNativeMessagesVerbatim(output, response) {
   }
   return replaceMessagesInPlace(output, nativeMessages);
 }
+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 {
     method: "transform",
@@ -30096,6 +30825,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 +30843,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,
@@ -30280,11 +31015,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 +31076,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 +31096,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 {
@@ -30448,7 +31198,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 +31215,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 +31244,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 +31461,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,24 +31472,75 @@ 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?.();
@@ -30798,6 +31609,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,24 +31622,9 @@ 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");
@@ -30861,7 +31658,10 @@ function createRustModeTransform(deps, options) {
           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) {
@@ -30983,7 +31783,26 @@ function createRustModeTransform(deps, options) {
           sessionLog(sessionId, "rust channel2 pending-intent CAS failed (ignored):", error);
         }
       }
+      const currentOverflowState = getOverflowState(deps.db, sessionId, modelKey);
+      const disarmEvidence = currentOverflowState.needsEmergencyRecovery ? shouldDisarmRustEmergencyRecovery({
+        materialized: materializeReason !== "none",
+        usagePercentage: passUsageSnapshot.percentage,
+        recoveryOrigin: currentOverflowState.emergencyRecoveryOrigin,
+        recoveryArmedAt: getEmergencyRecoveryArmedAt(sessionId),
+        usageEntry: deps.contextUsageMap.get(sessionId),
+        finalWireEstimate: servedFinalWireEstimate,
+        providerProvenLimitTokens: currentOverflowState.detectedContextLimit
+      }) : null;
+      if (disarmEvidence) {
+        try {
+          clearEmergencyRecovery(deps.db, sessionId);
+          sessionLog(sessionId, `rust pass disarmed emergency recovery via ${disarmEvidence} after ${materializeReason} at ${passUsageSnapshot.percentage.toFixed(1)}% usage`);
+        } catch {}
+      }
+      wireCaches.set(sessionId, pendingWireCache);
+      appliedAt = performance.now();
       if (options.moduleClient.mirrorPull) {
+        const mirrorPullStartedAt = performance.now();
         try {
           await pullMemoryMirrorOnce({
             db: deps.db,
@@ -30991,10 +31810,13 @@ function createRustModeTransform(deps, options) {
           });
         } catch (error) {
           sessionLog(sessionId, "rust memory mirror-back failed (ignored):", error);
+        } finally {
+          logStage(sessionId, "mirrorPull", mirrorPullStartedAt, timings);
         }
       }
       const getCompartmentsAfter = options.moduleClient.getCompartmentsAfter;
       if (getCompartmentsAfter) {
+        const compartmentMirrorStartedAt = performance.now();
         try {
           await mirrorModuleCompartments({
             db: deps.db,
@@ -31005,26 +31827,10 @@ function createRustModeTransform(deps, options) {
           });
         } catch (error) {
           sessionLog(sessionId, "rust compartment mirror-back failed (ignored):", error);
+        } finally {
+          logStage(sessionId, "compartmentMirror", compartmentMirrorStartedAt, timings);
         }
       }
-      const currentOverflowState = getOverflowState(deps.db, sessionId, modelKey);
-      const disarmEvidence = currentOverflowState.needsEmergencyRecovery ? shouldDisarmRustEmergencyRecovery({
-        materialized: materializeReason !== "none",
-        usagePercentage: passUsageSnapshot.percentage,
-        recoveryOrigin: currentOverflowState.emergencyRecoveryOrigin,
-        recoveryArmedAt: getEmergencyRecoveryArmedAt(sessionId),
-        usageEntry: deps.contextUsageMap.get(sessionId),
-        finalWireEstimate: servedFinalWireEstimate,
-        providerProvenLimitTokens: currentOverflowState.detectedContextLimit
-      }) : null;
-      if (disarmEvidence) {
-        try {
-          clearEmergencyRecovery(deps.db, sessionId);
-          sessionLog(sessionId, `rust pass disarmed emergency recovery via ${disarmEvidence} after ${materializeReason} at ${passUsageSnapshot.percentage.toFixed(1)}% usage`);
-        } catch {}
-      }
-      wireCaches.set(sessionId, pendingWireCache);
-      appliedAt = performance.now();
       finishPass(true);
     } catch (error) {
       if (error instanceof Error && error.message.startsWith("rust transform wire invariant failed")) {
@@ -31061,6 +31867,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 +32113,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 +32128,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 +32136,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 +32228,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 +32292,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 +32350,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 +32396,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 +32454,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 +32498,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 +32511,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 +32588,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 +32629,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);
         }
@@ -32131,7 +32943,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 +32956,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,
@@ -32361,9 +33174,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);
     }
   }
@@ -32453,6 +33266,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 +33330,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 +33364,7 @@ function createEventHandler2(deps) {
           }
         }
       }
-      const now = Date.now();
+      const now2 = Date.now();
       const usageTokens = [
         info.tokens?.input,
         info.tokens?.cache?.read,
@@ -32557,7 +33389,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 +33435,8 @@ function createEventHandler2(deps) {
               percentage,
               inputTokens: totalInputTokens
             },
-            updatedAt: now,
-            lastResponseTime: now,
+            updatedAt: now2,
+            lastResponseTime: now2,
             hasUsageTokens: true
           });
           updates.lastContextPercentage = percentage;
@@ -32907,6 +33739,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 +33962,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;
   }
@@ -33618,7 +34451,7 @@ 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(`
 `);
@@ -33793,8 +34626,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 +34636,7 @@ async function maybeSendUpgradeReminder(deps, sessionId) {
   const recordDelivery = () => {
     try {
       updateSessionMeta(deps.db, sessionId, {
-        upgradeReminderLastSentAt: now,
+        upgradeReminderLastSentAt: now2,
         upgradeReminderCount: meta.upgradeReminderCount + 1
       });
     } catch {}
@@ -34217,7 +35050,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 +35295,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 +35309,7 @@ function createMagicContextHook(deps) {
     maybeAutoEmbedSession,
     transformMode: deps.config.transform_mode,
     promptSurface: deps.config.prompt_surface,
+    promptSurfaceRuntime: deps.promptSurfaceRuntime,
     rustModeModuleClient,
     tsAuthorityRecoveryModuleClient: authorityRecoveryModuleClient,
     rustMemorySyncRequestedSessions,
@@ -34528,11 +35370,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,
@@ -34804,9 +35646,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
@@ -35432,6 +36274,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 +36313,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 +36447,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-0f8xpyw2.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 +36474,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-c3ff16k7.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 +36490,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-c3ff16k7.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 +36507,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 +36906,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 +37154,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 +37474,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 +37495,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 +37511,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 +37572,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 +37723,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 +37757,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 +37803,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 +37841,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 +37873,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 +38063,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 +38129,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 +38152,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 +38178,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 +38208,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 +38266,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));
@@ -37609,9 +38489,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 +38854,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,19 +38936,19 @@ 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,
@@ -38077,7 +38957,7 @@ class MagicContextRpcServer {
         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 +39169,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 +39182,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 +39356,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 +39377,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 {}