@cortexkit/opencode-magic-context 0.49.13 → 0.49.15

package/dist/v2/{context-w055w17c.js → context-4qczzck7.js}

@@ -195,6 +195,8 @@ import {
   HIDDEN_CURATE_AGENT,
   hiddenAgentFor,
   hiddenToolLoop,
+  HIDDEN_RUN_DISPOSED_REASON,
+  noteChildOfDisposedInstance,
   hiddenChildPermissions,
   registerHiddenChildAgents,
   hiddenToolCallRefusal,
@@ -281,7 +283,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-b81w6sw3.js";
+} from "./server-dd0tz6cn.js";
 import {
   resolveHistorianModel2
 } from "./server-8cd2j99z.js";
@@ -306,7 +308,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-n8ch9683.js";
+} from "./server-kmbarfmn.js";
 import {
   setHomeProjectPermission,
   shouldSkipHomeProjectMemory,
@@ -351,6 +353,7 @@ import {
   HYGIENE_PROVIDER_UNITS_VERSION,
   sessionDecisionCalibration,
   transitionSessionHygieneUnits,
+  readEpochFloorSnapshot,
   getProtectionWindowForSession,
   withReplayEnvelopeSnapshot,
   invalidateReplayEnvelopeSnapshot,
@@ -509,7 +512,7 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-m97brnat.js";
+} from "./server-ehyava47.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -601,12 +604,13 @@ import {
   isMessageIndexReconciledThrough2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexes2
-} from "./server-t4prcjc1.js";
+} from "./server-e298hswg.js";
 import {
   stableStringify,
   getTemporalDecisions,
   observeTemporalDecisions,
   freezeTemporalDecisions,
+  tagRevisionKey,
   tagIdentityRevisionKey
 } from "./server-pwv4ezb0.js";
 import {
@@ -701,7 +705,7 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./server-bxpwy6fy.js";
+} from "./server-atbc19ab.js";
 import"./server-51779zs2.js";
 import {
   isRawCompactionSummaryInfo2,
@@ -879,7 +883,7 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-xh7jar6k.js";
+} from "./server-cfbr1s2x.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
@@ -3024,6 +3028,20 @@ function resolveTodowriteAvailability(sessionId) {
 }
 
 // src/hooks/magic-context/degraded-pass-refusal.ts
+function describeDegradedPassFailure(site, cause) {
+  const details = [site];
+  const seen = new Set;
+  while (cause !== undefined && cause !== null && !seen.has(cause)) {
+    seen.add(cause);
+    const current = cause;
+    const detail = typeof current.site === "string" ? current.site : typeof current.message === "string" ? current.message : String(cause);
+    if (!details.includes(detail))
+      details.push(detail);
+    cause = current.cause;
+  }
+  return `Magic Context could not safely prepare this turn [${userFacingFailureCode("transform_pass_degraded")}] (${details.join(": ")}). This request was not sent.`;
+}
+
 class DegradedPassRefusalError extends Error {
   site;
   code = "DEGRADED_PASS_REFUSAL";
@@ -3031,7 +3049,7 @@ class DegradedPassRefusalError extends Error {
   estimatedTokens;
   contextLimitTokens;
   constructor(site, options) {
-    super(renderUserFacingFailure("transform_pass_degraded", "plain"), {
+    super(describeDegradedPassFailure(site, options?.cause), {
       cause: options?.cause
     });
     this.site = site;
@@ -5733,12 +5751,12 @@ function buildTriggerInMemoryTail(db, sessionId, messages) {
 function getProactiveCompartmentTriggerPercentage(executeThresholdPercentage) {
   return Math.max(0, executeThresholdPercentage - PROACTIVE_TRIGGER_OFFSET_PERCENTAGE);
 }
-function estimateProjectedPostDropPercentage(db, sessionId, usage, activeTags, keepReasoningTokens, clearedReasoningThroughTag, canClearReasoning, liveBudgetCutoff) {
+function estimateProjectedPostDropPercentage(db, sessionId, usage, activeTags, keepReasoningTokens, clearedReasoningThroughTag, canClearReasoning, liveBudgetCutoff, eligiblePendingDropTagIds) {
   const totalActiveBytes = activeTags.reduce((sum, tag) => sum + tag.byteSize + tag.reasoningByteSize, 0);
   if (totalActiveBytes === 0)
     return null;
   let droppableBytes = 0;
-  const pendingDrops = getPendingOps(db, sessionId).filter((op) => op.operation === "drop");
+  const pendingDrops = getPendingOps(db, sessionId).filter((op) => op.operation === "drop" && eligiblePendingDropTagIds?.has(op.tagId) === true);
   const pendingDropTagIds = new Set(pendingDrops.map((op) => op.tagId));
   if (pendingDrops.length > 0) {
     droppableBytes += activeTags.filter((tag) => pendingDropTagIds.has(tag.tagNumber)).reduce((sum, tag) => sum + tag.byteSize + tag.reasoningByteSize, 0);
@@ -5867,7 +5885,7 @@ function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThr
 function formatProjectedPostDropPercentage(value) {
   return value === null ? "none" : `${value.toFixed(1)}%`;
 }
-function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, keepReasoningTokens, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection, reclaimRide) {
+function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, keepReasoningTokens, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection, reclaimRide, eligiblePendingDropTagIds) {
   if (sessionMeta.compartmentInProgress) {
     sessionLog2(sessionId, `compartment trigger: skipped — historian already in progress (usage=${usage.percentage.toFixed(1)}%)`);
     return { shouldFire: false };
@@ -5931,7 +5949,7 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
     return { shouldFire: false };
   }
   const canClearReasoning = reasoningProjection?.canClearReasoning ?? modelAcceptsEmptyContent(reasoningProjection?.providerID);
-  const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession2(db, sessionId), keepReasoningTokens, sessionMeta.clearedReasoningThroughTag, canClearReasoning, reasoningProjection?.budgetCutoff);
+  const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession2(db, sessionId), keepReasoningTokens, sessionMeta.clearedReasoningThroughTag, canClearReasoning, reasoningProjection?.budgetCutoff, eligiblePendingDropTagIds);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
   const rideLabel = reclaimRide ? reclaimRideLabel(reclaimRide) : "ride=none";
   const dropsCanLand = reclaimRide !== undefined && hasReclaimRide(reclaimRide);
@@ -6857,6 +6875,76 @@ function resolveHistoryBudgetTokens(historyBudgetPercentage, contextUsage, execu
   }) / 100) * historyBudgetPercentage);
 }
 
+// src/hooks/magic-context/pending-drop-eligibility.ts
+function pendingDropVeto(tagNumber, target, protectedTagIds) {
+  if (protectedTagIds.has(tagNumber))
+    return "protected";
+  if (target?.thinkingDropProtected)
+    return "active_thinking";
+  return null;
+}
+function capturePendingDropEligibility(targets, protectedTagIds) {
+  const eligible = new Set;
+  for (const [number, target] of targets) {
+    if (pendingDropVeto(number, target, protectedTagIds))
+      continue;
+    if (target.drop) {
+      if (target.canDrop?.() === true)
+        eligible.add(number);
+    } else {
+      const content = target.getContent?.();
+      if (typeof content === "string" && content.length > `[dropped §${number}§]`.length)
+        eligible.add(number);
+    }
+  }
+  return eligible;
+}
+function pendingDropEligibilityKey(db, sessionId, input, protectionInputs) {
+  const digests = input.map((message) => message.contentDigest?.() ?? null);
+  if (digests.some((digest) => digest === null))
+    return null;
+  const revision = db.prepare("SELECT value FROM schema_migrations_meta WHERE key = ?").get(tagRevisionKey(sessionId));
+  if (!revision?.value)
+    return null;
+  return JSON.stringify([
+    input.map((message, index) => [
+      message.id,
+      message.role,
+      message.synthetic,
+      digests[index]
+    ]),
+    revision.value,
+    readEpochFloorSnapshot(db, sessionId),
+    sessionDecisionCalibration(db, sessionId).toolsRatio,
+    loadProtectedTailMeta(db, sessionId),
+    [...getMergedReasoningStrippedIds(db, sessionId)].sort(),
+    [...getReasoningRemovalState(db, sessionId).messageIds].sort(),
+    protectionInputs
+  ]);
+}
+function createPendingDropEligibilityCache() {
+  const sessions = new Map;
+  return {
+    read(sessionId, key) {
+      const previous = sessions.get(sessionId);
+      if (key === null || previous?.key !== key) {
+        sessions.delete(sessionId);
+        return;
+      }
+      return previous.eligible;
+    },
+    record(sessionId, key, eligible) {
+      sessions.delete(sessionId);
+      if (key === null)
+        return;
+      const oldest = sessions.keys().next().value;
+      if (sessions.size >= 64 && oldest !== undefined)
+        sessions.delete(oldest);
+      sessions.set(sessionId, { key, eligible: new Set(eligible) });
+    }
+  };
+}
+
 // src/hooks/magic-context/apply-operations.ts
 var RECENT_TOOL_SKELETON_WINDOW = 20;
 function buildReplacementContent(tagId) {
@@ -6977,7 +7065,7 @@ function renderConvertedToolSkeletons(targets, converted) {
   }
   return didMutate;
 }
-function applyPendingOperations(sessionId, db, targets, protectedTagIds, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set, onTagReduced, onBatchComplete) {
+function applyPendingOperations(sessionId, db, targets, protectedTagIds, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set, onTagReduced, onBatchComplete, onEligibilitySnapshot) {
   let didMutateMessage = false;
   let diagnostics;
   const reject = (reason) => {
@@ -6992,6 +7080,7 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
     }).immediate();
     {
       const pendingOps = preloadedPendingOps ?? getPendingOps(db, sessionId);
+      onEligibilitySnapshot?.(capturePendingDropEligibility(targets, protectedTagIds));
       const tags = preloadedTags ?? getTagsByNumbers2(db, sessionId, [
         ...new Set([
           ...pendingOps.map((op) => op.tagId),
@@ -7022,13 +7111,10 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
             removePendingOp(db, sessionId, pendingOp.tagId);
           continue;
         }
-        if (protectedTagIds.has(pendingOp.tagId)) {
-          reject("protected");
-          continue;
-        }
         const target = targets.get(pendingOp.tagId);
-        if (target?.thinkingDropProtected) {
-          reject("active_thinking");
+        const veto = pendingDropVeto(pendingOp.tagId, target, protectedTagIds);
+        if (veto) {
+          reject(veto);
           continue;
         }
         const isToolTag = tagTypeById.get(pendingOp.tagId) === "tool";
@@ -9996,7 +10082,7 @@ async function runPostTransformPhase(args) {
       pendingOpsDidMutate = applyPendingOperations(args.sessionId, args.db, newTargets, new Set([
         ...args.contextUsage.percentage >= 95 ? [] : args.protectedTagIds,
         ...protectedToolTags
-      ]), undefined, pendingOps, [], new Set, (reduction) => droppedTokenReductions.push(reduction));
+      ]), undefined, pendingOps, [], new Set, (reduction) => droppedTokenReductions.push(reduction), undefined, args.onPendingDropEligibility);
       if (pendingOpsDidMutate) {
         droppedCount += pendingOps.length;
         for (const pendingOp of pendingOps) {
@@ -17759,6 +17845,13 @@ async function runCompartmentPhaseImpl(args) {
     return snapshot !== null && hasRunnableCompartmentWindow(snapshot);
   }
   async function awaitCompartmentRun(activeRun, reason) {
+    await Promise.resolve();
+    if (activeRun.inlineJoinTimedOutBudgetMs !== undefined && !activeRun.settled) {
+      historianJoinTimedOut = true;
+      historianJoinBudgetMs = activeRun.inlineJoinTimedOutBudgetMs;
+      sessionLog2(args.sessionId, "transform: compartment inline join budget already exhausted for this run — not waiting again");
+      return "timed_out";
+    }
     sessionLog2(args.sessionId, reason);
     const timeoutMs = resolveHistorianInlineJoinBudget(args.historianTimeoutMs);
     historianJoinBudgetMs = timeoutMs;
@@ -17774,6 +17867,7 @@ async function runCompartmentPhaseImpl(args) {
         clearTimeout(timer);
     }
     if (result === "timeout") {
+      activeRun.inlineJoinTimedOutBudgetMs = timeoutMs;
       historianJoinTimedOut = true;
       sessionLog2(args.sessionId, `transform: compartment await timed out after ${timeoutMs}ms — proceeding without waiting`);
       return "timed_out";
@@ -18052,6 +18146,7 @@ function createTransform(deps) {
     memorySyncRequestedSessions: deps.rustMemorySyncRequestedSessions
   }) : undefined;
   let entryReuse;
+  const pendingDropEligibility = createPendingDropEligibilityCache();
   const projectEntry = createLkgEntryProjector({
     onReuse: (stats) => {
       entryReuse = stats;
@@ -18622,6 +18717,18 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     prewarmTagOwners(db, sessionId, ownerRatio);
     const tagOwnersReady = isTagOwnerSummaryReady2(db, sessionId, ownerRatio);
     let triggerBoundarySnapshot;
+    let dropProjectionEmergency = contextUsageEarly.percentage >= 95;
+    const dropProjectionKey = () => pendingDropEligibilityKey(db, sessionId, lkgInput, {
+      currentTurnId,
+      model: modelForBudget,
+      protectedTokens: deps.protectedTokens,
+      protectedTokenTierOverrides: deps.protectedTokenTierOverrides,
+      protectedTools: deps.protectedTools,
+      keepReasoningTokens: deps.keepReasoningTokens,
+      usableSoft: windowGeometry?.usableSoft ?? boundaryContextLimit,
+      emergency: dropProjectionEmergency,
+      clearedReasoningThroughTag: sessionMeta?.clearedReasoningThroughTag
+    });
     if (fullFeatureMode && !compactionOff && historianRunnable && tagOwnersReady && !sessionMeta.compartmentInProgress) {
       const tTrigger = performance.now();
       try {
@@ -18634,7 +18741,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           force: contextUsageEarly.percentage >= forceMaterializationPercentage && (contextUsageEarly.percentage >= 95 || getEmergencyInputSample(db, sessionId) === 0),
           explicitFlush: deps.pendingMaterializationSessions.has(sessionId),
           publishedHistory: isCacheBusting
-        });
+        }, pendingDropEligibility.read(sessionId, dropProjectionKey()));
         if (triggerResult.shouldFire) {
           sessionLog2(sessionId, `compartment trigger: firing (reason=${triggerResult.reason})`);
           updateSessionMeta(db, sessionId, { compartmentInProgress: true });
@@ -18940,6 +19047,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const protectedTagIds = protectedTagNumbers;
     const protectedCutoff = protectionWindow.cutoff;
     const tPostProcess = performance.now();
+    dropProjectionEmergency = thinkingFitRetries.has(sessionId) || contextUsage.percentage >= 95;
     const postTransformResult = await runPostTransformPhase({
       opencode2: deps.storeGeneration === "v2",
       normalizeRecoveryTail,
@@ -18997,6 +19105,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       lastHeuristicsTurnId: deps.lastHeuristicsTurnId,
       keepReasoningTokens: resolveKeepReasoningTokens(deps.keepReasoningTokens, currentModelKeyForBoundary),
       protectedTagIds,
+      onPendingDropEligibility: (eligible) => pendingDropEligibility.record(sessionId, dropProjectionKey(), eligible),
       protectedTagNumbers,
       protectedCutoff,
       protectedCount: protectionWindow.status.protectedCount,
@@ -22617,7 +22726,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-ca7qt75a.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-5zhxtwha.js"));
     const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-8ghn9tnv.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
@@ -22702,7 +22811,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-e1a2w6jh.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-65pwye0d.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -25506,6 +25615,25 @@ function subagentTemperature(model, metadata, temperature, log) {
 }
 
 // src/v2/hidden-completion.ts
+var DEFAULT_DISPOSE_DRAIN_MS = 2000;
+async function settleWithin(work, ms) {
+  let timer;
+  try {
+    await Promise.race([
+      work.then(() => {
+        return;
+      }, () => {
+        return;
+      }),
+      new Promise((resolve) => {
+        timer = setTimeout(resolve, Math.max(0, ms));
+      })
+    ]);
+  } finally {
+    if (timer)
+      clearTimeout(timer);
+  }
+}
 var POLL_INTERVAL_MS = 200;
 function modelKey(model) {
   return `${model.providerID}/${model.modelID}`;
@@ -25553,7 +25681,7 @@ function toolResultText(result) {
 `);
   return text.length > 0 ? text : undefined;
 }
-function toolLoopMessages(attempt) {
+function toolLoopMessages(attempt, rows) {
   const messages = attempt.observedMessages ?? [];
   const results = new Map;
   for (const message of messages) {
@@ -25571,10 +25699,28 @@ function toolLoopMessages(attempt) {
       });
     }
   }
-  return messages.flatMap((message) => {
+  const transcript = rows ? rows.map((row) => ({ role: "assistant", content: row.data.content ?? [] })) : messages;
+  return transcript.flatMap((message) => {
     if (message.role !== "assistant")
       return [];
     const parts = message.content.flatMap((part) => {
+      if (part.type === "text" && typeof part.text === "string")
+        return [{ type: "text", text: part.text }];
+      if (part.type === "tool" && typeof part.name === "string" && typeof part.state === "object" && part.state !== null) {
+        const state = part.state;
+        const output = state.status === "completed" ? toolResultText({ value: state.content }) : undefined;
+        return [
+          {
+            type: "tool",
+            tool: part.name,
+            state: {
+              status: state.status,
+              input: state.input,
+              ...output === undefined ? {} : { output }
+            }
+          }
+        ];
+      }
       if (part.type !== "tool-call" || typeof part.id !== "string" || typeof part.name !== "string")
         return [];
       const result = results.get(part.id);
@@ -25651,6 +25797,9 @@ function isProviderFailure(error) {
 }
 async function awaitAssistantRow(openReader, readSessionError, localFailure, childID, afterSeq, deadline, signal) {
   for (;; ) {
+    const refusedBefore = localFailure();
+    if (refusedBefore)
+      throw refusedBefore;
     const { assistant, idle } = withReader(openReader, (reader) => ({
       assistant: reader.latestAssistant(childID),
       idle: reader.latestIdle(childID)
@@ -25726,6 +25875,9 @@ async function createV2HiddenCompletionExecutor(host, options) {
   const generation = options.generation ?? "opencode2";
   const roleTails = new Map;
   const note = options.log ?? log2;
+  let disposed;
+  const openRuns = new Set;
+  const inFlight = new Set;
   const removeSession = host.removeSession;
   if (!removeSession)
     throw new Error("Magic Context requires OpenCode 2.0.22 session.remove");
@@ -25762,7 +25914,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
       const entry = rows.find((row) => row && typeof row === "object" && row.providerID === model.providerID && row.id === model.modelID);
       if (!entry)
         return model;
-      if (entry.variants && typeof entry.variants === "object" && Object.hasOwn(entry.variants, model.variant))
+      if (Array.isArray(entry.variants) ? entry.variants.some((variant) => variant?.id === model.variant) : entry.variants && typeof entry.variants === "object" && Object.hasOwn(entry.variants, model.variant))
         return model;
       const key = `${model.providerID}/${model.modelID}:${model.variant}`;
       if (!warnedVariants.has(key)) {
@@ -25820,10 +25972,17 @@ async function createV2HiddenCompletionExecutor(host, options) {
   return {
     capabilities: V2_HIDDEN_EXECUTOR_CAPABILITIES,
     async open(identity) {
+      if (disposed)
+        throw disposed;
       const role = roleFor(identity);
-      const releaseRole = await acquireRole(role);
+      const releaseStore = options.holdStore?.() ?? (() => {});
+      let releaseRole;
       let openedChild;
+      let opened;
       try {
+        releaseRole = await acquireRole(role);
+        if (disposed)
+          throw disposed;
         await options.ensureAgent?.();
         const head = await resolveHead(identity);
         const active = await lifecycle.open(identity, role, head);
@@ -25836,17 +25995,25 @@ async function createV2HiddenCompletionExecutor(host, options) {
           role,
           child: active,
           releaseRole,
+          releaseStore,
           failed: false,
           unsettledFailure: false,
           retired: false
         };
         runs.set(handle, run);
+        opened = run;
+        openRuns.add(run);
+        if (disposed)
+          noteChildOfDisposedInstance(active.id);
         await switchChildModel(run, head);
         return handle;
       } catch (error) {
         if (openedChild)
           lifecycle.retire(openedChild, "hidden-run-open-failed");
-        releaseRole();
+        if (opened)
+          openRuns.delete(opened);
+        releaseRole?.();
+        releaseStore();
         throw error;
       }
     },
@@ -25854,6 +26021,15 @@ async function createV2HiddenCompletionExecutor(host, options) {
       const run = runs.get(handle);
       if (!run)
         throw new Error("Unknown hidden completion run");
+      const refuseDisposed = () => {
+        if (!disposed)
+          return;
+        run.failed = true;
+        run.unsettledFailure = true;
+        retire(run, "plugin-instance-disposed");
+        throw disposed;
+      };
+      refuseDisposed();
       if (request.signal?.aborted) {
         await interruptAndRetire(run, "aborted-before-prompt");
         throw new Error("Hidden completion prompt aborted");
@@ -25891,6 +26067,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
         handle.childSessionId = run.child.id;
       }
       await switchChildModel(run, requested);
+      refuseDisposed();
       const baseline = withReader(options.openReader, (reader) => reader.latestSequence(run.child.id));
       const marker = `mc:hidden:${crypto.randomUUID()}:${crypto.randomUUID()}`;
       run.completion = undefined;
@@ -25958,6 +26135,28 @@ async function createV2HiddenCompletionExecutor(host, options) {
         interruptAndRetire(run, "prompt-timeout").finally(() => abortReject(new Error("Hidden completion prompt timed out")));
       }, Math.max(0, deadline - Date.now()));
       request.signal?.addEventListener("abort", onAbort, { once: true });
+      let settle;
+      const entry = {
+        cancel: async (refusal) => {
+          attempt.refusal ??= refusal;
+          noteChildOfDisposedInstance(run.child.id);
+          try {
+            await interruptAndRetire(run, "plugin-instance-disposed");
+          } catch (error) {
+            note(`[magic-context] hidden child ${run.child.id} could not be interrupted on dispose: ${errorText(error)}`);
+          } finally {
+            abortReject(refusal);
+          }
+        },
+        reject: (refusal) => {
+          attempt.refusal ??= refusal;
+          abortReject(refusal);
+        },
+        settled: new Promise((resolve) => {
+          settle = resolve;
+        })
+      };
+      inFlight.add(entry);
       try {
         await Promise.race([
           host.prompt({ sessionID: run.child.id, text: marker }),
@@ -26008,7 +26207,7 @@ async function createV2HiddenCompletionExecutor(host, options) {
         run.completion = {
           text,
           tokenLog: runTokenLog(tokens, run.identity.maxOutputTokens, row.data.finish),
-          ...hiddenToolLoop(run.identity) ? { messages: toolLoopMessages(attempt) } : {},
+          ...hiddenToolLoop(run.identity) ? { messages: toolLoopMessages(attempt, steps) } : {},
           reasoning: text ? null : assistantReasoning(row),
           usage: reportedUsage ? usage : meter(system, promptText(request), text ?? ""),
           lengthCapped: ["length", "max_tokens"].includes(row.data.finish ?? ""),
@@ -26037,6 +26236,8 @@ async function createV2HiddenCompletionExecutor(host, options) {
           clearInterval(budgetPoll);
         request.signal?.removeEventListener("abort", onAbort);
         options.hook.releaseAttempt(marker);
+        inFlight.delete(entry);
+        settle();
       }
     },
     async collect(handle) {
@@ -26060,9 +26261,27 @@ async function createV2HiddenCompletionExecutor(host, options) {
         }
       } finally {
         runs.delete(handle);
+        openRuns.delete(run);
         run.releaseRole();
+        run.releaseStore();
       }
       await lifecycle.finish(run.child, run.retired);
+    },
+    async dispose() {
+      disposed ??= new HiddenCompletionRefusal("hidden_instance_disposed", HIDDEN_RUN_DISPOSED_REASON, true);
+      const refusal = disposed;
+      for (const run of openRuns)
+        noteChildOfDisposedInstance(run.child.id);
+      const entries = [...inFlight];
+      if (entries.length === 0)
+        return;
+      note(`[magic-context] plugin instance disposed with ${entries.length} hidden run(s) in flight; cancelling them`);
+      const bound = options.disposeDrainMs ?? DEFAULT_DISPOSE_DRAIN_MS;
+      const deadline = Date.now() + bound;
+      await settleWithin(Promise.allSettled(entries.map((entry) => entry.cancel(refusal))), bound);
+      for (const entry of entries)
+        entry.reject(refusal);
+      await settleWithin(Promise.allSettled(entries.map((entry) => entry.settled)), deadline - Date.now());
     }
   };
 }
@@ -30272,7 +30491,8 @@ function currentManifest(text) {
   return start < 0 ? text : text.slice(start);
 }
 function parseMapMemoriesCompletion(text, completion, expectedIds) {
-  return validateMapMemoriesManifest(currentManifest(assistantText2(completion.messages ?? []) || text), expectedIds);
+  const source = /<mappings\b/i.test(text) ? text : assistantText2(completion.messages ?? []) || text;
+  return validateMapMemoriesManifest(currentManifest(source), expectedIds);
 }
 function validateClientMapMemories(messages, expectedIds) {
   if (hasLengthCappedOutput(messages)) {
@@ -32384,6 +32604,7 @@ var VERIFY_BATCH_SIZE = 5;
 var VERIFY_TOKENS_PER_MEMORY = 1e5;
 var VERIFY_RUN_TOKEN_BUDGET = 2500000;
 var VERIFY_RUN_SLICE_MS = 240000;
+var VERIFY_IN_FLIGHT_GRACE_MS = 120000;
 function verifyBatchTokenBudget(size, configured) {
   return Math.min(configured ?? Number.MAX_SAFE_INTEGER, size * VERIFY_TOKENS_PER_MEMORY);
 }
@@ -32470,7 +32691,15 @@ async function runVerifyWithCooldown(args) {
   const runTokenBudget = Math.min(args.tokenBudget ?? VERIFY_RUN_TOKEN_BUDGET, VERIFY_RUN_TOKEN_BUDGET);
   try {
     for (let i = 0;i < batches.length; i += 1) {
-      const remainingMs = Math.max(0, Math.min(args.deadline, sliceDeadline) - Date.now());
+      const now = Date.now();
+      const startCutoff = Math.min(args.deadline, sliceDeadline);
+      const hardStop = Math.min(args.deadline, sliceDeadline + VERIFY_IN_FLIGHT_GRACE_MS);
+      const remainingMs = Math.max(0, hardStop - now);
+      if (now >= startCutoff) {
+        result.stopReason = "deadline";
+        log2(`[dreamer] ${args.forceBroad ? "verify-broad" : "verify"}: stopping before batch ${i + 1}/${batches.length} — the run deadline passed ${now - startCutoff}ms ago`);
+        break;
+      }
       if (remainingMs < VERIFY_BATCH_FLOOR_MS) {
         result.stopReason = "deadline";
         log2(`[dreamer] ${args.forceBroad ? "verify-broad" : "verify"}: stopping before batch ${i + 1}/${batches.length} — remaining budget ${remainingMs}ms is below the ${VERIFY_BATCH_FLOOR_MS}ms batch floor`);
@@ -50970,6 +51199,7 @@ function persistV2UsageReading(args) {
 class V2LkgAdmissionReplay extends Error {
 }
 var HIDDEN_SESSION_ERROR_GRACE_MS = 50;
+var STORE_POOL_DISPOSE_WAIT_MS = 1000;
 function isBlockingV2TransformError(error) {
   return error instanceof EmergencyFailClosedError || error instanceof UnresolvedHistoryBoundaryError || error instanceof UnmanagedOverWindowError || error instanceof DegradedPassRefusalError || isFailClosedBlockingError(error);
 }
@@ -51317,7 +51547,8 @@ async function registerContext(context) {
       ensureAgent: () => hiddenAgentsReady ??= context.agent.reload(),
       modelCatalog: () => Promise.resolve(context.model.list()),
       historianTemperature: () => config.historian?.temperature,
-      openReader: openStoreReader
+      openReader: openStoreReader,
+      holdStore: () => readerPool.hold()
     });
   };
   const dreamerAtBoot = config.dreamer;
@@ -52348,6 +52579,7 @@ ${baseline}
   }, 0));
   return {
     async dispose() {
+      await hiddenCompletionExecutor?.dispose();
       rpcStopped = true;
       rpcServer.stop();
       transform?.disposeRust();
@@ -52361,7 +52593,8 @@ ${baseline}
         release();
       rawProviders.clear();
       restoredRows.clear();
-      readerPool.close();
+      if (!await readerPool.closeWhenIdle(STORE_POOL_DISPOSE_WAIT_MS))
+        log2(`[magic-context] v2 store reader pool still held by ${readerPool.holdCount()} hidden run(s) at dispose; it closes when they finish`);
       clearSyntheticCandidates(context);
     }
   };