@cortexkit/opencode-magic-context 0.49.15 → 0.49.16

package/dist/{index-3kdm78zp.js → index-9nkg2dzk.js}

@@ -1,6 +1,6 @@
 import {
   DEFAULT_LOCAL_EMBEDDING_MODEL
-} from "./index-1sarmj9z.js";
+} from "./index-wgypt3cs.js";
 import {
   log2
 } from "./index-j75v2476.js";
@@ -10,12 +10,12 @@ import {
 } from "./index-fkx2qnvw.js";
 import {
   LocalEmbeddingProvider
-} from "./index-e20m7284.js";
+} from "./index-7b2cfmaz.js";
 import {
   OpenAICompatibleEmbeddingProvider,
   getProjectEmbeddingSnapshot2,
   embedBatchForProject2
-} from "./index-y1qysm3q.js";
+} from "./index-qrahzcqv.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-qt1qqasc.js";

package/dist/{index-snp5wbge.js → index-ayym1x7f.js}

@@ -92,7 +92,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-944w16m0.js";
+} from "./index-j6zw70pf.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -142,7 +142,7 @@ import {
   ConfigProfilesSchema,
   MagicContextConfigSchema,
   LIVE_RELOAD_CONFIG_PATHS
-} from "./index-1sarmj9z.js";
+} from "./index-wgypt3cs.js";
 import {
   providerMass,
   calibrationForModelKey,
@@ -159,7 +159,7 @@ import {
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./index-yxycg7fs.js";
+} from "./index-cj9g0j7a.js";
 import {
   inRootAsyncContext2,
   Database2,
@@ -175,6 +175,12 @@ import {
 import {
   isPidAlive
 } from "./index-nj7yykkx.js";
+import {
+  isStrictGapHealingMessage2,
+  noteRawSessionSummaryRowWritten2,
+  RawOrdinalsNotReady2,
+  runSessionWarmupWorker
+} from "./index-7pa32z07.js";
 import {
   layoutLkgPrefix,
   assembleLkgPrefix,
@@ -211,7 +217,7 @@ import {
   getProjectChunkEmbeddingModelId2,
   getProjectEmbeddingMaxInputTokens2,
   embedItemsForProject2
-} from "./index-y1qysm3q.js";
+} from "./index-qrahzcqv.js";
 import {
   buildCanonicalChunkTextFromFts,
   buildCompartmentSummaryFallbackText,
@@ -221,7 +227,7 @@ import {
   replaceCompartmentChunkEmbeddings,
   deleteChunkEmbedBackoffForSession,
   chunkWindowSourceKey
-} from "./index-3kx0kg0f.js";
+} from "./index-hehkf6zm.js";
 import {
   BoundedSessionMap,
   clearCompressionDepth,
@@ -236,7 +242,7 @@ import {
   toMessageIndexSource2,
   clearIndexedMessagesInTransaction2,
   indexSourcesAfterOrdinal2
-} from "./index-thvnpfsv.js";
+} from "./index-p4vde22c.js";
 import {
   stripWellFormedLeadingTagPrefix,
   stripTagPrefix,
@@ -249,18 +255,12 @@ import {
   foldShrunkPartTags2,
   getTagNumberByMessageId2,
   getActiveTagsBySession2
-} from "./index-mht7bq0z.js";
-import {
-  isStrictGapHealingMessage2,
-  noteRawSessionSummaryRowWritten2,
-  RawOrdinalsNotReady2,
-  runSessionWarmupWorker
-} from "./index-mmfa86mt.js";
+} from "./index-nd7m2a5a.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-1d289pq2.js";
+} from "./index-mtw9e71a.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode,
@@ -269,7 +269,7 @@ import {
   insertPrimerCandidates,
   promoteSessionFactsDurable,
   embedPromotedFacts
-} from "./index-bxdg2nbt.js";
+} from "./index-wv9n2zcq.js";
 import {
   pushNotification2
 } from "./index-x8a7jmkh.js";
@@ -289,7 +289,7 @@ import {
 } from "./index-f71thw8j.js";
 import {
   sendStatusNotification2
-} from "./index-dgs16axy.js";
+} from "./index-b17m64g9.js";
 import {
   isCompactionEnabled,
   migrateLegacyAgentEnabledInMemory
@@ -9672,14 +9672,14 @@ function throwWithPromptFailure(legacyError, failedAttempts, args, timeoutMs, tr
   });
   throw error;
 }
-async function attemptOnce(client, args, timeoutMs, signal, callContext, label, transport) {
+async function attemptOnce(client, args, timeoutMs, signal, callContext, label, transport, allowModelSuggestions = true) {
   const originalBody = { ...args.body };
   const attemptArgs = copyPromptArgs(args, originalBody);
   try {
     await promptWithTimeout(client, attemptArgs, timeoutMs, signal, transport);
     return;
   } catch (error) {
-    if (isNonRetryable(error, signal))
+    if (isNonRetryable(error, signal) || !allowModelSuggestions)
       throw error;
     const suggestion = parseModelSuggestion(error);
     if (!suggestion || !originalBody.model) {
@@ -9707,7 +9707,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
   const explicitPrimaryLabel = baseBody.model?.providerID && baseBody.model.modelID ? `${baseBody.model.providerID}/${baseBody.model.modelID}` : "primary";
   let lastError = null;
   try {
-    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel, options.transport);
+    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel, options.transport, options.allowModelSuggestions);
     return;
   } catch (error) {
     lastError = error;
@@ -9733,7 +9733,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
       ...fallback?.qualifier ? { variant: fallback.qualifier } : {}
     });
     try {
-      await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label, options.transport);
+      await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label, options.transport, options.allowModelSuggestions);
       log2(`[${callContext}] fallback succeeded with ${label} (attempt ${i + 2}/${fallbacks.length + 1})`);
       return;
     } catch (error) {
@@ -9751,7 +9751,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
 }
 async function attemptAndValidate(client, args, timeoutMs, signal, callContext, attempt, options) {
   try {
-    await attemptOnce(client, args, timeoutMs, signal, callContext, attempt.label, options.transport);
+    await attemptOnce(client, args, timeoutMs, signal, callContext, attempt.label, options.transport, options.allowModelSuggestions);
   } catch (error) {
     throw {
       error,
@@ -10734,6 +10734,7 @@ function buildHistorianRepairPrompt(originalPrompt, previousOutput, validationEr
     "Return a corrected full XML response for the same existing state and new messages.",
     "Do not skip any displayed raw ordinal or displayed raw range, even if the message looks trivial.",
     "Every displayed message range must belong to exactly one compartment unless it is intentionally left in one trailing suffix marked by <unprocessed_from>.",
+    "If every message in the chunk is covered by a compartment, nothing is unprocessed: set `<unprocessed_from>` to the chunk's last message index + 1.",
     "",
     "Previous invalid XML:",
     previousOutput
@@ -18032,6 +18033,7 @@ async function runHistorianPrompt(args) {
             return executor.attempt(opened, request);
           }, { childSessionId: opened.childSessionId }),
           timeoutMs: timeoutMs ?? DEFAULT_HISTORIAN_TIMEOUT_MS,
+          allowModelSuggestions: false,
           fallbackModels: modelOverride ? undefined : fallbackModels,
           callContext: agentId === HISTORIAN_EDITOR_AGENT ? "historian:editor" : "historian"
         });
@@ -18116,7 +18118,7 @@ async function runFallbackHistorianPass(args) {
   const primary = toModelEntry(args.model);
   for (const candidateInput of [
     ...args.fallbackModels ?? [],
-    ...args.fallbackModelId ? [{ model: args.fallbackModelId }] : []
+    ...!primary && args.fallbackModelId ? [{ model: args.fallbackModelId }] : []
   ]) {
     const candidate = toModelEntry(candidateInput);
     if (!candidate)
@@ -20492,7 +20494,7 @@ async function runCompartmentAgent(deps) {
     const projectPath = resolveProjectIdentity(directory ?? process.cwd());
     const fallbackWindows = [
       ...(deps.fallbackModels ?? []).map((entry) => toModelEntry(entry)?.model),
-      deps.fallbackModelId
+      ...toModelEntry(deps.model) ? [] : [deps.fallbackModelId]
     ].filter((key) => typeof key === "string" && key !== producerModel).map((key) => resolveHistorianProducerWindow(key, deps.historianMaxOutputTokens));
     const promptFit = fitHistorianPrompt({
       window: producerWindow,

package/dist/{index-dgs16axy.js → index-b17m64g9.js}

@@ -10,7 +10,7 @@ import {
 } from "./index-y9f76s3f.js";
 import {
   shouldHoldIgnoredNotification
-} from "./index-1d289pq2.js";
+} from "./index-mtw9e71a.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";

package/dist/{index-yxycg7fs.js → index-cj9g0j7a.js}

@@ -16,7 +16,6 @@ import {
   withPrivilegedWriter2
 } from "./index-wafzvyhg.js";
 import {
-  bootQuietRemainingMs,
   scheduleAfterBootQuiet
 } from "./index-a8bvhwqs.js";
 import {
@@ -42,8 +41,8 @@ import {
   configureContextDatabasePragmas2
 } from "./index-fb3zxn06.js";
 import {
-  startMessageFtsRowidMapBackfill
-} from "./index-dyvbsvga.js";
+  startMessageFtsRowidMapBackfill2
+} from "./index-dqe8pq4x.js";
 import {
   LKG_SLOT_CHUNKS_DDL,
   SESSION_REPLAY_DECISIONS_DDL,
@@ -821,6 +820,8 @@ registerSlowWriteReporter2(logSlowWriteTransaction);
 registerSqliteDiagnosticSink2((message) => log2(message), getHarness2);
 var databases = new Map;
 var pendingAsyncOpens = new Map;
+var pendingDatabaseCloses = new Set;
+var startupBackfills = new WeakMap;
 var persistenceByDatabase = new WeakMap;
 var persistenceErrorByDatabase = new WeakMap;
 var pathByDatabase = new WeakMap;
@@ -1258,8 +1259,14 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
   healWedgedChannel2Claims(db);
   if (!explicitDbPath) {
     const readsOpenCodeStore = harnessOwnsOpenCodeStore2();
+    const state = { controller: new AbortController };
+    startupBackfills.set(db, state);
+    const { signal } = state.controller;
     let busyRetryMs = 100;
     const runBackfills = () => withoutSqliteTransformPass2(() => withSqliteBackgroundWriter2(() => {
+      state.timer = undefined;
+      if (signal.aborted)
+        return;
       if (readsOpenCodeStore) {
         try {
           runToolOwnerBackfill(db);
@@ -1267,19 +1274,23 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
           log2(`[magic-context] tool-owner backfill failed (continuing with lazy adoption fallback): ${getErrorMessage(error)}`);
         }
       }
-      startMessageFtsRowidMapBackfill(db).then(async () => {
-        if (!readsOpenCodeStore)
+      state.running = startMessageFtsRowidMapBackfill2(db, signal).then(async () => {
+        if (signal.aborted || !readsOpenCodeStore)
+          return;
+        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-4pwqxm5a.js"));
+        const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-8egzkd3z.js"));
+        if (signal.aborted)
           return;
-        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-3ae3nfdn.js"));
-        const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-qjge9044.js"));
         await startMessageTimeBackfill(db, Object.assign(readRawSessionMessages, {
           readPage: readRawSessionMessagePage
-        }));
+        }), signal);
       }).catch((error) => {
+        if (signal.aborted)
+          return;
         if (isTransientSqliteError2(error)) {
           withoutSqliteTransformPass2(() => {
-            const timer = setTimeout(runBackfills, busyRetryMs);
-            timer.unref();
+            state.timer = setTimeout(runBackfills, busyRetryMs);
+            state.timer.unref?.();
           });
           busyRetryMs = Math.min(30000, busyRetryMs * 2);
           return;
@@ -1287,10 +1298,7 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
         log2(`[magic-context] message-index backfill failed (will resume next startup): ${getErrorMessage(error)}`);
       });
     }));
-    if (bootQuietRemainingMs() > 0)
-      scheduleAfterBootQuiet(runBackfills);
-    else
-      runBackfills();
+    state.timer = scheduleAfterBootQuiet(runBackfills);
   }
   setDatabase(db);
   loadToolDefinitionMeasurements(db);

package/dist/{index-dyvbsvga.js → index-dqe8pq4x.js}

@@ -1,7 +1,11 @@
 import {
+  getSqliteDatabasePath2,
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2
 } from "./index-wafzvyhg.js";
+import {
+  runSessionWarmupWorker
+} from "./index-7pa32z07.js";
 import {
   logSlowWriteTransaction
 } from "./index-k29z4aqh.js";
@@ -41,7 +45,7 @@ function getBackfillState(db) {
     completed: row?.completed === 1
   };
 }
-function recordMessageFtsRowid(db, sessionId, messageOrdinal, ftsRowid, messageTimeMs = null) {
+function recordMessageFtsRowid2(db, sessionId, messageOrdinal, ftsRowid, messageTimeMs = null) {
   const numericRowid = Number(ftsRowid);
   if (!Number.isSafeInteger(numericRowid) || numericRowid <= 0) {
     throw new Error(`invalid message FTS rowid: ${String(ftsRowid)}`);
@@ -49,7 +53,7 @@ function recordMessageFtsRowid(db, sessionId, messageOrdinal, ftsRowid, messageT
   const normalizedTime = typeof messageTimeMs === "number" && Number.isSafeInteger(messageTimeMs) && messageTimeMs >= 0 ? messageTimeMs : null;
   getUpsertMapStatement(db).run(sessionId, messageOrdinal, numericRowid, normalizedTime);
 }
-function recordIndexedMessageTime(db, sessionId, messageOrdinal, messageTimeMs) {
+function recordIndexedMessageTime2(db, sessionId, messageOrdinal, messageTimeMs) {
   if (typeof messageTimeMs !== "number" || !Number.isSafeInteger(messageTimeMs) || messageTimeMs < 0) {
     return;
   }
@@ -91,7 +95,7 @@ function backfillMessageFtsRowidMapBatch(db, batchSize = MESSAGE_FTS_ROWID_MAP_B
         watermarkRowid = ftsRowid;
       }
       if (typeof row.sessionId === "string" && Number.isSafeInteger(messageOrdinal) && messageOrdinal >= 0 && Number.isSafeInteger(ftsRowid) && ftsRowid > 0) {
-        recordMessageFtsRowid(db, row.sessionId, messageOrdinal, ftsRowid);
+        recordMessageFtsRowid2(db, row.sessionId, messageOrdinal, ftsRowid);
       }
     }
     const completed = rows.length < boundedBatchSize;
@@ -107,26 +111,33 @@ function backfillMessageFtsRowidMapBatch(db, batchSize = MESSAGE_FTS_ROWID_MAP_B
   logSlowWriteTransaction("message_fts_rowid_backfill", transactionStartedAt);
   return progress;
 }
-async function runMessageFtsRowidMapBackfill(db) {
+async function runMessageFtsRowidMapBackfill2(db, signal) {
   await new Promise((resolve) => setTimeout(resolve, 0));
-  for (;; ) {
+  while (!signal?.aborted) {
     const progress = backfillMessageFtsRowidMapBatch(db);
     if (progress.completed)
       return;
     await new Promise((resolve) => setTimeout(resolve, 0));
   }
 }
-function startMessageFtsRowidMapBackfill(db) {
+function startMessageFtsRowidMapBackfill2(db, signal) {
   const active = activeBackfills.get(db);
   if (active)
     return active;
-  const run = withoutSqliteTransformPass2(() => withSqliteBackgroundWriter2(() => runMessageFtsRowidMapBackfill(db))).finally(() => {
+  const path = getSqliteDatabasePath2(db);
+  const run = (path ? runSessionWarmupWorker({ path, sessionId: "", ftsRowidBackfill: true }, { signal }).then((result) => {
+    if (signal?.aborted)
+      return;
+    if (!("ftsRowidBackfill" in result)) {
+      throw Object.assign(new Error(`FTS rowid backfill unavailable: ${"failure" in result ? result.detail : "unexpected reply"}`), "failure" in result ? { code: result.code, errcode: result.errcode } : {});
+    }
+  }) : withoutSqliteTransformPass2(() => withSqliteBackgroundWriter2(() => runMessageFtsRowidMapBackfill2(db, signal)))).finally(() => {
     activeBackfills.delete(db);
   });
   activeBackfills.set(db, run);
   return run;
 }
-function messageFtsOrdinalRangeIsMapped(db, sessionId, startOrdinal, endOrdinal) {
+function messageFtsOrdinalRangeIsMapped2(db, sessionId, startOrdinal, endOrdinal) {
   if (endOrdinal < startOrdinal)
     return true;
   if (getBackfillState(db).completed)
@@ -157,7 +168,7 @@ function messageFtsOrdinalRangeIsMapped(db, sessionId, startOrdinal, endOrdinal)
   const ordinalCount = endOrdinal - startOrdinal + 1;
   return row?.sourceOrdinalCount === ordinalCount && row.expectedMapCount === row.mappedCount;
 }
-function deleteUnmappedMessageFtsRows(db, sessionIds) {
+function deleteUnmappedMessageFtsRows2(db, sessionIds) {
   if (sessionIds.length === 0)
     return;
   const state = getBackfillState(db);
@@ -168,4 +179,4 @@ function deleteUnmappedMessageFtsRows(db, sessionIds) {
          WHERE rowid > ? AND session_id IN (${placeholders})`).run(state.watermarkRowid, ...sessionIds);
 }
 
-export { recordMessageFtsRowid, recordIndexedMessageTime, startMessageFtsRowidMapBackfill, messageFtsOrdinalRangeIsMapped, deleteUnmappedMessageFtsRows };
+export { recordMessageFtsRowid2, recordIndexedMessageTime2, runMessageFtsRowidMapBackfill2, startMessageFtsRowidMapBackfill2, messageFtsOrdinalRangeIsMapped2, deleteUnmappedMessageFtsRows2 };