@cortexkit/opencode-magic-context 0.49.14 → 0.49.16

package/dist/v2/{context-k4jrq71s.js → context-acw1nhv8.js}

@@ -6,7 +6,7 @@ import {
   resolveLegacyConfigSources,
   getProtectedTokensTierOverrides,
   loadPluginConfigDetailed
-} from "./server-zc3e54vy.js";
+} from "./server-y5pznjt9.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -46,7 +46,7 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DEFAULT_LOCAL_EMBEDDING_MODEL,
   DREAM_TASK_PROMOTION_DEFAULTS
-} from "./server-th4y11y7.js";
+} from "./server-271qxsf5.js";
 import {
   CANONICAL_DREAM_TASKS,
   DREAM_TASK_CAPABILITIES,
@@ -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-fnqxt9j6.js";
+} from "./server-6fyp0v67.js";
 import {
   resolveHistorianModel2
 } from "./server-8cd2j99z.js";
@@ -306,7 +308,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-kmbarfmn.js";
+} from "./server-r9gjxcte.js";
 import {
   setHomeProjectPermission,
   shouldSkipHomeProjectMemory,
@@ -322,7 +324,7 @@ import {
   storedPathBelongsToIdentity,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./server-gvkm8xaj.js";
+} from "./server-e3ftpk7v.js";
 import {
   detectLatestTurnThinkingMismatch,
   isPrefixBoundThinkingModel,
@@ -510,7 +512,7 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-ehyava47.js";
+} from "./server-1hcbw661.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -539,7 +541,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./server-hek6z3w6.js";
+} from "./server-kr2kc9dz.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -573,10 +575,18 @@ import {
   SqliteAcquisitionBusyError2,
   withAsyncPrivilegedWriter2
 } from "./server-wafzvyhg.js";
-import"./server-yrvqaswb.js";
+import"./server-51779zs2.js";
+import {
+  isRawCompactionSummaryInfo2,
+  extractInMemoryMessageViews2,
+  buildInMemoryTailRawMessages2,
+  RawOrdinalsNotReady2,
+  runSessionWarmupWorker
+} from "./server-6714jebr.js";
+import"./server-785mb90s.js";
 import {
   deleteChunkEmbedBackoffForSession
-} from "./server-qhfvvfxj.js";
+} from "./server-kqpawe1a.js";
 import {
   registerOwnRpcServerInstance,
   rpcPortDir,
@@ -602,7 +612,7 @@ import {
   isMessageIndexReconciledThrough2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexes2
-} from "./server-e298hswg.js";
+} from "./server-g59aatsz.js";
 import {
   stableStringify,
   getTemporalDecisions,
@@ -703,15 +713,7 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./server-atbc19ab.js";
-import"./server-51779zs2.js";
-import {
-  isRawCompactionSummaryInfo2,
-  extractInMemoryMessageViews2,
-  buildInMemoryTailRawMessages2,
-  RawOrdinalsNotReady2,
-  runSessionWarmupWorker
-} from "./server-prg55b7k.js";
+} from "./server-0mzjjw3s.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -745,7 +747,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   storedPathBelongsToWorkspace,
   computeWorkspaceEpochFingerprint
-} from "./server-k2bzedxk.js";
+} from "./server-00hx04yn.js";
 import {
   configureContextDatabasePragmas2
 } from "./server-fb3zxn06.js";
@@ -791,7 +793,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./server-6cdy4rc0.js";
+} from "./server-vgpab6rd.js";
 import {
   deriveTriggerBudget2,
   deriveHistorianChunkTokens2,
@@ -812,7 +814,7 @@ import {
   releaseGitSweepLease,
   recordSessionProjectIdentity,
   hasRecordedSessionProjectIdentity
-} from "./server-4gn3z5an.js";
+} from "./server-hgg55hde.js";
 import {
   saveEmbeddingIfHashMatches,
   invalidateProject2,
@@ -820,10 +822,10 @@ import {
 } from "./server-4dhv7mqz.js";
 import {
   getLocalEmbeddingNativeMemoryStats
-} from "./server-g10mdym6.js";
+} from "./server-gha9x4qq.js";
 import {
   cosineSimilarity
-} from "./server-ef89gdsx.js";
+} from "./server-aavz8pm6.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -875,16 +877,19 @@ import {
   SubcModuleTransport,
   indexCommitsForProject,
   embedUnembeddedCommits,
-  withMessageFtsSessionFilter,
   createUnifiedSearchDiagnostics2,
   parseIdShapedQuery2,
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-cfbr1s2x.js";
+} from "./server-n5q841qn.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
+import"./server-kaqs6h31.js";
+import {
+  renderSearchArchiveOffThread2
+} from "./server-zyw55ygv.js";
 import {
   compareSemverCore
 } from "./server-84w6rvvf.js";
@@ -9779,6 +9784,9 @@ async function runPostTransformPhase(args) {
     rewritingSignedPrefix = true;
     thinkingReleasedForFit ||= forFit;
   };
+  if (activeThinkingPrefixHold && args.forceSignedRebuildForFit) {
+    releaseThinkingForRewrite(true);
+  }
   const foldDueDecision = m0M1EnabledForFold && args.m0M1 && !freezeM0M1 ? mustMaterialize({
     db: args.db,
     sessionId: args.sessionId,
@@ -9923,7 +9931,7 @@ async function runPostTransformPhase(args) {
   const idleExpiryRebuild = (!freezeM0M1 || activeThinkingPrefixHold) && args.m0M1?.hardSignals?.cacheExpired === true;
   const rideSignals = {
     subagentExecute: !args.fullFeatureMode && args.schedulerDecision === "execute",
-    hardFold: foldBustsServedPrefixThisPass || firstRenderBust || idleExpiryRebuild,
+    hardFold: rewritingSignedPrefix || foldBustsServedPrefixThisPass || firstRenderBust || idleExpiryRebuild,
     force: emergencyDropEligible && (args.contextUsage.percentage >= 95 || getEmergencyInputSample(args.db, args.sessionId) === 0),
     explicitFlush: isExplicitFlush && hasPendingMaterializationOrigin(args.pendingMaterializationSessions, args.sessionId, "user_flush"),
     publishedHistory: !prefixPreflightFailed && (publishedM1RefreshedThisPass || !m0M1EnabledForFold && (args.pendingCompartmentInjection?.compartmentCount ?? 0) > 0 && legacyPublishedHeadChanged(args))
@@ -12283,6 +12291,7 @@ class HistorianHostRunner {
         timeoutMs: attemptMs,
         signal,
         fallbackModels: rest.map(withVariant),
+        allowModelSuggestions: false,
         callContext: `historian-host:${claim.runId}`,
         fetchOutput: () => withinAttempt(executor.collect(handle, 50), attemptStartedAt + attemptMs - Date.now(), attemptMs, signal).catch((error) => {
           recordAttempt(undefined, error);
@@ -18124,6 +18133,7 @@ function resolveTransformHostSeams(deps) {
     hostRefuse: deps.hostRefuse ?? abortSessionFailClosed
   };
 }
+var SIGNED_FIT_REFUSED_MARKER = "signed_fit:refused:v1";
 function createTransform(deps) {
   registerSystemDateRefresh(deps.historyRefreshSessions);
   const finalWireUsage = createFinalWireUsageTracker();
@@ -19045,7 +19055,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;
+    dropProjectionEmergency = contextUsage.percentage >= 95;
     const postTransformResult = await runPostTransformPhase({
       opencode2: deps.storeGeneration === "v2",
       normalizeRecoveryTail,
@@ -19064,7 +19074,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       client: deps.client,
       activeAgent,
       batch,
-      contextUsage: thinkingFitRetries.has(sessionId) ? { ...contextUsage, percentage: Math.max(95, contextUsage.percentage) } : contextUsage,
+      contextUsage,
       usableWindow: resolvedContextLimit ?? 0,
       schedulerDecision,
       schedulerDeferReason,
@@ -19149,6 +19159,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       postTransformResult.bustedThisPass = true;
     passOutcome.markFinalized();
     const finalWireTail = describeFinalWireTail(messages);
+    const signedFitPreviouslyRefused = !compactionOff && getMergedReasoningStrippedIds(db, sessionId).has(SIGNED_FIT_REFUSED_MARKER);
     let finalWireEstimate;
     if (postTransformResult.bustedThisPass) {
       try {
@@ -19166,7 +19177,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     }
     if (!compactionOff) {
       const emergencyUsagePercentage = usagePercentageSynthetic ? Math.max(95, contextUsage.percentage) : windowGeometry?.usableHard && contextUsage.inputTokens > 0 ? contextUsage.inputTokens / windowGeometry.usableHard * 100 : contextUsage.percentage;
-      finalWireEstimate = finalWireEstimate ?? (emergencyUsagePercentage >= 95 || schedulerDecision === "execute" ? finalWireUsage.estimate(sessionId, {
+      finalWireEstimate = finalWireEstimate ?? (emergencyUsagePercentage >= 95 || schedulerDecision === "execute" || signedFitPreviouslyRefused ? finalWireUsage.estimate(sessionId, {
         messages,
         systemPromptTokens: sessionMeta.systemPromptTokens,
         providerID: modelForBudget?.providerID,
@@ -19189,8 +19200,11 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           }
           return;
         }
-        if (thinkingFitRetries.has(sessionId) || postTransformResult.thinkingReleasedForFit)
+        if (thinkingFitRetries.has(sessionId) || postTransformResult.thinkingReleasedForFit || signedFitPreviouslyRefused) {
+          if (!signedFitPreviouslyRefused && !addMergedReasoningStrippedIds(db, sessionId, [SIGNED_FIT_REFUSED_MARKER]))
+            throw contextRefusalError("Cannot persist the signed-fit refusal");
           throw contextRefusalError("The request remains over the model window after stripping signed thinking and reclaiming context");
+        }
       }
       if (postTransformResult.prefixTrimStatus === "refused") {
         const untrimmed = finalWireEstimate ?? estimateFinalWireInputTokens({
@@ -22724,8 +22738,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-1j1nqrrr.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-8ghn9tnv.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-hzpgg06e.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-hmr7q0nt.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -22809,7 +22823,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-hkv8apcc.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-x4xj1782.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -25613,6 +25627,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}`;
@@ -25776,6 +25809,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)
@@ -25851,6 +25887,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");
@@ -25945,10 +25984,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);
@@ -25961,17 +26007,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;
       }
     },
@@ -25979,6 +26033,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");
@@ -26016,6 +26079,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;
@@ -26083,6 +26147,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 }),
@@ -26162,6 +26248,8 @@ async function createV2HiddenCompletionExecutor(host, options) {
           clearInterval(budgetPoll);
         request.signal?.removeEventListener("abort", onAbort);
         options.hook.releaseAttempt(marker);
+        inFlight.delete(entry);
+        settle();
       }
     },
     async collect(handle) {
@@ -26185,9 +26273,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());
     }
   };
 }
@@ -32510,6 +32616,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);
 }
@@ -32596,7 +32703,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`);
@@ -48836,56 +48951,6 @@ function renderItemByTag(db, sessionId, number, textIndexDomain = "part") {
   return selected ? renderPartFull(selected) ?? "" : `Tag ${number}'s original text part is no longer in stored history.`;
 }
 
-// src/tools/ctx-expand/search-archive.ts
-function renderSearchArchive(db, sessionId, start, end, tokenBudget, archiveOnly = false) {
-  return withMessageFtsSessionFilter(db, sessionId, (sessionFirst) => {
-    let rawIds;
-    const rows = db.prepare(sessionFirst ? `SELECT f.message_ordinal AS ordinal, f.message_id AS id, f.role, f.content
-                   FROM message_fts_rowid_map AS m
-                   JOIN message_history_fts AS f ON f.rowid = m.fts_rowid
-                   WHERE m.session_id = ?1 AND m.message_ordinal BETWEEN ?2 AND ?3
-                     AND f.session_id = ?1 AND f.message_ordinal BETWEEN ?2 AND ?3
-                   ORDER BY m.message_ordinal` : `SELECT message_ordinal AS ordinal, message_id AS id, role, content
-                   FROM message_history_fts
-                   WHERE session_id = ?1 AND message_ordinal BETWEEN ?2 AND ?3
-                   ORDER BY CAST(message_ordinal AS INTEGER)`);
-    const blocks = [];
-    let tokens = 0;
-    let lastOrdinal = start - 1;
-    let truncated = false;
-    for (const row of rows.iterate(sessionId, start, end)) {
-      if (!row.content)
-        continue;
-      if (!archiveOnly) {
-        rawIds ??= readRawSessionMessageIdOrdinalsForRange2(sessionId, start, end);
-        if (rawIds.get(row.id) === row.ordinal)
-          continue;
-      }
-      const block = `[${row.ordinal}] ${row.role === "user" ? "U" : "A"}: ${row.content}`;
-      const cost = estimateTokens(block);
-      if (blocks.length > 0 && tokens + cost > tokenBudget) {
-        truncated = true;
-        break;
-      }
-      blocks.push(block);
-      tokens += cost;
-      lastOrdinal = row.ordinal;
-    }
-    if (blocks.length === 0)
-      return null;
-    const text = [
-      "From the search archive: indexed text only; no surrounding messages or tool output.",
-      "",
-      ...blocks
-    ];
-    if (truncated) {
-      text.push("", `Truncated at message ${lastOrdinal} (budget: ~${tokenBudget} tokens). Call ctx_expand(start=${lastOrdinal + 1}, end=${end}) for more archived text.`);
-    }
-    return text.join(`
-`);
-  });
-}
-
 // src/tools/ctx-expand/tools.ts
 var ctxExpandArgsShape = {
   tag: tool.schema.union([tool.schema.number(), tool.schema.string()]).optional().describe("Tag number from a §N§ tag or a [dropped §N§] placeholder, not a message ordinal. Returns that one item in full. Use alone."),
@@ -48919,7 +48984,7 @@ function createCtxExpandTool(deps) {
         return renderItemByTag(deps.db, sessionId, mode.tag);
       }
       if (mode.kind === "message") {
-        return renderSearchArchive(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal(sessionId, mode.message);
+        return await renderSearchArchiveOffThread2(deps.db, sessionId, mode.message, mode.message, CTX_EXPAND_TOKEN_BUDGET) ?? renderMessageByOrdinal(sessionId, mode.message);
       }
       const { start, end, verbose } = mode;
       const lastCompartmentEnd = getLastCompartmentEndMessage(deps.db, sessionId);
@@ -48927,7 +48992,7 @@ function createCtxExpandTool(deps) {
         return `Range ${start}-${end} is entirely within the live tail (after the last compacted message ${lastCompartmentEnd}); those messages are already visible in context.`;
       }
       const effectiveEnd = lastCompartmentEnd >= 0 ? Math.min(end, lastCompartmentEnd) : end;
-      const archived = renderSearchArchive(deps.db, sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET);
+      const archived = await renderSearchArchiveOffThread2(deps.db, sessionId, start, effectiveEnd, CTX_EXPAND_TOKEN_BUDGET);
       if (archived)
         return archived;
       if (verbose) {
@@ -51096,6 +51161,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);
 }
@@ -51443,7 +51509,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;
@@ -51748,6 +51815,10 @@ async function registerContext(context) {
         if (usageController.signal.aborted)
           break;
         const event = value;
+        if (event.type === "provider.updated" || event.type === "model.updated") {
+          queriedModels.clear();
+          continue;
+        }
         if (!event.data?.sessionID)
           continue;
         const sessionID = event.data.sessionID;
@@ -52474,6 +52545,7 @@ ${baseline}
   }, 0));
   return {
     async dispose() {
+      await hiddenCompletionExecutor?.dispose();
       rpcStopped = true;
       rpcServer.stop();
       transform?.disposeRust();
@@ -52487,7 +52559,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);
     }
   };

package/dist/v2/{embedding-backfill-jmaf8zrr.js → embedding-backfill-jyd6492b.js}

@@ -1,16 +1,18 @@
 import {
   ensureMemoryEmbeddings2
-} from "./server-ef89gdsx.js";
-import"./server-hek6z3w6.js";
+} from "./server-aavz8pm6.js";
+import"./server-kr2kc9dz.js";
 import"./server-4dhv7mqz.js";
 import"./server-qt1qqasc.js";
-import"./server-g10mdym6.js";
-import"./server-th4y11y7.js";
-import"./server-4gn3z5an.js";
-import"./server-qhfvvfxj.js";
+import"./server-gha9x4qq.js";
+import"./server-271qxsf5.js";
+import"./server-hgg55hde.js";
+import"./server-kqpawe1a.js";
 import"./server-rrqpvwqd.js";
-import"./server-gvkm8xaj.js";
-import"./server-yrvqaswb.js";
+import"./server-e3ftpk7v.js";
+import"./server-785mb90s.js";
+import"./server-6714jebr.js";
+import"./server-51779zs2.js";
 import"./server-6pmqg9m4.js";
 import"./server-0ppsweh6.js";
 import"./server-wafzvyhg.js";

package/dist/v2/embedding-worker.js

@@ -4,7 +4,7 @@ import {
 import {
   log2
 } from "./server-f2xf5gcb.js";
-import"./server-th4y11y7.js";
+import"./server-271qxsf5.js";
 import"./server-rrqpvwqd.js";
 import"./server-0ppsweh6.js";
 import"./server-wafzvyhg.js";
@@ -12,7 +12,7 @@ import {
   resolveLocalEmbeddingWorkerRuntime,
   getLocalEmbeddingNativeMemoryStats,
   LocalEmbeddingProvider
-} from "./server-g10mdym6.js";
+} from "./server-gha9x4qq.js";
 import {
   setStoragePrivatePermissionEnforcement
 } from "./server-fvnzcnww.js";

package/dist/v2/hidden-completion.d.ts

@@ -31,6 +31,25 @@ export interface V2HiddenCompletionOptions {
      * receive it.
      */
     historianTemperature?: () => number | undefined;
+    /**
+     * Keep the store reader pool open for one hidden run; returns its release. The run
+     * reads the store from its first attempt until it is closed, so a pool closed in the
+     * meantime must wait for it rather than refuse its next read.
+     */
+    holdStore?: () => () => void;
+    /** Maximum time `dispose` waits for cancelled runs to settle. */
+    disposeDrainMs?: number;
+}
+/** The OpenCode 2 executor, plus the cancellation its plugin instance runs on dispose. */
+export interface V2HiddenCompletionExecutor extends HiddenCompletionExecutor {
+    /**
+     * Cancel every hidden run in flight and refuse new ones, with
+     * `HIDDEN_RUN_DISPOSED_REASON`. Each in-flight child is interrupted at the host, so
+     * the host stops stepping it before this instance's hooks are removed and the
+     * instance that replaces it never receives its turns. Waits at most
+     * `disposeDrainMs` for the cancelled attempts to settle.
+     */
+    dispose(): Promise<void>;
 }
 /**
  * Rebuild the child's assistant text and tool calls in the host message shape the dreamer validators read
@@ -60,5 +79,5 @@ export declare const V2_HIDDEN_EXECUTOR_CAPABILITIES: HiddenCompletionExecutor["
  * first successful open later reaches them without a restart.
  */
 export declare function createLateHiddenExecutor(current: () => HiddenCompletionExecutor | undefined): HiddenCompletionExecutor;
-export declare function createV2HiddenCompletionExecutor(host: HiddenChildHost, options: V2HiddenCompletionOptions): Promise<HiddenCompletionExecutor>;
+export declare function createV2HiddenCompletionExecutor(host: HiddenChildHost, options: V2HiddenCompletionOptions): Promise<V2HiddenCompletionExecutor>;
 //# sourceMappingURL=hidden-completion.d.ts.map