@cortexkit/opencode-magic-context 0.49.17 → 0.49.19

package/dist/v2/{server-fw7wrk01.js → server-6vdzn1td.js}

@@ -89,7 +89,7 @@ import {
   toMessageIndexSource2,
   clearIndexedMessagesInTransaction2,
   indexSourcesAfterOrdinal2
-} from "./server-3rhpvy84.js";
+} from "./server-2ar62dyx.js";
 import {
   detectOverflow,
   SESSION_META_SELECT_COLUMNS,
@@ -105,12 +105,15 @@ import {
   retreatPastHostUnservedRows,
   snapTerminalCompartmentToServedRow,
   isHostRenderedSystemMessage,
+  markCoveredInstructionRow,
+  isCoveredInstructionRow,
   completedToolArcCrossesBoundary,
   buildToolArcs,
   fenceBoundaryForCompletedToolArcs,
   fenceBoundaryForToolArcs,
   buildTrueRawTokenIndex,
   computeRawRangeFingerprint,
+  isFilePart,
   DreamTokenBudgetExceeded,
   TOKEN_BUDGET_FINALIZE_MESSAGE,
   registerBudgetFinalizeChild,
@@ -127,6 +130,7 @@ import {
   isRustMarkerAdmissionFenced,
   readReplayEnvelope,
   readReplayDocument,
+  updateReplayDocument,
   writeReplayDocument,
   describeProtectedTailDrainBudgetSkip,
   loadProtectedTailMeta,
@@ -157,6 +161,7 @@ import {
   serializeStrippedPlaceholderState,
   THINKING_BINDING_RECOVERY_FROZEN_PREFIX,
   THINKING_BINDING_STRIP_ORDER_END_MARKER,
+  COMPACTION_OFF_THINKING_FROZEN_PREFIX,
   getMergedReasoningStrippedIds,
   addMergedReasoningStrippedIds,
   parseProcessedImageMarkers,
@@ -182,7 +187,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./server-kh7dpa1a.js";
+} from "./server-9hx7g5jp.js";
 import {
   getTableColumnNames
 } from "./server-pwv4ezb0.js";
@@ -192,7 +197,7 @@ import {
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./server-gtfhttbr.js";
+} from "./server-bmymkx73.js";
 import {
   providerMass,
   calibrationForModelKey,
@@ -210,7 +215,7 @@ import {
   foldShrunkPartTags2,
   getTagNumberByMessageId2,
   getActiveTagsBySession2
-} from "./server-zyzawhdw.js";
+} from "./server-27gq4mfz.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -240,7 +245,7 @@ import {
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./server-gpvay0xz.js";
+} from "./server-xq7dfjke.js";
 import {
   shouldSkipHomeProjectMemory,
   resolveProjectIdentity
@@ -253,7 +258,7 @@ import {
   userFacingFailureCode,
   promoteSessionFactsDurable,
   embedPromotedFacts
-} from "./server-my7k4eds.js";
+} from "./server-hm38q7r0.js";
 import {
   isMarkerCandidateBasisCurrent2,
   invalidateMarkerCandidateBasis2,
@@ -2121,6 +2126,8 @@ function outputMessageIsPostAnchor(message, inputIndexById, anchorIndex) {
     }
     return false;
   }
+  if (isCoveredInstructionRow(message.info))
+    return false;
   if (!isSyntheticOutput(message))
     return null;
   const linked = ["sourceMessageId", "ownerMessageId", "anchorMessageId"].map((key) => recordValue(message.info, key)).find((value) => typeof value === "string");
@@ -2516,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,
@@ -2526,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) {
@@ -3073,10 +3112,11 @@ function dropSlot(sessionId, _reason) {
   if (pass !== undefined)
     hydrationAttemptBySession.set(sessionId, pass);
 }
-function noteEntry(sessionId, messages) {
+function noteEntry(sessionId, input) {
   const slot = getSlot(sessionId);
   if (!slot)
     return null;
+  const messages = input.some((message) => isCoveredInstructionRow(message.info)) ? input.filter((message) => !isCoveredInstructionRow(message.info)) : input;
   const entryInputIds = messages.map((message) => {
     const id = message.info?.id;
     return typeof id === "string" ? id : "";
@@ -3537,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-"))
@@ -6460,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) {
@@ -6540,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();
+  }, 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 {
@@ -6568,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) {
@@ -6578,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) {
@@ -6602,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;
@@ -6633,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") {
@@ -6668,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)
@@ -6691,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";
@@ -6702,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) {
@@ -6728,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;
@@ -6745,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,
@@ -6809,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 {
@@ -6823,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)
@@ -6870,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);
@@ -7228,6 +7345,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;
@@ -7325,6 +7460,8 @@ async function promptAsyncAndWaitForIdle(client, request, options = {}) {
     }
     let sentAt = Date.now();
     let sawBusy = false;
+    noteModelActivityMonitored(signal);
+    let sawOutput = false;
     for (;; ) {
       await sleep(pollIntervalMs, signal);
       const hostError = activeSessionErrors.get(sessionId);
@@ -7339,6 +7476,13 @@ async function promptAsyncAndWaitForIdle(client, request, options = {}) {
       }
       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);
@@ -10730,7 +10874,16 @@ function selectHiddenMessagesAtCompactionSeam(messagesBeforeTrim, skippedVisible
   }
   return markerBoundaryIndex < 0 ? [] : trimmed.slice(markerBoundaryIndex + 1);
 }
-function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, projectPath, injectionBudgetTokens, temporalAwareness) {
+function cutCoveredPrefix(messages, count, coveredInstructions) {
+  const removed = messages.splice(0, count);
+  for (const message of removed) {
+    if (!isHostRenderedSystemMessage(message))
+      continue;
+    markCoveredInstructionRow(message.info);
+    coveredInstructions.push(message);
+  }
+}
+function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, coveredInstructions, projectPath, injectionBudgetTokens, temporalAwareness) {
   const cached = injectionCache.get(sessionId);
   if (cached && cached.db !== db) {
     clearInjectionCache(sessionId);
@@ -10747,8 +10900,7 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
       if (prepared.compartmentEndMessageId.length > 0) {
         const cutoffIndex = findBoundaryIndex(sessionId, messages, prepared.compartmentEndMessageId);
         if (cutoffIndex >= 0) {
-          const remaining = messages.slice(cutoffIndex + (isPartialCompartmentEnd(db, sessionId, prepared.compartmentEndMessageId) ? 0 : 1));
-          messages.splice(0, messages.length, ...remaining);
+          cutCoveredPrefix(messages, cutoffIndex + (isPartialCompartmentEnd(db, sessionId, prepared.compartmentEndMessageId) ? 0 : 1), coveredInstructions);
         } else {
           sessionLog2(sessionId, `compartment injection: cached boundary ${prepared.compartmentEndMessageId} not in messages (already trimmed), reusing cache`);
         }
@@ -10870,8 +11022,7 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
   if (cutoffIndex >= 0) {
     clearDegradedRebuild(sessionId);
     skippedVisibleMessages = cutoffIndex + (isPartialCompartmentEnd(db, sessionId, trimEndMessageId) ? 0 : 1);
-    const remaining = messages.slice(skippedVisibleMessages);
-    messages.splice(0, messages.length, ...remaining);
+    cutCoveredPrefix(messages, skippedVisibleMessages, coveredInstructions);
     resultEndMessageId = trimEndMessageId;
   } else {
     const degradedCount = noteDegradedRebuild(sessionId);
@@ -10891,8 +11042,7 @@ function prepareCompartmentInjection(db, sessionId, messages, isCacheBusting, pr
         const reAnchorCutoff = findBoundaryIndex(sessionId, messages, reAnchorCompartment.endMessageId);
         if (reAnchorCutoff >= 0) {
           skippedVisibleMessages = reAnchorCutoff + (isPartialCompartmentEnd(db, sessionId, reAnchorCompartment.endMessageId) ? 0 : 1);
-          const remaining = messages.slice(skippedVisibleMessages);
-          messages.splice(0, messages.length, ...remaining);
+          cutCoveredPrefix(messages, skippedVisibleMessages, coveredInstructions);
           resultEndMessage = reAnchorCompartment.endMessage;
           resultEndMessageId = reAnchorCompartment.endMessageId;
           reAnchored = true;
@@ -15944,6 +16094,31 @@ function persistFilteredNoise(db, sessionId, chunk, eligibleEnd) {
   return saved;
 }
 
+// src/hooks/magic-context/file-token-coverage.ts
+function omitIncompleteFileTokenTotals(db, sessionId, messages, totals) {
+  const filesByMessage = new Map;
+  for (const message of messages) {
+    const count = message.parts.filter(isFilePart).length;
+    if (count > 0 && totals.has(message.id))
+      filesByMessage.set(message.id, count);
+  }
+  if (filesByMessage.size === 0)
+    return totals;
+  const rows = db.prepare(`
+        SELECT o.value AS owner, COUNT(t.id) AS count
+        FROM json_each(?) o LEFT JOIN tags t
+          ON t.session_id = ? AND t.type = 'file'
+          AND t.message_id >= o.value || ':file'
+          AND t.message_id < o.value || ':file;'
+        GROUP BY o.value
+    `).all(JSON.stringify([...filesByMessage.keys()]), sessionId);
+  for (const row of rows) {
+    if (row.count < (filesByMessage.get(row.owner) ?? 0))
+      totals.delete(row.owner);
+  }
+  return totals;
+}
+
 // src/hooks/magic-context/protected-tail-boundary.ts
 function describeBoundaryDiagnostics(snapshot) {
   return `boundaryDiagnostics=${JSON.stringify(snapshot.diagnostics ?? { unavailable: true, boundaryReason: snapshot.boundaryReason })}`;
@@ -16169,7 +16344,7 @@ function resolveProtectedTailBoundary(ctx) {
   const offset = Math.max(1, ctx.lastCompartmentEndOrdinal + 1);
   const absoluteMessageCount = getCachedAbsoluteMessageCount2(ctx.sessionId) ?? getRawSessionMessageOrdinalCount2(ctx.sessionId);
   const messages = readRawSessionMessageRange2(ctx.sessionId, Math.max(1, offset - 1), absoluteMessageCount);
-  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id)) ?? ctx.storedTokenTotals;
+  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id), messages) ?? ctx.storedTokenTotals;
   const index = buildTrueRawTokenIndex(ctx.sessionId, messages, {
     providerShapeVersion: ctx.providerShapeVersion,
     cacheNamespace: ctx.cacheNamespace,
@@ -16412,9 +16587,10 @@ function resolveBoundaryContext(args) {
     migrationFloorActive = seedResult.seeded;
   }
   const calibration = sessionDecisionCalibration(args.db, args.sessionId);
-  const storedTokenTotalsForMessages = (messageIds) => {
+  const storedTokenTotalsForMessages = (messageIds, messages = []) => {
     try {
-      return getAllStatusTagTokenTotalsFlat2(args.db, args.sessionId, args.taggerFloor ?? 0, calibration, messageIds).totals;
+      const totals = getAllStatusTagTokenTotalsFlat2(args.db, args.sessionId, args.taggerFloor ?? 0, calibration, messageIds).totals;
+      return omitIncompleteFileTokenTotals(args.db, args.sessionId, messages, totals);
     } catch (error) {
       sessionLog2(args.sessionId, "protected-tail stored-token map unavailable (live fallback):", error);
       return;
@@ -16449,7 +16625,7 @@ function resolveWrapupProtectedTailBoundary(args) {
   const offset = Math.max(1, ctx.lastCompartmentEndOrdinal + 1);
   const absoluteMessageCount = getCachedAbsoluteMessageCount2(ctx.sessionId) ?? getRawSessionMessageOrdinalCount2(ctx.sessionId);
   const messages = readRawSessionMessageRange2(ctx.sessionId, Math.max(1, offset - 1), absoluteMessageCount);
-  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id)) ?? ctx.storedTokenTotals;
+  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id), messages) ?? ctx.storedTokenTotals;
   const index = buildTrueRawTokenIndex(ctx.sessionId, messages, {
     providerShapeVersion: ctx.providerShapeVersion,
     cacheNamespace: ctx.cacheNamespace,
@@ -18620,4 +18796,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, 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, 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 };