@cortexkit/opencode-magic-context 0.49.18 → 0.49.20

package/dist/v2/{server-8by8qfec.js → server-0epqaxhd.js}

@@ -4,13 +4,13 @@ import {
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2,
   isTransientSqliteError2
-} from "./server-beht37jy.js";
+} from "./server-1zx2pa5d.js";
 import {
   DEFAULT_LOCAL_EMBEDDING_MODEL
 } from "./server-271qxsf5.js";
 import {
   setBootQuietPeriodForTests
-} from "./server-rmygf5pn.js";
+} from "./server-ne8arh8t.js";
 import {
   isEmbeddingHostBusy2
 } from "./server-qt1qqasc.js";
@@ -20,34 +20,37 @@ import {
 import {
   sanitizeDiagnosticText,
   log2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
+import {
+  createWorkerShutdown
+} from "./server-cpjk5jd2.js";
 import {
   SYNAPSE_DEFAULT_MODEL,
   isSynapseEmbeddingTruncated,
   getSynapseBatchRequestKey,
   SynapseEmbeddingProvider
-} from "./server-6tmj0s7j.js";
+} from "./server-af2pght7.js";
 import {
   estimateTokens
-} from "./server-tgnbmwah.js";
+} from "./server-3mz2qh5a.js";
 import {
-  DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS,
-  CHUNK_WINDOW_SAFETY_RATIO,
-  normalizeCompartmentChunkMaxInputTokens,
-  buildCanonicalChunkTextFromFts,
-  buildCompartmentSummaryFallbackText,
-  chunkCanonicalText,
-  chunkEmbeddingWindowsAreCurrent,
-  replaceCompartmentChunkEmbeddings,
-  loadUnembeddedShadowChunkCandidates,
-  loadUnembeddedCompartmentChunkCandidatesPolite,
-  recordChunkEmbedBackoff,
-  chunkWindowSourceKey,
-  loadUnembeddedSessionChunkCandidatesPolite,
-  countSessionCompartmentEmbedCoverage,
-  countSessionCompartmentEmbedCoveragePolite,
-  countUnembeddedSessionCompartmentsPolite
-} from "./server-46neh5fa.js";
+  DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2,
+  CHUNK_WINDOW_SAFETY_RATIO2,
+  normalizeCompartmentChunkMaxInputTokens2,
+  buildCanonicalChunkTextFromFts2,
+  buildCompartmentSummaryFallbackText2,
+  chunkCanonicalText2,
+  chunkEmbeddingWindowsAreCurrent2,
+  replaceCompartmentChunkEmbeddings2,
+  loadUnembeddedShadowChunkCandidates2,
+  loadUnembeddedCompartmentChunkCandidatesPolite2,
+  recordChunkEmbedBackoff2,
+  chunkWindowSourceKey2,
+  loadUnembeddedSessionChunkCandidatesPolite2,
+  countSessionCompartmentEmbedCoverage2,
+  countSessionCompartmentEmbedCoveragePolite2,
+  countUnembeddedSessionCompartmentsPolite2
+} from "./server-wyawsa88.js";
 import {
   acquireGitSweepLease,
   renewGitSweepLease,
@@ -55,7 +58,7 @@ import {
   findMisScopedCompartmentChunkEmbeddingIdsForProject,
   recordSessionProjectIdentity,
   repairMisScopedCompartmentChunkEmbeddingsForProject
-} from "./server-hy3d3vsx.js";
+} from "./server-4nw4fqhr.js";
 import {
   saveEmbeddingIfHashMatches,
   getMemoryEmbedCoverage,
@@ -65,12 +68,15 @@ import {
   dominantEmbeddingFailure,
   embeddingModelsMatch,
   resolveEmbeddingTextPrefixes,
+  getCachedLocalEmbeddingPooling,
+  logLocalEmbeddingPoolingDecisionOnce,
+  logLocalEmbeddingPoolingUnavailableOnce,
   getEmbeddingProviderIdentity,
   LocalEmbeddingProvider
-} from "./server-h1v0pyxb.js";
+} from "./server-j4jnp9b5.js";
 import {
   logSlowWriteTransaction
-} from "./server-6pmqg9m4.js";
+} from "./server-gyy4k6mf.js";
 
 // src/hooks/magic-context/embed-session-state.ts
 var embedPauseBySession = new Set;
@@ -202,6 +208,7 @@ function createChunkEmbeddingWriter(db) {
   const entry = new URL(import.meta.url.endsWith(".ts") ? "./chunk-embedding-write-worker.ts" : "./chunk-embedding-write-worker.js", import.meta.url);
   const timeout = db.prepare("PRAGMA busy_timeout").get().timeout;
   const worker = inRootAsyncContext2(() => new Worker(entry, { workerData: { path, harness: getHarness2(), timeout } }));
+  const shutdown = createWorkerShutdown(worker, "chunk-embedding-writer", timeout + 2000);
   let pending;
   let failure;
   let deadline;
@@ -232,7 +239,7 @@ function createChunkEmbeddingWriter(db) {
         pending = { resolve, reject };
         deadline = inRootAsyncContext2(() => setTimeout(() => {
           fail(new Error("chunk embedding database operation timed out; coverage will be rechecked"));
-          worker.terminate();
+          shutdown.close();
         }, 30000));
         deadline.unref();
         worker.postMessage(message);
@@ -264,7 +271,7 @@ function createChunkEmbeddingWriter(db) {
     release: (project, holder) => request({ kind: "release", project, holder }),
     async close() {
       clearTimeout(deadline);
-      await worker.terminate();
+      await shutdown.close();
     }
   };
 }
@@ -525,7 +532,7 @@ function responseSlots(items, inputCount) {
   return slots;
 }
 function capEmbeddingInput(input, maxInputTokens, purpose) {
-  const ratio = purpose === "query" ? CHUNK_WINDOW_SAFETY_RATIO : 1;
+  const ratio = purpose === "query" ? CHUNK_WINDOW_SAFETY_RATIO2 : 1;
   const budget = Math.max(1, Math.floor(maxInputTokens * ratio));
   if (estimateTokens(input) <= budget)
     return input;
@@ -635,12 +642,12 @@ class OpenAICompatibleEmbeddingProvider {
     this.truncate = options.truncate?.trim() ?? "";
     this.rateLimitKey = rateLimitStateKey(this.endpoint, this.apiKey);
     const maxInputTokensSet = typeof options.maxInputTokens === "number" && Number.isFinite(options.maxInputTokens);
-    this.maxInputTokens = maxInputTokensSet ? Math.max(1, Math.floor(options.maxInputTokens)) : DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS;
+    this.maxInputTokens = maxInputTokensSet ? Math.max(1, Math.floor(options.maxInputTokens)) : DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2;
     if (!maxInputTokensSet && this.endpoint && this.model) {
       const warningKey = `${this.endpoint}\x00${this.model}`;
       if (!maxInputTokensWarnings.has(warningKey)) {
         maxInputTokensWarnings.add(warningKey);
-        log2(`[magic-context] embedding.max_input_tokens is not set for openai-compatible model "${sanitizeDiagnosticText(this.model)}"; chunk embeddings use the ${DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS}-token default, which is sized for the bundled local model and splits history into small pieces. Set embedding.max_input_tokens to the model's input limit (changing it re-embeds stored chunks once).`);
+        log2(`[magic-context] embedding.max_input_tokens is not set for openai-compatible model "${sanitizeDiagnosticText(this.model)}"; chunk embeddings use the ${DEFAULT_COMPARTMENT_CHUNK_MAX_INPUT_TOKENS2}-token default, which is sized for the bundled local model and splits history into small pieces. Set embedding.max_input_tokens to the model's input limit (changing it re-embeds stored chunks once).`);
       }
     }
     this.modelId = getEmbeddingProviderIdentity({
@@ -1229,7 +1236,7 @@ function resolveEmbeddingConfig(config) {
       model: config?.model?.trim() || DEFAULT_LOCAL_EMBEDDING_MODEL,
       local_runtime: config?.local_runtime ?? "auto",
       ...config?.max_input_tokens ? {
-        max_input_tokens: normalizeCompartmentChunkMaxInputTokens(config.max_input_tokens)
+        max_input_tokens: normalizeCompartmentChunkMaxInputTokens2(config.max_input_tokens)
       } : {},
       ...config?.local_dtype ? { local_dtype: config.local_dtype } : {}
     };
@@ -1250,7 +1257,7 @@ function resolveEmbeddingConfig(config) {
       ...config.document_prefix !== undefined ? { document_prefix: config.document_prefix } : {},
       ...truncate ? { truncate } : {},
       ...config.max_input_tokens ? {
-        max_input_tokens: normalizeCompartmentChunkMaxInputTokens(config.max_input_tokens)
+        max_input_tokens: normalizeCompartmentChunkMaxInputTokens2(config.max_input_tokens)
       } : {}
     };
   }
@@ -1263,7 +1270,7 @@ function resolveEmbeddingConfig(config) {
     return {
       provider: "synapse",
       model: synapse.model?.trim() || "gte-modernbert-base-f16",
-      max_input_tokens: normalizeCompartmentChunkMaxInputTokens(descriptor?.max_tokens ?? synapse.max_input_tokens),
+      max_input_tokens: normalizeCompartmentChunkMaxInputTokens2(descriptor?.max_tokens ?? synapse.max_input_tokens),
       ...synapse.synapse_connection_file ? { synapse_connection_file: synapse.synapse_connection_file } : {},
       ...synapse.synapse_fingerprint ? { synapse_fingerprint: synapse.synapse_fingerprint } : {},
       ...typeof synapse.synapse_table_epoch === "number" ? { synapse_table_epoch: synapse.synapse_table_epoch } : {},
@@ -1351,7 +1358,7 @@ function getChunkEmbeddingModelId(config, providerIdentity) {
   const chunkIdentity = {
     providerIdentity,
     chunkerVersion: 2,
-    maxInputTokens: normalizeCompartmentChunkMaxInputTokens("max_input_tokens" in config ? config.max_input_tokens : undefined),
+    maxInputTokens: normalizeCompartmentChunkMaxInputTokens2("max_input_tokens" in config ? config.max_input_tokens : undefined),
     truncate: config.provider === "openai-compatible" ? config.truncate ?? "" : ""
   };
   return `${providerIdentity}:chunk:${sha256Prefix(stableStringify(chunkIdentity))}`;
@@ -1677,6 +1684,17 @@ async function drainStaleEmbeddingIdentitiesForProject2(db, projectIdentity, bud
 }
 function registerProjectEmbedding2(db, projectIdentity, config, features, sourceDirectory) {
   const resolvedConfig = resolveEmbeddingConfig(config);
+  if (resolvedConfig.provider === "local") {
+    const pooling = getCachedLocalEmbeddingPooling(resolvedConfig.model?.trim() || DEFAULT_LOCAL_EMBEDDING_MODEL);
+    if (pooling?.status === "unresolved" || !pooling) {
+      logLocalEmbeddingPoolingUnavailableOnce(resolvedConfig.model?.trim() || DEFAULT_LOCAL_EMBEDDING_MODEL, pooling?.reason ?? "pooling metadata has not been resolved by the background embedding bootstrap", log2);
+    } else {
+      logLocalEmbeddingPoolingDecisionOnce(resolvedConfig.model?.trim() || DEFAULT_LOCAL_EMBEDDING_MODEL, pooling, log2);
+    }
+    if (pooling?.status === "unsupported") {
+      return registerProjectInObservationMode2(db, projectIdentity, sourceDirectory, resolvedConfig, pooling ? `local model pooling is unsupported: ${pooling.reason}` : "local model pooling metadata has not been resolved");
+    }
+  }
   const providerIdentity = getEmbeddingProviderIdentity(resolvedConfig);
   const runtimeFingerprint = getRuntimeFingerprint(resolvedConfig);
   const chunkModelId = getChunkEmbeddingModelId(resolvedConfig, providerIdentity);
@@ -1872,7 +1890,7 @@ function shadowBackfillMissingBase(scope, primaryModelId, shadowModelId, project
 }
 function shadowBackfillMissingIds(db, projectIdentity, scope, primaryModelId, shadowModelId, limit, shadowMaxInputTokens) {
   if (scope === "chunk") {
-    return loadUnembeddedShadowChunkCandidates(db, projectIdentity, primaryModelId, shadowModelId, limit, shadowMaxInputTokens).map((candidate) => String(candidate.id));
+    return loadUnembeddedShadowChunkCandidates2(db, projectIdentity, primaryModelId, shadowModelId, limit, shadowMaxInputTokens).map((candidate) => String(candidate.id));
   }
   const { sql, params, orderBy } = shadowBackfillMissingBase(scope, primaryModelId, shadowModelId, projectIdentity);
   const rows = db.prepare(`${sql}${orderBy} LIMIT ?`).all(...params, limit);
@@ -1880,7 +1898,7 @@ function shadowBackfillMissingIds(db, projectIdentity, scope, primaryModelId, sh
 }
 function countShadowBackfillMissing(db, projectIdentity, scope, primaryModelId, shadowModelId, shadowMaxInputTokens) {
   if (scope === "chunk") {
-    return loadUnembeddedShadowChunkCandidates(db, projectIdentity, primaryModelId, shadowModelId, Number.MAX_SAFE_INTEGER, shadowMaxInputTokens).length;
+    return loadUnembeddedShadowChunkCandidates2(db, projectIdentity, primaryModelId, shadowModelId, Number.MAX_SAFE_INTEGER, shadowMaxInputTokens).length;
   }
   const { sql, params } = shadowBackfillMissingBase(scope, primaryModelId, shadowModelId, projectIdentity);
   return db.prepare(`SELECT COUNT(*) AS count FROM (${sql})`).get(...params).count;
@@ -1889,7 +1907,7 @@ function shadowModelIdForScope(registration, scope) {
   return scope === "chunk" ? registration.chunkModelId : registration.modelId;
 }
 function shadowMaxInputTokensFor(registration) {
-  return normalizeCompartmentChunkMaxInputTokens("max_input_tokens" in registration.config ? registration.config.max_input_tokens : undefined);
+  return normalizeCompartmentChunkMaxInputTokens2("max_input_tokens" in registration.config ? registration.config.max_input_tokens : undefined);
 }
 function shadowBackfillCohortFingerprint(db, projectIdentity, scope, primaryModelId) {
   if (scope === "memory") {
@@ -2227,14 +2245,14 @@ async function processShadowQueueItem(item) {
   let ftsMappingIncomplete = false;
   let emptyCanonicalText = false;
   for (const candidate of candidates) {
-    const mappedText = buildCanonicalChunkTextFromFts(db, candidate.session_id, candidate.start_message, candidate.end_message);
+    const mappedText = buildCanonicalChunkTextFromFts2(db, candidate.session_id, candidate.start_message, candidate.end_message);
     if (mappedText === null) {
       ftsMappingIncomplete = true;
     } else {
-      const text = mappedText || buildCompartmentSummaryFallbackText(db, candidate.id);
+      const text = mappedText || buildCompartmentSummaryFallbackText2(db, candidate.id);
       const shadowMaxInputTokens = shadowMaxInputTokensFor(registration);
-      const windows = chunkCanonicalText(text, candidate.start_message, candidate.end_message, shadowMaxInputTokens);
-      const windowSourceKey = chunkWindowSourceKey(text, candidate.start_message, candidate.end_message, shadowMaxInputTokens);
+      const windows = chunkCanonicalText2(text, candidate.start_message, candidate.end_message, shadowMaxInputTokens);
+      const windowSourceKey = chunkWindowSourceKey2(text, candidate.start_message, candidate.end_message, shadowMaxInputTokens);
       if (windows.length > 0)
         prepared.push({ candidate, windows, windowSourceKey });
       else
@@ -2275,7 +2293,7 @@ async function processShadowQueueItem(item) {
       ] : [];
     });
     if (rows.length === item.windows.length) {
-      replaceCompartmentChunkEmbeddings(db, rows, item.windowSourceKey);
+      replaceCompartmentChunkEmbeddings2(db, rows, item.windowSourceKey);
       writes += 1;
     } else {
       partialVectorSet = true;
@@ -2410,7 +2428,7 @@ function getProjectChunkEmbeddingModelId2(projectIdentity) {
 function getProjectEmbeddingMaxInputTokens2(projectIdentity) {
   const registration = projectRegistrations.get(projectIdentity);
   const configMax = registration?.config && "max_input_tokens" in registration.config ? registration.config.max_input_tokens : undefined;
-  return normalizeCompartmentChunkMaxInputTokens(registration?.provider?.maxInputTokens ?? configMax);
+  return normalizeCompartmentChunkMaxInputTokens2(registration?.provider?.maxInputTokens ?? configMax);
 }
 function getOrCreateProjectProvider(registration) {
   if (registration.providerIdentity === OFF_PROVIDER_IDENTITY || registration.observationMode) {
@@ -2668,7 +2686,7 @@ async function embedCompartmentChunkBatch(db, projectIdentity, batchSize, signal
   const priorModels = db.prepare(`SELECT COUNT(*) AS total,
         COALESCE(MAX(model_id = ?), 0) AS current
         FROM compartment_chunk_embeddings WHERE compartment_id = ?`);
-  const candidates = await loadUnembeddedCompartmentChunkCandidatesPolite(db, projectIdentity, snapshot.chunkModelId, batchSize, getProjectEmbeddingMaxInputTokens2(projectIdentity), true, (candidate) => {
+  const candidates = await loadUnembeddedCompartmentChunkCandidatesPolite2(db, projectIdentity, snapshot.chunkModelId, batchSize, getProjectEmbeddingMaxInputTokens2(projectIdentity), true, (candidate) => {
     const activity = activeEmbeddingSessions.get(candidate.sessionId);
     if (activity?.project === projectIdentity && activity.model === snapshot.chunkModelId && !embedPauseBySession.has(candidate.sessionId))
       return true;
@@ -2694,27 +2712,27 @@ async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates
   const prepared = [];
   for (const candidate of candidates) {
     await new Promise((resolve) => setTimeout(resolve, 0));
-    const mappedText = buildCanonicalChunkTextFromFts(db, candidate.sessionId, candidate.startMessage, candidate.endMessage);
+    const mappedText = buildCanonicalChunkTextFromFts2(db, candidate.sessionId, candidate.startMessage, candidate.endMessage);
     if (mappedText === null)
       continue;
-    const canonicalText = mappedText || buildCompartmentSummaryFallbackText(db, candidate.id);
+    const canonicalText = mappedText || buildCompartmentSummaryFallbackText2(db, candidate.id);
     if (canonicalText.length === 0) {
       if (writer)
         await writer.backoff(candidate, projectIdentity, modelId);
       else
-        recordChunkEmbedBackoff(db, candidate, projectIdentity, modelId);
+        recordChunkEmbedBackoff2(db, candidate, projectIdentity, modelId);
       noWork.push(candidate.id);
       continue;
     }
-    const windows = chunkCanonicalText(canonicalText, candidate.startMessage, candidate.endMessage, maxInputTokens);
-    if (windows.length === 0 || chunkEmbeddingWindowsAreCurrent(db, candidate.id, modelId, windows, projectIdentity)) {
+    const windows = chunkCanonicalText2(canonicalText, candidate.startMessage, candidate.endMessage, maxInputTokens);
+    if (windows.length === 0 || chunkEmbeddingWindowsAreCurrent2(db, candidate.id, modelId, windows, projectIdentity)) {
       noWork.push(candidate.id);
       continue;
     }
     prepared.push({
       candidate,
       windows,
-      windowSourceKey: chunkWindowSourceKey(canonicalText, candidate.startMessage, candidate.endMessage, maxInputTokens)
+      windowSourceKey: chunkWindowSourceKey2(canonicalText, candidate.startMessage, candidate.endMessage, maxInputTokens)
     });
   }
   if (prepared.length === 0)
@@ -2778,7 +2796,7 @@ async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates
           if (writer)
             await writer.replace(rows, item.windowSourceKey);
           else
-            replaceCompartmentChunkEmbeddings(db, rows, item.windowSourceKey);
+            replaceCompartmentChunkEmbeddings2(db, rows, item.windowSourceKey);
           persistedIds.add(item.candidate.id);
           enqueueShadowEmbeddingItems2(projectIdentity, "chunk", [
             String(item.candidate.id)
@@ -2806,7 +2824,7 @@ async function embedCandidateChunkBatch(db, projectIdentity, modelId, candidates
           if (writer)
             await writer.backoff(item.candidate, projectIdentity, modelId);
           else
-            recordChunkEmbedBackoff(db, item.candidate, projectIdentity, modelId);
+            recordChunkEmbedBackoff2(db, item.candidate, projectIdentity, modelId);
           failed.push(item.candidate.id);
         }
       }
@@ -2880,7 +2898,7 @@ async function embedSessionCompartmentChunks2(db, projectIdentity, sessionId, op
   else
     recordSessionProjectIdentity(db, sessionId, projectIdentity);
   const maxInputTokens = getProjectEmbeddingMaxInputTokens2(projectIdentity);
-  const total = writer ? await writer.count(projectIdentity, sessionId, snapshot.chunkModelId, maxInputTokens) : await countUnembeddedSessionCompartmentsPolite(db, projectIdentity, sessionId, snapshot.chunkModelId, maxInputTokens);
+  const total = writer ? await writer.count(projectIdentity, sessionId, snapshot.chunkModelId, maxInputTokens) : await countUnembeddedSessionCompartmentsPolite2(db, projectIdentity, sessionId, snapshot.chunkModelId, maxInputTokens);
   const holderId = `session-embed-${randomUUID()}`;
   const lease = writer ? await writer.acquire(projectIdentity, holderId) : acquireGitSweepLease(db, projectIdentity, holderId, { ignoreCooldown: true });
   if (!lease.acquired)
@@ -2923,7 +2941,7 @@ async function embedSessionCompartmentChunks2(db, projectIdentity, sessionId, op
           break;
         }
       }
-      const candidates = writer ? await writer.candidates(projectIdentity, sessionId, snapshot.chunkModelId, batchSize, [...skipIds, ...failedIds], maxInputTokens) : await loadUnembeddedSessionChunkCandidatesPolite(db, projectIdentity, sessionId, snapshot.chunkModelId, batchSize, [...skipIds, ...failedIds], maxInputTokens, true);
+      const candidates = writer ? await writer.candidates(projectIdentity, sessionId, snapshot.chunkModelId, batchSize, [...skipIds, ...failedIds], maxInputTokens) : await loadUnembeddedSessionChunkCandidatesPolite2(db, projectIdentity, sessionId, snapshot.chunkModelId, batchSize, [...skipIds, ...failedIds], maxInputTokens, true);
       if (candidates.length === 0)
         break;
       const {
@@ -2973,7 +2991,7 @@ async function embedSessionCompartmentChunks2(db, projectIdentity, sessionId, op
   if (aborted)
     return { status: "aborted", embedded, total, failed: failedIds.length };
   if (providerDown || failedIds.length > 0) {
-    const remaining = Math.max(failedIds.length, (writer ? await writer.count(projectIdentity, sessionId, snapshot.chunkModelId, maxInputTokens) : await countUnembeddedSessionCompartmentsPolite(db, projectIdentity, sessionId, snapshot.chunkModelId, maxInputTokens)) - skipIds.length);
+    const remaining = Math.max(failedIds.length, (writer ? await writer.count(projectIdentity, sessionId, snapshot.chunkModelId, maxInputTokens) : await countUnembeddedSessionCompartmentsPolite2(db, projectIdentity, sessionId, snapshot.chunkModelId, maxInputTokens)) - skipIds.length);
     if (remaining > 0) {
       return {
         status: "stalled",
@@ -3001,7 +3019,7 @@ function getEmbeddingCoverageStatus2(db, projectIdentity, sessionId) {
       shadowBackfillStalls: listShadowBackfillStalls2(db, projectIdentity)
     };
   }
-  const session = countSessionCompartmentEmbedCoverage(db, projectIdentity, sessionId, snapshot.chunkModelId, getProjectEmbeddingMaxInputTokens2(projectIdentity));
+  const session = countSessionCompartmentEmbedCoverage2(db, projectIdentity, sessionId, snapshot.chunkModelId, getProjectEmbeddingMaxInputTokens2(projectIdentity));
   const memories = snapshot.enabled ? getMemoryEmbedCoverage(db, projectIdentity, snapshot.modelId) : { embedded: 0, total: 0, memoryEnabled: false };
   const gitEnabled = snapshot.gitCommitEnabled;
   const commits = gitEnabled ? {
@@ -3025,7 +3043,7 @@ async function getAutoEmbeddingSessionCoverage2(db, projectIdentity, sessionId)
   if (!snapshot?.historyEnabled || snapshot.chunkModelId === "off") {
     return { enabled: false, embedded: 0, total: 0 };
   }
-  const coverage = await countSessionCompartmentEmbedCoveragePolite(db, projectIdentity, sessionId, snapshot.chunkModelId, getProjectEmbeddingMaxInputTokens2(projectIdentity));
+  const coverage = await countSessionCompartmentEmbedCoveragePolite2(db, projectIdentity, sessionId, snapshot.chunkModelId, getProjectEmbeddingMaxInputTokens2(projectIdentity));
   return { enabled: true, ...coverage };
 }
 async function sweepAllRegisteredProjects2(db, batchSize = 10) {

package/dist/v2/{server-pwv4ezb0.js → server-168pb207.js}

@@ -1,6 +1,6 @@
 import {
   sessionLog2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 import {
   isKnownAutocommit
 } from "./server-8ajstryz.js";

package/dist/v2/{server-h0410h0v.js → server-1bw1wcbp.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 
 // src/shared/safe-notification-target.ts
 var DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;

package/dist/{index-beht37jy.js → v2/server-1zx2pa5d.js}

@@ -752,7 +752,7 @@ async function withAsyncPrivilegedWriter2(db, operation, options = {}) {
     } catch (error) {
       if (entered || !(error instanceof SqliteAcquisitionBusyError2))
         throw error;
-      options.beforeRetry?.(error);
+      await options.beforeRetry?.(error);
       const elapsed = performance.now() - started;
       if (elapsed >= budgetMs) {
         reportSqliteDiagnostic(`sqlite writer site=privileged_writer lane=foreground acquire_ms=${Math.round(elapsed)} attempts=${attempts} outcome=busy`);

package/dist/v2/{server-a9xqj88f.js → server-230fnbws.js}

@@ -4,13 +4,13 @@ import {
 import {
   importPluginModule,
   sessionLog2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 import {
   isDefaultSessionTitle2
-} from "./server-h0410h0v.js";
+} from "./server-1bw1wcbp.js";
 import {
   shouldHoldIgnoredNotification
-} from "./server-n1prf1g6.js";
+} from "./server-brj8j2gk.js";
 import {
   getErrorMessage
 } from "./server-y8v6yerm.js";
@@ -142,7 +142,7 @@ async function sendIgnoredMessageNow(client, sessionId, text, params, forcePersi
     holdIgnoredNotification({ client, sessionId, text, params, forcePersist }, "during target checks");
     return "queued";
   }
-  const { waitForSafeNotificationTarget } = await importPluginModule(() => import("./safe-notification-target-qg7n2s77.js"));
+  const { waitForSafeNotificationTarget } = await importPluginModule(() => import("./safe-notification-target-khnzg57c.js"));
   if (await waitForSafeNotificationTarget(client, sessionId) === "skip") {
     sessionLog2(sessionId, "notification skipped (session not titled yet)");
     return "skipped";

package/dist/v2/{server-tbe1femw.js → server-29qp8nz4.js}

@@ -4,7 +4,7 @@ import {
 import {
   getMagicContextStorageDir,
   sessionLog2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 import {
   modelRefLookupOrder
 } from "./server-avwt563y.js";

package/dist/v2/{server-tgnbmwah.js → server-3mz2qh5a.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 
 // src/hooks/magic-context/read-session-formatting.ts
 import { existsSync, readFileSync, realpathSync, statSync } from "node:fs";

package/dist/v2/{server-hy3d3vsx.js → server-4nw4fqhr.js}

@@ -3,10 +3,10 @@ import {
 } from "./server-pavzsdc6.js";
 import {
   isUserHomeDirectory
-} from "./server-rmygf5pn.js";
+} from "./server-ne8arh8t.js";
 import {
   logSlowWriteTransaction
-} from "./server-6pmqg9m4.js";
+} from "./server-gyy4k6mf.js";
 
 // src/features/magic-context/git-commits/sweep-coordinator.ts
 var GIT_SWEEP_COOLDOWN_MS = 10 * 60 * 1000;

package/dist/v2/{server-qv7f0hhe.js → server-4sxjs6hn.js}

@@ -3,21 +3,21 @@ import {
 } from "./server-kaqs6h31.js";
 import {
   getSqliteDatabasePath2
-} from "./server-beht37jy.js";
+} from "./server-1zx2pa5d.js";
 import {
   runSessionWarmupWorker
-} from "./server-xj136kt8.js";
+} from "./server-55rgxfrw.js";
 import {
   estimateTokens
-} from "./server-tgnbmwah.js";
+} from "./server-3mz2qh5a.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb
-} from "./server-n1prf1g6.js";
+} from "./server-brj8j2gk.js";
 import {
   hasRawMessageProvider2,
   readRawSessionMessageIdOrdinalsForRange2
-} from "./server-xhab8jx8.js";
+} from "./server-ej96a39v.js";
 
 // src/tools/ctx-expand/search-archive.ts
 var archiveReadsOnThisThread = 0;

package/dist/v2/{server-34kwfsr4.js → server-53eh1r8r.js}

@@ -1,11 +1,11 @@
 import {
   log2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 import {
   getSdkWindowGeometry,
   getSdkContextLimit,
   getSdkInputLimit
-} from "./server-tbe1femw.js";
+} from "./server-29qp8nz4.js";
 import {
   localBudget,
   calibrationForModelKey

package/dist/v2/{server-xj136kt8.js → server-55rgxfrw.js}

@@ -3,12 +3,15 @@ import {
 } from "./server-51779zs2.js";
 import {
   log2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 import {
   inRootAsyncContext2,
   getSqliteDatabasePath2,
   releaseIndexOwner2
-} from "./server-beht37jy.js";
+} from "./server-1zx2pa5d.js";
+import {
+  createWorkerShutdown
+} from "./server-cpjk5jd2.js";
 
 // src/hooks/magic-context/raw-ordinal-warmup.ts
 import { Worker } from "node:worker_threads";
@@ -1127,6 +1130,7 @@ function readRawSessionBoundaryEndpointsFromDb2(db, sessionId, ids, blockIds = [
 // src/hooks/magic-context/raw-ordinal-warmup.ts
 var ACCEPT_TIMEOUT_MS = 2000;
 var RESULT_TIMEOUT_MS = 10 * 60000;
+var WARMUP_CLOSE_DEADLINE_MS = 2000;
 var FAILURE_BACKOFF_MS = 5 * 60000;
 var inFlight = new Map;
 var connectionIds = new WeakMap;
@@ -1155,6 +1159,7 @@ function runSessionWarmupWorker(input, options) {
   return new Promise((resolve) => {
     const openCancellation = new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT));
     let worker;
+    let shutdown;
     let deadline;
     let settled = false;
     const finish = (result) => {
@@ -1166,7 +1171,7 @@ function runSessionWarmupWorker(input, options) {
       options.signal?.removeEventListener("abort", abort);
       if (worker) {
         activeWorkers.delete(worker);
-        const stopped = worker.terminate();
+        const stopped = shutdown?.close() ?? worker.terminate();
         worker.unref();
         stopped.finally(() => {
           releaseIndexOwner2(input);
@@ -1192,6 +1197,7 @@ function runSessionWarmupWorker(input, options) {
       worker = inRootAsyncContext2(() => new Worker(options.entry ?? defaultEntry(), {
         workerData: { ...input, openCancellation: openCancellation.buffer }
       }));
+      shutdown = createWorkerShutdown(worker, "raw-ordinal-warmup", WARMUP_CLOSE_DEADLINE_MS);
     } catch (error) {
       finish({ failure: "start-failed", detail: String(error) });
       return;

package/dist/v2/{server-nj659894.js → server-5arr9ecn.js}

@@ -1,9 +1,9 @@
 import {
   log2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 import {
   setOutputReserveConfig
-} from "./server-tbe1femw.js";
+} from "./server-29qp8nz4.js";
 import {
   DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE,
   PROTECTED_TOKENS_MIN,

package/dist/{index-8cd2j99z.js → v2/server-5kym00ag.js}

@@ -15,6 +15,9 @@ function resolveHarnessBlock(container, harness) {
   const selected = harness === "omp" ? container?.omp ?? container?.pi : container?.[harness];
   return asRecord(selected);
 }
+function sourceHarness(container, harness) {
+  return harness === "omp" && container?.omp == null ? "pi" : harness;
+}
 function normalizeModelEntry2(entry, harness) {
   if (typeof entry === "string") {
     const model = readString(entry);
@@ -61,13 +64,19 @@ function resolveHistorianModel2(config, harness) {
   const block = resolveHarnessBlock(historian, harness);
   if (!block)
     return { fallbacks: [] };
+  const source = `historian.${sourceHarness(historian, harness)}`;
+  const primary = resolvePrimaryEntry({
+    entry: block.model,
+    defaultQualifier: block[harness === "opencode" ? "variant" : "thinking_level"],
+    harness
+  });
+  const fallbacks = resolveFallbackEntries2(block.fallback_models, harness);
   return {
-    primary: resolvePrimaryEntry({
-      entry: block.model,
-      defaultQualifier: block[harness === "opencode" ? "variant" : "thinking_level"],
-      harness
-    }),
-    fallbacks: resolveFallbackEntries2(block.fallback_models, harness)
+    primary: primary ? { ...primary, sourceConfigKey: `${source}.model` } : undefined,
+    fallbacks: fallbacks.map((entry) => ({
+      ...entry,
+      sourceConfigKey: `${source}.fallback_models`
+    }))
   };
 }
 function resolveDreamerTaskModel2(args) {
@@ -86,15 +95,25 @@ function resolveDreamerTaskModel2(args) {
   const taskQualifier = taskBlock?.[args.harness === "opencode" ? "variant" : "thinking_level"];
   const harnessQualifier = harnessBlock[args.harness === "opencode" ? "variant" : "thinking_level"] ?? normalizeModelEntry2(harnessBlock.model, args.harness)?.qualifier;
   const taskHasModel = taskBlock !== undefined && hasOwn(taskBlock, "model");
+  const taskHasFallbacks = taskBlock !== undefined && hasOwn(taskBlock, "fallback_models");
   const primarySource = taskHasModel ? taskBlock?.model : harnessBlock.model;
-  const fallbackSource = taskBlock !== undefined && hasOwn(taskBlock, "fallback_models") ? taskBlock.fallback_models : harnessBlock.fallback_models;
+  const fallbackSource = taskHasFallbacks ? taskBlock?.fallback_models : harnessBlock.fallback_models;
+  const source = `dreamer.${sourceHarness(dreamer, args.harness)}`;
+  const primary = resolvePrimaryEntry({
+    entry: primarySource,
+    defaultQualifier: taskQualifier ?? harnessQualifier,
+    harness: args.harness
+  });
+  const fallbacks = resolveFallbackEntries2(fallbackSource, args.harness);
   return {
-    primary: resolvePrimaryEntry({
-      entry: primarySource,
-      defaultQualifier: taskQualifier ?? harnessQualifier,
-      harness: args.harness
-    }),
-    fallbacks: resolveFallbackEntries2(fallbackSource, args.harness),
+    primary: primary ? {
+      ...primary,
+      sourceConfigKey: taskHasModel ? `${source}.tasks.${args.task}.model` : `${source}.model`
+    } : undefined,
+    fallbacks: fallbacks.map((entry) => ({
+      ...entry,
+      sourceConfigKey: taskHasFallbacks ? `${source}.tasks.${args.task}.fallback_models` : `${source}.fallback_models`
+    })),
     schedule: readString(schedulingTask?.schedule),
     timeoutMinutes: typeof taskBlock?.timeout_minutes === "number" ? taskBlock.timeout_minutes : undefined,
     promotionThreshold: typeof schedulingTask?.promotion_threshold === "number" ? schedulingTask.promotion_threshold : undefined