@cortexkit/opencode-magic-context 0.49.29 → 0.49.31

package/dist/auto-search-worker.js

@@ -28,7 +28,7 @@ var [
   import("./embedding-cache-mgyr73ef.js"),
   import("./storage-memory-e6a7mb0k.js"),
   import("./project-embedding-registry-cg281d9j.js"),
-  import("./search-0cd6hx7a.js"),
+  import("./search-fbaz1m8r.js"),
   import("./compartment-chunk-embedding-qgp0tbf7.js"),
   import("./embedding-activity-g1dhes6g.js"),
   import("./harness-e4avh192.js"),

package/dist/chunk-embedding-write-worker.js

@@ -35,7 +35,7 @@ import"./index-c7phnbvk.js";
 import {
   LATEST_SUPPORTED_VERSION,
   enforceSchemaFence
-} from "./index-h4s5jk7f.js";
+} from "./index-hbt0sbv2.js";
 import"./index-7kkphb6c.js";
 import"./index-xrnsygfq.js";
 import"./index-fr0wbhdn.js";

package/dist/{context-836j3vte.js → context-9a0f8mzh.js}

@@ -12,7 +12,6 @@ import {
   releaseCompartmentLeaseBestEffort,
   isCompartmentLeaseHeld,
   queueM0Mutation,
-  getCompartments,
   getUncoveredCompartmentEndsThrough,
   providerResponseFailed,
   isSuccessfulProviderCompletion,
@@ -65,7 +64,7 @@ import {
   rebaseSessionCoordinatesAsync,
   resolveOpenCodeProtectedTailBoundary,
   getActiveCompartmentRun
-} from "./index-q9zvphbq.js";
+} from "./index-kmayq4kq.js";
 import"./index-sd3egckz.js";
 import {
   getHarness2
@@ -157,7 +156,7 @@ import {
   applyJsonSchemaParameterDescriptions,
   MagicContextRpcServer,
   subagentTemperature
-} from "./index-wpcdk76y.js";
+} from "./index-22e7khnr.js";
 import {
   resolveHistorianModel2
 } from "./index-5kym00ag.js";
@@ -172,7 +171,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./index-h4s5jk7f.js";
+} from "./index-hbt0sbv2.js";
 import {
   setHomeProjectPermission,
   resolveProjectIdentityForSession,
@@ -202,7 +201,9 @@ import {
   preloadTokenizer,
   estimateTokens
 } from "./index-b88dwwrh.js";
-import"./index-xrnsygfq.js";
+import {
+  getTableColumnNames
+} from "./index-xrnsygfq.js";
 import"./index-58e3y90n.js";
 import"./index-y1qwzvxn.js";
 import {
@@ -240,13 +241,13 @@ import {
   cleanUserText2,
   readRawSessionMessageIdOrdinalsForRange2,
   readRawSessionMessageOrdinalById2
-} from "./index-zhgqgxtt.js";
+} from "./index-0fe4q77z.js";
 import {
   BoundedSessionMap,
   recordToolDefinitionSet,
   getCurrentToolSetHash
 } from "./index-s1n8dd2n.js";
-import"./index-tx68g9nc.js";
+import"./index-4s4zq97n.js";
 import"./index-v15ne3a3.js";
 import {
   invalidateAutoEmbedSession,
@@ -273,7 +274,7 @@ import {
   EmergencyFailClosedError,
   DegradedPassRefusalError,
   isSyntheticHeadMessage2
-} from "./index-bps8vn9r.js";
+} from "./index-qathsvz2.js";
 import"./index-qgh1qwjj.js";
 import"./index-qt1qqasc.js";
 import"./index-kfyb3k6n.js";
@@ -287,15 +288,15 @@ import {
 } from "./index-x8a7jmkh.js";
 import"./index-rrv26qjz.js";
 import"./index-waktfbjy.js";
-import"./index-wvffze8y.js";
-import"./index-093c4g1c.js";
+import"./index-vtz789ex.js";
+import"./index-y6ynjghv.js";
 import"./index-gp3kcpc4.js";
 import {
   detectConflicts
 } from "./index-4pnsgvfk.js";
 import"./index-fmsr7v69.js";
 import"./index-kaqs6h31.js";
-import"./index-a1h316s9.js";
+import"./index-3jmx3fae.js";
 import {
   isDreamerRunnable,
   isSmartNoteSurfaceAvailable,
@@ -313,6 +314,26 @@ import"./index-t5pck3ss.js";
 import { setTimeout as delay } from "node:timers/promises";
 
 // src/hooks/magic-context/history-boundary-repair.ts
+function readStoreBoundaries(db, sessionId) {
+  const columns = getTableColumnNames(db, "compartments");
+  const numbers = ["id", "sequence", "start_message", "end_message", "created_at"];
+  const strings = ["session_id", "start_message_id", "end_message_id", "title", "content"];
+  const predicates = [...numbers, ...strings].every((column) => columns.has(column)) ? [
+    ...numbers.map((column) => `typeof(${column}) IN ('integer', 'real')`),
+    ...strings.map((column) => `typeof(${column}) = 'text'`)
+  ] : ["0"];
+  for (const column of ["p1", "p2", "p3", "p4", "episode_type"]) {
+    if (columns.has(column))
+      predicates.push(`typeof(${column}) IN ('text', 'null')`);
+  }
+  for (const column of ["importance", "legacy"]) {
+    if (columns.has(column))
+      predicates.push(`typeof(${column}) IN ('integer', 'real', 'null')`);
+  }
+  return db.prepare(`SELECT sequence, ${columns.has("end_message_id") ? "end_message_id" : "NULL"} AS endMessageId
+             FROM compartments WHERE session_id = ? AND ${predicates.join(" AND ")}
+             ORDER BY sequence ASC`).all(sessionId);
+}
 function readBaseline(db, sessionId) {
   const row = db.prepare("SELECT cached_m0_bytes IS NOT NULL AS hasM0, cached_m0_last_baseline_end_message_id AS boundary FROM session_meta WHERE session_id = ?").get(sessionId);
   return {
@@ -379,7 +400,7 @@ function dropCompartmentsAfter(db, sessionId, anchor, holderId, activeBranch = f
 }
 function repairMissingHistoryBoundary(args) {
   const { db, sessionId, isInHostStore, scope = "store" } = args;
-  const compartments = scope === "active-branch" ? db.prepare("SELECT sequence, COALESCE(end_message_id, '') AS endMessageId FROM compartments WHERE session_id = ? ORDER BY sequence").all(sessionId) : getCompartments(db, sessionId);
+  const compartments = scope === "active-branch" ? db.prepare("SELECT sequence, COALESCE(end_message_id, '') AS endMessageId FROM compartments WHERE session_id = ? ORDER BY sequence").all(sessionId) : readStoreBoundaries(db, sessionId);
   let latestIndex = compartments.length - 1;
   while (latestIndex >= 0 && !compartments[latestIndex]?.endMessageId)
     latestIndex -= 1;
@@ -423,7 +444,7 @@ function repairMissingHistoryBoundary(args) {
     let dropped;
     let anchorForDrop = anchor;
     try {
-      if (scope === "active-branch" && anchor) {
+      if (anchor) {
         const row = db.prepare("SELECT end_message AS endMessage FROM compartments WHERE session_id = ? AND sequence = ?").get(sessionId, anchor.sequence);
         if (!row)
           return { kind: "unresolved", reason: "busy", missingEndMessageId: missing };
@@ -774,8 +795,14 @@ class FoldOwner {
   async observe(args) {
     return this.serial(args.sessionID, async () => {
       let state = await this.read(args.sessionID);
+      if (state?.rendered && state.rendered.id !== args.rendered.id)
+        state = undefined;
       let changed = !state;
-      const renderedSha = foldDigest(JSON.stringify(args.rendered));
+      const observedSha = foldDigest(JSON.stringify(args.rendered));
+      const rendered = structuredClone(args.rendered);
+      if (state?.withoutRecentContext && state.withoutRecentContext === rendered.id)
+        stripCheckpointRecentContext(rendered, args.summary);
+      const renderedSha = foldDigest(JSON.stringify(rendered));
       if (!state) {
         args.onHard("boot_recovery");
         state = {
@@ -786,10 +813,10 @@ class FoldOwner {
         };
       }
       const reason = args.cutSeq < state.watermark ? "host_cut_before_watermark" : state.submittedSha !== foldDigest(args.summary) || state.renderedSha && state.renderedSha !== renderedSha ? "host_rerender" : undefined;
-      if (reason && state.rejectedSha !== renderedSha) {
+      if (reason && state.rejectedSha !== observedSha) {
         args.onHard(reason);
         state.reason = reason;
-        state.rejectedSha = renderedSha;
+        state.rejectedSha = observedSha;
         changed = true;
       }
       if (state.cutSeq === undefined && args.cutSeq >= state.watermark) {
@@ -797,7 +824,7 @@ class FoldOwner {
         changed = true;
       }
       if (!state.rendered && reason !== "host_cut_before_watermark") {
-        state.rendered = structuredClone(args.rendered);
+        state.rendered = rendered;
         state.renderedSha = renderedSha;
         state.renderedSummary = args.summary;
         changed = true;
@@ -807,6 +834,50 @@ class FoldOwner {
       return state;
     });
   }
+  async stripRecentContext(sessionID, checkpointID) {
+    return this.serial(sessionID, async () => {
+      const state = await this.read(sessionID);
+      if (!state?.rendered || state.rendered.id !== checkpointID)
+        return;
+      if (state.withoutRecentContext === checkpointID)
+        return state;
+      if (!stripCheckpointRecentContext(state.rendered, state.renderedSummary ?? state.submitted))
+        return state;
+      state.withoutRecentContext = checkpointID;
+      state.renderedSha = foldDigest(JSON.stringify(state.rendered));
+      await this.storage.set(this.key(sessionID), state);
+      return state;
+    });
+  }
+}
+function stripCheckpointRecentContext(message, summary) {
+  let changed = false;
+  for (const part of message.content) {
+    if (part.type !== "text" || typeof part.text !== "string")
+      continue;
+    const summaryStart = part.text.indexOf("<summary>");
+    if (summaryStart < 0)
+      continue;
+    const summaryText = part.text.indexOf(summary, summaryStart + "<summary>".length);
+    if (summaryText < 0)
+      continue;
+    const start = part.text.indexOf("</summary>", summaryText + summary.length) + "</summary>".length;
+    const end = part.text.lastIndexOf("</conversation-checkpoint>");
+    if (start < "</summary>".length || end < start)
+      continue;
+    const suffix = part.text.slice(start, end);
+    if (!/^\s*<recent-context>[\s\S]*<\/recent-context>\s*$/.test(suffix))
+      continue;
+    part.text = `${part.text.slice(0, start)}
+${part.text.slice(end)}`;
+    changed = true;
+  }
+  if (changed && message.metadata && typeof message.metadata === "object") {
+    const metadata = { ...message.metadata };
+    delete metadata.recent;
+    message.metadata = metadata;
+  }
+  return changed;
 }
 
 // src/v2/fold/memory-cache.ts
@@ -2451,6 +2522,7 @@ function createNativeHiddenChildren(host, removeSession, options) {
     const inFlight = removing.get(child.id);
     if (inFlight)
       return inFlight;
+    options.log(`[magic-context] hidden child ${child.id} removing`);
     const done = (async () => {
       try {
         let timer;
@@ -2465,6 +2537,7 @@ function createNativeHiddenChildren(host, removeSession, options) {
           if (timer)
             clearTimeout(timer);
         }
+        options.log(`[magic-context] hidden child ${child.id} removed`);
       } catch (error) {
         if (isSessionNotFound(error))
           return;
@@ -2476,14 +2549,19 @@ function createNativeHiddenChildren(host, removeSession, options) {
     removing.set(child.id, done);
     return done;
   };
-  const confirmPlacement = async (sessionID, parentID) => {
+  const noteCreated = (sessionID, role, parentID) => {
+    options.log(`[magic-context] hidden child ${sessionID} created role=${role} parent=${parentID} keep_subagents=${options.keepSubagents}`);
+  };
+  const confirmPlacement = async (sessionID, parentID, role) => {
     let stored;
     try {
       stored = await host.get({ sessionID });
     } catch (error) {
+      noteCreated(sessionID, role, "unknown");
       options.log(`[magic-context] could not read back hidden child ${sessionID} to confirm its parent: ${errorText(error)}`);
       return;
     }
+    noteCreated(sessionID, role, stored.parentID ?? "none");
     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}. Reopen the parent session in ${directory}, then run /ctx-recomp so its owning instance can rebuild history.`, true);
@@ -2512,11 +2590,13 @@ function createNativeHiddenChildren(host, removeSession, options) {
     };
     if (parentID) {
       try {
-        await confirmPlacement(created.id, parentID);
+        await confirmPlacement(created.id, parentID, role);
       } catch (error) {
         await remove(child);
         throw error;
       }
+    } else {
+      noteCreated(created.id, role, "none");
     }
     return child;
   };
@@ -2525,16 +2605,22 @@ function createNativeHiddenChildren(host, removeSession, options) {
     open: create,
     create,
     retire(child) {
-      if (!kept(child))
+      if (kept(child)) {
+        options.log(`[magic-context] hidden child ${child.id} kept (keep_subagents)`);
+      } else {
         remove(child);
+      }
     },
     async finish(child, retired) {
       if (retired) {
         await removing.get(child.id);
         return;
       }
-      if (!kept(child))
+      if (kept(child)) {
+        options.log(`[magic-context] hidden child ${child.id} kept (keep_subagents)`);
+      } else {
         await remove(child);
+      }
     },
     updateModel: (child, model) => ({ ...child, model }),
     markEverSettled: (child) => ({ ...child, ever_settled: true })
@@ -2581,6 +2667,7 @@ async function cleanupLegacyHiddenChildren(db, remove, note, options = {}) {
               timer = setTimeout(() => reject(new Error("session.remove timed out")), Math.min(options.timeoutMs ?? 1000, Math.max(1, deadline - now())));
             })
           ]);
+          note(`[magic-context] legacy hidden child ${child.id} removed`);
         } catch (error) {
           if (!isSessionNotFound(error))
             throw error;
@@ -3383,6 +3470,96 @@ class HiddenModelActivity {
   }
 }
 
+// src/v2/message-times.ts
+function isSettled(entry, readAt) {
+  return (entry.version.type === "user" || entry.time.completed !== undefined) && typeof entry.version.updated === "number" && Number.isFinite(entry.version.updated) && entry.version.updated <= readAt - 1000;
+}
+function sameVersion(a, b) {
+  return a.type === b.type && a.seq === b.seq && a.created === b.created && a.updated === b.updated;
+}
+
+class V2MessageTimesCache {
+  capacity;
+  sessions = new Map;
+  constructor(capacity = 64) {
+    this.capacity = capacity;
+  }
+  delete(sessionID) {
+    this.sessions.delete(sessionID);
+  }
+  deleteMessage(sessionID, messageID) {
+    this.sessions.get(sessionID)?.entries.delete(messageID);
+  }
+  clear() {
+    this.sessions.clear();
+  }
+  pass(sessionID) {
+    const previous = this.sessions.get(sessionID);
+    const current = { entries: new Map };
+    this.sessions.delete(sessionID);
+    this.sessions.set(sessionID, current);
+    while (this.sessions.size > this.capacity) {
+      const oldest = this.sessions.keys().next().value;
+      if (oldest === undefined)
+        break;
+      this.sessions.delete(oldest);
+    }
+    const passTimes = new Map;
+    return (reader, ids) => {
+      const missing = [...new Set(ids)].filter((id) => !passTimes.has(id));
+      if (missing.length > 0) {
+        const readAt = Date.now();
+        const identity = reader.hostIdentity();
+        current.identity = identity;
+        const reusable = previous?.identity === identity ? previous.entries : undefined;
+        const known = [];
+        const refresh = [];
+        let first = Infinity;
+        let last = -Infinity;
+        for (const id of missing) {
+          const entry = reusable?.get(id);
+          if (entry && isSettled(entry, readAt)) {
+            known.push(id);
+            first = Math.min(first, entry.version.seq);
+            last = Math.max(last, entry.version.seq);
+          } else
+            refresh.push(id);
+        }
+        const versions = reader.messageTimeVersions(sessionID, known, { first, last });
+        for (const id of known) {
+          const version = versions.get(id);
+          const cached = reusable?.get(id);
+          if (!version) {
+            passTimes.set(id, null);
+          } else if (cached && sameVersion(cached.version, version) && (version.type === "user" || cached.time.completed !== undefined)) {
+            current.entries.set(id, cached);
+            passTimes.set(id, cached.time);
+          } else
+            refresh.push(id);
+        }
+        const times = reader.messageTimes(sessionID, refresh, versions);
+        for (const id of refresh) {
+          const time = times.get(id);
+          const version = versions.get(id);
+          passTimes.set(id, time ?? null);
+          if (time && version) {
+            const entry = { version, time };
+            if (isSettled(entry, readAt))
+              current.entries.set(id, entry);
+          }
+        }
+      }
+      const result = new Map;
+      for (const id of ids) {
+        const time = passTimes.get(id);
+        if (time)
+          result.set(id, { ...time });
+      }
+      return result;
+    };
+  }
+}
+
 // src/v2/hooks/channel2.ts
 import { randomBytes } from "node:crypto";
 var pendingCandidates = new WeakMap;
@@ -4871,6 +5048,28 @@ ${baseline}
   draft.messages.splice(0, draft.messages.length, checkpoint, ...draft.messages.filter((message) => message !== first));
   return true;
 }
+function estimateCheckpointRequest(draft) {
+  let toolDefinitionTokens = 0;
+  for (const tool of Object.values(draft.tools)) {
+    const schema = JSON.stringify(tool.input);
+    if (schema === undefined)
+      throw new Error("Checkpoint request has an unserializable tool schema");
+    toolDefinitionTokens += estimateTokens(tool.description) + estimateTokens(schema);
+  }
+  const estimateDraft = {
+    ...draft,
+    messages: draft.messages.map((message) => HEAD_IDS.some((id) => message.id === id) ? { ...message, id: undefined } : message)
+  };
+  return estimateFinalWireInputTokens({
+    messages: adaptPayload(estimateDraft).messages,
+    toolDefinitionTokens,
+    systemPromptTokens: estimateTokens(JSON.stringify(draft.system)),
+    providerID: draft.model.providerID,
+    modelID: draft.model.id,
+    agentName: draft.agent,
+    sessionId: draft.sessionID
+  });
+}
 var HIDDEN_SESSION_ERROR_GRACE_MS = 50;
 var STORE_POOL_DISPOSE_WAIT_MS = 1000;
 function isBlockingV2TransformError(error) {
@@ -5068,6 +5267,7 @@ function coveredInstructionRows(reader, sessionID, throughSeq, model) {
 async function registerContext(context) {
   const directory = context.location.directory;
   const config = loadPluginConfigDetailed(directory).config;
+  log2(`[magic-context] OpenCode 2 keep_subagents=${config.keep_subagents === true}`);
   setHomeProjectPermission(config.allow_home_project);
   if (!config.enabled)
     return;
@@ -5200,6 +5400,7 @@ async function registerContext(context) {
   });
   let hiddenAgentsReady;
   const readerPool = new V2StoreReaderPool;
+  const messageTimesCache = new V2MessageTimesCache;
   const openStoreReader = () => readerPool.open(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"));
   const createHiddenExecutor = async (database) => {
     await cleanupLegacyOnce(database);
@@ -5563,6 +5764,12 @@ async function registerContext(context) {
             if (event.type?.startsWith("session.revert.") || event.type === "session.message.content.updated") {
               nativeFoldReplay?.onEvent(event);
               restoredRows.forget(sessionID);
+              messageTimesCache.delete(sessionID);
+            }
+            if (event.type === "session.step.started" || event.type === "session.step.ended" || event.type === "session.step.failed") {
+              const messageID = event.data.assistantMessageID;
+              if (typeof messageID === "string")
+                messageTimesCache.deleteMessage(sessionID, messageID);
             }
             if (event.type === "session.error" || event.type === "session.execution.failed") {
               const error = hiddenTerminalError(event);
@@ -5601,6 +5808,7 @@ async function registerContext(context) {
                 rawProviders.get(sessionID)?.();
                 rawProviders.delete(sessionID);
                 usage.delete(sessionID);
+                messageTimesCache.delete(sessionID);
                 hiddenSessionErrors.delete(sessionID);
                 storageNoticeBySession.delete(sessionID);
                 liveModels.delete(sessionID);
@@ -5694,7 +5902,7 @@ async function registerContext(context) {
   await context.session.hook("compaction", async (draft) => {
     const hiddenSummary = hiddenChildHook.compactionSummary(draft.sessionID, draft.agent);
     if (hiddenSummary !== undefined) {
-      draft.result = { summary: hiddenSummary };
+      draft.result = { summary: hiddenSummary, metadata: { keepID: undefined } };
       return;
     }
     if (compactionOff)
@@ -5719,7 +5927,7 @@ async function registerContext(context) {
               previousCut: reader.latestCompaction(draft.sessionID),
               summary
             })) {
-              draft.result = { summary };
+              draft.result = { summary, metadata: { keepID: undefined } };
               return;
             }
           }
@@ -5735,7 +5943,7 @@ async function registerContext(context) {
         materialize: () => moduleBaseline ?? materialize(draft)
       });
       sessionLog2(draft.sessionID, `v2 compaction hook: fired answered=true source=${source}`);
-      draft.result = { summary: fold.submitted };
+      draft.result = { summary: fold.submitted, metadata: { keepID: undefined } };
     } catch (cause) {
       await refuseBeforeProvider(context.session, draft.sessionID, "compaction-fold", cause);
       throw new V2ContextRefusal("Magic Context could not preserve the host checkpoint.", {
@@ -5781,6 +5989,8 @@ async function registerContext(context) {
       ...args.messages.filter((message) => message !== args.incoming)
     ];
   };
+  const checkpointPassPermissions = new Map;
+  const checkpointInputEstimates = new Map;
   const initializeTransform = (database) => transform ??= createTransform({
     ...createV2TransformFeatureDeps(config, compactionOff, directory, embeddings.ensureRegistered),
     cacheTtlConfig: config.cache_ttl,
@@ -5790,6 +6000,10 @@ async function registerContext(context) {
     tagger,
     ...createV2ThresholdDeps(config),
     contextUsageMap: usage,
+    hostInputEstimate: (sessionID) => checkpointInputEstimates.get(sessionID),
+    onPassPermission: (sessionID, permission) => {
+      checkpointPassPermissions.set(sessionID, permission);
+    },
     compactionOff,
     storeGeneration: "v2",
     normalizeRestoredAssistantText: (text, providerID) => stripCopiedTagNotation(text, providerID === "anthropic"),
@@ -5895,22 +6109,9 @@ async function registerContext(context) {
     }
     await dropStorageNotices(draft.messages, isMagicContextSynthetic);
     const hostMessagesAtEntry = [...draft.messages];
-    const passTimes = new Map;
+    const cachedTimes = messageTimesCache.pass(draft.sessionID);
     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;
+      return cachedTimes(reader, timeIds(messages));
     };
     liveModels.set(draft.sessionID, {
       providerID: draft.model.providerID,
@@ -6224,6 +6425,21 @@ async function registerContext(context) {
       }
       const mapped = adaptPayload(draft, admitted, messageTimes, anchorTimesOnly);
       bindSystemDateRequestIdentity(mapped, draft);
+      checkpointPassPermissions.delete(draft.sessionID);
+      checkpointInputEstimates.delete(draft.sessionID);
+      if (checkpoint && submitted !== undefined) {
+        const projected = structuredClone(checkpoint);
+        if (stripCheckpointRecentContext(projected, submitted)) {
+          const estimate = estimateCheckpointRequest({
+            ...draft,
+            messages: [checkpoint, ...draft.messages]
+          });
+          checkpointInputEstimates.set(draft.sessionID, {
+            tokens: estimate.tokens,
+            pressureTokens: estimate.pressureTokens ?? estimate.tokens
+          });
+        }
+      }
       await createMessagesTransformHandler({
         magicContext: { "experimental.chat.messages.transform": transform },
         compactionOff,
@@ -6232,6 +6448,14 @@ async function registerContext(context) {
         rustReplayParticipant: () => transform?.getRustReplayParticipant() ?? null
       })({}, mapped);
       mapped.commit();
+      const checkpointPermission = checkpointPassPermissions.get(draft.sessionID);
+      checkpointPassPermissions.delete(draft.sessionID);
+      checkpointInputEstimates.delete(draft.sessionID);
+      if (checkpoint?.id && checkpointPermission && replayHead === undefined) {
+        const stripped = await folds.stripRecentContext(draft.sessionID, checkpoint.id);
+        if (stripped?.rendered)
+          checkpoint = structuredClone(stripped.rendered);
+      }
       stageOpenCodeV2TransformDecision({
         sessionId: draft.sessionID,
         responseAfterSequence
@@ -6310,17 +6534,45 @@ async function registerContext(context) {
       }
     }
   };
+  const refuseOversizedCheckpoint = async (draft) => {
+    const hasCheckpoint = draft.messages.some((message) => message.content.some((part) => part.type === "text" && typeof part.text === "string" && part.text.startsWith("<conversation-checkpoint>")));
+    const limit = draft.model.limit?.input ?? draft.model.limit?.context;
+    if (!hasCheckpoint || !limit)
+      return;
+    let estimate;
+    try {
+      estimate = estimateCheckpointRequest(draft);
+    } catch (cause) {
+      await refuseBeforeProvider(context.session, draft.sessionID, "checkpoint-fit-estimate", cause);
+      throw new V2ContextRefusal("Magic Context could not size the host checkpoint.", {
+        cause
+      });
+    }
+    if (estimate.tokens <= limit)
+      return;
+    await refuseBeforeProvider(context.session, draft.sessionID, "checkpoint-over-window");
+    throw new V2ContextRefusal("Magic Context refused an oversized host checkpoint.");
+  };
   await context.session.hook("context", (draft) => withSqliteTransformPass2(async () => {
     const anchor = generateReplayAnchor(draft.messages);
-    await runManagedContext(draft);
+    try {
+      await runManagedContext(draft);
+      if (!compactionOff)
+        await refuseOversizedCheckpoint(draft);
+    } finally {
+      checkpointInputEstimates.delete(draft.sessionID);
+      checkpointPassPermissions.delete(draft.sessionID);
+    }
     if (!compactionOff)
       generateReplay.capture(draft, anchor);
     else
       sessionLog2(draft.sessionID, "generate replay capture skipped: compaction-disabled");
   }));
   await context.session.hook("generate", async (draft) => {
-    if (!compactionOff && !deletedSessions.has(draft.sessionID))
+    if (!compactionOff && !deletedSessions.has(draft.sessionID)) {
       generateReplay.apply(draft);
+      await refuseOversizedCheckpoint(draft);
+    }
   });
   withoutSqliteTransformPass2(() => warmModelLimitCacheFromCatalog(context));
   const rpcLiveSessionState = createV2RpcLiveSessionState({
@@ -6435,6 +6687,7 @@ async function registerContext(context) {
   }, 0));
   return {
     async dispose() {
+      messageTimesCache.clear();
       usageController.abort();
       await hiddenCompletionExecutor?.dispose();
       await usageDone;

package/dist/features/magic-context/dreamer/map-memories-prompt.d.ts

@@ -38,9 +38,9 @@ export interface ParsedMemoryMapping {
  *  as file-independent (that silently excluded memories from verify). Nested
  *  `<file path="…"/>` children are accepted as an unambiguous alias. */
 export declare function parseMapMemoriesManifest(text: string): ParsedMemoryMapping[];
-/** Retry responses must contain a non-empty manifest with syntactically valid
- *  entries and a closing root element, so the response is complete rather than
- *  truncated. The mapper commits valid expected ids and retries only omissions.
+/** Responses must contain a closed manifest with syntactically valid entries.
+ *  A closed empty manifest is valid when no memory's mapping could be confirmed.
+ *  The mapper commits valid expected ids; omissions follow its retry/backoff policy.
  *  Duplicate expected ids are rejected; duplicate unknown ids are ignored. */
 export declare function validateMapMemoriesManifest(text: string, expectedIds: ReadonlySet<number>): ParsedMemoryMapping[];
 /** Recover only closed, individually valid decisions from an interrupted manifest.

package/dist/features/magic-context/dreamer/map-memories-prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-memories-prompt.d.ts","sourceRoot":"","sources":["../../../../src/features/magic-context/dreamer/map-memories-prompt.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,0BAA0B,8/GAsBsF,CAAC;AAM9H,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAW3C;oFACoF;AACpF,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAgBtF;AAED,MAAM,WAAW,cAAc;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;CACxB;AAID;kFACkF;AAClF,wBAAsB,wBAAwB,CAC1C,QAAQ,EAAE,cAAc,EAAE,EAC1B,OAAO,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,EAAE,CAAC,CAmE3B;AAED,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,CAkB9F;AAED,MAAM,WAAW,mBAAmB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;CACxB;AA4BD;;;;wEAIwE;AACxE,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,EAAE,CAmC5E;AAED;;;8EAG8E;AAC9E,wBAAgB,2BAA2B,CACvC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GACjC,mBAAmB,EAAE,CAQvB;AAED;qFACqF;AACrF,wBAAgB,+BAA+B,CAC3C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GACjC,mBAAmB,EAAE,CAqBvB"}
+{"version":3,"file":"map-memories-prompt.d.ts","sourceRoot":"","sources":["../../../../src/features/magic-context/dreamer/map-memories-prompt.ts"],"names":[],"mappings":"AAWA;;;;;;;;;;;;;GAaG;AAEH,eAAO,MAAM,0BAA0B,8/GAsBsF,CAAC;AAM9H,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAW3C;oFACoF;AACpF,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAgBtF;AAED,MAAM,WAAW,cAAc;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,EAAE,CAAC;CACxB;AAID;kFACkF;AAClF,wBAAsB,wBAAwB,CAC1C,QAAQ,EAAE,cAAc,EAAE,EAC1B,OAAO,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,EAAE,CAAC,CAmE3B;AAED,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,CAkB9F;AAED,MAAM,WAAW,mBAAmB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;CACxB;AA4BD;;;;wEAIwE;AACxE,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,EAAE,CAmC5E;AAED;;;8EAG8E;AAC9E,wBAAgB,2BAA2B,CACvC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GACjC,mBAAmB,EAAE,CAOvB;AAED;qFACqF;AACrF,wBAAgB,+BAA+B,CAC3C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GACjC,mBAAmB,EAAE,CAqBvB"}