@cortexkit/opencode-magic-context 0.49.19 → 0.49.21

package/dist/{context-j31m2dv7.js → context-j7hp43a0.js}

@@ -44,6 +44,11 @@ import {
   HiddenChildHook,
   parseProviderModel,
   toModelEntry,
+  ModelProducedNoOutputError,
+  noteModelActivityMonitored,
+  noteModelOutputReceived,
+  annotateSubagentInvocationError,
+  recordChildInvocation,
   CTX_NOTE_LIGHT_DESCRIPTION,
   ACTIVE_TOOL_IDS,
   createPromptSurfaceRuntime,
@@ -54,7 +59,7 @@ import {
   rebaseSessionCoordinatesAsync,
   resolveOpenCodeProtectedTailBoundary,
   getActiveCompartmentRun
-} from "./index-rpxdjkm0.js";
+} from "./index-y76rhsnr.js";
 import"./index-sd3egckz.js";
 import {
   getHarness2
@@ -66,7 +71,7 @@ import {
 import {
   log2,
   sessionLog2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   isSaneLimit,
   setOutputReserveConfig,
@@ -76,8 +81,8 @@ import {
   deriveHistorianChunkTokens2,
   resolveKnownHistorianContextLimit2,
   resolveHistorianContextLimit2
-} from "./index-v10f1rjv.js";
-import"./index-wgypt3cs.js";
+} from "./index-spwjbkc7.js";
+import"./index-nxrsns5x.js";
 import {
   CANONICAL_DREAM_TASKS,
   DREAM_TASK_CAPABILITIES,
@@ -86,7 +91,7 @@ import {
   buildDreamTaskRuntimeConfigs2,
   userObservationCollectionEnabled2,
   userObservationsRequested2
-} from "./index-p5y3k4g7.js";
+} from "./index-nda0zgna.js";
 import {
   logConfigDependencyNotesOnce,
   runSessionProjectBackfill,
@@ -96,6 +101,7 @@ import {
   createDreamTaskExecutor,
   runManualDream,
   runDueTasksForProject,
+  scheduleClearAndReindex,
   startDreamScheduleTimer,
   createDreamTimerModuleClient,
   ensureProjectRegisteredFromOpenCodeDirectory,
@@ -132,6 +138,8 @@ import {
   createMessagesTransformHandler,
   subagentToolRefusal,
   hideSubagentTools,
+  removePrimaryOnlyTools,
+  storedSubagentMode,
   createCtxExpandTools,
   createCtxMemoryTools,
   createCtxMemoryListTools,
@@ -143,10 +151,10 @@ import {
   applyJsonSchemaParameterDescriptions,
   MagicContextRpcServer,
   subagentTemperature
-} from "./index-3esx8tkf.js";
+} from "./index-11gzxvf4.js";
 import {
   resolveHistorianModel2
-} from "./index-8cd2j99z.js";
+} from "./index-5kym00ag.js";
 import {
   formatFailClosedBlockingMessage,
   formatFailClosedBlockingSummary,
@@ -158,12 +166,49 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./index-jrr131e0.js";
+} from "./index-a9zvn5fe.js";
 import {
   setHomeProjectPermission,
   resolveProjectIdentityForSession,
   scheduleAfterBootQuiet
-} from "./index-2vxtcb95.js";
+} from "./index-kq5w68dp.js";
+import"./index-c7phnbvk.js";
+import {
+  BoundedSessionMap,
+  advanceSessionActivity,
+  backfillSessionActivity,
+  gaDatabasePath,
+  RAW_MESSAGE_TYPES,
+  V2StoreReaderPool,
+  V2StoreReader
+} from "./index-mnnkgq0q.js";
+import"./index-v0p37hm2.js";
+import {
+  inRootAsyncContext2,
+  withSqliteTransformPass2,
+  withoutSqliteTransformPass2,
+  isTransientSqliteError2,
+  withAsyncPrivilegedWriter2
+} from "./index-gzy5w8ya.js";
+import"./index-cpjk5jd2.js";
+import"./index-jfem3dgz.js";
+import"./index-58e3y90n.js";
+import"./index-1zx87sdm.js";
+import {
+  stripPersistedAssistantText,
+  currentReclaimableToolOutputCount,
+  isRecord,
+  isDroppedToolOutput,
+  evaluateChannel2,
+  buildChannel2Reminder
+} from "./index-whcgcfrv.js";
+import {
+  hasMeaningfulUserText2,
+  preloadTokenizer,
+  estimateTokens
+} from "./index-b88dwwrh.js";
+import"./index-x9k3mqrf.js";
+import"./index-ksq50rg0.js";
 import {
   needsBlockedRead,
   markHostUnservedRow,
@@ -191,6 +236,7 @@ import {
   getObservedEpochFloor,
   detectOverflow,
   modelAcceptsEmptyContent,
+  markServedShapeRepair,
   getEmptyImageParts,
   estimateFinalWireInputTokens,
   hasRawMessageProvider2,
@@ -198,62 +244,28 @@ import {
   cleanUserText2,
   readRawSessionMessageIdOrdinalsForRange2,
   readRawSessionMessageOrdinalById2
-} from "./index-9zcsy3hh.js";
-import {
-  invalidateAutoEmbedSession,
-  clearEmbedSessionState
-} from "./index-ze7mvk54.js";
-import {
-  hasMeaningfulUserText2,
-  preloadTokenizer,
-  estimateTokens
-} from "./index-c5pytzne.js";
-import"./index-6x57ar45.js";
-import {
-  inRootAsyncContext2,
-  withSqliteTransformPass2,
-  withoutSqliteTransformPass2,
-  isTransientSqliteError2,
-  withAsyncPrivilegedWriter2
-} from "./index-beht37jy.js";
-import"./index-v0p37hm2.js";
-import"./index-s734jcsr.js";
-import"./index-a6mc0v4d.js";
-import {
-  deleteChunkEmbedBackoffForSession
-} from "./index-b5vqckbw.js";
-import"./index-nj7yykkx.js";
-import {
-  BoundedSessionMap,
-  advanceSessionActivity,
-  backfillSessionActivity,
-  gaDatabasePath,
-  RAW_MESSAGE_TYPES,
-  V2StoreReaderPool,
-  V2StoreReader
-} from "./index-se4m2g6w.js";
-import"./index-bp5083x2.js";
-import"./index-1zx87sdm.js";
-import {
-  stripPersistedAssistantText,
-  currentReclaimableToolOutputCount,
-  isDroppedToolOutput,
-  evaluateChannel2,
-  buildChannel2Reminder
-} from "./index-cf74k5ak.js";
-import"./index-58e3y90n.js";
-import"./index-kq82mtg0.js";
+} from "./index-mnhcdfxg.js";
 import {
   getCurrentToolSetHash,
   recordToolDefinition
-} from "./index-ke416mdc.js";
+} from "./index-j76ah6d7.js";
+import"./index-x6cbrv9h.js";
+import"./index-wfybj1dw.js";
+import {
+  deleteChunkEmbedBackoffForSession2
+} from "./index-m32esgmj.js";
+import {
+  invalidateAutoEmbedSession,
+  clearEmbedSessionState,
+  retainProjectEmbedding2
+} from "./index-zy67whjr.js";
 import"./index-fr0wbhdn.js";
-import"./index-63k48rv9.js";
+import"./index-9q1g3c5q.js";
 import"./index-fb3zxn06.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode
-} from "./index-3h4dp9wb.js";
+} from "./index-3svaejkh.js";
 import {
   createTagger,
   cavemanWordRulesForLanguage,
@@ -262,29 +274,29 @@ import {
   EmergencyFailClosedError,
   DegradedPassRefusalError,
   isSyntheticHeadMessage2
-} from "./index-jhghdnsm.js";
-import"./index-4s3t0nd0.js";
+} from "./index-1kbznkft.js";
+import"./index-qgh1qwjj.js";
 import"./index-qt1qqasc.js";
-import"./index-rr2bb45z.js";
+import"./index-kfyb3k6n.js";
 import"./index-4dhv7mqz.js";
-import"./index-bjcnntmz.js";
-import"./index-24fezq97.js";
-import"./index-n37sebck.js";
+import"./index-51rdvtkz.js";
+import"./index-rxqr723x.js";
+import"./index-jjvbk92s.js";
 import {
   pushNotification2,
   isTuiConnected2
 } from "./index-x8a7jmkh.js";
-import"./index-y9f76s3f.js";
-import"./index-s74zqahq.js";
-import"./index-dxmq29t1.js";
-import"./index-c1p88z1y.js";
+import"./index-rrv26qjz.js";
+import"./index-66eby7hx.js";
+import"./index-syaazvy2.js";
+import"./index-ffzhwfzy.js";
 import"./index-gp3kcpc4.js";
 import {
   detectConflicts
-} from "./index-kee4kn5j.js";
+} from "./index-4pnsgvfk.js";
 import"./index-fmsr7v69.js";
 import"./index-kaqs6h31.js";
-import"./index-edmpdxcw.js";
+import"./index-j32jj2t8.js";
 import {
   isDreamerRunnable,
   isSmartNoteSurfaceAvailable,
@@ -296,7 +308,7 @@ import {
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";
-import"./index-k29z4aqh.js";
+import"./index-t5pck3ss.js";
 
 // src/v2/hooks/context.ts
 import { setTimeout as delay } from "node:timers/promises";
@@ -350,7 +362,7 @@ function dropCompartmentsAfter(db, sessionId, anchor, holderId, activeBranch = f
       if (marker && clearPendingPiCompactionMarkerStateIf(db, sessionId, marker, null))
         clearedMarker = marker;
     }
-    deleteChunkEmbedBackoffForSession(db, sessionId);
+    deleteChunkEmbedBackoffForSession2(db, sessionId);
     queueM0Mutation(db, { sessionId, mutationType: "recomp_boundary_change" });
     clearCachedM0M1(db, sessionId);
     db.exec("COMMIT");
@@ -602,9 +614,9 @@ function trimToRecordedBoundary(db, sessionId, messages) {
 }
 
 // src/v2/fold/host-media.ts
-var isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+var isRecord2 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
 function isClassInstance(value) {
-  if (!isRecord(value))
+  if (!isRecord2(value))
     return false;
   const prototype = Object.getPrototypeOf(value);
   return prototype !== Object.prototype && prototype !== null;
@@ -623,10 +635,10 @@ function rememberHostMedia(messages) {
     if (!Array.isArray(content))
       continue;
     for (const part of content) {
-      if (!isRecord(part) || part.type !== "media")
+      if (!isRecord2(part) || part.type !== "media")
         continue;
       const media = part.media;
-      if (isClassInstance(media) && isRecord(media.source)) {
+      if (isClassInstance(media) && isRecord2(media.source)) {
         rememberedAssetClass = Object.getPrototypeOf(media).constructor;
         return;
       }
@@ -683,7 +695,7 @@ function hostMediaAsset(data, mediaType) {
   return hostMediaFromEncoded({ source: { type: "base64", data, mediaType } });
 }
 function hostMediaFromEncoded(value) {
-  if (!isRecord(value.source))
+  if (!isRecord2(value.source))
     return "missing Media.Asset source";
   const encoded = structuredClone(value);
   if (encoded.source.type === "bytes") {
@@ -1026,8 +1038,8 @@ function toolStateContent(state) {
 }
 
 // src/v2/hooks/copied-tag-notation.ts
-function stripCopiedTagNotation(text) {
-  return text.includes("§") ? stripPersistedAssistantText(text) : text;
+function stripCopiedTagNotation(text, acceptsEmpty = true) {
+  return text.includes("§") ? stripPersistedAssistantText(text, acceptsEmpty) : text;
 }
 
 // src/v2/hooks/payload.ts
@@ -1094,18 +1106,56 @@ function containsHostInstance(value) {
   return false;
 }
 function clonePreservingInstances(value) {
-  if (isHostInstance(value))
+  return cloneCounting(value, undefined);
+}
+function clonePreservingInstancesMeasured(value) {
+  const meter = { bytes: 0 };
+  const copy = cloneCounting(value, meter);
+  return { copy, bytes: meter.bytes };
+}
+function cloneCounting(value, meter) {
+  if (isHostInstance(value)) {
+    if (meter)
+      meter.bytes += instanceBytes(value, new WeakSet);
     return value;
-  if (Array.isArray(value))
-    return value.map(clonePreservingInstances);
+  }
+  if (Array.isArray(value)) {
+    if (meter)
+      meter.bytes += 16 + 8 * value.length;
+    return value.map((entry) => cloneCounting(entry, meter));
+  }
   if (value && typeof value === "object") {
     const copy = {};
-    for (const [key, entry] of Object.entries(value))
-      copy[key] = clonePreservingInstances(entry);
+    if (meter)
+      meter.bytes += 32;
+    for (const [key, entry] of Object.entries(value)) {
+      if (meter)
+        meter.bytes += 16;
+      copy[key] = cloneCounting(entry, meter);
+    }
     return copy;
   }
+  if (meter)
+    meter.bytes += typeof value === "string" ? 2 * value.length : 8;
   return value;
 }
+function instanceBytes(value, seen) {
+  if (typeof value === "string")
+    return 2 * value.length;
+  if (!value || typeof value !== "object")
+    return 8;
+  if (seen.has(value))
+    return 0;
+  seen.add(value);
+  if (ArrayBuffer.isView(value))
+    return value.byteLength;
+  if (value instanceof ArrayBuffer)
+    return value.byteLength;
+  let bytes = 32;
+  for (const entry of Object.values(value))
+    bytes += 16 + instanceBytes(entry, seen);
+  return bytes;
+}
 function contentKey(value) {
   const plain = (entry) => {
     if (ArrayBuffer.isView(entry)) {
@@ -1161,7 +1211,7 @@ function rebuildFileContent(value, output, attachments) {
     rebuilt.unshift({ type: "text", text: output });
   return { type: "content", value: rebuilt };
 }
-function adaptPayload(draft, admittedIDs = new Set, messageTimes = new Map) {
+function adaptPayload(draft, admittedIDs = new Set, messageTimes = new Map, hiddenTimes = false) {
   const existingHeads = new Map(draft.messages.filter((m) => HEAD_IDS.some((id) => m.id === id)).map((m) => [m.id, m]));
   const source = draft.messages.filter((m) => !existingHeads.has(m.id));
   const results = new Map;
@@ -1244,12 +1294,16 @@ function adaptPayload(draft, admittedIDs = new Set, messageTimes = new Map) {
   const messages = [];
   for (const message of source) {
     const parts = [];
+    const copiedTagOnly = [];
     for (const content of message.content) {
       if (paired.has(content))
         continue;
       const part = callParts.get(content) ?? (content.type === "tool-result" ? nativeTool(undefined, { part: content, message }) : clonePreservingInstances(content));
-      if (message.role === "assistant" && part.type === "text" && typeof part.text === "string")
-        part.text = stripCopiedTagNotation(part.text);
+      if (message.role === "assistant" && part.type === "text" && typeof part.text === "string") {
+        if (!modelAcceptsEmptyContent(draft.model.providerID) && part.text.trim().length > 0 && stripCopiedTagNotation(part.text).trim().length === 0)
+          copiedTagOnly.push({ index: parts.length, text: part.text });
+        part.text = stripCopiedTagNotation(part.text, modelAcceptsEmptyContent(draft.model.providerID));
+      }
       if (message.id && admittedIDs.has(message.id))
         part.synthetic = true;
       parts.push(part);
@@ -1280,7 +1334,18 @@ function adaptPayload(draft, admittedIDs = new Set, messageTimes = new Map) {
       },
       parts
     };
+    if (hiddenTimes && mapped.info.time !== undefined) {
+      const time = mapped.info.time;
+      delete mapped.info.time;
+      Object.defineProperty(mapped.info, "time", {
+        value: time,
+        enumerable: false,
+        configurable: true,
+        writable: true
+      });
+    }
     originals.set(mapped, message);
+    markServedShapeRepair(mapped.info, copiedTagOnly);
     if (isCoveredInstructionRow(message))
       markCoveredInstructionRow(mapped.info);
     if (typeof message.id !== "string")
@@ -2675,10 +2740,12 @@ function assistantText(row) {
 
 class HiddenProviderError extends Error {
   settled;
+  hostError;
   constructor(detail, options = {}) {
     super(`Hidden completion provider error: ${detail}`);
     this.name = "HiddenProviderError";
     this.settled = options.settled ?? true;
+    this.hostError = options.hostError;
   }
 }
 function requestModel(request, current) {
@@ -2742,7 +2809,9 @@ async function awaitAssistantRow(openReader, readSessionError, localFailure, chi
           `terminal_row=${errorText(newIdle)}`,
           `session_error=${sessionError === undefined ? "unavailable" : errorText(sessionError)}`
         ];
-        throw sessionError === undefined || !isProviderFailure(sessionError) ? new Error(`Hidden completion failed: ${details.join("; ")}`) : new HiddenProviderError(details.join("; "));
+        throw sessionError === undefined || !isProviderFailure(sessionError) ? new Error(`Hidden completion failed: ${details.join("; ")}`, {
+          cause: sessionError
+        }) : new HiddenProviderError(details.join("; "), { hostError: sessionError });
       }
       if (outcome === "succeeded" && newAssistant)
         return newAssistant;
@@ -2756,7 +2825,9 @@ async function awaitAssistantRow(openReader, readSessionError, localFailure, chi
           `terminal_row=${errorText(newAssistant)}`,
           `session_error=${sessionError === undefined ? "unavailable" : errorText(sessionError)}`
         ];
-        throw sessionError === undefined || !isProviderFailure(sessionError) ? new Error(`Hidden completion failed: ${details.join("; ")}`) : new HiddenProviderError(details.join("; "));
+        throw sessionError === undefined || !isProviderFailure(sessionError) ? new Error(`Hidden completion failed: ${details.join("; ")}`, {
+          cause: sessionError
+        }) : new HiddenProviderError(details.join("; "), { hostError: sessionError });
       }
       if (newAssistant.data.error !== undefined) {
         throw new HiddenProviderError(errorText(newAssistant.data.error), {
@@ -2911,7 +2982,13 @@ async function createV2HiddenCompletionExecutor(host, options) {
         const head = await resolveHead(identity);
         const active = await lifecycle.open(identity, role, head);
         openedChild = active;
-        const handle = { id: active.id, childSessionId: active.id };
+        const configuredModel = toModelEntry(identity.model);
+        const handle = {
+          id: active.id,
+          childSessionId: active.id,
+          attemptedModel: modelKey(head),
+          ...configuredModel?.sourceConfigKey ? { modelConfigKey: configuredModel.sourceConfigKey } : {}
+        };
         const tokenBudget = identity.metadata?.tokenBudget;
         const run = {
           identity,
@@ -2942,6 +3019,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
       }
     },
     async attempt(handle, request) {
+      const startedAt = Date.now();
       const run = runs.get(handle);
       if (!run)
         throw new Error("Unknown hidden completion run");
@@ -2959,6 +3037,10 @@ async function createV2HiddenCompletionExecutor(host, options) {
         throw new Error("Hidden completion prompt aborted");
       }
       const requested = await validateVariant(requestModel(request, run.child.model));
+      const requestedRef = modelKey(requested);
+      const configuredModel = [run.identity.model, ...run.identity.configuredModels ?? []].map(toModelEntry).find((entry) => entry?.model === requestedRef);
+      handle.attemptedModel = requestedRef;
+      handle.modelConfigKey = configuredModel?.sourceConfigKey ?? handle.modelConfigKey;
       if (run.identity.kind !== "dreamer-task" && request.body.temperature === undefined) {
         const configured = options.historianTemperature?.();
         if (typeof configured === "number" && Number.isFinite(configured))
@@ -3053,6 +3135,22 @@ async function createV2HiddenCompletionExecutor(host, options) {
         abortReject = reject;
       });
       const onAbort = () => {
+        const reason = request.signal?.reason;
+        if (reason instanceof ModelProducedNoOutputError && run.identity.kind === "dreamer-task") {
+          recordChildInvocation({
+            db: options.db,
+            parentSessionId: run.identity.parentSessionId ?? options.projectIdentity,
+            parentInvocationId: run.identity.parentInvocationId,
+            harness: "opencode2",
+            subagent: "dreamer",
+            task: run.identity.title.replace(/^magic-context-dream-/, ""),
+            startedAt,
+            status: "timed_out",
+            error: reason,
+            providerId: requested.providerID,
+            modelId: requested.modelID
+          });
+        }
         interruptAndRetire(run, "prompt-aborted").finally(() => abortReject(new Error("Hidden completion prompt aborted")));
       };
       const deadlineTimer = setTimeout(() => {
@@ -3081,6 +3179,9 @@ async function createV2HiddenCompletionExecutor(host, options) {
         })
       };
       inFlight.add(entry);
+      const stopWatching = host.watchModelActivity?.(run.child.id, () => noteModelOutputReceived(request.signal));
+      if (stopWatching)
+        noteModelActivityMonitored(request.signal);
       try {
         await Promise.race([
           host.prompt({ sessionID: run.child.id, text: marker }),
@@ -3136,12 +3237,20 @@ async function createV2HiddenCompletionExecutor(host, options) {
           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
+          modelId: row.data.model?.id ?? requested.modelID,
+          attemptedModel: requestedRef,
+          modelConfigKey: handle.modelConfigKey
         };
         if (!run.child.ever_settled)
           run.child = lifecycle.markEverSettled(run.child);
       } catch (caught) {
         const error = attempt.budgetExceeded ?? attempt.stepLimit ?? attempt.refusal ?? caught;
+        const hostError = error instanceof HiddenProviderError ? error.hostError : error instanceof Error && error.message.startsWith("Hidden completion failed:") ? error.cause : undefined;
+        annotateSubagentInvocationError(error, {
+          attemptedModel: handle.attemptedModel,
+          modelConfigKey: handle.modelConfigKey,
+          ...hostError === undefined ? {} : { hostError }
+        });
         run.failed = true;
         if (!(error instanceof HiddenProviderError)) {
           run.unsettledFailure = true;
@@ -3155,6 +3264,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
         }
         throw error;
       } finally {
+        stopWatching?.();
         clearTimeout(deadlineTimer);
         if (budgetPoll)
           clearInterval(budgetPoll);
@@ -3210,6 +3320,30 @@ async function createV2HiddenCompletionExecutor(host, options) {
   };
 }
 
+// src/v2/hidden-model-activity.ts
+class HiddenModelActivity {
+  watchers = new Map;
+  watch(sessionID, onOutput) {
+    this.watchers.set(sessionID, onOutput);
+    return () => {
+      if (this.watchers.get(sessionID) === onOutput)
+        this.watchers.delete(sessionID);
+    };
+  }
+  observe(event) {
+    if (!isRecord(event) || !isRecord(event.data))
+      return;
+    const { sessionID, delta, text } = event.data;
+    if (typeof sessionID !== "string")
+      return;
+    const streamed = ["session.text.delta", "session.reasoning.delta", "session.tool.input.delta"].includes(String(event.type)) && typeof delta === "string" && delta.length > 0;
+    const ended = ["session.text.ended", "session.reasoning.ended"].includes(String(event.type)) && typeof text === "string" && text.length > 0;
+    if (streamed || ended || event.type === "session.tool.input.started") {
+      this.watchers.get(sessionID)?.();
+    }
+  }
+}
+
 // src/v2/hooks/channel2.ts
 import { randomBytes } from "node:crypto";
 var pendingCandidates = new WeakMap;
@@ -3611,7 +3745,7 @@ function registerV2DreamScheduleTimer(args) {
       since_days: gitCommitIndexing.since_days,
       max_commits: gitCommitIndexing.max_commits
     } : undefined,
-    ensureRegistered: ensureProjectRegisteredFromOpenCodeDirectory
+    ensureRegistered: args.ensureRegistered ?? ensureProjectRegisteredFromOpenCodeDirectory
   }).catch((error) => {
     log2(`[magic-context] v2 dream timer registration failed (continuing without it): ${error}`);
     return;
@@ -3706,6 +3840,41 @@ function startDreamTrigger(context, args) {
   };
 }
 
+// src/v2/hooks/embedding-lifecycle.ts
+function createV2EmbeddingScope(initialProject) {
+  const releases = new Map;
+  const pending = new Set;
+  let disposed = false;
+  let disposal;
+  const claim = (project) => {
+    if (!releases.has(project))
+      releases.set(project, retainProjectEmbedding2(project));
+  };
+  if (initialProject)
+    claim(initialProject);
+  return {
+    ensureRegistered(directory, db) {
+      if (disposed)
+        return Promise.resolve();
+      const registration = ensureProjectRegisteredFromOpenCodeDirectory(directory, db, {
+        onRegistered: claim
+      });
+      pending.add(registration);
+      return registration.finally(() => pending.delete(registration));
+    },
+    dispose() {
+      disposed = true;
+      disposal ??= (async () => {
+        await Promise.allSettled([...pending]);
+        for (const release of releases.values())
+          release();
+        releases.clear();
+      })();
+      return disposal;
+    }
+  };
+}
+
 // src/v2/hooks/generate.ts
 function generateReplayAnchor(messages) {
   let index = messages.length - 1;
@@ -3718,26 +3887,70 @@ function generateReplayAnchor(messages) {
     return;
   return { id, tail: clonePreservingInstances(messages.slice(index + 1)) };
 }
+var DEFAULT_GENERATE_REPLAY_LIMITS = Object.freeze({
+  maxSessions: 16,
+  sessionMaxBytes: 128 * 1024 * 1024,
+  totalMaxBytes: 256 * 1024 * 1024
+});
 
 class V2GenerateReplay {
   prefixes = new Map;
+  totalBytes = 0;
+  limits;
+  constructor(limits = DEFAULT_GENERATE_REPLAY_LIMITS) {
+    if (!Number.isSafeInteger(limits.maxSessions) || limits.maxSessions < 1 || !Number.isSafeInteger(limits.sessionMaxBytes) || limits.sessionMaxBytes < 1 || !Number.isSafeInteger(limits.totalMaxBytes) || limits.totalMaxBytes < 1)
+      throw new Error("Generate replay limits must be positive integers");
+    this.limits = { ...limits };
+  }
   capture(draft, anchor) {
+    this.forget(draft.sessionID);
     if (!anchor) {
-      this.prefixes.delete(draft.sessionID);
       sessionLog2(draft.sessionID, "generate replay capture skipped: no-anchor");
       return;
     }
+    const parts = {
+      anchor: clonePreservingInstancesMeasured(anchor),
+      system: clonePreservingInstancesMeasured(draft.system),
+      messages: clonePreservingInstancesMeasured(draft.messages),
+      tools: clonePreservingInstancesMeasured(draft.tools)
+    };
+    const bytes = 256 + parts.anchor.bytes + parts.system.bytes + parts.messages.bytes + parts.tools.bytes;
+    if (bytes > this.limits.sessionMaxBytes || bytes > this.limits.totalMaxBytes) {
+      sessionLog2(draft.sessionID, `generate replay capture skipped: over-session-cap (${bytes} > ${Math.min(this.limits.sessionMaxBytes, this.limits.totalMaxBytes)} bytes)`);
+      return;
+    }
+    while (this.prefixes.size > 0 && (this.prefixes.size >= this.limits.maxSessions || this.totalBytes + bytes > this.limits.totalMaxBytes)) {
+      const oldest = this.prefixes.keys().next().value;
+      if (oldest === undefined)
+        break;
+      this.forget(oldest);
+    }
     this.prefixes.set(draft.sessionID, {
-      anchor: clonePreservingInstances(anchor),
+      anchor: parts.anchor.copy,
       model: `${draft.model.providerID}/${draft.model.id}`,
       agent: draft.agent,
-      system: clonePreservingInstances(draft.system),
-      messages: clonePreservingInstances(draft.messages),
-      tools: clonePreservingInstances(draft.tools)
+      system: parts.system.copy,
+      messages: parts.messages.copy,
+      tools: parts.tools.copy,
+      bytes
     });
+    this.totalBytes += bytes;
   }
   forget(sessionID) {
+    const prefix = this.prefixes.get(sessionID);
+    if (!prefix)
+      return;
     this.prefixes.delete(sessionID);
+    this.totalBytes -= prefix.bytes;
+  }
+  stats() {
+    return {
+      totalBytes: this.totalBytes,
+      sessions: [...this.prefixes].map(([sessionId, prefix]) => ({
+        sessionId,
+        bytes: prefix.bytes
+      }))
+    };
   }
   apply(draft) {
     const prefix = this.prefixes.get(draft.sessionID);
@@ -3747,6 +3960,8 @@ class V2GenerateReplay {
     };
     if (!prefix)
       return skip("no-prefix");
+    this.prefixes.delete(draft.sessionID);
+    this.prefixes.set(draft.sessionID, prefix);
     if (prefix.model !== `${draft.model.providerID}/${draft.model.id}`)
       return skip("model-mismatch");
     if (prefix.agent !== draft.agent)
@@ -3790,21 +4005,25 @@ function identity(slot) {
 
 class V2LkgSystemReplay {
   systems = new BoundedSessionMap(1000);
-  capture(sessionId, slot, input, served) {
+  capture(sessionId, slot, input, served, head) {
     this.systems.set(sessionId, {
       slot: identity(slot),
-      input: JSON.stringify(input),
-      served: structuredClone(served)
+      input: hostInputKey(input),
+      served: structuredClone(served),
+      head: head ? structuredClone(head) : null
     });
   }
   restore(sessionId, slot, input, target) {
     const saved = this.systems.get(sessionId);
-    if (!slot || !saved || saved.slot !== identity(slot) || saved.input !== JSON.stringify(input))
-      return false;
+    if (!slot || !saved || saved.slot !== identity(slot) || saved.input !== hostInputKey(input))
+      return;
     target.splice(0, target.length, ...structuredClone(saved.served));
-    return true;
+    return { head: saved.head ? structuredClone(saved.head) : null };
   }
 }
+function hostInputKey(input) {
+  return JSON.stringify({ system: input.system, checkpoint: input.checkpoint });
+}
 
 // src/v2/hooks/model-limit-cache.ts
 var warmStarted = false;
@@ -4197,6 +4416,22 @@ function* readV2RawMessagePagesForConversion(openReader, sessionID, pageRows = C
 function createV2RawMessageReader(openReader) {
   const servedBoundaryCache = new Map;
   return {
+    getRevision: (sessionID) => {
+      const reader = openReader();
+      try {
+        return reader.latestSequence(sessionID);
+      } finally {
+        reader.close();
+      }
+    },
+    getCountAfterRevision: (sessionID, after, through) => {
+      const reader = openReader();
+      try {
+        return reader.messageCountAfterSequence(sessionID, after, through);
+      } finally {
+        reader.close();
+      }
+    },
     readPage: (sessionID, afterOrdinal, limit, finalWatermark, after) => {
       const reader = openReader();
       try {
@@ -4340,13 +4575,13 @@ function bindV2SystemPromptResponse(sessionId, reader) {
 
 // src/v2/hooks/tools.ts
 import { tool } from "@opencode-ai/plugin";
-async function registerTools(context, db, config, rustToolBackends, isInternalChild) {
+async function registerTools(context, db, config, rustToolBackends, isInternalChild, ensureProjectRegistered = ensureProjectRegisteredFromOpenCodeDirectory) {
   const compaction = isCompactionEnabled(config);
   setCtxReduceRegisteredGlobally(compaction);
   const project = {
     db,
     resolveProjectPath: (directory) => resolveProjectIdentityForSession(directory, config.allow_home_project),
-    ensureProjectRegistered: ensureProjectRegisteredFromOpenCodeDirectory
+    ensureProjectRegistered
   };
   const definitions = {
     ...compaction ? createCtxReduceTools({
@@ -4366,7 +4601,11 @@ async function registerTools(context, db, config, rustToolBackends, isInternalCh
       smartNotesEnabled: config.smart_notes.enabled,
       ...rustToolBackends ? { rustToolBackends } : {}
     }),
-    ...createCtxSearchTools({ ...project, rerankConnectionFile: config.subc?.connection_file }),
+    ...createCtxSearchTools({
+      ...project,
+      rerankConnectionFile: config.subc?.connection_file,
+      rerankConfig: config.rerank
+    }),
     ...config.memory.enabled ? {
       ...createCtxMemoryTools({
         ...project,
@@ -4446,7 +4685,7 @@ function bindV2TransformDecision(args) {
 }
 
 // src/v2/hooks/transform-features.ts
-function createV2TransformFeatureDeps(config, compactionOff, directory) {
+function createV2TransformFeatureDeps(config, compactionOff, directory, ensureProjectRegistered = ensureProjectRegisteredFromOpenCodeDirectory) {
   return {
     protectedTools: config.protected_tools,
     commitClusterTrigger: config.commit_cluster_trigger,
@@ -4457,7 +4696,7 @@ function createV2TransformFeatureDeps(config, compactionOff, directory) {
       injectionBudgetTokens: config.memory.injection_budget_tokens,
       autoPromote: config.memory.auto_promote
     },
-    ensureProjectRegistered: ensureProjectRegisteredFromOpenCodeDirectory,
+    ensureProjectRegistered,
     historyBudgetPercentage: config.history_budget_percentage,
     experimentalUserMemories: userObservationCollectionEnabled2(config.dreamer),
     userObservationsRequested: userObservationsRequested2(config.dreamer),
@@ -4468,7 +4707,7 @@ function createV2TransformFeatureDeps(config, compactionOff, directory) {
       scoreThreshold: config.memory.auto_search?.score_threshold ?? 0.6,
       minPromptChars: config.memory.auto_search?.min_prompt_chars ?? 20,
       directory,
-      ensureProjectRegistered: ensureProjectRegisteredFromOpenCodeDirectory,
+      ensureProjectRegistered,
       wordRules: cavemanWordRulesForLanguage(config.language)
     },
     cavemanTextCompression: compactionOff ? undefined : config.caveman_text_compression?.enabled === true ? {
@@ -4478,7 +4717,7 @@ function createV2TransformFeatureDeps(config, compactionOff, directory) {
     } : undefined
   };
 }
-function createV2AutoEmbedSession(deps) {
+function createV2AutoEmbedSession(deps, ensureProjectRegistered = ensureProjectRegisteredFromOpenCodeDirectory) {
   return (sessionId) => {
     const directory = deps.resolveDirectory(sessionId);
     const projectIdentity = resolveProjectIdentityForSession(directory, deps.allowHomeProject);
@@ -4488,7 +4727,7 @@ function createV2AutoEmbedSession(deps) {
       db: deps.db,
       projectIdentity,
       ensureRegistered: async () => {
-        await ensureProjectRegisteredFromOpenCodeDirectory(directory, deps.db);
+        await ensureProjectRegistered(directory, deps.db);
         deps.onDirectoryResolved?.(sessionId, directory);
       }
     }, sessionId);
@@ -4577,6 +4816,26 @@ function persistV2UsageReading(args) {
 // src/v2/hooks/context.ts
 class V2LkgAdmissionReplay extends Error {
 }
+function applyCheckpointHead(draft, head) {
+  const { checkpoint, submitted } = head;
+  const first = draft.messages.find((message) => message.id === HEAD_IDS[0]);
+  const baseline = first?.content.find((part) => part.type === "text")?.text;
+  if (typeof baseline !== "string")
+    return false;
+  for (const part of checkpoint.content)
+    if (part.type === "text" && typeof part.text === "string") {
+      part.text = part.text.replace(`<summary>
+${submitted}
+</summary>`, `<summary>
+${baseline}
+</summary>`);
+    }
+  const volatile = draft.messages.find((message) => message.id === HEAD_IDS[1]);
+  if (volatile && first)
+    volatile.content.push(...first.content.filter((part) => part.type !== "text"));
+  draft.messages.splice(0, draft.messages.length, checkpoint, ...draft.messages.filter((message) => message !== first));
+  return true;
+}
 var HIDDEN_SESSION_ERROR_GRACE_MS = 50;
 var STORE_POOL_DISPOSE_WAIT_MS = 1000;
 function isBlockingV2TransformError(error) {
@@ -4802,6 +5061,7 @@ async function registerContext(context) {
     console.warn(`[magic-context] v2 setup disabled by conflicting context hooks: ${conflicts.reasons.join("; ")}`);
     return;
   }
+  const embeddings = createV2EmbeddingScope(resolveProjectIdentityForSession(directory, config.allow_home_project));
   const folds = new FoldOwner(context.storage);
   const nativeFoldMemory = !compactionOff && process.env.MC_OC2_INVISIBLE_FOLD === "1" ? nativeFoldCache(() => storage.require()) : undefined;
   const nativeFoldReplay = nativeFoldMemory ? new NativeFoldReplay(nativeFoldMemory, () => openStoreReader(), context.storage) : undefined;
@@ -4809,6 +5069,7 @@ async function registerContext(context) {
   const queriedModels = new Set;
   const rawLimits = new Map;
   const hiddenSessionErrors = new Map;
+  const hiddenModelActivity = new HiddenModelActivity;
   const liveModels = new Map;
   const promptSurfaceRuntime = createPromptSurfaceRuntime({
     harness: "opencode2",
@@ -4857,7 +5118,7 @@ async function registerContext(context) {
   }) : undefined;
   const hiddenChildHook = new HiddenChildHook;
   await context.session.hook("http.request", (draft) => hiddenChildHook.cacheRequest(draft));
-  const tools = db && isDatabasePersisted(db) ? await registerTools(context, db, config, moduleToolBackends?.backends, (id) => hiddenChildHook.owns(id)) : undefined;
+  const tools = db && isDatabasePersisted(db) ? await registerTools(context, db, config, moduleToolBackends?.backends, (id) => hiddenChildHook.owns(id), embeddings.ensureRegistered) : undefined;
   const usage = new Map;
   const generateReplay = new V2GenerateReplay;
   await context.session.hook("http.response", async (draft) => {
@@ -4903,6 +5164,7 @@ async function registerContext(context) {
     await cleanupLegacyOnce(database);
     return createV2HiddenCompletionExecutor({
       ...context.session,
+      watchModelActivity: (sessionID, onOutput) => hiddenModelActivity.watch(sessionID, onOutput),
       get: async (input) => {
         const session = await context.session.get(input);
         const error = hiddenSessionErrors.get(input.sessionID);
@@ -4978,7 +5240,8 @@ async function registerContext(context) {
       liveConfig: () => liveConfigReader.poll().effective,
       executor: withLiveDreamerOutputCap(lateHiddenExecutor, config, () => liveConfigReader.poll().effective),
       openReader: openStoreReader,
-      rustModeModuleClient
+      rustModeModuleClient,
+      ensureRegistered: embeddings.ensureRegistered
     });
   };
   if (db && isDatabasePersisted(db))
@@ -5244,6 +5507,7 @@ async function registerContext(context) {
             break;
           const event = value;
           try {
+            hiddenModelActivity.observe(event);
             if (event.type === "provider.updated" || event.type === "model.updated") {
               queriedModels.clear();
               continue;
@@ -5251,6 +5515,10 @@ async function registerContext(context) {
             if (!event.data?.sessionID)
               continue;
             const sessionID = event.data.sessionID;
+            if (db && event.type === "session.revert.committed") {
+              const indexDb = db;
+              withoutSqliteTransformPass2(() => scheduleClearAndReindex(indexDb, sessionID, pagedRead));
+            }
             if (event.type?.startsWith("session.revert.") || event.type === "session.message.content.updated") {
               nativeFoldReplay?.onEvent(event);
               restoredRows.forget(sessionID);
@@ -5278,34 +5546,47 @@ async function registerContext(context) {
             if (event.type === "session.deleted") {
               clearLkgMeasuredRequest(sessionID);
               deletedSessions.add(sessionID);
-              transform?.clearSessionLogState(sessionID);
-              if (db) {
-                markSessionCleanupPending(db, sessionID);
-                clearSession(db, sessionID);
+              const failures = [];
+              try {
+                transform?.clearSessionLogState(sessionID);
+                if (db) {
+                  markSessionCleanupPending(db, sessionID);
+                  clearSession(db, sessionID, false, true);
+                }
+              } catch (error) {
+                failures.push(error);
               }
-              rawProviders.get(sessionID)?.();
-              rawProviders.delete(sessionID);
-              usage.delete(sessionID);
-              hiddenSessionErrors.delete(sessionID);
-              storageNoticeBySession.delete(sessionID);
-              liveModels.delete(sessionID);
-              variants.delete(sessionID);
-              agents.delete(sessionID);
-              channel1.delete(sessionID);
-              commitSeenLastPass.delete(sessionID);
-              clearEmbedSessionState(sessionID);
-              historyRefreshSessions.delete(sessionID);
-              clearPendingMaterialization(pendingMaterializationSessions, sessionID);
-              lastHeuristicsTurnId.delete(sessionID);
-              restoredRows.forget(sessionID);
-              if (nativeFoldReplay)
-                await nativeFoldReplay.forget(sessionID);
-              else
-                await forgetNativeFoldProvenance(context.storage, sessionID);
-              generateReplay.forget(sessionID);
-              systemPromptRefreshSessions.delete(sessionID);
-              systemPrompt?.clearSession(sessionID);
-              tagger.cleanup(sessionID);
+              try {
+                rawProviders.get(sessionID)?.();
+                rawProviders.delete(sessionID);
+                usage.delete(sessionID);
+                hiddenSessionErrors.delete(sessionID);
+                storageNoticeBySession.delete(sessionID);
+                liveModels.delete(sessionID);
+                variants.delete(sessionID);
+                agents.delete(sessionID);
+                channel1.delete(sessionID);
+                commitSeenLastPass.delete(sessionID);
+                clearEmbedSessionState(sessionID);
+                historyRefreshSessions.delete(sessionID);
+                clearPendingMaterialization(pendingMaterializationSessions, sessionID);
+                lastHeuristicsTurnId.delete(sessionID);
+                restoredRows.forget(sessionID);
+                if (nativeFoldReplay)
+                  await nativeFoldReplay.forget(sessionID);
+                else
+                  await forgetNativeFoldProvenance(context.storage, sessionID);
+                generateReplay.forget(sessionID);
+                systemPromptRefreshSessions.delete(sessionID);
+                systemPrompt?.clearSession(sessionID);
+                tagger.cleanup(sessionID);
+              } catch (error) {
+                failures.push(error);
+              }
+              if (failures.length === 1)
+                throw failures[0];
+              if (failures.length > 1)
+                throw new AggregateError(failures, "session deletion failed in both the store clear and the in-memory cleanup");
               continue;
             }
             if (event.type !== "session.execution.succeeded")
@@ -5353,7 +5634,7 @@ async function registerContext(context) {
     }) || draft.model.limit?.context || (state.lastObservedModelKey === modelKey ? state.lastUsageContextLimit : undefined);
     return materializeM0({
       ...createM0RenderOptions({
-        ...createV2TransformFeatureDeps(config, compactionOff, directory),
+        ...createV2TransformFeatureDeps(config, compactionOff, directory, embeddings.ensureRegistered),
         ...createV2ThresholdDeps(config)
       }, usage.get(draft.sessionID)?.usage ?? { percentage: 0, inputTokens: 0 }, modelKey, contextLimit, resolveProjectIdentityForSession(directory, config.allow_home_project)),
       db,
@@ -5423,6 +5704,42 @@ async function registerContext(context) {
       reader.close();
     }
   });
+  const temporalTimes = config.temporal_awareness === true;
+  const anchorTimesOnly = !temporalTimes && !rustModeModuleClient;
+  const timeIds = (messages) => {
+    if (temporalTimes)
+      return messages.flatMap((message) => message.id ? [message.id] : []);
+    if (!anchorTimesOnly)
+      return [];
+    const ids = [];
+    for (const message of [...messages].reverse()) {
+      if (message.id)
+        ids.push(message.id);
+      if (message.role === "assistant")
+        break;
+    }
+    return ids;
+  };
+  const restoreAfterCheckpoint = (args) => {
+    const { db, reader, draft, cut, boundaryRepair } = args;
+    const moduleBoundaryID = rustModeModuleClient ? getPersistedCompactionMarkerState(db, draft.sessionID)?.boundaryMessageId ?? null : null;
+    const moduleBoundarySeq = moduleBoundaryID ? reader.sequenceForId(draft.sessionID, moduleBoundaryID) : undefined;
+    const boundaryID = db.prepare("SELECT cached_m0_last_baseline_end_message_id AS id FROM session_meta WHERE session_id = ?").get(draft.sessionID)?.id ?? (boundaryRepair?.kind === "repaired" || boundaryRepair?.kind === "baseline-reset" ? boundaryRepair.anchorEndMessageId : null);
+    const servedBoundary = boundaryID ? servedBoundaryRow(reader, draft.sessionID, boundaryID) : null;
+    const boundary = (nativeFoldReplay?.sourceChanged(draft.sessionID) && !rustModeModuleClient ? (reader.earliestSequence(draft.sessionID) ?? 0) - 1 : undefined) ?? (moduleBoundarySeq !== undefined ? moduleBoundarySeq - 1 : undefined) ?? servedBoundary?.seq ?? reader.sequenceForId(draft.sessionID, boundaryID) ?? (reader.earliestSequence(draft.sessionID) ?? 0) - 1;
+    if (moduleBoundarySeq !== undefined)
+      sessionLog2(draft.sessionID, `v2 restore: from the module boundary ${moduleBoundaryID} to the host checkpoint`);
+    const present = new Set(args.messages.map((message) => message.id));
+    const restored = restoredRows.rows(reader, draft.sessionID, boundary, cut.seq).filter((row) => !present.has(row.id)).flatMap((row) => restoreRow(row, draft.model, hostUsesMediaAssets() ? {
+      asset: hostMediaAsset,
+      unavailable: (detail) => sessionLog2(draft.sessionID, `v2 restore: attachment replaced by a note row=${detail.rowID} name=${JSON.stringify(detail.name ?? null)} mediaType=${detail.mediaType} reason=${JSON.stringify(detail.reason)}`)
+    } : undefined));
+    return [
+      ...rustModeModuleClient ? [] : coveredInstructionRows(reader, draft.sessionID, Math.min(boundary, cut.seq), draft.model),
+      ...restored,
+      ...args.messages.filter((message) => message !== args.incoming)
+    ];
+  };
   const runManagedContext = async (draft) => {
     rememberHostMedia(draft.messages);
     if (hiddenChildHook.apply(draft))
@@ -5434,12 +5751,18 @@ async function registerContext(context) {
       return;
     const systemAtEntry = structuredClone(draft.system);
     const slotAtEntry = getSlot(draft.sessionID);
+    let checkpointAtEntry;
+    let replayHead;
+    const hostInput = () => checkpointAtEntry === undefined ? undefined : { system: systemAtEntry, checkpoint: checkpointAtEntry };
     const restoreLkgSystem = () => {
       retirePendingSystemPromptDelivery(draft.sessionID);
-      if (!lkgSystems.restore(draft.sessionID, getSlot(draft.sessionID), systemAtEntry, draft.system)) {
+      const input = hostInput();
+      const restored = input && lkgSystems.restore(draft.sessionID, getSlot(draft.sessionID), input, draft.system);
+      if (!restored) {
         sessionLog2(draft.sessionID, "lkg_system_state_mismatch");
         throw new Error("LKG system identity is unavailable or changed");
       }
+      replayHead = restored.head;
     };
     const isMagicContextSynthetic = (id) => isAdmittedSynthetic(context, draft.sessionID, id);
     const newest = draft.messages.at(-1);
@@ -5448,6 +5771,24 @@ async function registerContext(context) {
       return;
     }
     await dropStorageNotices(draft.messages, isMagicContextSynthetic);
+    const hostMessagesAtEntry = [...draft.messages];
+    const passTimes = new Map;
+    const readTimes = (reader, messages) => {
+      const ids = timeIds(messages);
+      const missing = ids.filter((id) => !passTimes.has(id));
+      if (missing.length > 0) {
+        const read = reader.messageTimes(draft.sessionID, missing);
+        for (const id of missing)
+          passTimes.set(id, read.get(id) ?? null);
+      }
+      const times = new Map;
+      for (const id of ids) {
+        const time = passTimes.get(id);
+        if (time)
+          times.set(id, time);
+      }
+      return times;
+    };
     liveModels.set(draft.sessionID, {
       providerID: draft.model.providerID,
       modelID: draft.model.id
@@ -5459,8 +5800,9 @@ async function registerContext(context) {
     applyV2PromptSurfaceTools(draft, promptSurfaceRuntime, config.prompt_surface, isSmartNoteSurfaceAvailable(config));
     const admissionDb = db ?? storage.current();
     const replayFits = (messages) => {
-      const system = structuredClone(draft.system);
-      if (!admissionDb || !draft.tools || !lkgSystems.restore(draft.sessionID, getSlot(draft.sessionID), draft.system, system))
+      const system = [];
+      const input = hostInput();
+      if (!admissionDb || !draft.tools || !input || !lkgSystems.restore(draft.sessionID, getSlot(draft.sessionID), input, system))
         return false;
       const limit = lkgReplayLimit({
         db: admissionDb,
@@ -5495,14 +5837,75 @@ async function registerContext(context) {
         })
       }).fit === "under";
     };
+    const buildReplayInput = async () => {
+      let messages = [...hostMessagesAtEntry];
+      const admitted = new Set;
+      let times;
+      try {
+        const reader = openStoreReader();
+        try {
+          const cut = reader.latestCompaction(draft.sessionID);
+          const localCut = cut && isLocalCheckpoint(cut) ? cut : undefined;
+          const incoming = localCut && messages.find((message) => message.id === localCut.id);
+          if (localCut && !incoming || cut && nativeFoldReplay)
+            return;
+          checkpointAtEntry = incoming || null;
+          const modeDb = db ?? storage.current();
+          const subagent = modeDb ? storedSubagentMode(modeDb, draft.sessionID) : undefined;
+          if (subagent === undefined)
+            return;
+          if (subagent)
+            removePrimaryOnlyTools(draft.tools);
+          if (!rustModeModuleClient) {
+            const candidates = syntheticCandidates(context, draft.sessionID, reader.syntheticMessageIDs(draft.sessionID));
+            for (const message of messages)
+              if (message.id && candidates.has(message.id) && await isAdmittedSynthetic(context, draft.sessionID, message.id))
+                admitted.add(message.id);
+            const replayDb = db ?? storage.current();
+            if (localCut && incoming && replayDb)
+              messages = restoreAfterCheckpoint({
+                db: replayDb,
+                reader,
+                draft,
+                messages,
+                cut: localCut,
+                incoming,
+                boundaryRepair: undefined
+              });
+            else if (localCut)
+              return;
+            times = readTimes(reader, messages);
+          }
+        } finally {
+          reader.close();
+        }
+      } catch (error) {
+        sessionLog2(draft.sessionID, "lkg replay input unavailable", error);
+        return;
+      }
+      const replayDraft = { ...draft, messages };
+      return {
+        draft: replayDraft,
+        mapped: adaptPayload(replayDraft, admitted, times, anchorTimesOnly)
+      };
+    };
+    const adoptReplay = (replayed) => {
+      if (replayed !== draft)
+        draft.messages.splice(0, draft.messages.length, ...replayed.messages);
+      if (replayHead)
+        applyCheckpointHead(draft, replayHead);
+    };
     let postFold = false;
     try {
       if (!compactionOff && admissionDb)
         await withAsyncPrivilegedWriter2(admissionDb, () => {
           return;
         }, {
-          beforeRetry: (error) => {
-            const mapped = adaptPayload(draft);
+          beforeRetry: async (error) => {
+            const input = await buildReplayInput();
+            if (!input)
+              return;
+            const { mapped } = input;
             if (tryMessagesTransformLkgReplay({
               output: mapped,
               sessionId: draft.sessionID,
@@ -5513,6 +5916,7 @@ async function registerContext(context) {
               onLkgReplay: restoreLkgSystem
             })) {
               mapped.commit();
+              adoptReplay(input.draft);
               throw new V2LkgAdmissionReplay;
             }
           }
@@ -5602,7 +6006,7 @@ async function registerContext(context) {
       await cacheV2SessionDirectory(context.session, draft.sessionID, sessionDirectories);
       prepareHistorySession(draft.sessionID);
       transform ??= createTransform({
-        ...createV2TransformFeatureDeps(config, compactionOff, directory),
+        ...createV2TransformFeatureDeps(config, compactionOff, directory, embeddings.ensureRegistered),
         cacheTtlConfig: config.cache_ttl,
         cacheTtlConfigured: config.cacheTtlConfigured,
         sampleCacheTtlConfig: () => liveConfigReader.poll().effective,
@@ -5612,7 +6016,7 @@ async function registerContext(context) {
         contextUsageMap: usage,
         compactionOff,
         storeGeneration: "v2",
-        normalizeRestoredAssistantText: stripCopiedTagNotation,
+        normalizeRestoredAssistantText: (text, providerID) => stripCopiedTagNotation(text, providerID === "anthropic"),
         refreshSourceContents: (sessionID) => nativeFoldReplay?.needsHeadRebuild(sessionID) ?? false,
         hostCleanupCompactionMarkers: () => ({
           verified: true,
@@ -5649,7 +6053,7 @@ async function registerContext(context) {
           resolveDirectory: (sessionID) => sessionDirectories.get(sessionID) ?? directory,
           allowHomeProject: config.allow_home_project,
           recompProgressBySession: new Map
-        }),
+        }, embeddings.ensureRegistered),
         hiddenCompletionExecutor,
         historianRunnable: !compactionOff && hiddenCompletionExecutor !== undefined && config.historian?.disable !== true,
         historianModel: historianModels.primary,
@@ -5707,6 +6111,7 @@ async function registerContext(context) {
         postFold = cut !== undefined;
         if (localCut && !incoming)
           throw new Error("The host checkpoint disappeared from the context draft");
+        checkpointAtEntry = incoming || null;
         let nativeRestored;
         if (cut && nativeFoldReplay && await nativeFoldReplay.admits(draft.sessionID, cut, reader)) {
           try {
@@ -5748,22 +6153,17 @@ async function registerContext(context) {
             checkpoint = structuredClone(identity.rendered ?? incoming);
             submitted = identity.rendered ? identity.renderedSummary ?? identity.submitted : cut.data.summary ?? "";
           }
-          const moduleBoundaryID = rustModeModuleClient ? getPersistedCompactionMarkerState(db, draft.sessionID)?.boundaryMessageId ?? null : null;
-          const moduleBoundarySeq = moduleBoundaryID ? reader.sequenceForId(draft.sessionID, moduleBoundaryID) : undefined;
-          const boundaryID = db.prepare("SELECT cached_m0_last_baseline_end_message_id AS id FROM session_meta WHERE session_id = ?").get(draft.sessionID)?.id ?? (boundaryRepair?.kind === "repaired" || boundaryRepair?.kind === "baseline-reset" ? boundaryRepair.anchorEndMessageId : null);
-          const servedBoundary = boundaryID ? servedBoundaryRow(reader, draft.sessionID, boundaryID) : null;
-          const boundary = (nativeFoldReplay?.sourceChanged(draft.sessionID) && !rustModeModuleClient ? (reader.earliestSequence(draft.sessionID) ?? 0) - 1 : undefined) ?? (moduleBoundarySeq !== undefined ? moduleBoundarySeq - 1 : undefined) ?? servedBoundary?.seq ?? reader.sequenceForId(draft.sessionID, boundaryID) ?? (reader.earliestSequence(draft.sessionID) ?? 0) - 1;
-          if (moduleBoundarySeq !== undefined)
-            sessionLog2(draft.sessionID, `v2 restore: from the module boundary ${moduleBoundaryID} to the host checkpoint`);
-          const present = new Set(draft.messages.map((message) => message.id));
-          const restored = restoredRows.rows(reader, draft.sessionID, boundary, cut.seq).filter((row) => !present.has(row.id)).flatMap((row) => restoreRow(row, draft.model, hostUsesMediaAssets() ? {
-            asset: hostMediaAsset,
-            unavailable: (detail) => sessionLog2(draft.sessionID, `v2 restore: attachment replaced by a note row=${detail.rowID} name=${JSON.stringify(detail.name ?? null)} mediaType=${detail.mediaType} reason=${JSON.stringify(detail.reason)}`)
-          } : undefined));
-          draft.messages.splice(0, draft.messages.length, ...rustModeModuleClient ? [] : coveredInstructionRows(reader, draft.sessionID, Math.min(boundary, cut.seq), draft.model), ...restored, ...draft.messages.filter((message) => message !== incoming));
+          draft.messages.splice(0, draft.messages.length, ...restoreAfterCheckpoint({
+            db,
+            reader,
+            draft,
+            messages: draft.messages,
+            cut: localCut,
+            incoming,
+            boundaryRepair
+          }));
         }
-        if (config.temporal_awareness === true)
-          messageTimes = reader.messageTimes(draft.sessionID, draft.messages.flatMap((message) => message.id ? [message.id] : []));
+        messageTimes = readTimes(reader, draft.messages);
       } finally {
         reader.close();
       }
@@ -5780,7 +6180,7 @@ async function registerContext(context) {
           nativeFoldReplay.invalidate(draft.sessionID, true);
         }
       }
-      const mapped = adaptPayload(draft, admitted, messageTimes);
+      const mapped = adaptPayload(draft, admitted, messageTimes, anchorTimesOnly);
       bindSystemDateRequestIdentity(mapped, draft);
       await createMessagesTransformHandler({
         magicContext: { "experimental.chat.messages.transform": transform },
@@ -5797,24 +6197,9 @@ async function registerContext(context) {
       if (db) {
         await deliverPendingChannel2(context, db, draft.sessionID, channel1.get(draft.sessionID));
       }
-      if (checkpoint && submitted !== undefined) {
-        const head = draft.messages.find((message) => message.id === HEAD_IDS[0]);
-        const baseline = head?.content.find((part) => part.type === "text")?.text;
-        if (typeof baseline === "string") {
-          for (const part of checkpoint.content)
-            if (part.type === "text" && typeof part.text === "string") {
-              part.text = part.text.replace(`<summary>
-${submitted}
-</summary>`, `<summary>
-${baseline}
-</summary>`);
-            }
-          const volatile = draft.messages.find((message) => message.id === HEAD_IDS[1]);
-          if (volatile && head)
-            volatile.content.push(...head.content.filter((part) => part.type !== "text"));
-          draft.messages.splice(0, draft.messages.length, checkpoint, ...draft.messages.filter((message) => message !== head));
-        }
-      }
+      const head = replayHead !== undefined ? replayHead : checkpoint && submitted !== undefined ? { checkpoint, submitted } : null;
+      const servedHead = head && structuredClone(head);
+      const headApplied = head ? applyCheckpointHead(draft, head) : false;
       if (nativeMessages && !checkpoint) {
         try {
           await nativeFoldReplay?.capture(draft, nativeMessages);
@@ -5825,7 +6210,7 @@ ${baseline}
       }
       const capturedSlot = getSlot(draft.sessionID);
       if (capturedSlot && (!slotAtEntry || capturedSlot.capturedAt !== slotAtEntry.capturedAt || capturedSlot.captureSequence !== slotAtEntry.captureSequence || capturedSlot.jsonPrefix !== slotAtEntry.jsonPrefix)) {
-        lkgSystems.capture(draft.sessionID, capturedSlot, systemAtEntry, draft.system);
+        lkgSystems.capture(draft.sessionID, capturedSlot, { system: systemAtEntry, checkpoint: checkpointAtEntry ?? null }, draft.system, headApplied ? servedHead : null);
       }
     } catch (error) {
       if (error instanceof V2LkgAdmissionReplay)
@@ -5834,8 +6219,11 @@ ${baseline}
         throw error;
       if (!compactionOff && (isTransientSqliteError2(error) || error instanceof StorageBusyRefusalError)) {
         if (isTransientSqliteError2(error)) {
-          const mapped = adaptPayload(draft);
+          const input = await buildReplayInput();
           try {
+            if (!input)
+              throw new StorageBusyRefusalError(error, "v2-context");
+            const { mapped } = input;
             await createMessagesTransformHandler({
               replayFits,
               onLkgReplay: restoreLkgSystem,
@@ -5847,6 +6235,7 @@ ${baseline}
               }
             })({}, mapped);
             mapped.commit();
+            adoptReplay(input.draft);
             return;
           } catch (replayError) {
             if (!(replayError instanceof StorageBusyRefusalError))
@@ -5928,7 +6317,8 @@ ${baseline}
         return null;
       }
     },
-    storageDir
+    storageDir,
+    getDebugMemoryHolders: () => ({ generateReplay: generateReplay.stats() })
   });
   rpcServer.handle("dream", async (params) => {
     const sessionId = String(params.sessionId ?? "");
@@ -6013,6 +6403,7 @@ ${baseline}
       deletedSessions.clear();
       await dreamTrigger?.dispose();
       await maintenanceTimer?.dispose();
+      await embeddings.dispose();
       for (const release of rawProviders.values())
         release();
       rawProviders.clear();