@cortexkit/opencode-magic-context 0.49.7 → 0.49.9

package/dist/v2/{context-xq4rtywr.js → context-z2yagwy4.js}

@@ -9,7 +9,7 @@ import {
   resolveLegacyConfigSources,
   getProtectedTokensTierOverrides,
   loadPluginConfigDetailed
-} from "./server-d6g4whc2.js";
+} from "./server-4qr18rfg.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -24,7 +24,7 @@ import {
   log2,
   sessionLog2,
   getLoggerDiagnostics2
-} from "./server-t4k4qexw.js";
+} from "./server-9e5r8y60.js";
 import {
   hasTrustedAbsoluteWall,
   applyProvenInputFloor,
@@ -36,7 +36,7 @@ import {
   getSdkContextLimit,
   getSdkOutputLimit,
   getModelsDevCacheState
-} from "./server-vb7pbd9p.js";
+} from "./server-nveratm5.js";
 import {
   withContentLanguageDirective,
   parseCron,
@@ -48,7 +48,7 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DEFAULT_LOCAL_EMBEDDING_MODEL,
   DREAM_TASK_PROMOTION_DEFAULTS
-} from "./server-cw6521wn.js";
+} from "./server-7e087rvk.js";
 import {
   historianRunConfig,
   dreamerRunConfig,
@@ -265,7 +265,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-mv1w7t6z.js";
+} from "./server-c9w52qss.js";
 import {
   CANONICAL_DREAM_TASKS,
   DREAM_TASK_CAPABILITIES,
@@ -303,7 +303,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-v4fwha43.js";
+} from "./server-23znwjqk.js";
 import {
   setHomeProjectPermission,
   shouldSkipHomeProjectMemory,
@@ -319,7 +319,7 @@ import {
   storedPathBelongsToIdentity,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./server-kdrezdy0.js";
+} from "./server-njnx39q2.js";
 import {
   detectLatestTurnThinkingMismatch,
   isPrefixBoundThinkingModel,
@@ -337,6 +337,7 @@ import {
   toolPartHasUserAnswer,
   DreamTokenBudgetExceeded,
   createDreamTokenBudget,
+  needsBlockedRead,
   recordToolParameters,
   createDroppedInputGuard,
   assertExecutableToolInput,
@@ -473,6 +474,7 @@ import {
   reasoningTextAndOpaque,
   opencodeReasoningBudgetCutoff,
   describeFinalWireTail,
+  estimatePartImageTokens,
   estimateMessageTokens,
   wireContentBytes,
   createFinalWireUsageTracker,
@@ -499,11 +501,12 @@ import {
   readRawSessionMessageIdOrdinalsForRange2,
   readRawSessionMessagePartsById2,
   readRawSessionBoundaryEndpoints2,
+  hasRawSessionMessageById2,
   readRawSessionMessageOrdinalById2,
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-gtv9wbhq.js";
+} from "./server-gc8x2xdb.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -514,7 +517,7 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./server-kzns2hbz.js";
+} from "./server-s6jqh8bj.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -522,8 +525,9 @@ import {
   toSynapseLaneDescriptor,
   formatSynapseLaneDescriptor,
   SynapseEmbeddingProvider
-} from "./server-hb6xhh9q.js";
+} from "./server-988cqjme.js";
 import {
+  inRootAsyncContext2,
   getTagIdentityWriteGeneration2,
   Database2,
   getSqliteDatabasePath2,
@@ -535,21 +539,18 @@ import {
   isTransientSqliteError2,
   SqliteAcquisitionBusyError2,
   withAsyncPrivilegedWriter2
-} from "./server-j8epsc0g.js";
-import {
-  sameProjectDirectory,
-  canonicalProjectDirectory
-} from "./server-brhj8qtd.js";
+} from "./server-wafzvyhg.js";
+import"./server-63ha7f0f.js";
 import {
   deleteChunkEmbedBackoffForSession
-} from "./server-fpqe39as.js";
+} from "./server-9a6bwc12.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
   rpcPortFilePath,
   parseRpcPortFile,
   inspectProcessesAsync
-} from "./server-1rfgbjfn.js";
+} from "./server-cxsr0ng6.js";
 import {
   BoundedSessionMap,
   LkgRecoveryFenceError,
@@ -568,14 +569,14 @@ import {
   isMessageIndexReconciledThrough2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexes2
-} from "./server-7srtwsa4.js";
+} from "./server-z0rjemg1.js";
 import {
   stableStringify,
   getTemporalDecisions,
   observeTemporalDecisions,
   freezeTemporalDecisions,
   tagIdentityRevisionKey
-} from "./server-6byqfbqf.js";
+} from "./server-89fcbe37.js";
 import {
   resolveModelCalibration,
   calibrateBuckets,
@@ -590,6 +591,7 @@ import {
   peelLeadingMcTagNotation,
   prependTag,
   isThinkingPart,
+  currentReclaimableToolOutputCount,
   isRecord,
   contentTagOwnerMessageId,
   estimateImageTokensFromDataUrl,
@@ -614,7 +616,6 @@ import {
   evaluateChannel2,
   formatChannel1Evaluation,
   formatChannel2Evaluation,
-  reclaimableToolOutputCount,
   buildChannel2Reminder,
   buildChannel1Reminder,
   estimateEmergencyDropReclaimTokens,
@@ -667,14 +668,14 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./server-w3zeywp1.js";
+} from "./server-kmapq3v0.js";
 import"./server-51779zs2.js";
 import {
   isRawCompactionSummaryInfo2,
   extractInMemoryMessageViews2,
   buildInMemoryTailRawMessages2,
   runSessionWarmupWorker
-} from "./server-dd0nja67.js";
+} from "./server-bx59ezg6.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -690,12 +691,12 @@ import {
   latestRealUserTurnIdFromOpenCodeDb,
   getMessageTimesFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./server-wkdgjjch.js";
+} from "./server-zrwaj29a.js";
 import {
   getCurrentToolSetHash,
   recordToolDefinition,
   getMeasuredToolDefinitionTokens
-} from "./server-7ekna9zs.js";
+} from "./server-xqf2d2mg.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -708,7 +709,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./server-hcvcxzx7.js";
+} from "./server-f27he3j1.js";
 import {
   GIT_SWEEP_LEASE_RENEWAL_MS,
   acquireGitSweepLease,
@@ -735,7 +736,7 @@ import {
   drainCommitBacklogForProject2,
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2
-} from "./server-fw31krgq.js";
+} from "./server-4easnf78.js";
 import"./server-fb3zxn06.js";
 import {
   SESSION_NOTE_CONDITION_ERROR,
@@ -779,15 +780,15 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./server-jdwd03ep.js";
+} from "./server-4zwx20yg.js";
 import {
   deriveTriggerBudget2,
   deriveHistorianChunkTokens2,
   resolveKnownHistorianContextLimit2,
   resolveHistorianProducerLimits2,
   resolveHistorianContextLimit2
-} from "./server-t528t8qm.js";
-import"./server-x08d1xf3.js";
+} from "./server-hn9fb3v0.js";
+import"./server-npm52h2q.js";
 import {
   isEmbeddingHostBusy2
 } from "./server-qt1qqasc.js";
@@ -798,10 +799,10 @@ import {
 } from "./server-4dhv7mqz.js";
 import {
   getLocalEmbeddingNativeMemoryStats
-} from "./server-ras2sxnc.js";
+} from "./server-44ryn9rb.js";
 import {
   cosineSimilarity
-} from "./server-sy4b1sra.js";
+} from "./server-4rs8sm06.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -826,7 +827,7 @@ import {
   mergeMemoryStats2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./server-9yyqq3mm.js";
+} from "./server-n78avt2p.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -834,11 +835,11 @@ import {
   drainNotifications2,
   isTuiConnected2
 } from "./server-x8a7jmkh.js";
-import"./server-676xw7at.js";
+import"./server-ckrb5rm8.js";
 import {
   flushIgnoredMessages2,
   sendStatusNotification2
-} from "./server-qcw43339.js";
+} from "./server-ak7w74j9.js";
 import {
   renderSingleStoreMigrationRequiredRefusal,
   SingleStoreMigrationRequiredError,
@@ -859,7 +860,7 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-nfan6zb6.js";
+} from "./server-2hxypdx5.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
@@ -873,6 +874,10 @@ import {
 import {
   computeNormalizedHash
 } from "./server-2bvekkfy.js";
+import {
+  sameProjectDirectory,
+  canonicalProjectDirectory
+} from "./server-knvkbfvh.js";
 import {
   getErrorMessage,
   describeError
@@ -899,7 +904,7 @@ import {
 } from "./server-8ajstryz.js";
 import {
   logSlowWriteTransaction
-} from "./server-3t0q2cqx.js";
+} from "./server-7dv9wt9r.js";
 
 // ../../node_modules/.bun/zod@4.1.8/node_modules/zod/v4/classic/external.js
 var exports_external = {};
@@ -2968,10 +2973,10 @@ async function sourceReady(source, sessionId) {
 function defer(fn) {
   const immediate = globalThis.setImmediate;
   if (typeof immediate === "function") {
-    immediate(fn);
+    inRootAsyncContext2(() => immediate(fn));
     return;
   }
-  setTimeout(fn, 0);
+  inRootAsyncContext2(() => setTimeout(fn, 0));
 }
 function yieldToEventLoop() {
   return new Promise((resolve) => defer(resolve));
@@ -3055,14 +3060,14 @@ function scheduleReconciliation(db, sessionId, readMessages) {
       reconcileSessionIndex(db, sessionId, readMessages).then((ran) => {
         if (ran)
           return;
-        setTimeout(() => {
+        inRootAsyncContext2(() => setTimeout(() => {
           heapHolder.reconciliationScheduledSessions.delete(sessionId);
           scheduleReconciliation(db, sessionId, readMessages);
-        }, PREPARE_RETRY_MS).unref?.();
+        }, PREPARE_RETRY_MS)).unref?.();
       }).catch((error) => {
         logIndexingError(sessionId, "reconciliation", error);
         if (isDatabaseLockedError(error))
-          setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000).unref();
+          inRootAsyncContext2(() => setTimeout(() => scheduleReconciliation(db, sessionId, readMessages), 1000)).unref();
       }).finally(() => {
         heapHolder.reconciliationScheduledSessions.delete(sessionId);
       });
@@ -3872,7 +3877,7 @@ function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
       pending.delete(key);
       resolve();
     };
-    const queued = setTimeout(() => {
+    const queued = inRootAsyncContext2(() => setTimeout(() => {
       lifecycle.signal.removeEventListener("abort", cancel);
       if (lifecycle.signal.aborted)
         return done();
@@ -3883,7 +3888,7 @@ function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
         clearTimeout(timeout);
         done();
       });
-    }, 0);
+    }, 0));
     const cancel = () => {
       clearTimeout(queued);
       done();
@@ -3930,7 +3935,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     deadlineUnixMs: autoSearchDeadlineUnixMs(deadlineSignal)
   };
   return new Promise((resolve, reject) => {
-    const worker = new Worker(entry, { workerData: input });
+    const worker = inRootAsyncContext2(() => new Worker(entry, { workerData: input }));
     let settled = false;
     const finish = (results, error) => {
       if (settled)
@@ -4042,7 +4047,7 @@ function searchMessageHistoryOffThread(db, request, entry = defaultAutoSearchWor
       deadline.unref?.();
     };
     try {
-      worker = new Worker(entry, { workerData: input });
+      worker = inRootAsyncContext2(() => new Worker(entry, { workerData: input }));
     } catch (error) {
       finish(null, "start-failed", error);
       return;
@@ -5931,7 +5936,7 @@ function maybeInjectChannel1Nudge(args, sessionId, tool, output) {
     setChannel1NudgeState(args.db, sessionId, nextNudgeState);
     return;
   }
-  out.output += buildChannel1Reminder(decision.level, decision.undroppedTokens, reclaimableToolOutputCount(state.baselineParts), state.oldestReclaimableToolTags, decision.sticky);
+  out.output += buildChannel1Reminder(decision.level, decision.undroppedTokens, currentReclaimableToolOutputCount(state), state.oldestReclaimableToolTags, decision.sticky);
   setChannel1NudgeState(args.db, sessionId, {
     ...nextNudgeState,
     ordinal: state.realUserTurnCount
@@ -7672,7 +7677,7 @@ function buildEditSupersessionReclaim(input) {
       seenFile.add(filePath);
       continue;
     }
-    if (input.recentMessageIds && (tag.toolOwnerMessageId === null || input.recentMessageIds.has(tag.toolOwnerMessageId))) {
+    if (tag.tagNumber > input.watermark || input.recentMessageIds && (tag.toolOwnerMessageId === null || input.recentMessageIds.has(tag.toolOwnerMessageId))) {
       continue;
     }
     if (realPendingTagIds.has(tag.tagNumber))
@@ -7770,6 +7775,51 @@ async function waitForTagOwners(db, sessionId, ratio, waitMs = 250) {
   }
 }
 
+// src/shared/reclaim-distance.ts
+var RECLAIM_DISTANCE_USER_TURNS = 3;
+var RECLAIM_DISTANCE_WINDOW_FRACTION = 0.25;
+function isReclaimUserTurn(args) {
+  return args.role === "user" && !args.syntheticHead && !args.synthetic && !args.ignored && args.parts.some((part) => {
+    if (part.synthetic || part.ignored)
+      return false;
+    if (part.kind !== "text" && part.kind !== "image" && part.kind !== "file")
+      return false;
+    if (part.kind !== "text")
+      return true;
+    return stripReclaimMcText(part.text ?? "").trim().length > 0;
+  });
+}
+function stripReclaimMcText(text) {
+  return text.replace(/^§\d+§\s*/, "").replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, (reminder) => /^(?:Your next step: call ctx_reduce on the outputs you've already used|Still unstamped:|Housekeeping: .* are reclaimable\. Stamp each output with ctx_reduce|.* are reclaimable\. Make a ctx_reduce pass now|.* are still unstamped\. Call ctx_reduce now)/.test(reminder.slice("<system-reminder>".length).trimStart()) ? "" : reminder).replace(/<instruction name="deferred_notes">[\s\S]*?<\/instruction>/g, "");
+}
+function farBehindToolBookmark(entries, usableWindow) {
+  let newerTurns = 0;
+  let newerTokens = 0;
+  const farTags = [];
+  let firstYoungTag = Infinity;
+  const seenOutputs = new Set;
+  const tokenDistance = usableWindow > 0 && Number.isFinite(usableWindow) ? usableWindow * RECLAIM_DISTANCE_WINDOW_FRACTION : Infinity;
+  for (let index = entries.length - 1;index >= 0; index--) {
+    const entry = entries[index];
+    if (!entry)
+      continue;
+    const tag = entry.toolOutputTag;
+    if (tag !== undefined && !seenOutputs.has(tag)) {
+      seenOutputs.add(tag);
+      if (newerTurns >= RECLAIM_DISTANCE_USER_TURNS || newerTokens >= tokenDistance) {
+        farTags.push(tag);
+      } else {
+        firstYoungTag = Math.min(firstYoungTag, tag);
+      }
+    }
+    if (entry.userTurn)
+      newerTurns++;
+    if (Number.isFinite(entry.tokens) && entry.tokens > 0)
+      newerTokens += entry.tokens;
+  }
+  return farTags.reduce((bookmark, tag) => tag < firstYoungTag ? Math.max(bookmark, tag) : bookmark, 0);
+}
+
 // src/hooks/magic-context/tool-reclaim.ts
 function buildSyntheticToolReclaimOps(input) {
   const watermark = Math.max(0, input.watermark);
@@ -7801,10 +7851,74 @@ function buildSyntheticToolReclaimOps(input) {
   }
   return synthetic;
 }
-function advanceToolReclaimWatermarkToCurrentMax(db, sessionId) {
-  const maxTagNumber = getMaxTagNumberBySession2(db, sessionId);
-  advanceToolReclaimWatermark(db, sessionId, maxTagNumber);
-  return maxTagNumber;
+function advanceToolReclaimWatermarkByDistance(db, sessionId, entries, usableWindow) {
+  const bookmark = farBehindToolBookmark(entries, usableWindow);
+  advanceToolReclaimWatermark(db, sessionId, bookmark);
+  return bookmark;
+}
+function toolReclaimDistanceEntries(messages, targets) {
+  const outputTags = new Map;
+  for (const [tag, target] of targets) {
+    for (const location of target.mutationParts ?? []) {
+      const part = distancePart(location.part);
+      if (part.kind === "tool_result" || part.kind === "tool")
+        outputTags.set(location.part, tag);
+    }
+  }
+  const entries = [];
+  for (const message of messages) {
+    const parts = message.parts.map(distancePart);
+    let userTurn = isReclaimUserTurn({ ...message.info, parts });
+    for (const [index, part] of parts.entries()) {
+      const authored = isReclaimUserTurn({ role: "user", parts: [part] });
+      entries.push({
+        tokens: message.info.syntheticHead ? 0 : estimateTokens(stripReclaimMcText(part.text ?? "")) + part.imageTokens,
+        userTurn: userTurn && authored,
+        toolOutputTag: outputTags.get(message.parts[index])
+      });
+      if (authored)
+        userTurn = false;
+    }
+  }
+  return entries;
+}
+function distancePart(raw) {
+  if (!raw || typeof raw !== "object")
+    return { kind: "structural", imageTokens: 0 };
+  const part = raw;
+  const provenance = { synthetic: part.synthetic === true, ignored: part.ignored === true };
+  if (typeof part.getText === "function") {
+    const text = part.getText();
+    return {
+      ...provenance,
+      kind: String(part.kind),
+      text: typeof text === "string" ? text : undefined,
+      imageTokens: typeof part.imageTokens === "function" ? Number(part.imageTokens()) : 0
+    };
+  }
+  const metadata = { ...provenance, imageTokens: estimatePartImageTokens(raw) };
+  if (part.type === "tool") {
+    const state = part.state;
+    return {
+      ...metadata,
+      kind: "tool",
+      text: `${JSON.stringify(state?.input ?? {})}
+${typeof state?.output === "string" ? state.output : JSON.stringify(state?.output ?? "")}`
+    };
+  }
+  if (part.type === "tool_use")
+    return { ...metadata, kind: "tool_use", text: JSON.stringify(part.input ?? {}) };
+  if (part.type === "tool_result")
+    return {
+      ...metadata,
+      kind: "tool_result",
+      text: typeof part.content === "string" ? part.content : JSON.stringify(part.content ?? "")
+    };
+  return {
+    ...metadata,
+    kind: String(part.type),
+    text: typeof part.text === "string" ? part.text : typeof part.thinking === "string" ? part.thinking : undefined
+  };
 }
 // src/hooks/magic-context/strip-structural-noise.ts
 var STRUCTURAL_PART_TYPES = new Set(["meta", "step-start", "step-finish", "reasoning"]);
@@ -9349,6 +9463,7 @@ async function runPostTransformPhase(args) {
   const shouldApplyPendingOps = publishedWorkDrainAllowed;
   const shouldRunHeuristics = publishedWorkDrainAllowed && (rideSignals.publishedHistory || materializationRequested || forceMaterialization || foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild || emergencyDropEligible || args.schedulerDecision === "execute" && (!alreadyRanThisTurn || !args.fullFeatureMode));
   const isCacheBustingPass = publishedWorkDrainAllowed;
+  const reclaimDistance = isCacheBustingPass ? toolReclaimDistanceEntries(args.messages, args.targets) : [];
   const canEditWholePrefix = isCacheBustingPass && !activeThinkingPrefixHold;
   const previousTemporalDecisions = args.temporalCandidates && !compactionOff ? new Map([
     ...args.temporalObservedDecisions ?? [],
@@ -9692,6 +9807,7 @@ async function runPostTransformPhase(args) {
           }
         }
         const editReclaim = buildEditSupersessionReclaim({
+          watermark: args.sessionMeta.toolReclaimWatermark ?? 0,
           db: args.db,
           sessionId: args.sessionId,
           targets: newTargets,
@@ -9730,7 +9846,7 @@ async function runPostTransformPhase(args) {
     const tBatchFinalize = performance.now();
     args.batch?.finalize();
     if (toolReclaimApplicationOpportunity) {
-      const maxTagNumber = advanceToolReclaimWatermarkToCurrentMax(args.db, args.sessionId);
+      const maxTagNumber = advanceToolReclaimWatermarkByDistance(args.db, args.sessionId, reclaimDistance, args.usableWindow);
       args.sessionMeta.toolReclaimWatermark = Math.max(args.sessionMeta.toolReclaimWatermark ?? 0, maxTagNumber);
     }
     if (autoReclaimTargetCount > 0) {
@@ -10409,6 +10525,7 @@ async function runPostTransformPhase(args) {
         const hygieneCalibration = sessionDecisionCalibration(args.db, args.sessionId);
         const hygieneUnitsVersion = transitionSessionHygieneUnits(args.db, args.sessionId, bustedThisPass, hygieneCalibration);
         const baseline = refreshTailHygieneBaseline({
+          opencode2: args.opencode2,
           messages: args.messages,
           tags,
           protectedTagNumbers: args.protectedTagNumbers,
@@ -10425,7 +10542,7 @@ async function runPostTransformPhase(args) {
           sessionLog2(args.sessionId, formatTailHygienePrefixMismatch(baseline.lastPrefixMismatch, baseline.baselineGeneration));
         }
         const tTailState = performance.now();
-        const structuralSignature = tailHygieneStructuralSignature(args.messages);
+        const structuralSignature = tailHygieneStructuralSignature(args.messages, args.opencode2);
         const effective = effectiveTailHygiene(baseline);
         const durableGrace = baseline.evaluable && !baseline.generationInvalidated ? captureChannel1PostReduceGraceBaseline(args.db, args.sessionId, effective.u) : getChannel1NudgeState(args.db, args.sessionId);
         baseline.channel1PostReduceGrace = durableGrace.postReduceGracePending || durableGrace.postReduceGraceBaselineU !== undefined ? {
@@ -10437,7 +10554,7 @@ async function runPostTransformPhase(args) {
           ...baseline,
           usableWindow: args.usableWindow,
           realUserTurnCount: countRealUserMessages(args.messages),
-          reducedSinceRefresh: baseline.baselineGeneration !== previous?.baselineGeneration ? false : previous?.reducedSinceRefresh ?? false,
+          reducedSinceRefresh: baseline.baselineGeneration !== previous?.baselineGeneration || (previous?.generationInvalidated === true || previous?.evaluable === false) && baseline.evaluable && !baseline.generationInvalidated ? false : previous?.reducedSinceRefresh ?? false,
           agentDropsAppliedThisPass: pendingOpsDidMutate,
           oldestReclaimableToolTags: postprocessOldestTags(args.db, args.sessionId, args.protectedTagNumbers)
         });
@@ -10475,7 +10592,7 @@ async function runPostTransformPhase(args) {
   const tTailGuard = performance.now();
   if (assertedBaseline) {
     try {
-      const servedSignature = tailHygieneStructuralSignature(args.messages);
+      const servedSignature = tailHygieneStructuralSignature(args.messages, args.opencode2);
       if (!sameTailHygieneStructuralSignature(assertedBaseline.structuralSignature, servedSignature)) {
         sessionLog2(args.sessionId, `ERROR [tail-hygiene-last-writer-mismatch]: served messages changed after tail-hygiene baseline refresh (expected messages=${assertedBaseline.structuralSignature.messageCount}, parts=[${assertedBaseline.structuralSignature.partCounts.join(",")}], bytes=${assertedBaseline.structuralSignature.totalBytes}; actual messages=${servedSignature.messageCount}, parts=[${servedSignature.partCounts.join(",")}], bytes=${servedSignature.totalBytes})`);
       }
@@ -10483,6 +10600,7 @@ async function runPostTransformPhase(args) {
       sessionLog2(args.sessionId, "ERROR [tail-hygiene-last-writer-check-failed]: structural production guard failed open:", error);
     }
     assertTailHygieneContentUnchangedIfEnabled({
+      opencode2: args.opencode2,
       messages: args.messages,
       tags: assertedBaseline.tags,
       protectedTagNumbers: assertedBaseline.protectedTagNumbers,
@@ -14159,16 +14277,19 @@ function rustCaptureDigests(inputs, prior, acceptedInputs) {
   } : undefined);
   return { ...incremental, inputContentSignatures };
 }
+var contentSnapshotFieldVisitObserverForTests;
 function messageMatchesContentSnapshot(message, snapshot) {
   let fieldIndex = 0;
   const matched = visitMessageContentFields(contentSnapshotValue(message), {
     field(value) {
+      contentSnapshotFieldVisitObserverForTests?.();
       if (!Object.is(value, snapshot.fields[fieldIndex]))
         return false;
       fieldIndex += 1;
       return true;
     },
     beginObject() {
+      contentSnapshotFieldVisitObserverForTests?.();
       const expectedCount = snapshot.fields[fieldIndex];
       if (typeof expectedCount !== "number")
         return;
@@ -17504,15 +17625,27 @@ class UnmanagedOverWindowError extends Error {
 }
 
 // src/hooks/magic-context/unresolved-history-boundary.ts
+function storedHistoryBoundaryPresence(db, sessionId) {
+  try {
+    const row = db.prepare("SELECT cached_m0_last_baseline_end_message_id AS id FROM session_meta WHERE session_id = ?").get(sessionId);
+    return row?.id ? hasRawSessionMessageById2(sessionId, row.id) : undefined;
+  } catch {
+    return;
+  }
+}
+
 class UnresolvedHistoryBoundaryError extends Error {
   estimatedTokens;
   contextLimitTokens;
+  boundaryPresent;
   code = "UNRESOLVED_HISTORY_BOUNDARY";
   recoverable = true;
-  constructor(estimatedTokens, contextLimitTokens) {
-    super(renderUserFacingFailure("history_boundary_unresolved", "plain"));
+  constructor(estimatedTokens, contextLimitTokens, boundaryPresent) {
+    const reason = boundaryPresent === true ? "The boundary row is present in the host store but out of order relative to the loaded history. " : boundaryPresent === false ? "The boundary row is missing from the host store. " : "";
+    super(reason + renderUserFacingFailure("history_boundary_unresolved", "plain"));
     this.estimatedTokens = estimatedTokens;
     this.contextLimitTokens = contextLimitTokens;
+    this.boundaryPresent = boundaryPresent;
     this.name = "UnresolvedHistoryBoundaryError";
   }
 }
@@ -18509,6 +18642,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const protectedCutoff = protectionWindow.cutoff;
     const tPostProcess = performance.now();
     const postTransformResult = await runPostTransformPhase({
+      opencode2: deps.storeGeneration === "v2",
       normalizeRecoveryTail,
       compactionMarkerStrategy: deps.compactionMarkerStrategy ?? defaultCompactionMarkerStrategy,
       sessionId,
@@ -18669,7 +18803,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         });
         if (untrimmed.tokens > boundaryContextLimit) {
           sessionLog2(sessionId, `history boundary unresolved: prefix trim refused and the untrimmed request estimate ${untrimmed.tokens} (trusted=${untrimmed.trusted}) exceeds the context limit ${boundaryContextLimit}; not sending it`);
-          throw new UnresolvedHistoryBoundaryError(untrimmed.tokens, boundaryContextLimit);
+          throw new UnresolvedHistoryBoundaryError(untrimmed.tokens, boundaryContextLimit, storedHistoryBoundaryPresence(db, sessionId));
         }
       }
       if (unmanagedOverWindowPass) {
@@ -21715,6 +21849,7 @@ 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 {}
+    modelKey ??= persistedModelKey ?? undefined;
     const modelSlash = modelKey?.indexOf("/") ?? -1;
     if (modelKey && modelSlash > 0) {
       detail.windowGeometry = resolveContextWindowGeometry(modelKey.slice(0, modelSlash), modelKey.slice(modelSlash + 1), { db, sessionID: sessionId });
@@ -22059,7 +22194,7 @@ function registerRpcHandlers(rpcServer, args) {
     const sessionId = String(params.sessionId ?? "");
     if (!sessionId)
       return { owner: false };
-    const sessionDirectory = liveSessionState.sessionDirectoryBySession.get(sessionId) ?? await readHostSessionDirectory(args.client, sessionId);
+    const sessionDirectory = args.readSessionDirectory ? await args.readSessionDirectory(sessionId) : await readHostSessionDirectory(args.client, sessionId) ?? liveSessionState.sessionDirectoryBySession.get(sessionId);
     if (!sessionDirectory)
       return { owner: false };
     return {
@@ -22130,7 +22265,7 @@ function registerRpcHandlers(rpcServer, args) {
     return { count: buildCompartmentCount(db, sessionId, moduleStatus) };
   });
   const buildManagedCtx = async (db) => {
-    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await importPluginModule(() => import("./derive-budgets-enckmg7y.js"));
+    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await importPluginModule(() => import("./derive-budgets-0rmpmxjw.js"));
     const { resolveHistorianModel } = await importPluginModule(() => import("./model-resolution-nx97z3x7.js"));
     const { userMemoryCollectionEnabled } = await importPluginModule(() => import("./task-config-x0hq3qfd.js"));
     const DEFAULT_HISTORIAN_TIMEOUT_MS = 10 * 60 * 1000;
@@ -22145,6 +22280,7 @@ function registerRpcHandlers(rpcServer, args) {
       directory,
       historianChunkTokens: deriveHistorianChunkTokens(resolveHistorianContextLimit(historianModel.primary?.model)),
       historianTimeoutMs: runConfig.historian_timeout_ms ?? DEFAULT_HISTORIAN_TIMEOUT_MS,
+      historianMaxOutputTokens: runConfig.historian?.maxTokens,
       memoryEnabled: config.memory?.enabled ?? true,
       autoPromote: runConfig.memory?.auto_promote ?? true,
       historianModel: historianModel.primary,
@@ -22159,6 +22295,20 @@ function registerRpcHandlers(rpcServer, args) {
     const sessionId = String(params.sessionId ?? "");
     if (!sessionId)
       return { ok: false, error: "no session" };
+    const readDirectory = args.readSessionDirectory;
+    if (readDirectory) {
+      const { handoffHistoryWork } = await import("./history-owner-2cr9py37.js");
+      const handed = await handoffHistoryWork({
+        storageDir: args.storageDir ?? getMagicContextStorageDir(),
+        directory,
+        sessionId,
+        method: "recomp",
+        params,
+        readDirectory: () => readDirectory(sessionId)
+      });
+      if (handed)
+        return handed;
+    }
     const dir = String(params.directory ?? directory);
     if (config.transform_mode === "rust") {
       return executeRustRecompRpc(rustModeModuleClient, sessionId, dir);
@@ -22166,8 +22316,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-n11zv1f1.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-ppgc8qdz.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-s5tdpsbs.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-6n7chhyp.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -22223,6 +22373,21 @@ function registerRpcHandlers(rpcServer, args) {
     return { ok: true, message };
   });
   rpcServer.handle("wrapup", async (params) => {
+    const readDirectory = args.readSessionDirectory;
+    if (readDirectory && params.sessionId) {
+      const { handoffHistoryWork } = await import("./history-owner-2cr9py37.js");
+      const sessionId = String(params.sessionId);
+      const handed = await handoffHistoryWork({
+        storageDir: args.storageDir ?? getMagicContextStorageDir(),
+        directory,
+        sessionId,
+        method: "wrapup",
+        params,
+        readDirectory: () => readDirectory(sessionId)
+      });
+      if (handed)
+        return handed;
+    }
     const sessionId = String(params.sessionId ?? "");
     if (!sessionId)
       return { ok: false, error: "no session" };
@@ -22236,7 +22401,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-s92ebfzv.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-wg8dmmm9.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -22661,7 +22826,7 @@ class MagicContextRpcServer {
     }
     this.startedAt = Date.now();
     const self = this;
-    const server = Bun.serve({
+    const server = inRootAsyncContext2(() => Bun.serve({
       port: 0,
       hostname: "127.0.0.1",
       fetch(req, srv) {
@@ -22684,7 +22849,7 @@ class MagicContextRpcServer {
           self.sockets.delete(ws);
         }
       }
-    });
+    }));
     this.server = server;
     this.port = server.port ?? 0;
     try {
@@ -24732,7 +24897,7 @@ function childCreateInput(identity, role, model) {
     },
     location: { directory: identity.directory },
     metadata: { magic_context: "hidden-run", role },
-    permissions: hiddenChildPermissions(agent)
+    permissions: hiddenChildPermissions(agent, model.providerID)
   };
 }
 function assistantOutcome(row) {
@@ -24817,7 +24982,7 @@ function createNativeHiddenChildren(host, removeSession, options) {
     }
     const directory = stored.location?.directory;
     if (options.directory !== undefined && directory !== undefined && !sameProjectDirectory(directory, options.directory)) {
-      throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", `hidden child ${sessionID} is bound to ${directory}, not to this instance's ${options.directory}`, true);
+      throw new HiddenCompletionRefusal("hidden_prompt_unrecognized", `hidden child ${sessionID} is bound to ${directory}, not to this instance's ${options.directory}. Reopen the parent session in ${directory}, then run /ctx-recomp so its owning instance can rebuild history.`, true);
     }
     if (stored.parentID === parentID || parentDroppedNoted)
       return;
@@ -25412,6 +25577,9 @@ async function createV2HiddenCompletionExecutor(host, options) {
           body.temperature = temperature;
         request = { ...request, body };
       }
+      if (needsBlockedRead(run.identity.agent, run.child.model.providerID) !== needsBlockedRead(run.identity.agent, requested.providerID)) {
+        retire(run, "hidden-run-tool-surface-changed");
+      }
       if (run.retired) {
         run.child = await lifecycle.create(run.identity, run.role, requested);
         run.failed = false;
@@ -25444,7 +25612,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
         budgetReject = reject;
       });
       if (budget) {
-        budgetPoll = setInterval(() => {
+        budgetPoll = inRootAsyncContext2(() => setInterval(() => {
           try {
             const fresh = withReader(options.openReader, (reader) => reader.assistantSince?.(run.child.id, usageSeq) ?? (() => {
               const latest = reader.latestAssistant(run.child.id);
@@ -25458,7 +25626,10 @@ async function createV2HiddenCompletionExecutor(host, options) {
               const decision = budget.charge(Math.max(0, tokens?.input ?? 0), Math.max(0, tokens?.cache?.read ?? 0), Math.max(0, tokens?.cache?.write ?? 0), row.data.finish === "stop" && !(row.data.content ?? []).some((part) => part.type === "tool-call"), false);
               const onBudgetUpdate = run.identity.metadata?.onBudgetUpdate;
               if (typeof onBudgetUpdate === "function")
-                onBudgetUpdate({ ...budget.snapshot(), sessionId: run.child.id });
+                onBudgetUpdate({
+                  ...budget.snapshot(),
+                  sessionId: run.child.id
+                });
               if (decision !== "continue") {
                 if (budgetPoll)
                   clearInterval(budgetPoll);
@@ -25472,7 +25643,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
               clearInterval(budgetPoll);
             budgetReject(error instanceof Error ? error : new Error(String(error)));
           }
-        }, POLL_INTERVAL_MS);
+        }, POLL_INTERVAL_MS));
       }
       let abortReject;
       const aborted = new Promise((_resolve, reject) => {
@@ -25520,8 +25691,14 @@ async function createV2HiddenCompletionExecutor(host, options) {
         const system = typeof request.body.system === "string" ? request.body.system : run.identity.system;
         const tokens = row.data.tokens;
         const tokenNumber = (value) => typeof value === "number" && Number.isFinite(value) ? value : undefined;
-        const reportedInput = tokenNumber(tokens?.input);
-        const reportedOutput = tokenNumber(tokens?.output);
+        const steps = withReader(options.openReader, (reader) => reader.assistantSince?.(run.child.id, baseline) ?? [row]).filter((step) => step.seq > baseline && step.seq <= row.seq);
+        const reportedUsage = steps.some((step) => tokenNumber(step.data.tokens?.input) !== undefined || tokenNumber(step.data.tokens?.output) !== undefined);
+        const usage = steps.reduce((total, step) => ({
+          input: total.input + (tokenNumber(step.data.tokens?.input) ?? 0),
+          output: total.output + (tokenNumber(step.data.tokens?.output) ?? 0),
+          cacheRead: total.cacheRead + (tokenNumber(step.data.tokens?.cache?.read) ?? 0),
+          cacheWrite: total.cacheWrite + (tokenNumber(step.data.tokens?.cache?.write) ?? 0)
+        }), { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 });
         if (request.signal?.aborted || run.retired || Date.now() >= deadline) {
           await interruptAndRetire(run, "prompt-aborted-or-timeout");
           throw new Error(request.signal?.aborted ? "Hidden completion prompt aborted" : "Hidden completion prompt timed out");
@@ -25531,12 +25708,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
           tokenLog: runTokenLog(tokens, run.identity.maxOutputTokens, row.data.finish),
           ...hiddenToolLoop(run.identity) ? { messages: toolLoopMessages(attempt) } : {},
           reasoning: text ? null : assistantReasoning(row),
-          usage: reportedInput !== undefined || reportedOutput !== undefined ? {
-            input: reportedInput ?? 0,
-            output: reportedOutput ?? 0,
-            cacheRead: tokenNumber(tokens?.cache?.read) ?? 0,
-            cacheWrite: tokenNumber(tokens?.cache?.write) ?? 0
-          } : meter(system, promptText(request), text ?? ""),
+          usage: reportedUsage ? usage : meter(system, promptText(request), text ?? ""),
           lengthCapped: ["length", "max_tokens"].includes(row.data.finish ?? ""),
           providerId: row.data.model?.providerID ?? requested.providerID,
           modelId: row.data.model?.id ?? requested.modelID
@@ -25637,7 +25809,7 @@ async function deliverPendingChannel2(context, db, sessionID, baseline) {
   if (!claimChannel2NudgeState(db, sessionID, token))
     return;
   try {
-    await deliverSynthetic(context, sessionID, buildChannel2Reminder(evaluation.reclaimableTokens, reclaimableToolOutputCount(baseline?.baselineParts ?? [])));
+    await deliverSynthetic(context, sessionID, buildChannel2Reminder(evaluation.reclaimableTokens, currentReclaimableToolOutputCount(baseline)));
   } catch (error) {
     casChannel2NudgeClaim(db, sessionID, "pending", token);
     throw error;
@@ -26034,7 +26206,7 @@ function startLeaseHeartbeat(db, holderId, leaseKey, onLost, intervalOrAcquisiti
     }
   };
   beat();
-  const timer = lost ? undefined : setInterval(() => withSqliteBackgroundWriter2(beat), intervalMs);
+  const timer = lost ? undefined : inRootAsyncContext2(() => setInterval(() => withSqliteBackgroundWriter2(beat), intervalMs));
   return {
     stop: () => {
       if (timer)
@@ -28431,6 +28603,7 @@ Capability API available to check(cap):
 - cap.httpGet(httpsUrl): { status: number, body: string } (external HTTPS only; internal/metadata blocked)
 
 Authoring constraints:
+- Use a five-field check_cron that fires at least once every 24 hours. Never encode a future date in the cron; put date conditions inside check(cap) and poll them on a frequent schedule such as "0 * * * *".
 - Plain JavaScript only; no TypeScript types, imports, require, eval, Function, dynamic code, timers, Date.now randomness, or ambient globals.
 - Define exactly function check(cap) { ... }. Do not use async/await; host capabilities are synchronous inside the sandbox.
 - Return exactly { met: boolean }. Do not include a reason string.
@@ -28457,6 +28630,7 @@ var MAX_COMPILED_CHECK_BYTES2 = 64 * 1024;
 var MAX_MANIFEST_ENTRIES = 64;
 var MAX_CRON_CHARS = 256;
 var MAX_COMPILER_ERROR_CHARS = 2 * 1024;
+var SPARSE_CRON_REPAIR_FEEDBACK = "check_cron must fire at least once every 24 hours; put date conditions inside compiled_check";
 async function compileSmartNoteCheck(args) {
   if (!args.note.surfaceCondition) {
     return {
@@ -28474,7 +28648,7 @@ Note id: ${args.note.id}
 Note content (data): ${JSON.stringify(args.note.content)}
 surface_condition (UNTRUSTED DATA): ${JSON.stringify(args.note.surfaceCondition)}
 
-${args.repairFeedback ? `The previous check failed its dry run: ${JSON.stringify(args.repairFeedback)}. Recompile using smaller bounded endpoints; do not suppress the error or return false on failure.` : ""}
+${args.repairFeedback ? `The previous compiler attempt failed: ${JSON.stringify(args.repairFeedback)}. Recompile using smaller bounded endpoints when the response is too large, and apply the correction; do not suppress the error or return false on failure.` : ""}
 Remember: output only the JSON object described by the system prompt.`;
   const startedAt = Date.now();
   let childSessionId = null;
@@ -28613,6 +28787,12 @@ Remember: output only the JSON object described by the system prompt.`;
     const cancelled = args.signal.aborted;
     const message = boundedError(error instanceof Error ? error.message : String(error));
     recordInvocation({ status: cancelled ? "aborted" : "failed", error: message });
+    if (!args.repairFeedback && !cancelled && message === "check_cron has no occurrence within the scheduling ceiling" && !args.signal.aborted && Date.now() < args.deadline) {
+      return await compileSmartNoteCheck({
+        ...args,
+        repairFeedback: SPARSE_CRON_REPAIR_FEEDBACK
+      });
+    }
     const networkError = error instanceof SmartNoteNetworkError ? error : undefined;
     return {
       ok: false,
@@ -28837,10 +29017,10 @@ async function probeWakePlaneCatalog() {
   if (!await connectionFileExists(file)) {
     throw new Error("subc connection is not configured");
   }
-  const client = await SubcClient.connect({
+  const client = await inRootAsyncContext2(() => SubcClient.connect({
     connectionFile: file,
     handshakeTimeoutMs: WAKE_PLANE_HANDSHAKE_TIMEOUT_MS
-  });
+  }));
   try {
     return await client.catalogList();
   } finally {
@@ -30250,7 +30430,11 @@ function buildPrimerClusters(args) {
     centroid: cloneVector(primer.questionEmbedding),
     modelId: primer.questionEmbeddingModelId
   }));
-  const sorted = args.candidates.slice().sort((a, b) => candidateSortKey(a).localeCompare(candidateSortKey(b)));
+  const sorted = args.candidates.slice().sort((a, b) => {
+    const left = candidateSortKey(a);
+    const right = candidateSortKey(b);
+    return left < right ? -1 : left > right ? 1 : 0;
+  });
   for (const candidate of sorted) {
     let best = null;
     for (const cluster of clusters) {
@@ -34358,7 +34542,7 @@ async function startDreamScheduleTimer(args) {
       startupTickTimer = null;
       runTick("startup");
     });
-    const timer = setInterval(() => runTick("interval"), DREAM_TIMER_INTERVAL_MS);
+    const timer = inRootAsyncContext2(() => setInterval(() => runTick("interval"), DREAM_TIMER_INTERVAL_MS));
     if (typeof timer === "object" && "unref" in timer) {
       timer.unref();
     }
@@ -34654,7 +34838,7 @@ async function runCompiledSmartNoteSweep(reg, db) {
   }
 }
 function startGitSweepLeaseRenewal(db, projectIdentity, holderId) {
-  const timer = setInterval(() => {
+  const timer = inRootAsyncContext2(() => setInterval(() => {
     try {
       if (!renewGitSweepLease(db, projectIdentity, holderId)) {
         log2(`[git-commits] sweep lease renewal failed for ${projectIdentity}`);
@@ -34662,7 +34846,7 @@ function startGitSweepLeaseRenewal(db, projectIdentity, holderId) {
     } catch (error) {
       log2(`[git-commits] sweep lease renewal errored for ${projectIdentity}: ${error instanceof Error ? error.message : String(error)}`);
     }
-  }, GIT_SWEEP_LEASE_RENEWAL_MS);
+  }, GIT_SWEEP_LEASE_RENEWAL_MS));
   timer.unref?.();
   return () => clearInterval(timer);
 }
@@ -35201,12 +35385,12 @@ function createRustRefusalRecovery(options) {
     watchers.delete(sessionId);
   };
   const schedule = (sessionId, watcher) => {
-    watcher.timer = setTimeout(() => void poll(sessionId, watcher), pollIntervalMs);
+    watcher.timer = inRootAsyncContext2(() => setTimeout(() => void poll(sessionId, watcher), pollIntervalMs));
   };
   const probe = async (watcher, sessionId) => {
     const controller = new AbortController;
     const timeoutError = new Error("rust refusal recovery probe timed out");
-    const timer = setTimeout(() => controller.abort(timeoutError), probeTimeoutMs);
+    const timer = inRootAsyncContext2(() => setTimeout(() => controller.abort(timeoutError), probeTimeoutMs));
     try {
       await Promise.race([
         options.moduleClient.call({
@@ -35888,6 +36072,14 @@ function createV2RawMessageReader(openReader) {
         reader.close();
       }
     },
+    orderOf: (sessionID, messageID) => {
+      const reader = openReader();
+      try {
+        return reader.sequenceForId(sessionID, messageID) ?? null;
+      } finally {
+        reader.close();
+      }
+    },
     ordinalMapForRange: (sessionID, fromOrdinal, toOrdinal) => {
       const reader = openReader();
       try {
@@ -35945,6 +36137,9 @@ function createV2RawMessageProvider(reader, sessionID) {
     readMessagePartsById: (messageID) => reader.findPartsById(sessionID, messageID),
     hasMessageById: (messageID) => reader.hasById(sessionID, messageID),
     readMessageOrdinalById: (messageID) => reader.ordinalOf(sessionID, messageID),
+    ...reader.orderOf ? {
+      readMessageOrderById: (messageID) => reader.orderOf?.(sessionID, messageID) ?? null
+    } : {},
     readMessageIdOrdinalsForRange: (fromOrdinal, toOrdinal) => reader.ordinalMapForRange(sessionID, fromOrdinal, toOrdinal),
     readMessageOrdinalPage: (after, limit) => reader.readOrdinalPage(sessionID, after, limit),
     getMessageCount: () => reader.getCount(sessionID),
@@ -51326,6 +51521,13 @@ ${baseline}
     hiddenCompletionExecutor: storageOpenedAtBoot ? hiddenCompletionExecutor : lateHiddenExecutor,
     compactionMarkerStrategy: v2CompactionMarkerStrategy,
     prepareHistorySession,
+    readSessionDirectory: async (sessionID) => {
+      try {
+        return (await context.session.get({ sessionID })).location?.directory ?? null;
+      } catch {
+        return null;
+      }
+    },
     storageDir
   });
   rpcServer.handle("dream", async (params) => {
@@ -51393,11 +51595,11 @@ ${baseline}
     directory,
     compactionEnabled: !compactionOff
   });
-  setTimeout(() => {
+  inRootAsyncContext2(() => setTimeout(() => {
     if (rpcStopped)
       return;
     rpcServer.start().catch((error) => log2("[magic-context] v2 RPC server failed to start", error));
-  }, 0);
+  }, 0));
   return {
     async dispose() {
       rpcStopped = true;