@cortexkit/opencode-magic-context 0.49.18 → 0.49.20

package/dist/v2/{server-bfpda1tb.js → server-c7dxxsj7.js}

@@ -9,7 +9,7 @@ import {
   sanitizeDiagnosticText,
   log2,
   sessionLog2
-} from "./server-f2xf5gcb.js";
+} from "./server-6495nmn9.js";
 import {
   parseTree,
   parseJsoncRecovering,
@@ -18,13 +18,13 @@ import {
   cortexKitProjectConfigBasePath,
   resolveLegacyConfigSourcesForHarness,
   loadPluginConfigDetailed
-} from "./server-nj659894.js";
+} from "./server-5arr9ecn.js";
 import {
   catalogOutputReserve,
   getSdkContextLimit,
   modelSupportsVision,
   getSdkOutputLimit
-} from "./server-tbe1femw.js";
+} from "./server-29qp8nz4.js";
 import {
   withContentLanguageDirective,
   buildPrimaryLanguageDirective,
@@ -40,12 +40,12 @@ import {
   getProjectChunkEmbeddingModelId2,
   getProjectEmbeddingMaxInputTokens2,
   embedItemsForProject2
-} from "./server-8by8qfec.js";
+} from "./server-0epqaxhd.js";
 import {
   hasMeaningfulUserText2,
   estimateTokens,
   estimateFixedPromptTokens
-} from "./server-tgnbmwah.js";
+} from "./server-3mz2qh5a.js";
 import {
   inRootAsyncContext2,
   Database2,
@@ -53,26 +53,26 @@ import {
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2,
   beginSqliteWriterAsync2
-} from "./server-beht37jy.js";
+} from "./server-1zx2pa5d.js";
 import {
   isStrictGapHealingMessage2,
   noteRawSessionSummaryRowWritten2,
   RawOrdinalsNotReady2,
   runSessionWarmupWorker
-} from "./server-xj136kt8.js";
+} from "./server-55rgxfrw.js";
 import {
-  buildCanonicalChunkTextFromFts,
-  buildCompartmentSummaryFallbackText,
-  canonicalizeInMemoryChunkTextForEmbedding,
-  chunkCanonicalText,
-  chunkEmbeddingWindowsAreCurrent,
-  replaceCompartmentChunkEmbeddings,
-  deleteChunkEmbedBackoffForSession,
-  chunkWindowSourceKey
-} from "./server-46neh5fa.js";
+  buildCanonicalChunkTextFromFts2,
+  buildCompartmentSummaryFallbackText2,
+  canonicalizeInMemoryChunkTextForEmbedding2,
+  chunkCanonicalText2,
+  chunkEmbeddingWindowsAreCurrent2,
+  replaceCompartmentChunkEmbeddings2,
+  deleteChunkEmbedBackoffForSession2,
+  chunkWindowSourceKey2
+} from "./server-wyawsa88.js";
 import {
   isPidAlive
-} from "./server-da07v4xp.js";
+} from "./server-k3t06fxr.js";
 import {
   BoundedSessionMap,
   clearCompressionDepth,
@@ -89,7 +89,7 @@ import {
   toMessageIndexSource2,
   clearIndexedMessagesInTransaction2,
   indexSourcesAfterOrdinal2
-} from "./server-2ehj0bw7.js";
+} from "./server-63fqdghs.js";
 import {
   detectOverflow,
   SESSION_META_SELECT_COLUMNS,
@@ -130,6 +130,7 @@ import {
   isRustMarkerAdmissionFenced,
   readReplayEnvelope,
   readReplayDocument,
+  updateReplayDocument,
   writeReplayDocument,
   describeProtectedTailDrainBudgetSkip,
   loadProtectedTailMeta,
@@ -160,6 +161,7 @@ import {
   serializeStrippedPlaceholderState,
   THINKING_BINDING_RECOVERY_FROZEN_PREFIX,
   THINKING_BINDING_STRIP_ORDER_END_MARKER,
+  COMPACTION_OFF_THINKING_FROZEN_PREFIX,
   getMergedReasoningStrippedIds,
   addMergedReasoningStrippedIds,
   parseProcessedImageMarkers,
@@ -185,17 +187,17 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./server-xhab8jx8.js";
+} from "./server-ej96a39v.js";
 import {
   getTableColumnNames
-} from "./server-pwv4ezb0.js";
+} from "./server-168pb207.js";
 import {
   FAIL_CLOSED_DOCTOR_COMMAND,
   getSchemaFenceRejection,
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./server-a2eqhkxr.js";
+} from "./server-hqzyq8n4.js";
 import {
   providerMass,
   calibrationForModelKey,
@@ -213,7 +215,7 @@ import {
   foldShrunkPartTags2,
   getTagNumberByMessageId2,
   getActiveTagsBySession2
-} from "./server-27gq4mfz.js";
+} from "./server-a3dwxfgd.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -224,10 +226,10 @@ import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./server-n1prf1g6.js";
+} from "./server-brj8j2gk.js";
 import {
   getMeasuredToolDefinitionTokens
-} from "./server-g3qma5c0.js";
+} from "./server-dj7tz4ph.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY,
@@ -243,11 +245,11 @@ import {
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./server-gpvay0xz.js";
+} from "./server-9x0kmta4.js";
 import {
   shouldSkipHomeProjectMemory,
   resolveProjectIdentity
-} from "./server-rmygf5pn.js";
+} from "./server-ne8arh8t.js";
 import {
   getSessionNotes,
   getReadySmartNotes,
@@ -256,13 +258,13 @@ import {
   userFacingFailureCode,
   promoteSessionFactsDurable,
   embedPromotedFacts
-} from "./server-my7k4eds.js";
+} from "./server-vn2nwcv6.js";
 import {
   isMarkerCandidateBasisCurrent2,
   invalidateMarkerCandidateBasis2,
   readMarkerCandidateBasis2,
   prepareMarkerCandidateBasis2
-} from "./server-d04vrx0j.js";
+} from "./server-ygtykank.js";
 import {
   computeCueContentHash,
   getMuralCueState,
@@ -270,7 +272,7 @@ import {
   getMemoriesByProject2,
   getMemoriesByProjects2,
   getMaxMemoryIdForProjects2
-} from "./server-n37sebck.js";
+} from "./server-y4a3nhtk.js";
 import {
   pushNotification2
 } from "./server-x8a7jmkh.js";
@@ -278,10 +280,10 @@ import {
   deriveTriggerBudget2,
   resolveHistorianProducerLimits2,
   producerSourceLocalBudget2
-} from "./server-34kwfsr4.js";
+} from "./server-53eh1r8r.js";
 import {
   sendStatusNotification2
-} from "./server-a9xqj88f.js";
+} from "./server-230fnbws.js";
 import {
   piModelRefToCanonical
 } from "./server-avwt563y.js";
@@ -295,7 +297,7 @@ import {
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
-} from "./server-6pmqg9m4.js";
+} from "./server-gyy4k6mf.js";
 
 // src/config/live-snapshot.ts
 import { createHash } from "node:crypto";
@@ -2521,6 +2523,34 @@ function noteLkgCapturedPrefix(sessionId) {
   if (!sessions.has(sessionId))
     sessions.set(sessionId, {});
 }
+function readPersistedLkgUntaggedInputIds(db, sessionId) {
+  try {
+    const saved = readReplayEnvelope(db, sessionId, "read").lkgUntaggedInputIds;
+    return Array.isArray(saved) ? saved.filter((id) => typeof id === "string" && id.length > 0) : [];
+  } catch (error) {
+    sessionLog2(sessionId, "LKG untagged-input record unreadable:", error);
+    return [];
+  }
+}
+function persistLkgUntaggedInputIds(db, sessionId, ids) {
+  const next = [...new Set(ids)].sort();
+  try {
+    return updateReplayDocument(db, sessionId, (doc) => {
+      const saved = Array.isArray(doc.lkgUntaggedInputIds) ? doc.lkgUntaggedInputIds : [];
+      if (JSON.stringify(saved) === JSON.stringify(next))
+        return false;
+      doc.version = 2;
+      if (next.length > 0)
+        doc.lkgUntaggedInputIds = next;
+      else
+        delete doc.lkgUntaggedInputIds;
+      return true;
+    });
+  } catch (error) {
+    sessionLog2(sessionId, "LKG untagged-input record write failed:", error);
+    return false;
+  }
+}
 function noteLkgRecoveryPrefix(args) {
   const digests = [
     ...args.entry.entryContentDigests,
@@ -2531,19 +2561,23 @@ function noteLkgRecoveryPrefix(args) {
   const ids = args.entry.entryInputIds;
   if (ids.some((id) => !id) || new Set(ids).size !== ids.length)
     return false;
+  const untaggedInputIds = new Set([
+    ...sessions.get(args.sessionId)?.prefix?.untaggedInputIds ?? [],
+    ...args.db ? readPersistedLkgUntaggedInputIds(args.db, args.sessionId) : [],
+    ...ids.slice(args.entry.anchorIndex + 1)
+  ]);
   sessions.set(args.sessionId, {
     fenceRevision: sessions.get(args.sessionId)?.fenceRevision,
     prefix: {
       inputs: ids.map((id, index) => ({ id, digest: digests[index] })),
       json: JSON.stringify(args.messages),
-      untaggedInputIds: new Set([
-        ...sessions.get(args.sessionId)?.prefix?.untaggedInputIds ?? [],
-        ...ids.slice(args.entry.anchorIndex + 1)
-      ]),
+      untaggedInputIds,
       modelKey: args.modelKey,
       providerKey: args.providerKey
     }
   });
+  if (args.db)
+    persistLkgUntaggedInputIds(args.db, args.sessionId, untaggedInputIds);
   return true;
 }
 function readLkgRecoveryPrefix(sessionId, inputs, messages, db) {
@@ -3543,11 +3577,15 @@ function clonePiContentDecisions(raw, filter) {
       ])}`);
       continue;
     }
-    if (entry.startsWith(THINKING_BINDING_RECOVERY_FROZEN_PREFIX)) {
-      const messageId = entry.slice(THINKING_BINDING_RECOVERY_FROZEN_PREFIX.length);
+    const thinkingPrefix = [
+      THINKING_BINDING_RECOVERY_FROZEN_PREFIX,
+      COMPACTION_OFF_THINKING_FROZEN_PREFIX
+    ].find((prefix) => entry.startsWith(prefix));
+    if (thinkingPrefix) {
+      const messageId = entry.slice(thinkingPrefix.length);
       if (messageId.length === 0 || !filter.includeMessageId(messageId))
         continue;
-      copied.push(`${THINKING_BINDING_RECOVERY_FROZEN_PREFIX}${mapMessageId(filter, messageId) ?? messageId}`);
+      copied.push(`${thinkingPrefix}${mapMessageId(filter, messageId) ?? messageId}`);
       continue;
     }
     if (entry.startsWith(MERGED_REASONING_PARTS_PREFIX) || entry.startsWith("pi-content-replay-"))
@@ -5580,19 +5618,19 @@ async function embedAndStoreCompartmentChunks(db, sessionId, projectPath, compar
   const maxInputTokens = getProjectEmbeddingMaxInputTokens2(projectPath);
   for (const compartment of compartments) {
     try {
-      const fromMemory = compartment.sourceChunkText ? canonicalizeInMemoryChunkTextForEmbedding(compartment.sourceChunkText, compartment.startMessage, compartment.endMessage) : "";
-      const mappedText = fromMemory ? fromMemory : buildCanonicalChunkTextFromFts(db, sessionId, compartment.startMessage, compartment.endMessage);
+      const fromMemory = compartment.sourceChunkText ? canonicalizeInMemoryChunkTextForEmbedding2(compartment.sourceChunkText, compartment.startMessage, compartment.endMessage) : "";
+      const mappedText = fromMemory ? fromMemory : buildCanonicalChunkTextFromFts2(db, sessionId, compartment.startMessage, compartment.endMessage);
       if (mappedText === null)
         continue;
-      const canonicalText = mappedText || buildCompartmentSummaryFallbackText(db, compartment.id);
+      const canonicalText = mappedText || buildCompartmentSummaryFallbackText2(db, compartment.id);
       if (canonicalText.length === 0)
         continue;
-      const windows = chunkCanonicalText(canonicalText, compartment.startMessage, compartment.endMessage, maxInputTokens);
+      const windows = chunkCanonicalText2(canonicalText, compartment.startMessage, compartment.endMessage, maxInputTokens);
       if (windows.length === 0)
         continue;
-      const windowSourceKey = chunkWindowSourceKey(canonicalText, compartment.startMessage, compartment.endMessage, maxInputTokens);
+      const windowSourceKey = chunkWindowSourceKey2(canonicalText, compartment.startMessage, compartment.endMessage, maxInputTokens);
       const currentModelId = getProjectChunkEmbeddingModelId2(projectPath);
-      if (currentModelId !== "off" && chunkEmbeddingWindowsAreCurrent(db, compartment.id, currentModelId, windows, projectPath)) {
+      if (currentModelId !== "off" && chunkEmbeddingWindowsAreCurrent2(db, compartment.id, currentModelId, windows, projectPath)) {
         continue;
       }
       const result = await embedItemsForProject2(projectPath, windows.map((window) => ({
@@ -5602,7 +5640,7 @@ async function embedAndStoreCompartmentChunks(db, sessionId, projectPath, compar
       })), undefined, db, sessionId);
       if (!result)
         continue;
-      if (chunkEmbeddingWindowsAreCurrent(db, compartment.id, currentModelId, windows, projectPath)) {
+      if (chunkEmbeddingWindowsAreCurrent2(db, compartment.id, currentModelId, windows, projectPath)) {
         continue;
       }
       const rows = [];
@@ -5620,7 +5658,7 @@ async function embedAndStoreCompartmentChunks(db, sessionId, projectPath, compar
         });
       }
       if (rows.length === windows.length) {
-        replaceCompartmentChunkEmbeddings(db, rows, windowSourceKey);
+        replaceCompartmentChunkEmbeddings2(db, rows, windowSourceKey);
         enqueueShadowEmbeddingItems2(projectPath, "chunk", [String(compartment.id)]);
       }
     } catch (error) {
@@ -6466,9 +6504,33 @@ var promptFailureDetails = new WeakMap;
 function isHostTimeoutError(error) {
   return error !== null && typeof error === "object" && error.name === "TimeoutError";
 }
+
+class ModelProducedNoOutputError extends Error {
+  waitedMs;
+  constructor(waitedMs) {
+    super(`prompt timed out after ${waitedMs}ms with no model output`);
+    this.waitedMs = waitedMs;
+    this.name = "ModelProducedNoOutputError";
+  }
+}
+var modelActivityBySignal = new WeakMap;
+function noteModelActivityMonitored(signal) {
+  const activity = signal ? modelActivityBySignal.get(signal) : undefined;
+  if (activity)
+    activity.monitored = true;
+}
+function noteModelOutputReceived(signal) {
+  const activity = signal ? modelActivityBySignal.get(signal) : undefined;
+  if (activity) {
+    activity.monitored = true;
+    activity.received = true;
+  }
+}
 function isPromptTimeoutError(error) {
   if (isHostTimeoutError(error))
     return true;
+  if (error instanceof ModelProducedNoOutputError)
+    return true;
   return error instanceof Error && /^prompt timed out after \d+ms$/.test(error.message);
 }
 function getPromptFailureDetail(error) {
@@ -6546,12 +6608,22 @@ function raceWithSignal(work, signal) {
     work.then(resolve, reject).finally(() => signal.removeEventListener("abort", abort));
   });
 }
-async function promptWithTimeout(client, args, timeoutMs, signal, transport) {
+async function promptWithTimeout(client, args, timeoutMs, signal, transport, firstOutputTimeoutMs) {
   if (signal?.aborted) {
     throw new Error(externalAbortMessage(signal));
   }
   const controller = new AbortController;
   const timeout = setTimeout(() => controller.abort(), timeoutMs);
+  const activity = { monitored: false, received: false };
+  modelActivityBySignal.set(controller.signal, activity);
+  let silent = false;
+  const firstOutputTimer = firstOutputTimeoutMs !== undefined && firstOutputTimeoutMs < timeoutMs ? setTimeout(() => {
+    if (!activity.monitored || activity.received)
+      return;
+    silent = true;
+    controller.abort(new ModelProducedNoOutputError(firstOutputTimeoutMs));
+  }, firstOutputTimeoutMs) : undefined;
+  const timeoutError = () => silent && firstOutputTimeoutMs !== undefined ? new ModelProducedNoOutputError(firstOutputTimeoutMs) : new Error(`prompt timed out after ${timeoutMs}ms`);
   const onExternalAbort = () => controller.abort();
   signal?.addEventListener("abort", onExternalAbort);
   try {
@@ -6574,7 +6646,7 @@ async function promptWithTimeout(client, args, timeoutMs, signal, transport) {
       if (!transport || transport.childSessionId) {
         await abortChildRun(client, transport?.childSessionId ?? args.path.id);
       }
-      throw new Error(`prompt timed out after ${timeoutMs}ms`);
+      throw timeoutError();
     }
     if (isHostTimeoutError(error)) {
       if (!transport || transport.childSessionId) {
@@ -6584,13 +6656,15 @@ async function promptWithTimeout(client, args, timeoutMs, signal, transport) {
     throw error;
   } finally {
     clearTimeout(timeout);
+    if (firstOutputTimer)
+      clearTimeout(firstOutputTimer);
     signal?.removeEventListener("abort", onExternalAbort);
   }
   if (signal?.aborted || controller.signal.aborted) {
     if (!transport || transport.childSessionId) {
       await abortChildRun(client, transport?.childSessionId ?? args.path.id);
     }
-    throw new Error(signal?.aborted ? externalAbortMessage(signal) : `prompt timed out after ${timeoutMs}ms`);
+    throw signal?.aborted ? new Error(externalAbortMessage(signal)) : timeoutError();
   }
 }
 async function abortChildRun(client, sessionId) {
@@ -6608,6 +6682,8 @@ async function abortChildRun(client, sessionId) {
 function isNonRetryable(error, externalSignal) {
   if (externalSignal?.aborted || error instanceof HiddenCompletionRefusal && error.terminal || error instanceof HiddenAgentStepLimit || error instanceof DreamTokenBudgetExceeded)
     return true;
+  if (error instanceof ModelProducedNoOutputError)
+    return false;
   if (error instanceof Error) {
     if (error.name === "AbortError")
       return true;
@@ -6639,7 +6715,7 @@ function classifyPromptFailure(error, phase, externalSignal) {
   if (externalSignal?.aborted || message === "prompt aborted by external signal") {
     return "child_aborted";
   }
-  if (/^prompt timed out after \d+ms$/.test(message) || isHostTimeoutError(error)) {
+  if (error instanceof ModelProducedNoOutputError || /^prompt timed out after \d+ms$/.test(message) || isHostTimeoutError(error)) {
     return "provider_timeout";
   }
   if (phase === "validation") {
@@ -6674,11 +6750,11 @@ function throwWithPromptFailure(legacyError, failedAttempts, args, timeoutMs, tr
   });
   throw error;
 }
-async function attemptOnce(client, args, timeoutMs, signal, callContext, label, transport, allowModelSuggestions = true) {
+async function attemptOnce(client, args, timeoutMs, signal, callContext, label, transport, allowModelSuggestions = true, firstOutputTimeoutMs) {
   const originalBody = { ...args.body };
   const attemptArgs = copyPromptArgs(args, originalBody);
   try {
-    await promptWithTimeout(client, attemptArgs, timeoutMs, signal, transport);
+    await promptWithTimeout(client, attemptArgs, timeoutMs, signal, transport, firstOutputTimeoutMs);
     return;
   } catch (error) {
     if (isNonRetryable(error, signal) || !allowModelSuggestions)
@@ -6697,9 +6773,30 @@ async function attemptOnce(client, args, timeoutMs, signal, callContext, label,
         providerID: suggestion.providerID,
         modelID: suggestion.suggestion
       }
-    }), timeoutMs, signal, transport);
+    }), timeoutMs, signal, transport, firstOutputTimeoutMs);
   }
 }
+function createChainClock(options, timeoutMs) {
+  const fallbacks = options.fallbackModels ?? [];
+  const hasValidFallbackFrom = (index) => fallbacks.slice(index).some((fallback) => {
+    const entry = toModelEntry(fallback);
+    return entry ? parseProviderModel(entry.model) !== null : false;
+  });
+  let silentSpentMs = 0;
+  return {
+    budget(nextFallbackIndex) {
+      const attemptTimeoutMs = Math.max(1, timeoutMs - silentSpentMs);
+      if (options.firstOutputTimeoutMs === undefined || !hasValidFallbackFrom(nextFallbackIndex))
+        return { timeoutMs: attemptTimeoutMs };
+      const bound = Math.min(options.firstOutputTimeoutMs, Math.floor(attemptTimeoutMs / 2));
+      return bound > 0 ? { timeoutMs: attemptTimeoutMs, firstOutputTimeoutMs: bound } : { timeoutMs: attemptTimeoutMs };
+    },
+    settle(error, startedAt) {
+      if (error instanceof ModelProducedNoOutputError)
+        silentSpentMs += Date.now() - startedAt;
+    }
+  };
+}
 async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
   const timeoutMs = options.timeoutMs ?? 300000;
   const callContext = options.callContext ?? "subagent";
@@ -6708,11 +6805,15 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
   const baseArgs = copyPromptArgs(args, baseBody);
   const explicitPrimaryLabel = baseBody.model?.providerID && baseBody.model.modelID ? `${baseBody.model.providerID}/${baseBody.model.modelID}` : "primary";
   let lastError = null;
+  const clock = createChainClock(options, timeoutMs);
+  const primaryStartedAt = Date.now();
   try {
-    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel, options.transport, options.allowModelSuggestions);
+    const budget = clock.budget(0);
+    await attemptOnce(client, baseArgs, budget.timeoutMs, options.signal, callContext, explicitPrimaryLabel, options.transport, options.allowModelSuggestions, budget.firstOutputTimeoutMs);
     return;
   } catch (error) {
     lastError = error;
+    clock.settle(error, primaryStartedAt);
     if (isNonRetryable(error, options.signal))
       throw error;
     if (fallbacks.length === 0) {
@@ -6734,12 +6835,15 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
       model: parsed,
       ...fallback?.qualifier ? { variant: fallback.qualifier } : {}
     });
+    const attemptStartedAt = Date.now();
     try {
-      await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label, options.transport, options.allowModelSuggestions);
+      const budget = clock.budget(i + 1);
+      await attemptOnce(client, attemptArgs, budget.timeoutMs, options.signal, callContext, label, options.transport, options.allowModelSuggestions, budget.firstOutputTimeoutMs);
       log2(`[${callContext}] fallback succeeded with ${label} (attempt ${i + 2}/${fallbacks.length + 1})`);
       return;
     } catch (error) {
       lastError = error;
+      clock.settle(error, attemptStartedAt);
       if (isNonRetryable(error, options.signal))
         throw error;
       const remaining = fallbacks.length - i - 1;
@@ -6751,9 +6855,9 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
   log2(`[${callContext}] all models exhausted; tried: ${[explicitPrimaryLabel, ...fallbacks.map((fallback) => toModelEntry(fallback)?.model ?? String(fallback))].join(", ")}; last error: ${shortErr(lastError)}`);
   throw lastError ?? new Error("All fallback models failed");
 }
-async function attemptAndValidate(client, args, timeoutMs, signal, callContext, attempt, options) {
+async function attemptAndValidate(client, args, timeoutMs, signal, callContext, attempt, options, firstOutputTimeoutMs) {
   try {
-    await attemptOnce(client, args, timeoutMs, signal, callContext, attempt.label, options.transport, options.allowModelSuggestions);
+    await attemptOnce(client, args, timeoutMs, signal, callContext, attempt.label, options.transport, options.allowModelSuggestions, firstOutputTimeoutMs);
   } catch (error) {
     throw {
       error,
@@ -6815,6 +6919,8 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
   let firstError = null;
   let lastError = null;
   const cooledPrimary = primaryQuotaFailure(explicitPrimaryLabel);
+  const clock = createChainClock(options, timeoutMs);
+  const primaryStartedAt = Date.now();
   try {
     if (cooledPrimary)
       throw {
@@ -6829,16 +6935,18 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
           skipped: true
         }
       };
-    return await attemptAndValidate(client, baseArgs, timeoutMs, options.signal, callContext, {
+    const budget = clock.budget(0);
+    return await attemptAndValidate(client, baseArgs, budget.timeoutMs, options.signal, callContext, {
       label: explicitPrimaryLabel,
       attemptIndex: 0,
       isFallback: false,
       totalAttempts,
       model: baseBody.model
-    }, options);
+    }, options, budget.firstOutputTimeoutMs);
   } catch (caught) {
     const failure = caught;
     failedAttempts.push(failure);
+    clock.settle(failure.error, primaryStartedAt);
     firstError = failure.error;
     lastError = failure.error;
     if (failure.error instanceof DreamerProviderOutputFailureError && failure.error.quotaResetAt !== undefined)
@@ -6876,13 +6984,16 @@ async function promptSyncWithValidatedOutputRetry(client, args, options) {
       totalAttempts,
       model: parsed
     };
+    const attemptStartedAt = Date.now();
     try {
-      const result = await attemptAndValidate(client, attemptArgs, timeoutMs, options.signal, callContext, attempt, options);
+      const budget = clock.budget(i + 1);
+      const result = await attemptAndValidate(client, attemptArgs, budget.timeoutMs, options.signal, callContext, attempt, options, budget.firstOutputTimeoutMs);
       log2(`[${callContext}] fallback succeeded with ${label} (attempt ${i + 2}/${fallbacks.length + 1})`);
       return result;
     } catch (caught) {
       const failure = caught;
       failedAttempts.push(failure);
+      clock.settle(failure.error, attemptStartedAt);
       lastError = failure.error;
       if (isNonRetryable(failure.error, options.signal)) {
         throwWithPromptFailure(failure.error, failedAttempts, args, timeoutMs, options.transport);
@@ -7059,6 +7170,152 @@ function buildHiddenAgentRegistrations(args) {
 }
 
 // src/features/magic-context/subagent-token-capture.ts
+var warnedUnknownModels = new Set;
+var loggedModelReroutes = new Set;
+var MAX_SUBAGENT_INVOCATION_ERROR_CHARS = 1000;
+var invocationErrorDetails = new WeakMap;
+function annotateSubagentInvocationError(error, details) {
+  if (error && typeof error === "object") {
+    const previous = invocationErrorDetails.get(error) ?? {};
+    invocationErrorDetails.set(error, {
+      ...previous,
+      ...details,
+      hostError: details.hostError ?? previous.hostError
+    });
+  }
+  return error;
+}
+function errorDetailsOf(error) {
+  const seen = new Set;
+  const visit = (value, depth) => {
+    if (!value || typeof value !== "object" || depth > 4 || seen.has(value))
+      return {};
+    seen.add(value);
+    const direct = invocationErrorDetails.get(value) ?? {};
+    const record = value;
+    const nested = visit(record.hostError, depth + 1);
+    const cause = visit(record.cause, depth + 1);
+    return {
+      ...cause,
+      ...nested,
+      ...direct,
+      hostError: direct.hostError ?? nested.hostError ?? cause.hostError ?? record.hostError
+    };
+  };
+  return visit(error, 0);
+}
+function modelRef(value) {
+  const reference = typeof value === "string" ? value : value?.model;
+  return typeof reference === "string" && reference.trim().length > 0 ? reference.trim() : undefined;
+}
+function splitModelRef(value) {
+  if (!value)
+    return { providerId: null, modelId: null };
+  const slash = value.indexOf("/");
+  return slash > 0 && slash < value.length - 1 ? { providerId: value.slice(0, slash), modelId: value.slice(slash + 1) } : { providerId: null, modelId: value };
+}
+function cleanOneLine(value) {
+  const oneLine = sanitizeDiagnosticText(value).replaceAll("\r", " ").replaceAll(`
+`, " ").replaceAll("\t", " ").replace(/\s+/g, " ").trim();
+  return oneLine.length <= MAX_SUBAGENT_INVOCATION_ERROR_CHARS ? oneLine : `${oneLine.slice(0, MAX_SUBAGENT_INVOCATION_ERROR_CHARS - 1)}…`;
+}
+function recordMessage(error) {
+  if (typeof error === "string")
+    return error;
+  if (!error || typeof error !== "object")
+    return String(error ?? "");
+  const record = error;
+  const data = record.data && typeof record.data === "object" ? record.data : undefined;
+  const message = typeof data?.message === "string" ? data.message : typeof record.message === "string" ? record.message : typeof record.description === "string" ? record.description : "";
+  const name = typeof record.name === "string" ? record.name : typeof record.type === "string" ? record.type : "";
+  return [name, message].filter(Boolean).join(": ") || "The host reported an error without a message.";
+}
+function modelNotFoundDetail(error, attemptedModel) {
+  const seen = new Set;
+  const visit = (value, depth) => {
+    if (typeof value === "string") {
+      const modelMatch = value.match(/model not found:\s*(.+?)(?=(?:\.?\s*did you mean|$))/i);
+      if (!modelMatch)
+        return null;
+      const model = modelMatch[1].trim().replace(/[.,;(]+$/, "");
+      const suggestion = value.match(/did you mean:?\s*\(?\s*([^?);]+)/i)?.[1]?.trim();
+      const message = `Model not found: ${model}${suggestion ? ` (did you mean ${suggestion}?)` : ""}`;
+      return { model, ...suggestion ? { suggestion } : {}, message };
+    }
+    if (!value || typeof value !== "object" || depth > 4 || seen.has(value))
+      return null;
+    seen.add(value);
+    const record = value;
+    const data = record.data && typeof record.data === "object" ? record.data : undefined;
+    const modelRecord = data?.model ?? record.model;
+    const modelId = (typeof data?.modelID === "string" ? data.modelID : undefined) ?? (typeof modelRecord?.modelID === "string" ? modelRecord.modelID : undefined) ?? (typeof modelRecord?.id === "string" ? modelRecord.id : undefined);
+    const providerId = (typeof data?.providerID === "string" ? data.providerID : undefined) ?? (typeof modelRecord?.providerID === "string" ? modelRecord.providerID : undefined);
+    const suggestions = data?.suggestions;
+    const suggestion = Array.isArray(suggestions) && typeof suggestions[0] === "string" ? suggestions[0] : typeof data?.suggestion === "string" ? data.suggestion : undefined;
+    const rawMessage = recordMessage(value);
+    const fromMessage = visit(rawMessage, depth + 1);
+    if (fromMessage)
+      return fromMessage.suggestion || !suggestion ? fromMessage : {
+        ...fromMessage,
+        suggestion,
+        message: `Model not found: ${fromMessage.model} (did you mean ${suggestion}?)`
+      };
+    const name = `${String(record.name ?? "")} ${String(record.type ?? "")}`;
+    if (/ProviderModelNotFoundError|model not found/i.test(name) && modelId) {
+      const model = providerId ? `${providerId}/${modelId}` : modelId;
+      const detail = `Model not found: ${model}${suggestion ? ` (did you mean ${suggestion}?)` : ""}`;
+      return { model, ...suggestion ? { suggestion } : {}, message: detail };
+    }
+    for (const key of ["data", "error", "cause", "hostError"]) {
+      const match = visit(record[key], depth + 1);
+      if (match)
+        return match;
+    }
+    return null;
+  };
+  const found = visit(error, 0);
+  if (!found && attemptedModel && (typeof error === "string" && /ProviderModelNotFoundError/i.test(error) || error !== null && typeof error === "object" && /ProviderModelNotFoundError/i.test(`${String(error.name ?? "")} ${String(error.type ?? "")}`))) {
+    return { model: attemptedModel, message: `Model not found: ${attemptedModel}` };
+  }
+  return found;
+}
+function hostLabel(harness) {
+  switch (harness) {
+    case "opencode2":
+      return "OpenCode 2";
+    case "opencode":
+      return "OpenCode";
+    case "pi":
+      return "Pi";
+    case "omp":
+      return "Oh My Pi";
+  }
+}
+function invocationErrorText(input, details, attemptedModel) {
+  if (input.error == null && input.hostError == null && details.hostError == null)
+    return null;
+  const rawHostError = input.hostError ?? details.hostError;
+  const modelError = modelNotFoundDetail(rawHostError ?? input.error, attemptedModel);
+  if (modelError) {
+    return cleanOneLine(`No reply: ${hostLabel(input.harness)} refused the model: ${modelError.message}`);
+  }
+  if (rawHostError != null) {
+    return cleanOneLine(`No reply: ${hostLabel(input.harness)} reported a child-session error: ${recordMessage(rawHostError)}`);
+  }
+  return cleanOneLine(describeError(input.error).brief);
+}
+function warnUnknownModel(input, details, attemptedModel, modelConfigKey) {
+  if (!attemptedModel)
+    return;
+  const issue = modelNotFoundDetail(input.hostError ?? details.hostError ?? input.error, attemptedModel);
+  if (!issue || warnedUnknownModels.has(attemptedModel))
+    return;
+  if (!modelConfigKey)
+    return;
+  warnedUnknownModels.add(attemptedModel);
+  const suggestion = issue.suggestion ? `provider suggests ${cleanOneLine(issue.suggestion)}` : "provider gave no model suggestion";
+  log2(`[magic-context] WARNING: ${modelConfigKey} configured ${attemptedModel}, but ${hostLabel(input.harness)} does not know that model; ${suggestion}`);
+}
 function asNumber(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : 0;
 }
@@ -7129,8 +7386,11 @@ function sumTokensFromChildMessages(messages) {
 function findLastAssistantModel(messages) {
   for (let index = messages.length - 1;index >= 0; index -= 1) {
     const message = messages[index];
-    if (isAssistantMessage(message))
-      return modelFromMessage(message);
+    if (isAssistantMessage(message)) {
+      const model = modelFromMessage(message);
+      if (model.providerId || model.modelId)
+        return model;
+    }
   }
   return { providerId: null, modelId: null };
 }
@@ -7139,10 +7399,25 @@ function recordChildInvocation(input) {
     return null;
   const tokens = input.tokens ?? sumTokensFromChildMessages(input.messages ?? []);
   const observedModel = findLastAssistantModel(input.messages ?? []);
+  const details = errorDetailsOf(input.error);
+  const attemptedModel = details.attemptedModel ?? modelRef(input.attemptedModel);
+  const attemptConfig = [input.attemptedModel, ...input.configuredModels ?? []].find((candidate) => modelRef(candidate) === attemptedModel);
+  const modelConfigKey = details.modelConfigKey ?? input.modelConfigKey ?? (typeof attemptConfig === "object" ? attemptConfig?.sourceConfigKey : undefined);
+  const attemptedParts = splitModelRef(attemptedModel);
   const model = {
-    providerId: input.providerId ?? observedModel.providerId,
-    modelId: input.modelId ?? observedModel.modelId
+    providerId: observedModel.providerId ?? input.providerId ?? attemptedParts.providerId,
+    modelId: observedModel.modelId ?? input.modelId ?? attemptedParts.modelId
   };
+  const reportedModelRef = observedModel.providerId && observedModel.modelId ? `${observedModel.providerId}/${observedModel.modelId}` : input.providerId && input.modelId ? `${input.providerId}/${input.modelId}` : undefined;
+  if (attemptedModel && reportedModelRef && attemptedModel !== reportedModelRef && (observedModel.providerId !== null || input.providerId !== undefined)) {
+    const rerouteKey = `${input.harness}\x00${attemptedModel}\x00${reportedModelRef}`;
+    if (!loggedModelReroutes.has(rerouteKey)) {
+      loggedModelReroutes.add(rerouteKey);
+      sessionLog2(input.parentSessionId, `subagent model rerouted by host: attempted=${attemptedModel} reported=${reportedModelRef}`);
+    }
+  }
+  warnUnknownModel(input, details, attemptedModel, modelConfigKey);
+  const errorText = invocationErrorText(input, details, attemptedModel);
   try {
     return recordSubagentInvocation(input.db, {
       sessionId: input.parentSessionId,
@@ -7158,7 +7433,7 @@ function recordChildInvocation(input) {
       outputTokens: tokens.output,
       cacheReadTokens: tokens.cacheRead,
       cacheWriteTokens: tokens.cacheWrite,
-      error: input.error ? describeError(input.error).brief : null,
+      error: errorText,
       parentInvocationId: input.parentInvocationId ?? null
     });
   } catch (error) {
@@ -7186,6 +7461,17 @@ var HOST_SESSION_ERROR = Symbol("promptAsyncHostSessionError");
 function isHostSessionError(error) {
   return error !== null && typeof error === "object" && error[HOST_SESSION_ERROR] === true;
 }
+function hostSessionErrorOf(error) {
+  if (!isHostSessionError(error))
+    return;
+  return error.hostError;
+}
+function requestModelRef(request) {
+  const model = request.body?.model;
+  if (model && typeof model.providerID === "string" && typeof model.modelID === "string")
+    return `${model.providerID}/${model.modelID}`;
+  return;
+}
 function supportsPromptAsync(client) {
   const session = sessionApi(client);
   return typeof session?.promptAsync === "function" && typeof session?.status === "function" && typeof session?.messages === "function";
@@ -7234,6 +7520,24 @@ function isTerminalAssistant(message) {
   const info = infoOf(message);
   return isSettledAssistant(message) && info.finish !== "tool-calls" && info.finish !== "tool_use" && !(message && typeof message === "object" && Array.isArray(message.parts) && message.parts.some((part) => part.type === "tool"));
 }
+function showsModelOutput(message) {
+  if (infoOf(message).role !== "assistant")
+    return false;
+  const tokens = sumTokensFromChildMessages([message]);
+  if (tokens.input + tokens.output + tokens.cacheRead + tokens.cacheWrite > 0)
+    return true;
+  const parts = message?.parts;
+  if (!Array.isArray(parts))
+    return false;
+  return parts.some((part) => {
+    if (!part || typeof part !== "object")
+      return false;
+    const { type, text } = part;
+    if (type === "tool")
+      return true;
+    return (type === "text" || type === "reasoning") && typeof text === "string" && text.trim().length > 0;
+  });
+}
 function unwrapData(response) {
   if (response && typeof response === "object" && "data" in response) {
     return response.data;
@@ -7322,15 +7626,35 @@ async function promptAsyncAndWaitForIdle(client, request, options = {}) {
   const initialBaseline = new Set(completionBaseline);
   activeSessionErrors.set(sessionId, undefined);
   try {
-    const sent = await session.promptAsync?.(request);
+    let sent;
+    try {
+      sent = await session.promptAsync?.(request);
+    } catch (error) {
+      annotateSubagentInvocationError(error, {
+        attemptedModel: requestModelRef(request),
+        modelConfigKey: options.modelConfigKey,
+        hostError: error
+      });
+      throw error;
+    }
     if (sent && typeof sent === "object" && "error" in sent) {
       const rejection = sent.error;
       if (rejection) {
-        throw new Error(`prompt_async was rejected: ${describeRejection(rejection)}`);
+        const error = new Error(`prompt_async was rejected: ${describeRejection(rejection)}`, {
+          cause: rejection
+        });
+        annotateSubagentInvocationError(error, {
+          attemptedModel: requestModelRef(request),
+          modelConfigKey: options.modelConfigKey,
+          hostError: rejection
+        });
+        throw error;
       }
     }
     let sentAt = Date.now();
     let sawBusy = false;
+    noteModelActivityMonitored(signal);
+    let sawOutput = false;
     for (;; ) {
       await sleep(pollIntervalMs, signal);
       const hostError = activeSessionErrors.get(sessionId);
@@ -7339,12 +7663,25 @@ async function promptAsyncAndWaitForIdle(client, request, options = {}) {
         Object.assign(error, {
           name: "DreamerProviderOutputFailureError",
           transient: true,
-          [HOST_SESSION_ERROR]: true
+          [HOST_SESSION_ERROR]: true,
+          hostError
+        });
+        annotateSubagentInvocationError(error, {
+          attemptedModel: requestModelRef(request),
+          modelConfigKey: options.modelConfigKey,
+          hostError
         });
         throw error;
       }
       const status = await readStatus(session, sessionId, dir, signal);
       const messages = await readMessages(session, sessionId, dir, signal);
+      if (!sawOutput && messages.some((message) => {
+        const id = messageId2(message);
+        return id !== null && !initialBaseline.has(id) && showsModelOutput(message);
+      })) {
+        sawOutput = true;
+        noteModelOutputReceived(signal);
+      }
       if (budget) {
         const latest = messages.at(-1);
         const latestId = messageId2(latest);
@@ -15085,6 +15422,8 @@ function resolveHiddenCompletionExecutor(executor, client, db, directory, entryP
 }
 function createV1HiddenCompletionExecutor(client, db, directory) {
   const historianChildren = new Set;
+  const hostErrors = new Map;
+  const runIdentities = new Map;
   return {
     capabilities: { tools: true, harness: "opencode" },
     async open(run) {
@@ -15101,23 +15440,49 @@ function createV1HiddenCompletionExecutor(client, db, directory) {
         preferResponseOnMissingData: true
       });
       const id = typeof created?.id === "string" ? created.id : "";
-      if (id)
+      if (id) {
         rememberV1HiddenRun(id, run);
+        runIdentities.set(id, run);
+      }
       if (id && run.kind !== "dreamer-task") {
         historianChildren.add(id);
         rememberHistorianOutputCap(id, run.maxOutputTokens);
       }
-      return { id, childSessionId: id || undefined };
+      const configured = toModelEntry(run.model);
+      return {
+        id,
+        childSessionId: id || undefined,
+        ...configured ? { attemptedModel: configured.model } : {},
+        ...configured?.sourceConfigKey ? { modelConfigKey: configured.sourceConfigKey } : {}
+      };
     },
     async attempt(handle, request) {
       if (!client)
         throw new Error("Hidden completion client is unavailable");
+      const identity = runIdentities.get(handle.id);
+      const requestedModel = request.body?.model;
+      const requestedRef = requestedModel && typeof requestedModel.providerID === "string" && typeof requestedModel.modelID === "string" ? `${requestedModel.providerID}/${requestedModel.modelID}` : undefined;
+      const matchingConfigured = (identity?.configuredModels ?? []).map(toModelEntry).find((entry) => entry?.model === requestedRef);
+      const configured = matchingConfigured ?? (requestedRef && identity?.model && toModelEntry(identity.model)?.model === requestedRef ? toModelEntry(identity.model) : toModelEntry(identity?.model));
+      handle.attemptedModel = requestedRef ?? configured?.model ?? handle.attemptedModel;
+      handle.modelConfigKey = configured?.sourceConfigKey ?? handle.modelConfigKey;
       if (supportsPromptAsync(client)) {
         try {
-          await promptAsyncAndWaitForIdle(client, request);
+          await promptAsyncAndWaitForIdle(client, request, {
+            modelConfigKey: handle.modelConfigKey
+          });
         } catch (error) {
-          if (historianChildren.has(handle.id) && isHostSessionError(error))
-            return;
+          if (isHostSessionError(error)) {
+            const hostError = hostSessionErrorOf(error);
+            hostErrors.set(handle.id, hostError);
+            annotateSubagentInvocationError(error, {
+              attemptedModel: handle.attemptedModel,
+              modelConfigKey: handle.modelConfigKey,
+              hostError
+            });
+            if (historianChildren.has(handle.id))
+              return;
+          }
           throw error;
         }
         return;
@@ -15135,9 +15500,16 @@ function createV1HiddenCompletionExecutor(client, db, directory) {
         preferResponseOnMissingData: true
       });
       const assistantFailure = extractLatestAssistantFailure(messages);
+      const hostError = hostErrors.get(handle.id);
       if (assistantFailure) {
         const finish = assistantFailure.finish ? ` (finish=${assistantFailure.finish})` : "";
-        throw new Error(`Historian host recorded an assistant error${finish}: ${describeAssistantFailure(assistantFailure.error)}`);
+        const error = new Error(`Historian host recorded an assistant error${finish}: ${describeAssistantFailure(assistantFailure.error)}`, hostError === undefined ? undefined : { cause: hostError });
+        annotateSubagentInvocationError(error, {
+          attemptedModel: handle.attemptedModel,
+          modelConfigKey: handle.modelConfigKey,
+          hostError
+        });
+        throw error;
       }
       const text = extractLatestAssistantText(messages);
       const latest = Array.isArray(messages) ? messages.filter((message) => isRecord(message) && isRecord(message.info) && message.info.role === "assistant").sort((left, right) => historianMessageCreatedAt(right) - historianMessageCreatedAt(left))[0] : undefined;
@@ -15148,13 +15520,18 @@ function createV1HiddenCompletionExecutor(client, db, directory) {
         reasoning: text ? null : extractLatestHistorianReasoning(messages),
         lengthCapped: hasLengthCappedOutput(messages),
         usage: sumTokensFromChildMessages(messages),
-        tokenLog: runTokenLog(info.tokens, undefined, info.finish ?? info.finish_reason ?? info.finishReason)
+        tokenLog: runTokenLog(info.tokens, undefined, info.finish ?? info.finish_reason ?? info.finishReason),
+        attemptedModel: handle.attemptedModel,
+        modelConfigKey: handle.modelConfigKey,
+        ...hostError === undefined ? {} : { hostError }
       };
     },
     async close(handle, settlement) {
       if (handle?.id) {
         rememberV1HiddenRun(handle.id, undefined);
         historianChildren.delete(handle.id);
+        hostErrors.delete(handle.id);
+        runIdentities.delete(handle.id);
         forgetHistorianOutputCap(handle.id);
       }
       if (!client)
@@ -15309,7 +15686,8 @@ async function runHistorianPrompt(args) {
     if (invocationRecorded)
       return null;
     invocationRecorded = true;
-    const actualModelRef = completion?.providerId && completion.modelId ? `${completion.providerId}/${completion.modelId}` : null;
+    const configuredModel = toModelEntry(modelOverride);
+    const actualModelRef = completion?.providerId && completion.modelId ? `${completion.providerId}/${completion.modelId}` : handle?.attemptedModel ?? configuredModel?.model ?? null;
     const usedConfiguredFallback = actualModelRef !== null && (fallbackModels ?? []).some((candidate) => toModelEntry(candidate)?.model === actualModelRef);
     return recordChildInvocation({
       db: openDatabase(),
@@ -15325,6 +15703,10 @@ async function runHistorianPrompt(args) {
         providerId: completion.providerId,
         modelId: completion.modelId
       } : {},
+      attemptedModel: handle?.attemptedModel ?? modelOverride,
+      configuredModels: fallbackModels,
+      modelConfigKey: handle?.modelConfigKey ?? configuredModel?.sourceConfigKey,
+      hostError: params.hostError ?? completion?.hostError,
       error: params.error,
       parentInvocationId: agentId === HISTORIAN_EDITOR_AGENT ? parentInvocationId ?? null : null
     });
@@ -15438,7 +15820,8 @@ async function runHistorianPrompt(args) {
     const invocationId = recordInvocation({
       status: emptyError ? "empty" : "completed",
       messages: completion.messages,
-      error: emptyError
+      error: emptyError,
+      hostError: completion.hostError
     });
     if (emptyError && (!reasoningResult || lengthCapped)) {
       return {
@@ -16344,7 +16727,8 @@ function resolveProtectedTailBoundary(ctx) {
       break;
     }
     livePromptFloor.ordinal = lastMeaningfulUserOrdinal || null;
-    if (lastMeaningfulUserOrdinal >= offset) {
+    livePromptFloor.messageId = boundaryMessageId(index, lastMeaningfulUserOrdinal);
+    if (!ctx.liftLivePromptFloor && lastMeaningfulUserOrdinal >= offset) {
       protectedTailStart = Math.min(protectedTailStart, lastMeaningfulUserOrdinal);
     }
   }
@@ -16472,6 +16856,7 @@ function resolveBoundaryContext(args) {
     protectedTailPolicyVersion: meta.protectedTailPolicyVersion,
     migrationFloorActive,
     emergencyTailScale: args.emergencyTailScale,
+    liftLivePromptFloor: args.liftLivePromptFloor,
     providerShapeVersion: args.providerShapeVersion ?? "opencode-v1",
     cacheNamespace: args.cacheNamespace ?? `opencode:${args.sessionId}`,
     storedTokenTotalsForMessages,
@@ -17583,7 +17968,7 @@ function promoteRecompStagingWithM0Mutation(db, sessionId, holderId) {
       finished = true;
       return null;
     }
-    deleteChunkEmbedBackoffForSession(db, sessionId);
+    deleteChunkEmbedBackoffForSession2(db, sessionId);
     db.prepare("DELETE FROM compartments WHERE session_id = ?").run(sessionId);
     db.prepare("DELETE FROM session_facts WHERE session_id = ?").run(sessionId);
     insertRecompCompartmentRows(db, sessionId, staging.compartments, now);
@@ -18658,4 +19043,4 @@ ${failure}`;
   }
 }
 
-export { historianRunConfig, dreamerRunConfig, pluginConfigReader, currentPluginConfigReader, withLiveDreamerOutputCap, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getUncoveredCompartmentEndsThrough, providerResponseFailed, isSuccessfulProviderCompletion, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, clearSession, requestPendingMaterialization, pendingMaterializationOrigin, hasPendingMaterializationOrigin, clearPendingMaterialization, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, isHeldHeadForRequest, deferDeliveredSystemRefresh, retirePendingSystemPromptDelivery, lkgProviderInputTotal, beginV2LkgRequest, claimLkgRequestIdentity, currentLkgRequestIdentity, noteCapturedLkgRequest, noteLkgProviderResponse, measuredLkgPrefix, clearLkgMeasuredRequest, saveLkgSlotToDb, clearPersistedLkgSlotStrict, loadPersistedLkgSlot, drainStaleLkgSlots, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, validateAnthropicReasoningRuns, validateLkgSeam, replayLkg, coldStartRawServedIndex, coldStartUncapturedReplay, noteUncertifiedNormalLkg, hasProcessLocalLkgProof, lkgDirtyRevision, rememberLkgDirtyRevision, noteLkgRecoveryPrefix, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgRecoveryReplayUnproven, lkgRecoveryEntryUnproven, beginLkgPass, visitMessageContentFields, contentSnapshotValue, messageContentFields, signatureForFields, exactReusablePrefix, incrementalLkgContentDigests, lkgSlotRejection, captureSlot, getInMemorySlot, getSlot, forgetInMemorySlot, dropSlot, noteEntry, getLkgSlotHeapStats, TOOL_SWEEP_SCOPED_MARKER, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, queueMemoryMutation, getMaxMemoryMutationIdForProjects, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, readCoordinateGeneration, rebaseSessionCoordinatesAsync, HiddenCompletionRefusal, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, prepareCompactionMarkerCandidates, removeMcOwnedCompactionMarkers, getCompartmentEvents, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, DreamerProviderOutputFailureError, withDreamerModelCooldown, providerOutputFailureFromInvalidManifest, DREAMER_AGENT, DREAMER_RETROSPECTIVE_AGENT, DREAMER_PRIMER_INVESTIGATOR_AGENT, DREAMER_MEMORY_MAPPER_AGENT, DREAMER_CLASSIFIER_AGENT, DREAMER_DOCS_AGENT, DREAMER_REVIEWER_AGENT, HIDDEN_HISTORIAN_AGENT, HIDDEN_DREAMER_AGENT, HIDDEN_CURATE_AGENT, hiddenAgentFor, hiddenToolLoop, HIDDEN_RUN_DISPOSED_REASON, noteChildOfDisposedInstance, hiddenChildPermissions, registerHiddenChildAgents, hiddenToolCallRefusal, HiddenAgentStepLimit, HiddenChildHook, extractLatestAssistantText, hasLengthCappedOutput, parseProviderModel, modelBodyField, toModelEntry, isPromptTimeoutError, getPromptFailureDetail, raceWithSignal, promptSyncWithValidatedOutputRetry, normalizeSDKResponse, failedInvocationStatus, sumTokensFromChildMessages, recordChildInvocation, createPromptAsyncTransport, CTX_NOTE_LIGHT_DESCRIPTION, ACTIVE_TOOL_IDS, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, MARKER_SUMMARY_TEXT, markerUpdateDefinitelyDidNotCut, applyDeferredCompactionMarker, teardownChildSession, runTokenLog, formatRunTokenLog, createChildSessionWithFence, buildMagicContextSection, getMuralIdentity, getMural, modelKeyAcceptsImages, resolveMuralWire, extractM0Block, formatDate, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, hydrateCachedM0Mural, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, clampProducerAtomChars, producerInputTokenLimit, historianProducerReserve, producerPromptFailureReason, resolveHiddenCompletionExecutor, createV1HiddenCompletionExecutor, EMPTY_READ_REPLY, noteTouchedAt, renderGlance, renderNotesById, formatWriteReply, observeNoteNudgeServe, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, omitIncompleteFileTokenTotals, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, noteTransformPassForExactOrdinalReads, runCompartmentAgent, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, isRecompFailure2, isRecompSkip2, extractRecompReason2, setRecompStarting2, setRecompNote2, setRecompTerminal2, buildRecompDeps2, runManagedRecomp2 };
+export { historianRunConfig, dreamerRunConfig, pluginConfigReader, currentPluginConfigReader, withLiveDreamerOutputCap, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getUncoveredCompartmentEndsThrough, providerResponseFailed, isSuccessfulProviderCompletion, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, clearSession, requestPendingMaterialization, pendingMaterializationOrigin, hasPendingMaterializationOrigin, clearPendingMaterialization, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, isHeldHeadForRequest, deferDeliveredSystemRefresh, retirePendingSystemPromptDelivery, lkgProviderInputTotal, beginV2LkgRequest, claimLkgRequestIdentity, currentLkgRequestIdentity, noteCapturedLkgRequest, noteLkgProviderResponse, measuredLkgPrefix, clearLkgMeasuredRequest, saveLkgSlotToDb, clearPersistedLkgSlotStrict, loadPersistedLkgSlot, drainStaleLkgSlots, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, validateAnthropicReasoningRuns, validateLkgSeam, replayLkg, coldStartRawServedIndex, coldStartUncapturedReplay, noteUncertifiedNormalLkg, hasProcessLocalLkgProof, lkgDirtyRevision, rememberLkgDirtyRevision, readPersistedLkgUntaggedInputIds, persistLkgUntaggedInputIds, noteLkgRecoveryPrefix, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgRecoveryReplayUnproven, lkgRecoveryEntryUnproven, beginLkgPass, visitMessageContentFields, contentSnapshotValue, messageContentFields, signatureForFields, exactReusablePrefix, incrementalLkgContentDigests, lkgSlotRejection, captureSlot, getInMemorySlot, getSlot, forgetInMemorySlot, dropSlot, noteEntry, getLkgSlotHeapStats, TOOL_SWEEP_SCOPED_MARKER, useScopedToolSweep, createPreAdoptionToolSweepResolver, copySessionStateForClone, queueMemoryMutation, getMaxMemoryMutationIdForProjects, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, replaceSourceContent, getSourceContents, readCoordinateGeneration, rebaseSessionCoordinatesAsync, HiddenCompletionRefusal, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, prepareCompactionMarkerCandidates, removeMcOwnedCompactionMarkers, getCompartmentEvents, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, DreamerProviderOutputFailureError, withDreamerModelCooldown, providerOutputFailureFromInvalidManifest, DREAMER_AGENT, DREAMER_RETROSPECTIVE_AGENT, DREAMER_PRIMER_INVESTIGATOR_AGENT, DREAMER_MEMORY_MAPPER_AGENT, DREAMER_CLASSIFIER_AGENT, DREAMER_DOCS_AGENT, DREAMER_REVIEWER_AGENT, HIDDEN_HISTORIAN_AGENT, HIDDEN_DREAMER_AGENT, HIDDEN_CURATE_AGENT, hiddenAgentFor, hiddenToolLoop, HIDDEN_RUN_DISPOSED_REASON, noteChildOfDisposedInstance, hiddenChildPermissions, registerHiddenChildAgents, hiddenToolCallRefusal, HiddenAgentStepLimit, HiddenChildHook, extractLatestAssistantText, hasLengthCappedOutput, parseProviderModel, modelBodyField, toModelEntry, ModelProducedNoOutputError, noteModelActivityMonitored, noteModelOutputReceived, isPromptTimeoutError, getPromptFailureDetail, raceWithSignal, promptSyncWithValidatedOutputRetry, normalizeSDKResponse, annotateSubagentInvocationError, failedInvocationStatus, sumTokensFromChildMessages, recordChildInvocation, createPromptAsyncTransport, CTX_NOTE_LIGHT_DESCRIPTION, ACTIVE_TOOL_IDS, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, MARKER_SUMMARY_TEXT, markerUpdateDefinitelyDidNotCut, applyDeferredCompactionMarker, teardownChildSession, runTokenLog, formatRunTokenLog, createChildSessionWithFence, buildMagicContextSection, getMuralIdentity, getMural, modelKeyAcceptsImages, resolveMuralWire, extractM0Block, formatDate, TEMPORAL_MARKER_REPLAY_PATTERN, collectTemporalCandidates, injectTemporalMarkers, clearInjectionCache, getVisibleMemoryIds, selectHiddenMessagesAtCompactionSeam, prepareCompartmentInjection, renderCompartmentInjection, MaterializeContentionError, mustMaterialize, trimMemoriesToBudgetV2, renderMemoryBlockV2, materializeM0, hydrateCachedM0Mural, resetPrefixTrimFallbackState, findHostCompactionWindow, capturePrefixTrimSourceOrder, prepareCachedM0M1Replay, hasCompleteCachedM0M1, injectM0M1, clampProducerAtomChars, producerInputTokenLimit, historianProducerReserve, producerPromptFailureReason, resolveHiddenCompletionExecutor, createV1HiddenCompletionExecutor, EMPTY_READ_REPLY, noteTouchedAt, renderGlance, renderNotesById, formatWriteReply, observeNoteNudgeServe, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, omitIncompleteFileTokenTotals, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, noteTransformPassForExactOrdinalReads, runCompartmentAgent, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, isRecompFailure2, isRecompSkip2, extractRecompReason2, setRecompStarting2, setRecompNote2, setRecompTerminal2, buildRecompDeps2, runManagedRecomp2 };