@cortexkit/opencode-magic-context 0.49.19 → 0.49.20

package/dist/{index-rpxdjkm0.js → index-v7r4td4c.js}

@@ -97,7 +97,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-9zcsy3hh.js";
+} from "./index-x4k3f4mf.js";
 import {
   getHarness2,
   harnessOwnsOpenCodeStore2
@@ -111,7 +111,7 @@ import {
   sanitizeDiagnosticText,
   log2,
   sessionLog2
-} from "./index-j75v2476.js";
+} from "./index-h7tgn49j.js";
 import {
   createScanner,
   parseTree,
@@ -134,7 +134,7 @@ import {
   deriveTriggerBudget2,
   resolveHistorianProducerLimits2,
   producerSourceLocalBudget2
-} from "./index-v10f1rjv.js";
+} from "./index-spwjbkc7.js";
 import {
   withContentLanguageDirective,
   buildPrimaryLanguageDirective,
@@ -157,14 +157,14 @@ import {
   hasMeaningfulUserText2,
   estimateTokens,
   estimateFixedPromptTokens
-} from "./index-c5pytzne.js";
+} from "./index-b88dwwrh.js";
 import {
   FAIL_CLOSED_DOCTOR_COMMAND,
   getSchemaFenceRejection,
   LATEST_SUPPORTED_VERSION,
   getPersistedSchemaVersion,
   openDatabase
-} from "./index-jrr131e0.js";
+} from "./index-rmd0069m.js";
 import {
   inRootAsyncContext2,
   Database2,
@@ -172,20 +172,20 @@ import {
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2,
   beginSqliteWriterAsync2
-} from "./index-beht37jy.js";
+} from "./index-1zx2pa5d.js";
 import {
   shouldSkipHomeProjectMemory,
   resolveProjectIdentity
-} from "./index-2vxtcb95.js";
+} from "./index-vkc1ca9p.js";
 import {
   isPidAlive
-} from "./index-nj7yykkx.js";
+} from "./index-c7phnbvk.js";
 import {
   isStrictGapHealingMessage2,
   noteRawSessionSummaryRowWritten2,
   RawOrdinalsNotReady2,
   runSessionWarmupWorker
-} from "./index-s734jcsr.js";
+} from "./index-35qc6606.js";
 import {
   layoutLkgPrefix,
   assembleLkgPrefix,
@@ -196,10 +196,10 @@ import {
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-63k48rv9.js";
+} from "./index-pnjwa6qa.js";
 import {
   getTableColumnNames
-} from "./index-bp5083x2.js";
+} from "./index-x9k3mqrf.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY,
@@ -213,7 +213,7 @@ import {
 } from "./index-58e3y90n.js";
 import {
   getMeasuredToolDefinitionTokens
-} from "./index-ke416mdc.js";
+} from "./index-j76ah6d7.js";
 import {
   invalidateAutoEmbedSession,
   drainBackgroundBatches,
@@ -222,17 +222,17 @@ import {
   getProjectChunkEmbeddingModelId2,
   getProjectEmbeddingMaxInputTokens2,
   embedItemsForProject2
-} from "./index-ze7mvk54.js";
+} from "./index-2yhtnfcf.js";
 import {
-  buildCanonicalChunkTextFromFts,
-  buildCompartmentSummaryFallbackText,
-  canonicalizeInMemoryChunkTextForEmbedding,
-  chunkCanonicalText,
-  chunkEmbeddingWindowsAreCurrent,
-  replaceCompartmentChunkEmbeddings,
-  deleteChunkEmbedBackoffForSession,
-  chunkWindowSourceKey
-} from "./index-b5vqckbw.js";
+  buildCanonicalChunkTextFromFts2,
+  buildCompartmentSummaryFallbackText2,
+  canonicalizeInMemoryChunkTextForEmbedding2,
+  chunkCanonicalText2,
+  chunkEmbeddingWindowsAreCurrent2,
+  replaceCompartmentChunkEmbeddings2,
+  deleteChunkEmbedBackoffForSession2,
+  chunkWindowSourceKey2
+} from "./index-153r2q6z.js";
 import {
   BoundedSessionMap,
   clearCompressionDepth,
@@ -249,7 +249,7 @@ import {
   toMessageIndexSource2,
   clearIndexedMessagesInTransaction2,
   indexSourcesAfterOrdinal2
-} from "./index-se4m2g6w.js";
+} from "./index-48stjd56.js";
 import {
   stripWellFormedLeadingTagPrefix,
   stripTagPrefix,
@@ -262,12 +262,12 @@ import {
   foldShrunkPartTags2,
   getTagNumberByMessageId2,
   getActiveTagsBySession2
-} from "./index-cf74k5ak.js";
+} from "./index-305y133n.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-kq82mtg0.js";
+} from "./index-11zf2wwc.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode,
@@ -276,7 +276,7 @@ import {
   insertPrimerCandidates,
   promoteSessionFactsDurable,
   embedPromotedFacts
-} from "./index-3h4dp9wb.js";
+} from "./index-1pefp8ar.js";
 import {
   pushNotification2
 } from "./index-x8a7jmkh.js";
@@ -287,16 +287,16 @@ import {
   getMemoriesByProject2,
   getMemoriesByProjects2,
   getMaxMemoryIdForProjects2
-} from "./index-n37sebck.js";
+} from "./index-y4a3nhtk.js";
 import {
   isMarkerCandidateBasisCurrent2,
   invalidateMarkerCandidateBasis2,
   readMarkerCandidateBasis2,
   prepareMarkerCandidateBasis2
-} from "./index-4s3t0nd0.js";
+} from "./index-616rsjrv.js";
 import {
   sendStatusNotification2
-} from "./index-s74zqahq.js";
+} from "./index-kc9pn495.js";
 import {
   isCompactionEnabled,
   migrateLegacyAgentEnabledInMemory
@@ -314,7 +314,7 @@ import {
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
-} from "./index-k29z4aqh.js";
+} from "./index-t5pck3ss.js";
 import {
   ensureStorageDirectorySync,
   writeStorageFileAtomicSync
@@ -9032,7 +9032,7 @@ async function promptWithTimeout(client, args, timeoutMs, signal, transport, fir
     if (!activity.monitored || activity.received)
       return;
     silent = true;
-    controller.abort();
+    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();
@@ -9445,6 +9445,152 @@ function normalizeSDKResponse(response, fallback, options) {
   return fallback;
 }
 // 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;
 }
@@ -9515,8 +9661,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 };
 }
@@ -9525,10 +9674,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,
@@ -9544,7 +9708,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) {
@@ -9578,6 +9742,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";
@@ -9732,11 +9907,29 @@ 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();
@@ -9751,7 +9944,13 @@ 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;
       }
@@ -17274,6 +17473,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) {
@@ -17290,23 +17491,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;
@@ -17324,9 +17551,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;
@@ -17337,13 +17571,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)
@@ -17498,7 +17737,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(),
@@ -17514,6 +17754,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
     });
@@ -17627,7 +17871,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 {
@@ -17834,19 +18079,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) => ({
@@ -17856,7 +18101,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 = [];
@@ -17874,7 +18119,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) {
@@ -19327,7 +19572,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);
     }
   }
@@ -19455,6 +19701,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,
@@ -20566,7 +20813,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);
@@ -21516,4 +21763,4 @@ async function executeContextRecomp(deps, options = {}) {
   return (await executeContextRecompWithResult(deps, options)).message;
 }
 
-export { denyTaskRoutingToCallerAgents, buildHiddenAgentRegistrations, buildZenReadAgentRegistrations, buildHiddenAgentConfig, getMagicContextBuiltinCommands, formatConfigParseStatusLine, claimConfigParseFailuresOnce, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, resolveLegacyConfigSources, migrateMagicContextConfigLocations, getProtectedTokensTierOverrides, loadPluginConfigDetailed, historianRunConfig, dreamerRunConfig, pluginConfigReader, currentPluginConfigReader, withLiveDreamerOutputCap, createDreamerOutputCapSampler, COMPARTMENT_AGENT_SYSTEM_PROMPT, HISTORIAN_EDITOR_SYSTEM_PROMPT, COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, clampProducerAtomChars, producerInputTokenLimit, historianProducerReserve, producerPromptFailureReason, DREAMER_AGENT, DREAMER_RETROSPECTIVE_AGENT, DREAMER_PRIMER_INVESTIGATOR_AGENT, DREAMER_MEMORY_MAPPER_AGENT, DREAMER_CLASSIFIER_AGENT, DREAMER_DOCS_AGENT, DREAMER_REVIEWER_AGENT, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getUncoveredCompartmentEndsThrough, providerResponseFailed, isSuccessfulProviderCompletion, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, cancelAutoSearchWork, 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, createDbLkgPersistence, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, validateAnthropicReasoningRuns, validateLkgSeam, replayLkg, coldStartRawServedIndex, coldStartUncapturedReplay, noteUncertifiedNormalLkg, hasProcessLocalLkgProof, lkgDirtyRevision, rememberLkgDirtyRevision, readPersistedLkgUntaggedInputIds, persistLkgUntaggedInputIds, noteLkgRecoveryPrefix, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgRecoveryReplayUnproven, lkgRecoveryEntryUnproven, registerLkgPersistence, 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, createChildSessionWithFence, HiddenCompletionRefusal, DreamerProviderOutputFailureError, withDreamerModelCooldown, providerOutputFailureFromInvalidManifest, 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, recordPromptSessionError, createPromptAsyncTransport, CTX_NOTE_LIGHT_DESCRIPTION, ACTIVE_TOOL_IDS, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, setKeepSubagents, teardownChildSession, getCompartmentEvents, runTokenLog, formatRunTokenLog, buildMagicContextSection, getMuralIdentity, getMural, modelKeyAcceptsImages, resolveMuralWire, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, prepareCompactionMarkerCandidates, removeMcOwnedCompactionMarkers, MARKER_SUMMARY_TEXT, markerUpdateDefinitelyDidNotCut, applyDeferredCompactionMarker, removeCompactionMarkerForSession, checkCompactionMarkerConsistency, 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, resolveHiddenCompletionExecutor, createV1HiddenCompletionExecutor, readCoordinateGeneration, readCoordinateRebaseNotice, formatCoordinateRebaseNotice, rebaseSessionCoordinatesAsync, EMPTY_READ_REPLY, noteTouchedAt, renderGlance, renderNotesById, formatWriteReply, observeNoteNudgeServe, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, resetNoteNudgeCooldownOnly, clearNoteNudgeTriggerOnly, omitIncompleteFileTokenTotals, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, noteTransformPassForExactOrdinalReads, runCompartmentAgent, snapRangeToCompartments, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, executeContextRecomp };
+export { denyTaskRoutingToCallerAgents, buildHiddenAgentRegistrations, buildZenReadAgentRegistrations, buildHiddenAgentConfig, getMagicContextBuiltinCommands, formatConfigParseStatusLine, claimConfigParseFailuresOnce, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, resolveLegacyConfigSources, migrateMagicContextConfigLocations, getProtectedTokensTierOverrides, loadPluginConfigDetailed, historianRunConfig, dreamerRunConfig, pluginConfigReader, currentPluginConfigReader, withLiveDreamerOutputCap, createDreamerOutputCapSampler, COMPARTMENT_AGENT_SYSTEM_PROMPT, HISTORIAN_EDITOR_SYSTEM_PROMPT, COMPARTMENT_STRUCTURAL_SYSTEM_PROMPT, clampProducerAtomChars, producerInputTokenLimit, historianProducerReserve, producerPromptFailureReason, DREAMER_AGENT, DREAMER_RETROSPECTIVE_AGENT, DREAMER_PRIMER_INVESTIGATOR_AGENT, DREAMER_MEMORY_MAPPER_AGENT, DREAMER_CLASSIFIER_AGENT, DREAMER_DOCS_AGENT, DREAMER_REVIEWER_AGENT, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getUncoveredCompartmentEndsThrough, providerResponseFailed, isSuccessfulProviderCompletion, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, cancelAutoSearchWork, 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, createDbLkgPersistence, resolveLkgModelKeys, createLkgEntryProjector, captureLkgSlot, validateAnthropicReasoningRuns, validateLkgSeam, replayLkg, coldStartRawServedIndex, coldStartUncapturedReplay, noteUncertifiedNormalLkg, hasProcessLocalLkgProof, lkgDirtyRevision, rememberLkgDirtyRevision, readPersistedLkgUntaggedInputIds, persistLkgUntaggedInputIds, noteLkgRecoveryPrefix, readLkgRecoveryPrefix, noteLkgHealthyPrefix, lkgRecoveryReplayUnproven, lkgRecoveryEntryUnproven, registerLkgPersistence, 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, createChildSessionWithFence, HiddenCompletionRefusal, DreamerProviderOutputFailureError, withDreamerModelCooldown, providerOutputFailureFromInvalidManifest, 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, recordPromptSessionError, createPromptAsyncTransport, CTX_NOTE_LIGHT_DESCRIPTION, ACTIVE_TOOL_IDS, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, setKeepSubagents, teardownChildSession, getCompartmentEvents, runTokenLog, formatRunTokenLog, buildMagicContextSection, getMuralIdentity, getMural, modelKeyAcceptsImages, resolveMuralWire, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getOpenCodeDbPath, compareOpenCodeMessagesByCanonicalOrder, prepareCompactionMarkerCandidates, removeMcOwnedCompactionMarkers, MARKER_SUMMARY_TEXT, markerUpdateDefinitelyDidNotCut, applyDeferredCompactionMarker, removeCompactionMarkerForSession, checkCompactionMarkerConsistency, 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, resolveHiddenCompletionExecutor, createV1HiddenCompletionExecutor, readCoordinateGeneration, readCoordinateRebaseNotice, formatCoordinateRebaseNotice, rebaseSessionCoordinatesAsync, EMPTY_READ_REPLY, noteTouchedAt, renderGlance, renderNotesById, formatWriteReply, observeNoteNudgeServe, onNoteTrigger, peekNoteNudgeText, markNoteNudgeDelivered, clearNoteNudgeTriggerAndCooldown, resetNoteNudgeCooldownOnly, clearNoteNudgeTriggerOnly, omitIncompleteFileTokenTotals, describeBoundaryDiagnostics, RECOVERY_NO_HEAD_LIMIT, deriveProtectedTailTokenTarget, selectPerRunCap, resolveOpenCodeProtectedTailBoundary, resolveWrapupProtectedTailBoundary, getRawHistoryEligibility, hasRunnableCompartmentWindow, recordHighPressureNoEligibleHead, noteTransformPassForExactOrdinalReads, runCompartmentAgent, snapRangeToCompartments, getActiveCompartmentRun, markActiveCompartmentRunPublished, registerActiveCompartmentRun, startCompartmentAgent, executeContextRecomp };