@cortexkit/opencode-magic-context 0.49.7 → 0.49.9

package/dist/{index-tagss15p.js → index-x57ep4fp.js}

@@ -15,7 +15,7 @@ import {
   log2,
   sessionLog2,
   getLoggerDiagnostics2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -28,6 +28,7 @@ import {
   claimOpenCodeDbDiagnosticOnce
 } from "./index-58e3y90n.js";
 import {
+  inRootAsyncContext2,
   Database2,
   getSqliteDatabasePath2,
   getSqliteMemoryStats2,
@@ -38,7 +39,7 @@ import {
   SqliteAcquisitionBusyError2,
   withAsyncPrivilegedWriter2,
   indexCoordinationInput2
-} from "./index-j8epsc0g.js";
+} from "./index-wafzvyhg.js";
 import {
   shouldSkipHomeProjectMemory,
   ProjectIdentityError,
@@ -53,7 +54,7 @@ import {
   storedPathBelongsToIdentity,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-g8qbdb03.js";
+} from "./index-0jz47061.js";
 import {
   recordSessionProjectIdentity,
   hasRecordedSessionProjectIdentity,
@@ -80,7 +81,7 @@ import {
   drainCommitBacklogForProject2,
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2
-} from "./index-sf94at64.js";
+} from "./index-rg1cezmj.js";
 import {
   hasTrustedAbsoluteWall,
   applyProvenInputFloor,
@@ -92,7 +93,7 @@ import {
   deriveTriggerBudget2,
   resolveKnownHistorianContextLimit2,
   resolveHistorianProducerLimits2
-} from "./index-w23dh319.js";
+} from "./index-jw4gbfkv.js";
 import {
   resolveModelCalibration,
   calibrateBuckets,
@@ -106,11 +107,12 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./index-qx53vezw.js";
+} from "./index-gjvjh960.js";
 import {
   protectedToolTokenCount,
   peelLeadingMcTagNotation,
   isThinkingPart,
+  currentReclaimableToolOutputCount,
   isRecord,
   contentTagOwnerMessageId,
   normalizeTodoStateJson,
@@ -121,7 +123,6 @@ import {
   evaluateChannel2,
   formatChannel1Evaluation,
   formatChannel2Evaluation,
-  reclaimableToolOutputCount,
   buildChannel2Reminder,
   buildChannel1Reminder,
   queuePendingOp,
@@ -143,11 +144,11 @@ import {
   getDroppedTagsByNumbers2,
   getMaxDroppedTagNumber2,
   getTagById2
-} from "./index-tmtty2x5.js";
+} from "./index-f8cn4xqa.js";
 import {
   observeTemporalDecisions,
   stableStringify
-} from "./index-1bt88epp.js";
+} from "./index-g7jkrz0x.js";
 import {
   withContentLanguageDirective,
   parseCron,
@@ -160,13 +161,13 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DEFAULT_LOCAL_EMBEDDING_MODEL,
   DREAM_TASK_PROMOTION_DEFAULTS
-} from "./index-k6xvbj2e.js";
+} from "./index-w28y7d0z.js";
 import {
   isRawCompactionSummaryInfo2,
   extractInMemoryMessageViews2,
   buildInMemoryTailRawMessages2,
   runSessionWarmupWorker
-} from "./index-37q80veb.js";
+} from "./index-angx1s0k.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
@@ -174,7 +175,7 @@ import {
   latestPersistedMessageForRecovery,
   latestRealUserTurnIdFromOpenCodeDb,
   findLastAssistantModelFromOpenCodeDb
-} from "./index-a8acx4gc.js";
+} from "./index-q76br5zn.js";
 import {
   expandToolPart,
   estimateTrueRawMessageTokens,
@@ -291,13 +292,14 @@ import {
   readRawSessionMessageIdOrdinalsForRange2,
   readRawSessionMessagePartsById2,
   readRawSessionBoundaryEndpoints2,
+  hasRawSessionMessageById2,
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./index-n5a170gs.js";
+} from "./index-wpwpn7nj.js";
 import {
   getMeasuredToolDefinitionTokens
-} from "./index-h2wc01qk.js";
+} from "./index-9jvab89d.js";
 import {
   CANONICAL_DREAM_TASKS,
   DREAM_TASK_CAPABILITIES,
@@ -325,20 +327,17 @@ import {
   runSqliteOptimize,
   openDatabase,
   openCurrentDatabase
-} from "./index-4btknbqh.js";
+} from "./index-swgpe402.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
   rpcPortFilePath,
   parseRpcPortFile,
   inspectProcessesAsync
-} from "./index-w4mw92w3.js";
+} from "./index-q28hsbpg.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fb3zxn06.js";
-import {
-  canonicalProjectDirectory
-} from "./index-rzmjkdd6.js";
 import {
   unescapeXml,
   resolveWorkspaceShareCategories,
@@ -347,7 +346,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./index-j5hce1ab.js";
+} from "./index-a865mj02.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -521,7 +520,7 @@ import {
   snapRangeToCompartments,
   getActiveCompartmentRun,
   startCompartmentAgent
-} from "./index-5tbvdff4.js";
+} from "./index-3403gbzj.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -529,7 +528,7 @@ import {
   toSynapseLaneDescriptor,
   formatSynapseLaneDescriptor,
   SynapseEmbeddingProvider
-} from "./index-vkbqdnkj.js";
+} from "./index-kvw6xew3.js";
 import {
   BoundedSessionMap,
   LkgRecoveryFenceError,
@@ -550,7 +549,7 @@ import {
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexes2
-} from "./index-wq16ahsn.js";
+} from "./index-0x9cn9w1.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode,
@@ -594,7 +593,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./index-n7kwfw2r.js";
+} from "./index-16vwdyy5.js";
 import {
   registerNotificationSink2,
   pushNotification2,
@@ -604,7 +603,7 @@ import {
 } from "./index-x8a7jmkh.js";
 import {
   getLocalEmbeddingNativeMemoryStats
-} from "./index-gbmqa9x9.js";
+} from "./index-bmwfzz28.js";
 import {
   saveEmbeddingIfHashMatches,
   invalidateProject2,
@@ -612,7 +611,7 @@ import {
 } from "./index-4dhv7mqz.js";
 import {
   cosineSimilarity
-} from "./index-w6bd03dc.js";
+} from "./index-a43xq1pg.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -637,7 +636,7 @@ import {
   mergeMemoryStats2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./index-9yyqq3mm.js";
+} from "./index-n78avt2p.js";
 import {
   renderSingleStoreMigrationRequiredRefusal,
   SingleStoreMigrationRequiredError,
@@ -659,17 +658,17 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./index-j58gqrn2.js";
+} from "./index-ffa8x2as.js";
 import {
   flushIgnoredMessages2,
   clearIgnoredMessages2,
   observeIgnoredNotificationEvent2,
   sendStatusNotification2
-} from "./index-vt4sf4ep.js";
+} from "./index-pgy3h49n.js";
 import {
   setRecompStarting2,
   setRecompTerminal2
-} from "./index-rwmpkss5.js";
+} from "./index-21919gcq.js";
 import {
   makeToolCompositeKey,
   searchMessageHistoryOffThread,
@@ -720,7 +719,7 @@ import {
   abortSessionFailClosed2,
   evaluateEmergencyFailClosed2,
   runPostTransformPhase2
-} from "./index-ebnngykq.js";
+} from "./index-6k86es2p.js";
 import {
   ANNOUNCEMENT_VERSION2,
   ANNOUNCEMENT_FEATURES2,
@@ -737,6 +736,9 @@ import {
 import {
   computeNormalizedHash
 } from "./index-2bvekkfy.js";
+import {
+  canonicalProjectDirectory
+} from "./index-knvkbfvh.js";
 import {
   getErrorMessage,
   describeError
@@ -759,7 +761,7 @@ import {
 } from "./index-8ajstryz.js";
 import {
   logSlowWriteTransaction
-} from "./index-4mjhqadz.js";
+} from "./index-150zz6fh.js";
 
 // src/features/magic-context/dreamer/open-opencode-db.ts
 function openOpenCodeDb() {
@@ -1280,6 +1282,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.
@@ -1524,7 +1527,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)
@@ -5422,6 +5425,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 {
@@ -5439,7 +5443,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;
@@ -5578,6 +5582,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,
@@ -5984,10 +5994,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 {
@@ -7397,7 +7407,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) {
@@ -11120,10 +11134,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));
@@ -11207,14 +11221,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);
       });
@@ -11229,7 +11243,7 @@ function scheduleIncrementalIndex(db, sessionId, messageId, messageSource) {
   const activeTimer = heapHolder.incrementalTimers.get(schedulingKey);
   if (activeTimer)
     clearTimeout(activeTimer);
-  const timer = setTimeout(() => {
+  const timer = inRootAsyncContext2(() => setTimeout(() => {
     heapHolder.incrementalTimers.delete(schedulingKey);
     heapHolder.pendingIncrementalKeys.add(schedulingKey);
     const indexMessage = async () => {
@@ -11273,7 +11287,7 @@ function scheduleIncrementalIndex(db, sessionId, messageId, messageSource) {
       if ((sessionEpochs.get(sessionId) ?? 0) === epoch)
         heapHolder.pendingIncrementalKeys.delete(schedulingKey);
     });
-  }, INCREMENTAL_DEBOUNCE_MS);
+  }, INCREMENTAL_DEBOUNCE_MS));
   heapHolder.incrementalTimers.set(schedulingKey, timer);
 }
 async function indexSingleMessageOffThread(db, sessionId, message) {
@@ -11490,7 +11504,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();
     }
@@ -11786,7 +11800,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}`);
@@ -11794,7 +11808,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);
 }
@@ -14819,7 +14833,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
@@ -15491,6 +15505,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 });
@@ -15835,7 +15850,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 {
@@ -15906,7 +15921,7 @@ function registerRpcHandlers(rpcServer, args) {
     return { count: buildCompartmentCount(db, sessionId, moduleStatus) };
   });
   const buildManagedCtx = async (db) => {
-    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await importPluginModule(() => import("./derive-budgets-j4ry8j8n.js"));
+    const { deriveHistorianChunkTokens, resolveHistorianContextLimit } = await importPluginModule(() => import("./derive-budgets-3nbxsyss.js"));
     const { resolveHistorianModel } = await importPluginModule(() => import("./model-resolution-nx97z3x7.js"));
     const { userMemoryCollectionEnabled } = await importPluginModule(() => import("./task-config-cgpg0nvh.js"));
     const DEFAULT_HISTORIAN_TIMEOUT_MS = 10 * 60 * 1000;
@@ -15921,6 +15936,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,
@@ -15935,6 +15951,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-ty29fz0f.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);
@@ -15942,8 +15972,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-trcgmm23.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-2tp44tfa.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-77xc8wpe.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-q8ngbap3.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -15999,6 +16029,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-ty29fz0f.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" };
@@ -16012,7 +16057,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-df61jmz9.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-b1z99yg5.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -16203,7 +16248,7 @@ function scheduleOpenCodeTransformDecisionWrite(args) {
   lastBoundMessageIdBySession.set(args.sessionId, args.messageId);
   pendingDecisionBySession.delete(args.sessionId);
   const token = addScheduledWriteToken(args.sessionId);
-  setTimeout(() => {
+  inRootAsyncContext2(() => setTimeout(() => {
     try {
       if (!hasScheduledWriteToken(args.sessionId, token))
         return;
@@ -16217,7 +16262,7 @@ function scheduleOpenCodeTransformDecisionWrite(args) {
     } finally {
       deleteScheduledWriteToken(args.sessionId, token);
     }
-  }, 0);
+  }, 0));
   return true;
 }
 function addScheduledWriteToken(sessionId) {
@@ -16378,7 +16423,7 @@ async function maybeDeliverChannel2(sessionId, deps) {
     return false;
   }
   try {
-    const reminder = deps.directiveText ?? buildChannel2Reminder(effectiveU, reclaimableToolOutputCount(deps.baseline?.baselineParts ?? []), deps.oldestReclaimableToolTags);
+    const reminder = deps.directiveText ?? buildChannel2Reminder(effectiveU, currentReclaimableToolOutputCount(deps.baseline), deps.oldestReclaimableToolTags);
     const sent = await deliverSyntheticUserMessage(sessionId, {
       client,
       text: reminder,
@@ -19927,16 +19972,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;
@@ -23282,15 +23330,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";
   }
 }
@@ -24296,6 +24356,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const protectedCutoff = protectionWindow.cutoff;
     const tPostProcess = performance.now();
     const postTransformResult = await runPostTransformPhase2({
+      opencode2: deps.storeGeneration === "v2",
       normalizeRecoveryTail,
       compactionMarkerStrategy: deps.compactionMarkerStrategy ?? defaultCompactionMarkerStrategy2,
       sessionId,
@@ -24456,7 +24517,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) {
@@ -24854,12 +24915,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({
@@ -28264,7 +28325,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) {
@@ -28287,7 +28348,7 @@ class MagicContextRpcServer {
           self.sockets.delete(ws);
         }
       }
-    });
+    }));
     this.server = server;
     this.port = server.port ?? 0;
     try {

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,qBAAqB,CAAC;AA4GvE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAqiCpC,QAAA,MAAM,MAAM,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,OAAO,KAAK,CAAA;CAIjD,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,qBAAqB,CAAC;AA8GvE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAuiCpC,QAAA,MAAM,MAAM,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,OAAO,KAAK,CAAA;CAIjD,CAAC;AAEF,eAAe,MAAM,CAAC"}