@cortexkit/opencode-magic-context 0.49.19 → 0.49.21

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-gsxjv2q2.js → server-33nqbqkw.js}

@@ -6,21 +6,23 @@ import {
   StaleRouteHandleError,
   SubcClient,
   isConsumerReconnectTransient
-} from "./server-6tmj0s7j.js";
+} from "./server-ab1g0wn9.js";
 import {
   getHarness2
 } from "./server-pavzsdc6.js";
 import {
   getDataDir,
   log2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 import {
   inRootAsyncContext2
-} from "./server-beht37jy.js";
+} from "./server-gzy5w8ya.js";
 import {
-  buildCanonicalChunkTextFromFts,
-  loadCompartmentChunkEmbeddingsForSearch
-} from "./server-46neh5fa.js";
+  buildCanonicalChunkTextFromFts2,
+  loadCompartmentChunkEmbeddingsForSearch2,
+  peekCompartmentChunkSearchPool2,
+  warmCompartmentChunkSearchPool2
+} from "./server-62g58aaz.js";
 import {
   recordEmbeddingMeasurement,
   saveCommitEmbedding,
@@ -37,7 +39,7 @@ import {
   enqueueShadowEmbeddingItems2,
   getProjectEmbeddingSnapshot2,
   embedItemsForProject2
-} from "./server-8by8qfec.js";
+} from "./server-ad18djzs.js";
 import {
   getProjectEmbeddings2
 } from "./server-4dhv7mqz.js";
@@ -46,13 +48,13 @@ import {
   isEmbeddingEnabled,
   embedText,
   ensureMemoryEmbeddings2
-} from "./server-zzkj2fch.js";
+} from "./server-qteg2kt9.js";
 import {
   ModuleMemoryAuthorityError2,
   getMemoriesByProject2,
   getMemoriesByProjects2,
   updateMemoryRetrievalCount2
-} from "./server-n37sebck.js";
+} from "./server-jjvbk92s.js";
 import {
   getNotes,
   getActivePrimers,
@@ -61,27 +63,27 @@ import {
   sanitizeFtsQuery,
   searchMemoriesFTS,
   searchMemoriesFTSUnion
-} from "./server-hm38q7r0.js";
+} from "./server-d48x3m4x.js";
 import {
   cleanSearchText,
   keywordRelevance,
   matchedSearchSnippet,
   getIndexedMessageCorpusSize2
-} from "./server-2ar62dyx.js";
+} from "./server-ppcd1qxh.js";
 import {
   MESSAGE_FTS_SESSION_FILTER_SQL,
   withMessageFtsSessionFilter
 } from "./server-kaqs6h31.js";
 import {
   isRecord
-} from "./server-27gq4mfz.js";
+} from "./server-fa7vtp40.js";
 import {
   resolveWorkspaceShareCategories,
   resolveWorkspaceIdentitySet,
   expandWorkspaceIdentitySetWithAliases,
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory
-} from "./server-xq7dfjke.js";
+} from "./server-wwaw5npa.js";
 import {
   isKnownAutocommit
 } from "./server-8ajstryz.js";
@@ -1425,6 +1427,7 @@ function sha256(value) {
 var RERANK_MODEL = "gte-reranker-modernbert-base-f32";
 var RERANK_LANE_LIMIT = 25;
 var DEADLINE_MS = 1500;
+var DOCUMENT_BYTES = 1024;
 function isProseQuery(query) {
   const text = query.trim();
   if (!text || /[\n;]|^["'`]|["'`]$/.test(text))
@@ -1504,7 +1507,7 @@ function candidateText(location, title, body) {
 ${truncateUtf8(title.replaceAll(`
 `, " "), 120)}
 `;
-  return header + truncateUtf8(body, 1024 - Buffer.byteLength(header));
+  return header + truncateUtf8(body, DOCUMENT_BYTES - Buffer.byteLength(header));
 }
 
 class RerankFailure extends Error {
@@ -1574,7 +1577,79 @@ async function connect(connectionFile) {
   }
   return bounded(connection);
 }
-async function prepareReranker(projectRoot, sessionId, connectionFile, injectedClient) {
+async function remoteScores(config, query, documents, signal) {
+  const controller = new AbortController;
+  let timer;
+  let onAbort;
+  try {
+    const cancelled = new Promise((_, reject) => {
+      const cancel = (reason) => {
+        reject(new RerankFailure(reason));
+        controller.abort();
+      };
+      onAbort = () => cancel("aborted");
+      if (signal?.aborted)
+        onAbort();
+      else
+        signal?.addEventListener("abort", onAbort, { once: true });
+      timer = setTimeout(() => cancel("timeout"), Math.max(50, Math.min(15000, config.timeout_ms ?? DEADLINE_MS)));
+    });
+    const request = async () => {
+      const tei = config.endpoint?.startsWith("tei+");
+      const endpoint = (tei ? config.endpoint?.slice(4) : config.endpoint)?.replace(/\/+$/, "");
+      if (!endpoint || !/^https?:\/\//.test(endpoint))
+        throw new RerankFailure("invalid_endpoint");
+      const response = await fetch(`${endpoint}/rerank`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          ...config.api_key ? { Authorization: `Bearer ${config.api_key}` } : {}
+        },
+        body: JSON.stringify(tei ? { query, texts: documents } : {
+          model: config.model,
+          query,
+          documents,
+          top_n: documents.length
+        }),
+        signal: controller.signal,
+        redirect: "error"
+      });
+      if (!response.ok)
+        throw new RerankFailure(`http_${response.status}`);
+      const body = await response.json();
+      const rows = tei ? body : body?.results;
+      if (!Array.isArray(rows) || rows.length !== documents.length)
+        throw new RerankFailure("invalid_reply");
+      const scores = new Array(documents.length);
+      const seen = new Set;
+      for (const row of rows) {
+        const index = row?.index;
+        const score = tei ? row?.score : row?.relevance_score;
+        if (!Number.isInteger(index) || index < 0 || index >= documents.length || seen.has(index) || typeof score !== "number" || !Number.isFinite(score))
+          throw new RerankFailure("invalid_reply");
+        seen.add(index);
+        scores[index] = score;
+      }
+      return scores;
+    };
+    return await Promise.race([cancelled, request()]);
+  } finally {
+    clearTimeout(timer);
+    if (onAbort)
+      signal?.removeEventListener("abort", onAbort);
+  }
+}
+function remoteRerankSkipped(reason, onSkipped) {
+  const safe = /^(?:invalid_reply|invalid_endpoint|validation|timeout|aborted|candidate_validation|http_\d{3})$/.test(reason) ? reason : "remote_error";
+  const line = `Reranking skipped: ${safe}`;
+  logRerankFallback(safe);
+  onSkipped?.(line);
+}
+async function prepareReranker(projectRoot, sessionId, connectionFile, injectedClient, config) {
+  if (config?.provider === "off")
+    return null;
+  if (config?.provider === "remote")
+    return { remote: config };
   try {
     if (injectedClient === null)
       throw new RerankFailure("missing_synapse");
@@ -1591,36 +1666,43 @@ async function prepareReranker(projectRoot, sessionId, connectionFile, injectedC
     return null;
   }
 }
-async function rerankSearchResults(session, query, baseline, pool, texts, limit) {
+async function rerankSearchResults(session, query, baseline, pool, texts, limit, signal, onSkipped) {
   if (!pool.length)
     return baseline;
   try {
-    if (pool.length > 20 || texts.length !== pool.length || texts.some((text) => Buffer.byteLength(text) > 1024))
-      throw new RerankFailure("validation");
-    const body = unwrap(await bounded(session.client.call("synapse", "rerank.score", {
-      model: RERANK_MODEL,
-      query,
-      candidates: texts,
-      required_fingerprint: session.lane.fingerprint,
-      allow_equivalent: false,
-      accept_declared: false,
-      max_queue_ms: 100,
-      deadline_ms: DEADLINE_MS
-    }, {
-      timeoutMs: DEADLINE_MS,
-      targetKind: "management_surface",
-      identity: session.identity
-    })));
-    if (body.fingerprint !== session.lane.fingerprint)
-      throw new RerankFailure("fingerprint_mismatch");
-    if (body.table_epoch !== session.lane.tableEpoch)
-      throw new RerankFailure("epoch_mismatch");
-    if (!Array.isArray(body.scores) || body.scores.length !== pool.length || body.scores.some((score) => typeof score !== "number" || !Number.isFinite(score)))
+    if (pool.length > 20 || texts.length !== pool.length || texts.some((text) => Buffer.byteLength(text) > DOCUMENT_BYTES))
       throw new RerankFailure("validation");
-    const scores = body.scores;
+    let scores;
+    if ("remote" in session) {
+      scores = await remoteScores(session.remote, query, texts, signal);
+    } else {
+      const body = unwrap(await bounded(session.client.call("synapse", "rerank.score", {
+        model: RERANK_MODEL,
+        query,
+        candidates: texts,
+        required_fingerprint: session.lane.fingerprint,
+        allow_equivalent: false,
+        max_queue_ms: 100,
+        deadline_ms: DEADLINE_MS
+      }, {
+        timeoutMs: DEADLINE_MS,
+        targetKind: "management_surface",
+        identity: session.identity
+      })));
+      if (body.fingerprint !== session.lane.fingerprint)
+        throw new RerankFailure("fingerprint_mismatch");
+      if (body.table_epoch !== session.lane.tableEpoch)
+        throw new RerankFailure("epoch_mismatch");
+      if (!Array.isArray(body.scores) || body.scores.length !== pool.length || body.scores.some((score) => typeof score !== "number" || !Number.isFinite(score)))
+        throw new RerankFailure("validation");
+      scores = body.scores;
+    }
     return pool.map((hit, index) => ({ hit, index, score: scores[index] })).sort((a, b) => b.score - a.score || a.index - b.index).slice(0, limit).map((row) => row.hit);
   } catch (error) {
-    logRerankFallback(reasonOf(error));
+    if ("remote" in session)
+      remoteRerankSkipped(error instanceof RerankFailure ? error.reason : "remote_error", onSkipped);
+    else
+      logRerankFallback(reasonOf(error));
     return baseline;
   }
 }
@@ -1675,7 +1757,7 @@ Reason: ${row.reason}` : ""}`;
       case "compartment": {
         title = hit.title;
         location = `compartment ${hit.compartmentId} ${hit.sessionId} @${hit.startOrdinal}-${hit.endOrdinal}`;
-        body = buildCanonicalChunkTextFromFts(db, hit.sessionId, hit.startOrdinal, hit.endOrdinal) ?? "";
+        body = buildCanonicalChunkTextFromFts2(db, hit.sessionId, hit.startOrdinal, hit.endOrdinal) ?? "";
         break;
       }
     }
@@ -2614,10 +2696,42 @@ function searchNotes(args) {
   }));
 }
 async function searchCompartmentChunks(args) {
-  if (!args.queryEmbedding || args.limit <= 0 || !args.modelId || args.modelId === "off")
+  if (args.limit <= 0 || !args.modelId || args.modelId === "off") {
+    if (args.timings)
+      args.timings.chunkPool = "off";
+    return [];
+  }
+  if (!args.queryEmbedding) {
+    if (args.timings)
+      args.timings.chunkPool = "no-vector";
+    if (args.warmOnly)
+      warmCompartmentChunkSearchPool2(args.db, args.sessionId, args.projectPath, args.modelId);
     return [];
+  }
   const cutoff = args.maxOrdinal != null && args.maxOrdinal >= 0 ? args.maxOrdinal : null;
-  const rows = await loadCompartmentChunkEmbeddingsForSearch(args.db, args.sessionId, args.projectPath, args.modelId, args.dateRange);
+  let rows;
+  if (args.warmOnly) {
+    const warm = peekCompartmentChunkSearchPool2(args.db, args.sessionId, args.projectPath, args.modelId, args.dateRange);
+    if (warm === null) {
+      if (args.timings)
+        args.timings.chunkPool = "cold";
+      warmCompartmentChunkSearchPool2(args.db, args.sessionId, args.projectPath, args.modelId);
+      return [];
+    }
+    if (args.timings)
+      args.timings.chunkPool = "warm";
+    rows = warm;
+  } else {
+    try {
+      rows = await loadCompartmentChunkEmbeddingsForSearch2(args.db, args.sessionId, args.projectPath, args.modelId, args.dateRange, args.signal);
+    } catch (error) {
+      if (args.signal?.aborted)
+        return [];
+      throw error;
+    }
+    if (args.timings)
+      args.timings.chunkPool = "loaded";
+  }
   if (rows.length === 0)
     return [];
   const byCompartment = new Map;
@@ -2909,7 +3023,7 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
     return [];
   }
   const limit = normalizeLimit(options.limit);
-  const reranker = options.explicitSearch && options.rerank !== false && isProseQuery(trimmedQuery) ? await prepareReranker(projectPath, sessionId, options.rerankConnectionFile, options.rerankClient) : null;
+  const reranker = options.explicitSearch && options.rerank !== false && isProseQuery(trimmedQuery) ? await prepareReranker(projectPath, sessionId, options.rerankConnectionFile, options.rerankClient, options.rerankConfig) : null;
   const lanes = reranker || options.captureRerankLanes ? emptySearchLanes() : undefined;
   const dateRange = normalizeDateRange(options.from, options.to);
   const tierLimit = Math.max(limit * 3, DEFAULT_UNIFIED_SEARCH_LIMIT);
@@ -2942,6 +3056,8 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
   if (options.signal?.aborted)
     return [];
   const messageProbes = options.explicitSearch ? extractLiteralProbes(trimmedQuery) : [];
+  const timings = options.stepTimings;
+  let stepStartedAt = performance.now();
   let messageResults = [];
   if (runMessages) {
     const messageRequest = {
@@ -2968,8 +3084,13 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
     messageResults = outcome.results.filter((result) => result.messageId !== options.excludeMessageId);
     if (lanes)
       lanes.message_fts = (outcome.laneResults ?? outcome.results).slice(0, 25);
+    if (timings)
+      timings.messageMs = performance.now() - stepStartedAt;
   }
+  stepStartedAt = performance.now();
   const capturedQuery = await queryEmbeddingPromise;
+  if (timings && needsEmbedding)
+    timings.vectorWaitMs = performance.now() - stepStartedAt;
   if (options.signal?.aborted)
     return [];
   const embeddingSnapshot = getProjectEmbeddingSnapshot2(projectPath);
@@ -2979,6 +3100,9 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
   const workspace = resolveSearchWorkspaceContext(db, projectPath);
   const embeddingModelId = queryContract?.modelId ?? options.embeddingModelIdOverride ?? embeddingSnapshot?.modelId;
   const chunkModelId = queryContract?.chunkModelId ?? options.chunkModelIdOverride ?? embeddingSnapshot?.chunkModelId;
+  stepStartedAt = performance.now();
+  if (timings)
+    timings.chunkPool = "off";
   const compartmentResults = runCompartmentChunks ? await searchCompartmentChunks({
     db,
     sessionId,
@@ -2987,8 +3111,14 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
     limit: lanes ? Math.max(tierLimit, 25) : tierLimit,
     maxOrdinal: options.maxMessageOrdinal,
     modelId: chunkModelId && chunkModelId !== "off" ? chunkModelId : null,
-    dateRange
+    dateRange,
+    warmOnly: options.chunkPoolWarmOnly,
+    signal: options.signal,
+    timings
   }) : [];
+  if (timings && runCompartmentChunks)
+    timings.chunkMs = performance.now() - stepStartedAt;
+  stepStartedAt = performance.now();
   if (lanes)
     lanes.chunk_vector = compartmentResults.slice(0, 25);
   const messageLikeResults = mergeMessageAndCompartmentResults({
@@ -3044,6 +3174,8 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
       dateRange
     })) : Promise.resolve([])
   ]);
+  if (timings)
+    timings.otherLanesMs = performance.now() - stepStartedAt;
   if (options.diagnostics) {
     options.diagnostics.suppressedVisibleMemoryIds = memoryOutcome.suppressedVisibleIds;
   }
@@ -3061,11 +3193,14 @@ async function unifiedSearch2(db, sessionId, projectPath, query, options = {}) {
     options.captureRerankLanes?.(lanes);
   }
   if (reranker && lanes) {
-    const pool = fuseSearchLanes(lanes);
+    const pool = fuseSearchLanes(lanes).slice(0, "remote" in reranker ? reranker.remote.top_n : 20);
     try {
-      results = await rerankSearchResults(reranker, trimmedQuery, results, pool, candidateTexts(db, sessionId, projectPath, pool), limit);
+      results = await rerankSearchResults(reranker, trimmedQuery, results, pool, candidateTexts(db, sessionId, projectPath, pool), limit, options.signal, options.onRerankSkipped);
     } catch {
-      logRerankFallback("candidate_validation");
+      if ("remote" in reranker)
+        remoteRerankSkipped("candidate_validation", options.onRerankSkipped);
+      else
+        logRerankFallback("candidate_validation");
     }
   }
   if (!options.measurementDisabled) {

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-n1prf1g6.js → server-3vhxy2k5.js}

@@ -4,7 +4,7 @@ import {
 } from "./server-pavzsdc6.js";
 import {
   log2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -15,7 +15,7 @@ import {
 } from "./server-2ra6pwf3.js";
 import {
   Database2
-} from "./server-beht37jy.js";
+} from "./server-gzy5w8ya.js";
 import {
   closeQuietly
 } from "./server-8ajstryz.js";

package/dist/v2/{server-xj136kt8.js → server-4kjmrjn4.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-gzy5w8ya.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-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/{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