@cortexkit/pi-magic-context 0.49.19 → 0.49.20

package/dist/index.js

@@ -18,7 +18,7 @@ import {
   log2,
   sessionLog2,
   flushLogger2
-} from "./index-7bqrfyny.js";
+} from "./index-fgs78jyd.js";
 import {
   COMPACTION_ENABLED_PATH,
   isDreamerRunnable,
@@ -249,7 +249,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-ek9zvs4f.js";
+} from "./index-jt0g3hn0.js";
 import"./index-4knyh1kt.js";
 import {
   canonicalModelIdentity,
@@ -290,7 +290,7 @@ import {
   openCurrentDatabase,
   openDatabaseAsync,
   closeDatabase
-} from "./index-sqt2haap.js";
+} from "./index-mtvvhcw4.js";
 import {
   pruneMissingProjectIdentities,
   setHomeProjectPermission,
@@ -302,7 +302,7 @@ import {
   resolveProjectIdentityForSession,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-g7p75667.js";
+} from "./index-p63nwn5v.js";
 import {
   detectThinkingBindingMismatch,
   detectLatestTurnThinkingMismatch,
@@ -396,6 +396,7 @@ import {
   addProcessedImageStrippedIds,
   getPendingCompactionMarkerState,
   getCompactionMarkerHealth,
+  loadPostprocessReplaySnapshot,
   clearPendingCompactionMarkerStateIf,
   getPendingPiCompactionMarkerState,
   setPendingPiCompactionMarkerState,
@@ -462,7 +463,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-wveb51es.js";
+} from "./index-zhwwp8zz.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -549,7 +550,7 @@ import {
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2
-} from "./index-rhprywn6.js";
+} from "./index-bttctq07.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -561,7 +562,7 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./index-1kcfwk9c.js";
+} from "./index-my0dn413.js";
 import {
   inRootAsyncContext2,
   Database2,
@@ -574,7 +575,7 @@ import {
   isTransientSqliteError2,
   withAsyncPrivilegedWriter2,
   indexCoordinationInput2
-} from "./index-rrwv9y2k.js";
+} from "./index-hws5f0z9.js";
 import {
   stableStringify,
   closeQuietly,
@@ -582,14 +583,15 @@ import {
   observeTemporalDecisions,
   freezeTemporalDecisions,
   tagIdentityRevisionKey
-} from "./index-jrap43gc.js";
+} from "./index-w1avzkdt.js";
 import {
   piHarnessKindFromExecutable
-} from "./index-apgwdby5.js";
+} from "./index-n4wyxcgr.js";
 import {
   BoundedSessionMap,
   LkgRecoveryFenceError,
   clearLkgFenceProcessState,
+  takeLkgRecoveryLockSweepPage,
   lkgFenceRequiresRebuild,
   lkgRecoveryFenceUnclean,
   ownsLkgDirtyFence,
@@ -611,7 +613,7 @@ import {
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./index-ym6nh2gk.js";
+} from "./index-vdy273xw.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -621,24 +623,27 @@ import {
   claimOpenCodeDbDiagnosticOnce
 } from "./index-8976mezv.js";
 import"./index-399p688g.js";
+import {
+  createWorkerShutdown
+} from "./index-54wmg4rj.js";
 import {
   runSessionWarmupWorker,
   RAW_SUMMARY_TEXT_MAX_CHARS2
-} from "./index-vktahpdj.js";
+} from "./index-rfyvax95.js";
 import {
   formatSynapseLaneDescriptor
-} from "./index-d8gc0112.js";
-import"./index-yygsh681.js";
+} from "./index-jxjr7kz9.js";
+import"./index-rgfb753z.js";
 import {
-  buildCanonicalChunkTextFromFts,
-  buildCompartmentSummaryFallbackText,
-  canonicalizeInMemoryChunkTextForEmbedding,
-  chunkCanonicalText,
-  chunkEmbeddingWindowsAreCurrent,
-  replaceCompartmentChunkEmbeddings,
-  deleteChunkEmbedBackoffForSession,
-  chunkWindowSourceKey
-} from "./index-xnch62s6.js";
+  buildCanonicalChunkTextFromFts2,
+  buildCompartmentSummaryFallbackText2,
+  canonicalizeInMemoryChunkTextForEmbedding2,
+  chunkCanonicalText2,
+  chunkEmbeddingWindowsAreCurrent2,
+  replaceCompartmentChunkEmbeddings2,
+  deleteChunkEmbedBackoffForSession2,
+  chunkWindowSourceKey2
+} from "./index-5n5zxs8e.js";
 import {
   recordSessionProjectIdentity,
   GIT_SWEEP_LEASE_RENEWAL_MS,
@@ -647,7 +652,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-svgkv4g2.js";
+} from "./index-qerzchrs.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -673,7 +678,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-vmcgew7x.js";
+} from "./index-v2epyzbm.js";
 import {
   rememberV1HiddenRun
 } from "./index-6x556c2q.js";
@@ -688,7 +693,7 @@ import {
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-msqrs4nf.js";
+} from "./index-5vgt1zeh.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -738,7 +743,7 @@ import {
   normalizeVerificationFiles,
   indexCommitsForProject,
   embedUnembeddedCommits
-} from "./index-58mj0dzc.js";
+} from "./index-af9t637y.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -762,18 +767,20 @@ import {
   setMemoryClassification2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./index-e1rza8gp.js";
+} from "./index-dzem6gn9.js";
 import {
   invalidateMemory2
 } from "./index-yhzhdp3m.js";
 import {
   pushNotification2
 } from "./index-q1yc6bs0.js";
-import"./index-2mmy81qt.js";
+import {
+  getCachedLocalEmbeddingPooling
+} from "./index-e19qtjj0.js";
 import {
   cosineSimilarity
-} from "./index-z2rkv0mb.js";
-import"./index-qpq6w67c.js";
+} from "./index-b8am7tns.js";
+import"./index-6kb2xpw7.js";
 import {
   DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS,
   buildHiddenAgentRegistrations,
@@ -795,10 +802,10 @@ import {
   drainPiTagSnapshotSession,
   assertPiTagSnapshotReady,
   ensurePiTagSnapshotReady
-} from "./index-rc1dez8m.js";
-import"./index-f18ec69t.js";
+} from "./index-kqb3d8bs.js";
+import"./index-jn44h81p.js";
 import"./index-1cvyaw9a.js";
-import"./index-dtp1efvf.js";
+import"./index-tb3d9trm.js";
 import {
   __toESM
 } from "./index-22jkk6wg.js";
@@ -814,7 +821,7 @@ import {
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
-} from "./index-d4dt19md.js";
+} from "./index-hqw0rt9k.js";
 import {
   setStoragePrivatePermissionEnforcement,
   ensureStorageDirectorySync,
@@ -1207,6 +1214,9 @@ function resolveHarnessBlock(container, harness) {
   const selected = harness === "omp" ? container?.omp ?? container?.pi : container?.[harness];
   return asRecord(selected);
 }
+function sourceHarness(container, harness) {
+  return harness === "omp" && container?.omp == null ? "pi" : harness;
+}
 function normalizeModelEntry(entry, harness) {
   if (typeof entry === "string") {
     const model = readString(entry);
@@ -1253,13 +1263,19 @@ function resolveHistorianModel(config, harness) {
   const block = resolveHarnessBlock(historian, harness);
   if (!block)
     return { fallbacks: [] };
+  const source = `historian.${sourceHarness(historian, harness)}`;
+  const primary = resolvePrimaryEntry({
+    entry: block.model,
+    defaultQualifier: block[harness === "opencode" ? "variant" : "thinking_level"],
+    harness
+  });
+  const fallbacks = resolveFallbackEntries(block.fallback_models, harness);
   return {
-    primary: resolvePrimaryEntry({
-      entry: block.model,
-      defaultQualifier: block[harness === "opencode" ? "variant" : "thinking_level"],
-      harness
-    }),
-    fallbacks: resolveFallbackEntries(block.fallback_models, harness)
+    primary: primary ? { ...primary, sourceConfigKey: `${source}.model` } : undefined,
+    fallbacks: fallbacks.map((entry) => ({
+      ...entry,
+      sourceConfigKey: `${source}.fallback_models`
+    }))
   };
 }
 function resolveDreamerTaskModel(args) {
@@ -1278,15 +1294,25 @@ function resolveDreamerTaskModel(args) {
   const taskQualifier = taskBlock?.[args.harness === "opencode" ? "variant" : "thinking_level"];
   const harnessQualifier = harnessBlock[args.harness === "opencode" ? "variant" : "thinking_level"] ?? normalizeModelEntry(harnessBlock.model, args.harness)?.qualifier;
   const taskHasModel = taskBlock !== undefined && hasOwn(taskBlock, "model");
+  const taskHasFallbacks = taskBlock !== undefined && hasOwn(taskBlock, "fallback_models");
   const primarySource = taskHasModel ? taskBlock?.model : harnessBlock.model;
-  const fallbackSource = taskBlock !== undefined && hasOwn(taskBlock, "fallback_models") ? taskBlock.fallback_models : harnessBlock.fallback_models;
+  const fallbackSource = taskHasFallbacks ? taskBlock?.fallback_models : harnessBlock.fallback_models;
+  const source = `dreamer.${sourceHarness(dreamer, args.harness)}`;
+  const primary = resolvePrimaryEntry({
+    entry: primarySource,
+    defaultQualifier: taskQualifier ?? harnessQualifier,
+    harness: args.harness
+  });
+  const fallbacks = resolveFallbackEntries(fallbackSource, args.harness);
   return {
-    primary: resolvePrimaryEntry({
-      entry: primarySource,
-      defaultQualifier: taskQualifier ?? harnessQualifier,
-      harness: args.harness
-    }),
-    fallbacks: resolveFallbackEntries(fallbackSource, args.harness),
+    primary: primary ? {
+      ...primary,
+      sourceConfigKey: taskHasModel ? `${source}.tasks.${args.task}.model` : `${source}.model`
+    } : undefined,
+    fallbacks: fallbacks.map((entry) => ({
+      ...entry,
+      sourceConfigKey: taskHasFallbacks ? `${source}.tasks.${args.task}.fallback_models` : `${source}.fallback_models`
+    })),
     schedule: readString(schedulingTask?.schedule),
     timeoutMinutes: typeof taskBlock?.timeout_minutes === "number" ? taskBlock.timeout_minutes : undefined,
     promotionThreshold: typeof schedulingTask?.promotion_threshold === "number" ? schedulingTask.promotion_threshold : undefined
@@ -1306,6 +1332,7 @@ function buildDreamTaskRuntimeConfigs(dreamer, harness, language, smartNotesEnab
       schedule: resolved.schedule ?? "",
       model: resolved.primary,
       fallbackModels: resolved.fallbacks,
+      modelConfigKey: resolved.primary?.sourceConfigKey ?? resolved.fallbacks[0]?.sourceConfigKey,
       thinkingLevel: harness === "pi" ? resolved.primary?.qualifier : undefined,
       language,
       timeoutMinutes: resolved.timeoutMinutes ?? 20,
@@ -3520,7 +3547,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.19",
+  version: "0.49.20",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -4961,7 +4988,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();
@@ -5374,6 +5401,152 @@ function normalizeSDKResponse(response, fallback, options) {
   return fallback;
 }
 // ../plugin/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;
 }
@@ -5444,8 +5617,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 };
 }
@@ -5454,10 +5630,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,
@@ -5473,7 +5664,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) {
@@ -5501,6 +5692,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";
@@ -5655,11 +5857,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();
@@ -5674,7 +5894,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;
       }
@@ -9238,6 +9464,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) {
@@ -9254,23 +9482,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;
@@ -9288,9 +9542,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;
@@ -9301,13 +9562,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)
@@ -9462,7 +9728,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(),
@@ -9478,6 +9745,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
     });
@@ -9591,7 +9862,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 {
@@ -10414,7 +10686,9 @@ async function compressOneChunk(args, chunk, sliceMs, signal) {
         status: "completed",
         tokens: run.output.usage,
         providerId: run.output.providerId,
-        modelId: run.output.modelId
+        modelId: run.output.modelId,
+        attemptedModel: args.model,
+        configuredModels: args.fallbackModels
       });
     }
     stage = "apply";
@@ -10606,6 +10880,7 @@ async function runHiddenSingleShotPrompt(args) {
       });
   }).catch(() => {});
   const handle = await raceWithSignal(opening, args.signal);
+  let completion;
   args.onOpened?.(handle.id);
   let promptSettled = false;
   try {
@@ -10627,7 +10902,10 @@ async function runHiddenSingleShotPrompt(args) {
       ...args.signal ? { signal: args.signal } : {},
       fallbackModels: args.fallbackModels,
       callContext: args.callContext,
-      fetchOutput: () => args.executor.collect(handle, 50),
+      fetchOutput: async () => {
+        completion = await args.executor.collect(handle, 50);
+        return completion;
+      },
       validateOutput: (completion) => {
         const tokens = completion.tokenLog ?? runTokenLog(undefined);
         sessionLog2(args.parentSessionId ?? "dreamer", `${args.callContext} response_chars=${(completion.text ?? completion.reasoning ?? "").length} ${formatRunTokenLog(tokens)}`);
@@ -10643,6 +10921,12 @@ async function runHiddenSingleShotPrompt(args) {
     promptSettled = true;
     return { validated: run.validated, completion: run.output, childSessionId: handle.id };
   } catch (error) {
+    const configuredModel = toModelEntry(args.model);
+    annotateSubagentInvocationError(error, {
+      attemptedModel: completion?.attemptedModel ?? handle.attemptedModel ?? configuredModel?.model,
+      modelConfigKey: completion?.modelConfigKey ?? handle.modelConfigKey ?? configuredModel?.sourceConfigKey,
+      ...completion?.hostError === undefined ? {} : { hostError: completion.hostError }
+    });
     if (args.onFailureOutput) {
       let timer;
       try {
@@ -10970,6 +11254,8 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
       startedAt,
       status: params.status,
       messages: params.messages,
+      attemptedModel: args.model,
+      configuredModels: args.fallbackModels,
       error: params.error
     });
   };
@@ -11757,6 +12043,8 @@ function recordInvocation(args, startedAt, params) {
     startedAt,
     status: params.status,
     messages: params.messages,
+    attemptedModel: args.model,
+    configuredModels: args.fallbackModels,
     ...params.completion && !params.completion.messages ? {
       tokens: params.completion.usage,
       providerId: params.completion.providerId,
@@ -13292,6 +13580,8 @@ Remember: output only the JSON object described by the system prompt.`;
       startedAt,
       status: params.status,
       messages: params.messages,
+      attemptedModel: args.model,
+      configuredModels: args.fallbackModels,
       error: params.error
     });
   };
@@ -14039,6 +14329,8 @@ async function confirmReadOnly(args, noteId, content, surfaceCondition, leaseSig
       startedAt,
       status: params.status,
       messages: params.messages,
+      attemptedModel: args.model,
+      configuredModels: args.fallbackModels,
       error: params.error
     });
   };
@@ -14953,12 +15245,14 @@ function recordInvocation2(args, startedAt, params) {
   recordChildInvocation({
     db: args.db,
     parentSessionId: args.parentSessionId,
-    harness: "opencode",
+    harness: args.hiddenCompletionExecutor?.capabilities.harness ?? "opencode",
     subagent: "dreamer",
     task: "map-memories",
     startedAt,
     status: params.status,
     messages: params.messages,
+    attemptedModel: args.model,
+    configuredModels: args.fallbackModels,
     error: params.error
   });
 }
@@ -15583,12 +15877,14 @@ function recordInvocation3(args, startedAt, params) {
   recordChildInvocation({
     db: args.db,
     parentSessionId: args.parentSessionId,
-    harness: "opencode",
+    harness: args.hiddenCompletionExecutor?.capabilities.harness ?? "opencode",
     subagent: "dreamer",
     task: "refresh-primers",
     startedAt,
     status: params.status,
     messages: params.messages,
+    attemptedModel: args.model,
+    configuredModels: args.fallbackModels,
     error: params.error
   });
 }
@@ -17162,12 +17458,14 @@ function recordInvocation4(args, startedAt, params) {
   recordChildInvocation({
     db: args.db,
     parentSessionId: args.parentSessionId,
-    harness: "opencode",
+    harness: args.hiddenCompletionExecutor?.capabilities.harness ?? "opencode",
     subagent: "dreamer",
     task: args.forceBroad ? "verify-broad" : "verify",
     startedAt,
     status: params.status,
     messages: params.messages,
+    attemptedModel: args.model,
+    configuredModels: args.fallbackModels,
     error: params.error
   });
 }
@@ -18043,6 +18341,25 @@ async function runRetrospectiveTask(config, ctx, helpers) {
   let childSessionId = null;
   let hiddenHandle = null;
   let promptSettled = false;
+  let invocationRecorded = false;
+  const recordInvocation = (status, messages, error) => {
+    if (!parent || !childSessionId || invocationRecorded)
+      return;
+    invocationRecorded = true;
+    recordChildInvocation({
+      db,
+      parentSessionId: parent,
+      harness: deps.hiddenCompletionExecutor?.capabilities.harness ?? "opencode",
+      subagent: "dreamer",
+      task: config.task,
+      startedAt: helpers.invocationStartedAt,
+      status,
+      messages,
+      attemptedModel: config.model,
+      configuredModels: config.fallbackModels,
+      error
+    });
+  };
   try {
     if (deps.hiddenCompletionExecutor) {
       hiddenHandle = await deps.hiddenCompletionExecutor.open({
@@ -18127,18 +18444,8 @@ async function runRetrospectiveTask(config, ctx, helpers) {
       return { ...run, output };
     };
     const finish = (run, watermark) => {
-      if (parent && run) {
-        recordChildInvocation({
-          db,
-          parentSessionId: parent,
-          harness: "opencode",
-          subagent: "dreamer",
-          task: config.task,
-          startedAt: helpers.invocationStartedAt,
-          status: "completed",
-          messages: run.output
-        });
-      }
+      if (run)
+        recordInvocation("completed", run.output);
       return completedWindow(watermark);
     };
     const userLines = renderGateUserLines(messages);
@@ -18231,6 +18538,7 @@ async function runRetrospectiveTask(config, ctx, helpers) {
     log2(`[dreamer] retrospective: flagged=${flagged.length} learnings=${learnings.length} memory=${applied.memoryWritten} observations=${applied.observationsInserted} dropped=${applied.observationsDropped} rejected=${applied.rejected.length}`);
     return finish(deepenRun, scan.maxScannedTs);
   } catch (error) {
+    recordInvocation(abortController.signal.aborted ? "aborted" : failedInvocationStatus(error), undefined, error);
     if (!detectOverflow(error).isOverflow)
       throw error;
     const failures = (activeOverflow?.failures ?? 0) + 1;
@@ -18302,6 +18610,25 @@ async function runAgenticTask(config, ctx, helpers) {
   let childSessionId = null;
   let promptSettled = false;
   let expiredArchived = 0;
+  let invocationRecorded = false;
+  const recordInvocation = (status, messages, error) => {
+    if (!parent || !childSessionId || invocationRecorded)
+      return;
+    invocationRecorded = true;
+    recordChildInvocation({
+      db,
+      parentSessionId: parent,
+      harness: deps.hiddenCompletionExecutor?.capabilities.harness ?? "opencode",
+      subagent: "dreamer",
+      task,
+      startedAt: invocationStartedAt,
+      status,
+      messages,
+      attemptedModel: config.model,
+      configuredModels: config.fallbackModels,
+      error
+    });
+  };
   try {
     let curateMemories;
     let curateCategory;
@@ -18390,6 +18717,9 @@ async function runAgenticTask(config, ctx, helpers) {
           callContext: `dreamer:${task}`,
           metadata: { tokenBudget: config.tokenBudget, onBudgetUpdate },
           allowEmpty: task === "curate",
+          onOpened: (sessionId) => {
+            childSessionId = sessionId;
+          },
           model: config.model,
           fallbackModels: config.fallbackModels,
           language: task === "curate" ? config.language ?? deps.language : undefined,
@@ -18505,18 +18835,7 @@ async function runAgenticTask(config, ctx, helpers) {
       helpers.reportProgress(curateRefused, curateRefused);
       log2(`[dreamer] curate safety summary: refused=${curateRefused}`);
     }
-    if (parent) {
-      recordChildInvocation({
-        db,
-        parentSessionId: parent,
-        harness: "opencode",
-        subagent: "dreamer",
-        task,
-        startedAt: invocationStartedAt,
-        status: "completed",
-        messages: run.output
-      });
-    }
+    recordInvocation("completed", run.output);
     if (task === "maintain-docs" && docsHashes && changes) {
       try {
         if (run.validated === "[]") {
@@ -18570,6 +18889,9 @@ async function runAgenticTask(config, ctx, helpers) {
         }
       } : {}
     };
+  } catch (error) {
+    recordInvocation(abortController.signal.aborted ? "aborted" : failedInvocationStatus(error), undefined, error);
+    throw error;
   } finally {
     heartbeat.stop();
     if (childSessionId)
@@ -19355,6 +19677,11 @@ async function indexSingleMessageOffThread(db, sessionId, message) {
   return result.inserted;
 }
 async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, options = {}) {
+  if (getHarness2() === "opencode" || getHarness2() === "opencode2")
+    options = {
+      ...options,
+      fenceLockNames: options.fenceLockNames ?? takeLkgRecoveryLockSweepPage()
+    };
   if (getHarness2() === "opencode2")
     openSource = () => new Database2(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"), {
       readonly: true,
@@ -20580,7 +20907,8 @@ class PiSubagentRunner {
         ...options,
         model: attempt?.model,
         thinkingLevel: attempt?.qualifier,
-        fallbackModels: undefined
+        fallbackModels: undefined,
+        accountingModelConfigKey: typeof attempt === "object" ? attempt.sourceConfigKey ?? options.accountingModelConfigKey : options.accountingModelConfigKey
       };
       const result = await this.runOnce(attemptOptions, runMode, index === 0 ? primaryModelRef : undefined);
       if (result.ok)
@@ -20635,6 +20963,8 @@ class PiSubagentRunner {
         subagent: options.accountingSubagent ?? inferAccountingSubagent(options.agent),
         task: options.accountingTask ?? null,
         startedAt: startTime,
+        attemptedModel: modelRef,
+        modelConfigKey: options.accountingModelConfigKey,
         status: result.ok ? "completed" : result.meta?.failureClass === ZEN_FREE_TIER_FAILURE ? "failed" : result.reason === "abort" ? "aborted" : result.reason === "timeout" ? "timed_out" : result.reason === "no_assistant" || result.reason === "truncated" ? "empty" : "failed",
         messages,
         providerId: hasProvider ? modelRef?.slice(0, providerSeparator) : undefined,
@@ -21184,10 +21514,11 @@ class PiSubagentRunner {
         if (settled)
           return;
         terminateChild(child);
+        const silentCut = options.signal?.reason instanceof ModelProducedNoOutputError ? options.signal.reason : undefined;
         settle({
           ok: false,
-          reason: "abort",
-          error: "pi subagent aborted by caller",
+          reason: silentCut ? "timeout" : "abort",
+          error: silentCut?.message ?? "pi subagent aborted by caller",
           durationMs: Date.now() - startTime
         });
       };
@@ -21593,6 +21924,28 @@ function terminateChild(child) {
   }
 }
 
+// src/dreamer/model-activity.ts
+function piEventShowsModelOutput(event) {
+  if (!isRecord(event))
+    return false;
+  if (event.type !== "message_update" && event.type !== "message_end")
+    return false;
+  const update = event.assistantMessageEvent;
+  if (event.type === "message_update" && isRecord(update)) {
+    if (update.type === "toolcall_start")
+      return true;
+    if (["text_delta", "thinking_delta", "toolcall_delta"].includes(String(update.type)) && typeof update.delta === "string" && update.delta.length > 0)
+      return true;
+  }
+  const message = event.message;
+  if (!isRecord(message) || message.role !== "assistant")
+    return false;
+  if (Array.isArray(message.content) && message.content.some((part) => isRecord(part) && (part.type === "toolCall" || part.type === "text" && typeof part.text === "string" && part.text.length > 0 || part.type === "thinking" && typeof part.thinking === "string" && part.thinking.length > 0)))
+    return true;
+  const usage = message.usage;
+  return isRecord(usage) && ["input", "output", "cacheRead", "cacheWrite"].some((key) => typeof usage[key] === "number" && usage[key] > 0);
+}
+
 // src/dreamer/primer-raw-provider-pi.ts
 import { join as join13 } from "node:path";
 
@@ -22275,7 +22628,7 @@ function extractPiTextContent(content) {
 }
 
 // src/dreamer/index.ts
-var warnedUnknownModels = new Set;
+var warnedUnknownModels2 = new Set;
 var modelAvailability = new WeakMap;
 function validatePiDreamerModels(tasks, registry, harness = "pi") {
   let resolved = modelAvailability.get(registry);
@@ -22297,9 +22650,9 @@ function validatePiDreamerModels(tasks, registry, harness = "pi") {
       }
       if (available)
         return true;
-      if (!warnedUnknownModels.has(model)) {
+      if (!warnedUnknownModels2.has(model)) {
         log2(`[dreamer] WARNING: dropping Pi model not found: ${model}`);
-        warnedUnknownModels.add(model);
+        warnedUnknownModels2.add(model);
       }
       return false;
     });
@@ -22531,6 +22884,8 @@ function createPiDreamerClient(opts, onAdjunctsRefreshNeeded = opts.onAdjunctsRe
       const systemPrompt = extractSystemPrompt(args);
       const perTaskModel = extractBodyModel(args);
       const requestedAgent = extractBodyAgent(args) ?? "magic-context-dreamer";
+      const accountingTask = accountingTaskFromTitle(dreamSession.title);
+      const taskConfig = accountingTask ? buildDreamTaskRuntimeConfigs(getDreamerConfig(), opts.harness).find((entry) => entry.task === accountingTask) : undefined;
       const controller = new AbortController;
       let controllers = dreamAbortControllers.get(opts.registrationOwner);
       if (!controllers) {
@@ -22538,7 +22893,12 @@ function createPiDreamerClient(opts, onAdjunctsRefreshNeeded = opts.onAdjunctsRe
         dreamAbortControllers.set(opts.registrationOwner, controllers);
       }
       controllers.add(controller);
+      noteModelActivityMonitored(args.signal ?? undefined);
       const runPromise = runner.run({
+        onProgress: (progress) => {
+          if (progress.type === "raw_event" && piEventShowsModelOutput(progress.event))
+            noteModelOutputReceived(args.signal ?? undefined);
+        },
         agent: requestedAgent,
         systemPrompt,
         userMessage,
@@ -22551,15 +22911,9 @@ function createPiDreamerClient(opts, onAdjunctsRefreshNeeded = opts.onAdjunctsRe
         maxOutputTokens: getMaxOutputTokens(),
         accountingSessionId: opts.projectIdentity,
         accountingSubagent: "dreamer",
-        accountingTask: accountingTaskFromTitle(dreamSession.title),
-        tokenBudget: (() => {
-          if (args.tokenBudget !== undefined)
-            return args.tokenBudget;
-          const task = accountingTaskFromTitle(dreamSession.title);
-          if (!task)
-            return;
-          return buildDreamTaskRuntimeConfigs(getDreamerConfig(), opts.harness).find((entry) => entry.task === task)?.tokenBudget;
-        })()
+        accountingTask,
+        accountingModelConfigKey: taskConfig?.modelConfigKey,
+        tokenBudget: args.tokenBudget ?? taskConfig?.tokenBudget
       });
       inFlightDreams.set(runPromise, opts.registrationOwner);
       try {
@@ -23007,6 +23361,13 @@ Unknown task "${requested}".`,
 }
 
 // ../plugin/src/hooks/magic-context/auto-embed-session.ts
+function localPoolingPreflightPending(projectIdentity) {
+  const snapshot = getProjectEmbeddingSnapshot2(projectIdentity);
+  if (snapshot?.provider !== "local")
+    return false;
+  const metadata = getCachedLocalEmbeddingPooling(snapshot.model);
+  return !metadata || metadata.status === "unresolved";
+}
 function embeddingIdentity(projectIdentity) {
   const snapshot = getProjectEmbeddingSnapshot2(projectIdentity);
   return JSON.stringify([
@@ -23027,7 +23388,8 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
     invalidateAutoEmbedSession(sessionId);
     autoEmbedIdentityBySession.set(sessionId, identity);
   }
-  if (autoEmbedAttemptedBySession.has(sessionId) || embedPauseBySession.has(sessionId) || embedRunStateBySession.has(sessionId) || Date.now() < (autoEmbedRetryAfterBySession.get(sessionId) ?? 0))
+  const poolingPreflightPending = localPoolingPreflightPending(deps.projectIdentity);
+  if (embedPauseBySession.has(sessionId) || embedRunStateBySession.has(sessionId) || Date.now() < (autoEmbedRetryAfterBySession.get(sessionId) ?? 0) || autoEmbedAttemptedBySession.has(sessionId) && !poolingPreflightPending)
     return;
   const controller = new AbortController;
   embedRunStateBySession.set(sessionId, controller);
@@ -23037,6 +23399,7 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
     let started = false;
     let reason = "error";
     let registeredIdentity = identity;
+    let poolingPendingAfterRegistration = poolingPreflightPending;
     try {
       await new Promise((resolve) => setTimeout(resolve, 0));
       if (controller.signal.aborted)
@@ -23044,6 +23407,7 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
       await deps.ensureRegistered();
       if (controller.signal.aborted)
         return;
+      poolingPendingAfterRegistration = localPoolingPreflightPending(deps.projectIdentity);
       markActive();
       registeredIdentity = embeddingIdentity(deps.projectIdentity);
       autoEmbedIdentityBySession.set(sessionId, registeredIdentity);
@@ -23051,7 +23415,9 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
       if (controller.signal.aborted || !coverage.enabled)
         return;
       if (coverage.embedded === coverage.total) {
-        complete = true;
+        complete = !poolingPendingAfterRegistration;
+        if (!complete)
+          retryDelay = 60000;
         return;
       }
       const model = getProjectEmbeddingSnapshot2(deps.projectIdentity)?.model;
@@ -23060,8 +23426,11 @@ function maybeAutoEmbedSessionBackfill(deps, sessionId) {
       const outcome = await embedSessionCompartmentChunks2(deps.db, deps.projectIdentity, sessionId, { signal: controller.signal, automatic: true });
       reason = outcome.status;
       const after = await getAutoEmbeddingSessionCoverage2(deps.db, deps.projectIdentity, sessionId);
-      complete = after.enabled && after.embedded === after.total;
-      if (!complete && outcome.status !== "busy" && outcome.status !== "aborted") {
+      complete = after.enabled && after.embedded === after.total && !poolingPendingAfterRegistration;
+      if (poolingPendingAfterRegistration) {
+        retryDelay = 60000;
+        reason = "pooling metadata unavailable";
+      } else if (!complete && outcome.status !== "busy" && outcome.status !== "aborted") {
         retryDelay = 60000;
         if (outcome.status === "nothing" || outcome.status === "done")
           reason = "deferred";
@@ -23334,7 +23703,9 @@ function maybeAutoEmbedPiSession(deps, sessionId, projectDir, projectIdentity) {
   maybeAutoEmbedSessionBackfill({
     db: deps.db,
     projectIdentity,
-    ensureRegistered: () => ensureProjectRegisteredFromPiDirectory(projectDir, deps.db)
+    ensureRegistered: () => ensureProjectRegisteredFromPiDirectory(projectDir, deps.db, {
+      preflightLocalPooling: true
+    })
   }, sessionId);
 }
 
@@ -24348,7 +24719,8 @@ function capturePendingDropEligibility(targets, protectedTagIds) {
         eligible.add(number);
     } else {
       const content = target.getContent?.();
-      if (typeof content === "string" && content.length > `[dropped §${number}§]`.length)
+      const replacement = `[dropped §${number}§]`;
+      if (typeof content === "string" && content.length > replacement.length && target.canSetContent?.(replacement) !== false)
         eligible.add(number);
     }
   }
@@ -24635,12 +25007,16 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
               }
             } else if (target) {
               const replacement = buildReplacementContent(pendingOp.tagId);
+              if (target.canSetContent?.(replacement) === false) {
+                reject("content_unchanged");
+                continue;
+              }
               persistDrop();
               mutations.push(() => {
                 const priorContent = target.getContent?.();
                 const changed = target.setContent(replacement);
-                record(changed);
                 if (changed) {
+                  record(true);
                   const originalCharacters = typeof priorContent === "string" ? priorContent.length : tagById.get(pendingOp.tagId)?.byteSize ?? replacement.length;
                   onTagReduced?.({
                     tagNumber: pendingOp.tagId,
@@ -24731,7 +25107,7 @@ function applyFlushedStatuses(sessionId, db, targets, preloadedTags) {
 
 // ../plugin/src/hooks/magic-context/cache-busting-signals.ts
 function hasReclaimRide(signals) {
-  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory || signals.subagentExecute === true;
+  return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory || signals.subagentExecute === true || signals.executeReclaim === true;
 }
 function prefixMutationPermitted(gate) {
   return !gate.signedThinkingHold || gate.firstRender || gate.idleExpiry || gate.emergency;
@@ -24744,7 +25120,8 @@ var RECLAIM_RIDE_NAMES = [
   "force",
   "explicitFlush",
   "publishedHistory",
-  "subagentExecute"
+  "subagentExecute",
+  "executeReclaim"
 ];
 function reclaimRideLabel(signals) {
   const active = RECLAIM_RIDE_NAMES.filter((name) => signals[name]);
@@ -24977,6 +25354,140 @@ function rearmChannel2AfterMeasuredCollapse(input) {
   return casChannel2NudgeState(input.db, input.sessionId, "delivered", "");
 }
 
+// ../plugin/src/hooks/magic-context/postprocess-read-cache.ts
+var connections = new WeakMap;
+function snapshot(db, sessionId) {
+  const transaction = db;
+  try {
+    if (transaction.inTransaction || transaction.isTransaction) {
+      connections.delete(db);
+      return { version: -1, changes: -1 };
+    }
+  } catch {
+    connections.delete(db);
+    return { version: -1, changes: -1 };
+  }
+  let connection = connections.get(db);
+  if (!connection) {
+    connection = {
+      stamp: db.prepare("SELECT total_changes() AS changes, data_version AS version FROM pragma_data_version"),
+      sessions: new BoundedSessionMap(100)
+    };
+    connections.set(db, connection);
+  }
+  const stamp = connection.stamp.get();
+  const previous = connection.sessions.get(sessionId);
+  if (previous?.version === stamp.version && previous.changes === stamp.changes) {
+    return previous;
+  }
+  const value = { ...stamp };
+  connection.sessions.set(sessionId, value);
+  return value;
+}
+function postprocessReplaySnapshot(db, sessionId) {
+  const state = snapshot(db, sessionId);
+  const replay = state.replay ??= loadPostprocessReplaySnapshot(db, sessionId);
+  return {
+    ...replay,
+    staleReduceStrippedIds: new Set(replay.staleReduceStrippedIds),
+    processedImageStrippedIds: new Set(replay.processedImageStrippedIds),
+    processedImageMarkers: new Map(replay.processedImageMarkers),
+    strippedPlaceholderIds: new Set(replay.strippedPlaceholderIds),
+    hiddenSeamPlaceholderIds: new Set(replay.hiddenSeamPlaceholderIds),
+    mergedReasoningStrippedIds: new Set(replay.mergedReasoningStrippedIds),
+    trailingBlankDecisions: new Map(replay.trailingBlankDecisions),
+    noteNudgeAnchors: structuredClone(replay.noteNudgeAnchors),
+    autoSearchHintDecisions: structuredClone(replay.autoSearchHintDecisions),
+    todoSyntheticAnchor: structuredClone(replay.todoSyntheticAnchor),
+    pendingCompactionMarker: structuredClone(replay.pendingCompactionMarker),
+    compactionMarker: structuredClone(replay.compactionMarker)
+  };
+}
+
+// ../plugin/src/hooks/magic-context/execute-reclaim.ts
+var NAMESPACE2 = "executeReclaim";
+var failedWrites = new WeakMap;
+function readExecuteReclaimState(db, sessionId) {
+  return parseState2(postprocessReplaySnapshot(db, sessionId).executeReclaim);
+}
+function parseState2(lane) {
+  const value = lane;
+  return {
+    heldPasses: typeof value?.heldPasses === "number" ? Math.max(0, value.heldPasses) : 0,
+    floorOrdinal: typeof value?.floorOrdinal === "number" ? value.floorOrdinal : null,
+    floorPromptId: typeof value?.floorPromptId === "string" ? value.floorPromptId : null
+  };
+}
+function writeExecuteReclaimState(db, sessionId, patch) {
+  if (failedWrites.get(db)?.has(sessionId))
+    return false;
+  try {
+    const current = readExecuteReclaimState(db, sessionId);
+    if (JSON.stringify(current) === JSON.stringify({ ...current, ...patch }))
+      return true;
+    if (!updateReplayDocument(db, sessionId, (doc) => {
+      const previous = parseState2(doc[NAMESPACE2]);
+      const state = { ...previous, ...patch };
+      if (JSON.stringify(previous) === JSON.stringify(state))
+        return false;
+      doc.version = 2;
+      doc[NAMESPACE2] = state;
+      return true;
+    }))
+      throw new Error("Could not persist execute reclaim state");
+    return true;
+  } catch (error) {
+    let failed = failedWrites.get(db);
+    if (!failed)
+      failedWrites.set(db, failed = new Set);
+    failed.add(sessionId);
+    sessionLog2(sessionId, `execute reclaim state persistence failed; retaining existing policy: ${String(error)}`);
+    return false;
+  }
+}
+function clearExecuteReclaimState(db, sessionId) {
+  writeExecuteReclaimState(db, sessionId, {
+    heldPasses: 0,
+    floorOrdinal: null,
+    floorPromptId: null
+  });
+}
+function maintainExecuteFloorMark(db, sessionId, promptId, belowExecute) {
+  failedWrites.get(db)?.delete(sessionId);
+  const state = readExecuteReclaimState(db, sessionId);
+  if (state.floorOrdinal !== null && (belowExecute || promptId !== null && promptId !== state.floorPromptId)) {
+    writeExecuteReclaimState(db, sessionId, { floorOrdinal: null, floorPromptId: null });
+  }
+}
+function estimateExecuteReclaimTokens(args) {
+  const eligible = capturePendingDropEligibility(args.targets, args.protectedTagIds);
+  const queued = new Set(args.pendingOps.filter((op) => op.operation === "drop").map((op) => op.tagId));
+  const candidates = args.tags.filter((tag) => tag.status === "active" && queued.has(tag.tagNumber) && eligible.has(tag.tagNumber));
+  const preparationTargets = new Map;
+  for (const tag of candidates) {
+    const target = args.targets.get(tag.tagNumber);
+    if (target?.prepareDrop)
+      preparationTargets.set(tag.tagNumber, target);
+  }
+  const prepared = preparationTargets.size === 0 ? new Set : args.probePreparation?.(preparationTargets) ?? new Set([...preparationTargets].filter(([, target]) => target.prepareDrop?.() !== false).map(([number]) => number));
+  const seed = sessionDecisionCalibration(args.db, args.sessionId);
+  return candidates.reduce((total, tag) => {
+    if (preparationTargets.has(tag.tagNumber) && !prepared.has(tag.tagNumber))
+      return total;
+    const ratio = tag.type === "tool" ? seed.toolsRatio : seed.proseRatio;
+    return total + Math.max(0, (tag.tokenCount ?? Math.ceil(tag.byteSize / 4)) * ratio);
+  }, 0);
+}
+function originateExecuteReclaim(args) {
+  if (failedWrites.get(args.db)?.has(args.sessionId))
+    return false;
+  const state = readExecuteReclaimState(args.db, args.sessionId);
+  const heldPasses = args.primaryExecute && args.reclaimableTokens > 0 && !args.alreadyBusting ? state.heldPasses + 1 : 0;
+  if (!writeExecuteReclaimState(args.db, args.sessionId, { heldPasses }))
+    return false;
+  return args.primaryExecute && !args.alreadyBusting && !args.summaryCanCome && args.reclaimableTokens > 0 && (args.usableWindow > 0 && args.reclaimableTokens >= args.usableWindow * 0.02 || heldPasses >= 3);
+}
+
 // ../plugin/src/hooks/magic-context/file-token-coverage.ts
 function omitIncompleteFileTokenTotals(db, sessionId, messages, totals) {
   const filesByMessage = new Map;
@@ -25364,7 +25875,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);
     }
   }
@@ -25492,6 +26004,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,
@@ -25873,7 +26386,7 @@ function resolveBoundaryContextLimit(usage, fallbackContextLimit) {
   }
   return 128000;
 }
-function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, inMemoryTail, taggerFloor = 0) {
+function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, inMemoryTail, taggerFloor = 0, liftLivePromptFloor = false) {
   return withRawSessionMessageCache2(() => {
     try {
       const memoryPrimed = inMemoryTail ? primeInMemoryTailRawMessageCache2({
@@ -25903,7 +26416,8 @@ function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThr
         executeThresholdPercentage,
         usage,
         usageSource: "live",
-        taggerFloor
+        taggerFloor,
+        liftLivePromptFloor
       });
       const hasProtectedEligibleHead = boundary.offset < Math.min(boundary.protectedTailStart, boundary.eligibleEndOrdinal);
       if (!hasProtectedEligibleHead) {
@@ -25939,7 +26453,10 @@ function getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThr
 function formatProjectedPostDropPercentage(value) {
   return value === null ? "none" : `${value.toFixed(1)}%`;
 }
-function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, keepReasoningTokens, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection, reclaimRide, eligiblePendingDropTagIds) {
+function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPercentage, executeThresholdPercentage, triggerBudget, keepReasoningTokens, commitClusterTrigger, preloadedActiveTags, contextLimit, inMemoryTail, taggerFloorOverride, reasoningProjection, reclaimRide, eligiblePendingDropTagIds, primaryExecute = false) {
+  if (usage.percentage < executeThresholdPercentage) {
+    writeExecuteReclaimState(db, sessionId, { floorOrdinal: null, floorPromptId: null });
+  }
   if (sessionMeta.compartmentInProgress) {
     sessionLog2(sessionId, `compartment trigger: skipped — historian already in progress (usage=${usage.percentage.toFixed(1)}%)`);
     return { shouldFire: false };
@@ -25992,7 +26509,22 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
       resolvedInMemoryTail = undefined;
     }
   }
-  const tailInfo = getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, resolvedInMemoryTail, taggerFloor);
+  let tailInfo = getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, resolvedInMemoryTail, taggerFloor);
+  const markState = readExecuteReclaimState(db, sessionId);
+  const mark = markState.floorOrdinal;
+  const livePromptOrdinal = tailInfo.boundarySnapshot?.diagnostics?.livePromptFloor.ordinal;
+  let consumedFloorMark = false;
+  if (mark !== null) {
+    const consumed = writeExecuteReclaimState(db, sessionId, {
+      floorOrdinal: null,
+      floorPromptId: null
+    });
+    if (consumed && mark === livePromptOrdinal && markState.floorPromptId === tailInfo.boundarySnapshot?.diagnostics?.livePromptFloor.messageId && usage.percentage >= executeThresholdPercentage) {
+      consumedFloorMark = true;
+      sessionLog2(sessionId, `compartment trigger: live-prompt floor mark consumed at ${mark}`);
+      tailInfo = getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, resolvedInMemoryTail, taggerFloor, true);
+    }
+  }
   if (!tailInfo.hasNewRawHistory) {
     try {
       const lastCompartmentEnd = getLastCompartmentEndMessage(db, sessionId);
@@ -26076,7 +26608,21 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
     return { shouldFire: false };
   }
   if (!tailInfo.hasProtectedEligibleHead || !tailInfo.isMeaningful) {
-    sessionLog2(sessionId, `compartment trigger: not firing at ${usage.percentage.toFixed(1)}% because unsummarized tail from ${tailInfo.nextStartOrdinal} is too small`);
+    let floorOnly = false;
+    const boundary = tailInfo.boundarySnapshot;
+    const floor = boundary?.diagnostics?.livePromptFloor;
+    if (!consumedFloorMark && floor?.ordinal && floor.from > floor.to) {
+      const withoutFloor = getUnsummarizedTailInfo(db, sessionId, triggerBudget, usage, executeThresholdPercentage, contextLimit, resolvedInMemoryTail, taggerFloor, true);
+      floorOnly = withoutFloor.hasProtectedEligibleHead && withoutFloor.isMeaningful;
+      if (floorOnly && primaryExecute && usage.percentage >= executeThresholdPercentage && writeExecuteReclaimState(db, sessionId, {
+        floorOrdinal: floor.ordinal,
+        floorPromptId: floor.messageId ?? null
+      })) {
+        sessionLog2(sessionId, `compartment trigger: live-prompt floor mark set at ${floor.ordinal}`);
+      }
+    }
+    const refusal = floorOnly ? `no eligible head (live-prompt floor at ${floor?.ordinal})` : tailInfo.hasProtectedEligibleHead ? "below meaningfulness" : "no eligible head";
+    sessionLog2(sessionId, `compartment trigger: not firing at ${usage.percentage.toFixed(1)}% — ${refusal}; offset=${tailInfo.nextStartOrdinal} protectedStart=${boundary?.protectedTailStart ?? "none"} eligibleEnd=${boundary?.eligibleEndOrdinal ?? "none"} rawTokens=${tailInfo.trueRawEligibleTokens} chunkTokens=${tailInfo.tokenEstimate}`);
     return { shouldFire: false };
   }
   sessionLog2(sessionId, `compartment trigger: proactive fire at ${usage.percentage.toFixed(1)}% (floor=${proactiveTriggerPercentage}% projected post-drop=${formatProjectedPostDropPercentage(projectedPostDropPercentage)} target=${relativePostDropTarget.toFixed(1)}%)`);
@@ -26245,6 +26791,9 @@ function latestAssistantTurnStart(messages) {
 function latestAssistantTurnMessages(messages) {
   return new Set(messages.slice(latestAssistantTurnStart(messages)));
 }
+function isAnthropicThinkingPart(part, familyRoute) {
+  return isRecord(part) && THINKING_TYPES.has(String(part.type ?? part.kind)) && (familyRoute || isRecord(part.metadata) && isRecord(part.metadata.anthropic));
+}
 function hasActiveAnthropicThinkingTurn(messages, provider, model) {
   const familyRoute = isAnthropicFamilyRoute(provider, model);
   for (const message of messages.slice(latestAssistantTurnStart(messages))) {
@@ -26253,7 +26802,7 @@ function hasActiveAnthropicThinkingTurn(messages, provider, model) {
     const parts = content(message);
     if (!Array.isArray(parts))
       continue;
-    if (parts.some((part) => isRecord(part) && THINKING_TYPES.has(String(part.type ?? part.kind)) && (familyRoute || isRecord(part.metadata) && isRecord(part.metadata.anthropic))))
+    if (parts.some((part) => isAnthropicThinkingPart(part, familyRoute)))
       return true;
   }
   return false;
@@ -28022,7 +28571,8 @@ ${trimmedBody}…
   return wrapped;
 }
 function selectAutoSearchResults(results, threshold) {
-  return results.filter((result) => (result.relevanceScore ?? result.score) >= threshold);
+  const relevance = (result) => result.relevanceScore ?? result.score;
+  return results.filter((result) => relevance(result) >= threshold).sort((left, right) => relevance(right) - relevance(left));
 }
 
 // ../plugin/src/hooks/magic-context/auto-search-worker-client.ts
@@ -28115,6 +28665,13 @@ function retryUnpublishedAutoSearchNoHint(db, sessionId, messageId, startedAt) {
   }
   return true;
 }
+
+class AutoSearchBusyError extends Error {
+  constructor() {
+    super("an earlier auto-search of this session is still running");
+    this.name = "AutoSearchBusyError";
+  }
+}
 async function searchAutoHint(db, sessionId, projectPath, query, options, entry = new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./auto-search-worker.ts" : "./auto-search-worker.js", import.meta.url)) {
   return executeAutoSearchWorker(db, sessionId, projectPath, query, options, entry, "search");
 }
@@ -28123,14 +28680,19 @@ var searchWorkers = new WeakMap;
 var liveSearchWorkers = new Set;
 var MAX_IDLE_SEARCH_WORKERS = 4;
 var SEARCH_WORKER_IDLE_MS = 5 * 60000;
+var DETACHED_SEARCH_LIMIT_MS = 30000;
+var AUTO_SEARCH_WORKER_CLOSE_DEADLINE_MS = 2000;
 var workersCreated = 0;
 var workersReused = 0;
+var searchesSkippedBusy = 0;
 async function acquireSearchWorker(db, key, entry, input, signal) {
   const pool = searchWorkers.get(db) ?? new Map;
   searchWorkers.set(db, pool);
   while (!signal.aborted) {
     let slot = pool.get(key);
     if (slot?.busy) {
+      if (input.job === "search" && (slot.detached || slot.busySessionId === input.sessionId))
+        return "busy";
       const current = slot;
       await new Promise((resolve) => {
         const done = () => {
@@ -28139,6 +28701,8 @@ async function acquireSearchWorker(db, key, entry, input, signal) {
         };
         signal.addEventListener("abort", done, { once: true });
         current.busy?.then(done);
+        if (!current.detached)
+          current.detachedSignal?.then(done);
         if (signal.aborted)
           done();
       });
@@ -28147,14 +28711,16 @@ async function acquireSearchWorker(db, key, entry, input, signal) {
     const fresh = !slot;
     if (!slot) {
       const worker = inRootAsyncContext2(() => new Worker(entry, { workerData: { ...input, persistent: true } }));
+      const shutdown = createWorkerShutdown(worker, "auto-search", AUTO_SEARCH_WORKER_CLOSE_DEADLINE_MS);
       slot = {
         worker,
         dispose() {
+          this.disposed = true;
           clearTimeout(this.idleTimer);
           if (pool.get(key) === this)
             pool.delete(key);
           liveSearchWorkers.delete(this);
-          worker.terminate();
+          shutdown.close();
           worker.unref();
         }
       };
@@ -28168,9 +28734,14 @@ async function acquireSearchWorker(db, key, entry, input, signal) {
       workersReused++;
     clearTimeout(slot.idleTimer);
     const current = slot;
+    current.busySessionId = input.sessionId;
+    current.detached = false;
     current.busy = new Promise((resolve) => {
       current.release = resolve;
     });
+    current.detachedSignal = new Promise((resolve) => {
+      current.markDetached = resolve;
+    });
     current.worker.ref();
     return { slot: current, fresh };
   }
@@ -28179,6 +28750,9 @@ async function acquireSearchWorker(db, key, entry, input, signal) {
 function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
   if (isEmbeddingHostBusy2())
     return Promise.resolve();
+  const snapshot = getProjectEmbeddingSnapshot2(projectPath);
+  if (!snapshot?.enabled || !snapshot.features.memoryEnabled)
+    return Promise.resolve();
   const key = `${sessionId}\x00${projectPath}`;
   const pending = pendingBackfills.get(db) ?? new Map;
   pendingBackfills.set(db, pending);
@@ -28226,6 +28800,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     signal: deadlineSignal,
     readMessages: _readMessages,
     searchMessageHistory: _searchMessageHistory,
+    stepTimings: _stepTimings,
     ...serializable
   } = options;
   const lifecycle = registerAutoSearchWork(sessionId);
@@ -28261,30 +28836,55 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     lifecycle.done();
     return [];
   }
+  if (lease === "busy") {
+    lifecycle.done();
+    searchesSkippedBusy++;
+    throw new AutoSearchBusyError;
+  }
   const { slot, fresh } = lease;
   const worker = slot.worker;
+  const detachable = job === "search" && entry.href === defaultAutoSearchWorkerEntry().href;
+  const startedAt = performance.now();
+  let detachedAt;
+  let ownerVectorMs;
+  let abandonTimer;
   return new Promise((resolve, reject) => {
     let settled = false;
-    const finish = (results, error) => {
+    let released = false;
+    const settle = (results, error) => {
       if (settled)
         return;
       settled = true;
+      if (error)
+        reject(error);
+      else
+        resolve(results);
+    };
+    const release = (dispose) => {
+      if (released)
+        return;
+      released = true;
+      clearTimeout(abandonTimer);
       signal?.removeEventListener("abort", abort);
       lifecycle.signal.removeEventListener("abort", abort);
       lifecycle.done();
       worker.off("message", onMessage);
       worker.off("error", onError);
       worker.off("exit", onExit);
-      if (error || signal.aborted || entry.href !== defaultAutoSearchWorkerEntry().href)
+      if (dispose || !detachable)
         slot.dispose();
-      else {
+      else if (!slot.disposed) {
         slot.idleTimer = setTimeout(() => slot.dispose(), SEARCH_WORKER_IDLE_MS);
         slot.idleTimer.unref?.();
       }
-      const release = slot.release;
+      const free = slot.release;
       slot.busy = undefined;
       slot.release = undefined;
-      release?.();
+      slot.busySessionId = undefined;
+      slot.detached = false;
+      slot.detachedSignal = undefined;
+      slot.markDetached = undefined;
+      free?.();
       const reusable = liveSearchWorkers.delete(slot);
       if (reusable)
         liveSearchWorkers.add(slot);
@@ -28292,51 +28892,82 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
       for (const prior of idle.slice(0, Math.max(0, idle.length - MAX_IDLE_SEARCH_WORKERS)))
         prior.dispose();
       worker.unref();
-      if (error)
-        reject(error);
-      else
-        resolve(results);
     };
-    const abort = () => finish([]);
+    const finish = (results, error) => {
+      settle(results, error);
+      release(Boolean(error) || signal.aborted);
+    };
+    const abort = () => {
+      if (lifecycle.signal.aborted || !detachable) {
+        finish([]);
+        return;
+      }
+      if (settled)
+        return;
+      detachedAt = performance.now();
+      slot.detached = true;
+      slot.markDetached?.();
+      settle([]);
+      abandonTimer = setTimeout(() => {
+        log2(`[auto-search] session ${sessionId}: search still running ${DETACHED_SEARCH_LIMIT_MS} ms after its deadline; disposing its worker (owner vector wait ${formatMs(ownerVectorMs)})`);
+        release(true);
+      }, DETACHED_SEARCH_LIMIT_MS);
+      abandonTimer.unref?.();
+    };
     signal?.addEventListener("abort", abort, { once: true });
     lifecycle.signal.addEventListener("abort", abort, { once: true });
     const onError = (error) => finish([], error);
     const onExit = (code) => finish([], new Error(`auto-search worker exited (${code})`));
     const onMessage = async (reply) => {
-      if (settled)
+      if (released)
         return;
-      if (reply.kind === "result") {
+      if (reply.kind === "result" || reply.kind === "error") {
+        if (detachedAt !== undefined) {
+          logLateSearch(sessionId, performance.now() - detachedAt, detachedAt - startedAt, ownerVectorMs, reply.kind === "result" ? reply.timings : undefined, reply.kind === "error");
+          release(reply.kind === "error");
+          return;
+        }
+        if (reply.kind === "error") {
+          finish([], new Error(reply.error));
+          return;
+        }
         if (snapshot && getProjectEmbeddingSnapshot2(projectPath)?.generation !== snapshot.generation)
           finish([]);
         else
           finish(reply.results);
         return;
       }
-      if (reply.kind === "error") {
-        finish([], new Error(reply.error));
-        return;
-      }
       if (reply.kind === "messages" || reply.kind === "accepted")
         return;
       const response = { id: reply.id };
-      try {
+      if (!signal.aborted) {
+        const requestedAt = performance.now();
+        try {
+          if (reply.kind === "query")
+            response.result = await (job === "backfill" ? embedTextForProject2(projectPath, reply.text, signal, "query") : boundedHintEmbedding(embedQuery, reply.text, signal)) ?? null;
+          else {
+            const passage = await embedBatchForProject2(projectPath, reply.texts, signal, reply.purpose);
+            const current = getProjectEmbeddingSnapshot2(projectPath);
+            response.passage = passage && current ? {
+              ...passage,
+              providerIdentity: current.providerIdentity,
+              runtimeFingerprint: current.runtimeFingerprint,
+              dimensions: passage.vectors.find((vector) => vector !== null)?.length ?? null
+            } : null;
+          }
+        } catch (error) {
+          response.error = error instanceof Error ? error.message : String(error);
+        }
         if (reply.kind === "query")
-          response.result = await (job === "backfill" ? embedTextForProject2(projectPath, reply.text, signal, "query") : boundedHintEmbedding(embedQuery, reply.text, signal)) ?? null;
-        else {
-          const passage = await embedBatchForProject2(projectPath, reply.texts, signal, reply.purpose);
-          const current = getProjectEmbeddingSnapshot2(projectPath);
-          response.passage = passage && current ? {
-            ...passage,
-            providerIdentity: current.providerIdentity,
-            runtimeFingerprint: current.runtimeFingerprint,
-            dimensions: passage.vectors.find((vector) => vector !== null)?.length ?? null
-          } : null;
+          ownerVectorMs = performance.now() - requestedAt;
+        if (signal.aborted) {
+          response.result = undefined;
+          response.passage = undefined;
+          response.error = undefined;
         }
-      } catch (error) {
-        response.error = error instanceof Error ? error.message : String(error);
       }
       response.embeddingHostBusy = isEmbeddingHostBusy2();
-      if (!settled && !signal?.aborted) {
+      if (!released) {
         try {
           worker.postMessage(response);
         } catch (error) {
@@ -28358,6 +28989,15 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     }
   });
 }
+function formatMs(value) {
+  return value === undefined ? "n/a" : `${Math.round(value)} ms`;
+}
+function logLateSearch(sessionId, lateMs, waitedMs, ownerVectorMs, timings, failed) {
+  const steps = timings?.steps;
+  const warm = timings?.lastPoolWarm;
+  const pool = warm ? `last pool refresh ${warm.outcome} in ${formatMs(warm.totalMs)} (probe ${formatMs(warm.probeMs)}, read ${formatMs(warm.readMs)}, decode ${formatMs(warm.decodeMs)}, ${warm.probedRows} rows probed, ${warm.decodedRows} decoded)` : "no pool refresh yet";
+  log2(`[auto-search] session ${sessionId}: deadline passed after ${formatMs(waitedMs)}; the search ${failed ? "failed" : "finished"} ${formatMs(lateMs)} later. Steps: message FTS ${formatMs(steps?.messageMs)}, vector wait ${formatMs(steps?.vectorWaitMs)} (owner embedding ${formatMs(ownerVectorMs)}), chunk lane ${formatMs(steps?.chunkMs)} (pool ${steps?.chunkPool ?? "n/a"}), other lanes ${formatMs(steps?.otherLanesMs)}, job ${formatMs(timings?.jobMs)}; ${pool}`);
+}
 async function boundedHintEmbedding(embed, text, signal) {
   const controller = new AbortController;
   const combined = AbortSignal.any([signal, controller.signal]);
@@ -28581,7 +29221,8 @@ async function runAutoSearchHintForPi(args) {
           },
           isEmbeddingRuntimeEnabled: () => embeddingEnabled === true,
           visibleMemoryIds: options.visibleMemoryIds ?? null,
-          sources: ["memory", "message", "git_commit"]
+          sources: ["memory", "message", "git_commit"],
+          chunkPoolWarmOnly: true
         };
         return searchAutoHint(db, sessionId, options.projectPath, rawPrompt, {
           ...searchOptions,
@@ -28593,6 +29234,11 @@ async function runAutoSearchHintForPi(args) {
       args.passGuard?.assert();
       if (lifecycleSignal.aborted)
         return messages;
+      if (error instanceof AutoSearchBusyError) {
+        sessionLog2(sessionId, "auto-search: an earlier search of this session is still running, skipping hint for this turn");
+        persistAutoSearchSkip(db, sessionId, userMsgId);
+        return messages;
+      }
       log2(`[auto-search] unified search failed for session ${sessionId} (no-hint frozen for this turn): ${error instanceof Error ? error.message : String(error)}`);
       await writeNoHintAndReconcile("error");
       return messages;
@@ -28644,7 +29290,7 @@ ${hintText}`;
       if (outcome.decision.decision === "hint") {
         appendHintToUserMessage(userMsg, outcome.decision.text);
       }
-      sessionLog2(sessionId, `auto-search: attached hint to ${userMsgId} (${results.length} fragments, top score ${results[0].score.toFixed(3)})`);
+      sessionLog2(sessionId, `auto-search: attached hint to ${userMsgId} (${results.length} fragments, top relevance ${(results[0].relevanceScore ?? results[0].score).toFixed(3)})`);
       return messages;
     } finally {
       if (!lifecycleSignal.aborted && results !== null) {
@@ -28680,19 +29326,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) => ({
@@ -28702,7 +29348,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 = [];
@@ -28720,7 +29366,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) {
@@ -29489,7 +30135,8 @@ ${chunkText}`,
           maxOutputTokens,
           onProgress: buildProgressLogger("first"),
           accountingSessionId: sessionId,
-          accountingSubagent: "historian"
+          accountingSubagent: "historian",
+          accountingModelConfigKey: deps.modelConfigKey
         }
       });
       let validatedPass = await validateHistorianResult(firstResult, sessionId, chunk, priorCompartments, sequenceOffset);
@@ -29549,6 +30196,7 @@ ${chunkText}`,
               onProgress: buildProgressLogger("fallback"),
               accountingSessionId: sessionId,
               accountingSubagent: "historian",
+              accountingModelConfigKey: candidate.sourceConfigKey ?? deps.modelConfigKey,
               accountingTask: "fallback"
             }
           });
@@ -29600,7 +30248,8 @@ ${chunkText}`,
               maxOutputTokens,
               onProgress: buildProgressLogger("editor"),
               accountingSessionId: sessionId,
-              accountingSubagent: "historian_editor"
+              accountingSubagent: "historian_editor",
+              accountingModelConfigKey: deps.modelConfigKey
             }
           });
           const editorPass = await validateHistorianResult(editorResult, sessionId, chunk, priorCompartments, sequenceOffset);
@@ -31655,7 +32304,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);
@@ -32563,7 +33212,7 @@ function dropCompartmentsAfter(db, sessionId, anchor, holderId, activeBranch = f
       if (marker && clearPendingPiCompactionMarkerStateIf(db, sessionId, marker, null))
         clearedMarker = marker;
     }
-    deleteChunkEmbedBackoffForSession(db, sessionId);
+    deleteChunkEmbedBackoffForSession2(db, sessionId);
     queueM0Mutation(db, { sessionId, mutationType: "recomp_boundary_change" });
     clearCachedM0M1(db, sessionId);
     db.exec("COMMIT");
@@ -34521,7 +35170,7 @@ function isSentinelPart(part) {
 
 // src/pi-append-compaction.ts
 var loggedIncompatibleHost = false;
-var failedWrites = new WeakMap;
+var failedWrites2 = new WeakMap;
 function adaptPiAppendCompaction(sessionManager) {
   if (!sessionManager || typeof sessionManager !== "object")
     return;
@@ -34529,7 +35178,7 @@ function adaptPiAppendCompaction(sessionManager) {
   const append = host.appendCompaction;
   if (typeof append !== "function")
     return;
-  if (failedWrites.has(host))
+  if (failedWrites2.has(host))
     return;
   const harness = resolvePiHarnessKind();
   if ((harness === "omp" ? append.length !== 4 && append.length !== 7 : append.length !== 5 && append.length !== 6) || typeof host.getEntry !== "function") {
@@ -34541,7 +35190,7 @@ function adaptPiAppendCompaction(sessionManager) {
   }
   const getEntry = host.getEntry.bind(host);
   return (summary, firstKeptEntryId, tokensBefore, details, fromHook) => {
-    const previousFailure = failedWrites.get(host);
+    const previousFailure = failedWrites2.get(host);
     if (previousFailure)
       throw previousFailure;
     let id;
@@ -34559,7 +35208,7 @@ function adaptPiAppendCompaction(sessionManager) {
       }
     } catch {
       const error = new Error("Compaction marker read-back failed; writes disabled for this session manager until restart");
-      failedWrites.set(host, error);
+      failedWrites2.set(host, error);
       log2(`ERROR: compaction marker read-back failed harness=${harness} compactionId=${typeof id === "string" ? id : "<missing>"} expectedFirstKept=${firstKeptEntryId}; further writes disabled for this session manager until restart; leaving marker pending`);
       throw error;
     }
@@ -44124,6 +44773,20 @@ function registerPiContextHandler(pi, baseOptions) {
           elapsedMs: performance.now() - fitInputStart,
           extra: inputForFitReclaim ? "snapshot" : "no-snapshot"
         });
+      if (!options.compactionOff && !sessionMeta.isSubagent) {
+        let promptId = null;
+        for (let i = event.messages.length - 1;i >= 0; i--) {
+          const message = event.messages[i];
+          if (message?.role !== "user")
+            continue;
+          const parts = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content;
+          if (!hasMeaningfulUserText2(parts))
+            continue;
+          promptId = entryIds?.[i] ?? null;
+          break;
+        }
+        maintainExecuteFloorMark(options.db, sessionId, promptId, usagePercentage < effectiveExecuteThresholdPercentage);
+      }
       const pipelineArgs = {
         recoveryPrefix: recovery.prefix,
         recoveryRebuildReason: recovery.rebuildReason,
@@ -44225,6 +44888,65 @@ function registerPiContextHandler(pi, baseOptions) {
       };
       if (!options.compactionOff)
         assertPiTagSnapshotReady(options.db, sessionId);
+      let historianEvaluatedThisPass = false;
+      const historian = options.historian;
+      const scheduleHistorian = (result) => {
+        if (historianEvaluatedThisPass)
+          return;
+        historianEvaluatedThisPass = true;
+        const tHistorianScheduling = performance.now();
+        budget.stage = "historian scheduling";
+        if (historian && !options.compactionOff && budget.remainingWork() > 0) {
+          guardSqliteTransformPass2({
+            assert: budget.assert,
+            remainingMs: budget.remainingWork
+          });
+          try {
+            budget.assert();
+            maybeFireHistorian({
+              startGuard: () => {
+                if (!budget.completed)
+                  budget.assertOwner();
+                if (budget.abandoned || budget.remainingWork() === 0)
+                  throw new PiContextDeadlineError(budget.diagnostic());
+              },
+              pi,
+              ctx,
+              sessionId,
+              db: options.db,
+              historian,
+              isFirstContextPassForSession,
+              activeTags: result.activeTags,
+              eligiblePendingDropTagIds: result.eligiblePendingDropTagIds,
+              rawMessageProvider,
+              ordinalAlignment: ordinalAlignment(),
+              taggerFloor,
+              sessionMeta,
+              piUsage,
+              pressureSnapshot: {
+                percentage: usagePercentage,
+                inputTokens: usageInputTokens
+              },
+              minimumPercentage: usagePercentage,
+              liveIsRawBranchEstimate: piLiveUsageIsRawBranchEstimate,
+              historianStateSnapshot: historianStateForPass,
+              publishedHistoryRide: isCacheBusting,
+              primaryExecute: schedulerDecision === "execute" && !sessionMeta.isSubagent,
+              signedThinkingHeld: result.strictThinkingKept
+            });
+          } catch (error) {
+            budget.assertOutcome();
+            sessionLog2(sessionId, `historian scheduling skipped: ${String(error)}`);
+          } finally {
+            guardSqliteTransformPass2({
+              assert: budget.assertOutcome,
+              remainingMs: budget.remainingOutcome
+            });
+          }
+        }
+        logTransformTiming(sessionId, "historianScheduling", tHistorianScheduling);
+      };
+      pipelineArgs.evaluateHistorianBeforeReclaim = scheduleHistorian;
       let result = await budget.waitMandatory(runPipeline(pipelineArgs));
       observePipelineResultForTests(sessionId, result);
       logTransformTiming(sessionId, "runPipeline", tRunPipeline);
@@ -44256,57 +44978,7 @@ function registerPiContextHandler(pi, baseOptions) {
         }, piDecisionSnapshotNewestAssistant, budget.assertDecisionPublication);
       } : undefined;
       logTransformTiming(sessionId, "transformDecisionAndReuseState", tTransformDecision);
-      const tHistorianScheduling = performance.now();
-      const historian = options.historian;
-      budget.stage = "historian scheduling";
-      if (historian && !options.compactionOff && budget.remainingWork() > 0) {
-        guardSqliteTransformPass2({
-          assert: budget.assert,
-          remainingMs: budget.remainingWork
-        });
-        try {
-          budget.assert();
-          maybeFireHistorian({
-            startGuard: () => {
-              if (!budget.completed)
-                budget.assertOwner();
-              if (budget.abandoned || budget.remainingWork() === 0)
-                throw new PiContextDeadlineError(budget.diagnostic());
-            },
-            pi,
-            ctx,
-            sessionId,
-            db: options.db,
-            historian,
-            isFirstContextPassForSession,
-            activeTags: result.activeTags,
-            eligiblePendingDropTagIds: result.eligiblePendingDropTagIds,
-            rawMessageProvider,
-            ordinalAlignment: ordinalAlignment(),
-            taggerFloor,
-            sessionMeta,
-            piUsage,
-            pressureSnapshot: {
-              percentage: usagePercentage,
-              inputTokens: usageInputTokens
-            },
-            minimumPercentage: usagePercentage,
-            liveIsRawBranchEstimate: piLiveUsageIsRawBranchEstimate,
-            historianStateSnapshot: historianStateForPass,
-            publishedHistoryRide: isCacheBusting,
-            signedThinkingHeld: result.strictThinkingKept
-          });
-        } catch (error) {
-          budget.assertOutcome();
-          sessionLog2(sessionId, `historian scheduling skipped: ${String(error)}`);
-        } finally {
-          guardSqliteTransformPass2({
-            assert: budget.assertOutcome,
-            remainingMs: budget.remainingOutcome
-          });
-        }
-      }
-      logTransformTiming(sessionId, "historianScheduling", tHistorianScheduling);
+      scheduleHistorian(result);
       const tPostTransform = performance.now();
       let outputMessages = result.messages;
       let assertTailHygieneLastWriter;
@@ -45135,6 +45807,7 @@ function spawnPiHistorianRun(args) {
         runner: historian.runner,
         signal: controller.signal,
         historianModel: historian.model,
+        modelConfigKey: historian.modelConfigKey,
         fallbackModels: historian.fallbackModels,
         fallbackModelId,
         historianChunkTokens: historian.historianChunkTokens,
@@ -45457,7 +46130,7 @@ Historian previously failed ${failureCount} time(s), so Magic Context is retryin
         idleExpiry: false,
         emergency: usage.percentage >= historianForceMaterializationPercentage
       }
-    }, args.eligiblePendingDropTagIds);
+    }, args.eligiblePendingDropTagIds, args.primaryExecute === true);
     if (!trigger.shouldFire) {
       sessionLog2(sessionId, `historian trigger eval: shouldFire=false (no trigger condition met)`);
       try {
@@ -45557,7 +46230,7 @@ function captureReasoningMutationRollback(messages) {
 async function runCompactionOffPipeline(args) {
   let injectionResult = null;
   const transcript = [...args.messages];
-  let headChangedUnderSignedTurn = false;
+  let headChangedUnderSignedThinking = false;
   if (args.injection) {
     const state = {
       sessionId: args.sessionId,
@@ -45579,10 +46252,16 @@ async function runCompactionOffPipeline(args) {
     if (servedBeforeFirstRender !== undefined) {
       const headCount = injectionResult?.syntheticLeadingCount ?? 0;
       const head = JSON.stringify(args.messages.slice(0, headCount));
-      headChangedUnderSignedTurn = servedBeforeFirstRender === null || JSON.stringify(servedBeforeFirstRender.slice(0, headCount)) !== head;
+      headChangedUnderSignedThinking = servedBeforeFirstRender === null || JSON.stringify(servedBeforeFirstRender.slice(0, headCount)) !== head;
+    } else if (!signedTurnHoldsHead && args.reasoningClearing?.prefixBound === true && (injectionResult?.m0Materialized === true || injectionResult?.m1RenderedCoverage != null)) {
+      const served = args.readLastServedMessages?.() ?? null;
+      const headCount = injectionResult?.syntheticLeadingCount ?? 0;
+      headChangedUnderSignedThinking = served === null || JSON.stringify(served.slice(0, headCount)) !== JSON.stringify(args.messages.slice(0, headCount));
+      if (headChangedUnderSignedThinking)
+        sessionLog2(args.sessionId, "compaction-off fold changed the head: stripping signed thinking");
     }
   }
-  if (headChangedUnderSignedTurn)
+  if (headChangedUnderSignedThinking)
     applyPiProactiveThinkingStrip({
       db: args.db,
       sessionId: args.sessionId,
@@ -45896,6 +46575,7 @@ async function runPipeline(args) {
     logTransformTiming(args.sessionId, "injectTemporalMarkers", tTemporal);
   }
   let nativeRemovalInputs;
+  let probingExecuteRemoval = false;
   try {
     nativeRemovalInputs = getNativeReplayState(args.db, args.sessionId).toolInputs;
   } catch {}
@@ -45907,7 +46587,7 @@ async function runPipeline(args) {
       sessionId: args.sessionId,
       callId,
       saved: nativeRemovalInputs,
-      canApply: isCacheBustingPass
+      canApply: isCacheBustingPass || probingExecuteRemoval
     }),
     authorizeToolRemovals: (callIds) => preparePiToolRemovalMeasurements({
       db: args.db,
@@ -45939,6 +46619,7 @@ async function runPipeline(args) {
   const heldIdleExpiryRebuild = protectedSignedPrefix && piHardSignals?.cacheExpired === true;
   const systemPrefixChangedThisPass = !prefixPreflightContended && effectiveSystemChangedThisPass;
   const rideSignals = {
+    executeReclaim: false,
     subagentExecute: args.sessionMeta.isSubagent && args.schedulerDecision === "execute",
     hardFold: foldBustsServedPrefixThisPass || systemPrefixChangedThisPass || firstRenderBust || heldIdleExpiryRebuild || isCacheBustingPass,
     force: (args.forceMaterialization === true || emergencyDropEligible) && (args.contextUsage.percentage >= 95 || getEmergencyInputSample(args.db, args.sessionId) === 0),
@@ -46051,11 +46732,14 @@ async function runPipeline(args) {
       }
     }
   }
-  if (args.temporalAwareness && isCacheBustingPass && !protectedSignedPrefix) {
+  const applyTemporalOnRide = () => {
+    if (!args.temporalAwareness || !isCacheBustingPass || protectedSignedPrefix)
+      return;
     temporalDecisions = freezeTemporalDecisions(args.db, args.sessionId, temporalCandidates);
     if (injectPiTemporalMarkers(args.messages, temporalDecisions, stableIdResolver) > 0)
       recordFirstApplicationWireEdit(true);
-  }
+  };
+  applyTemporalOnRide();
   logPiUnresolvedIdentities(args.sessionId, [
     ...guardPiToolAllocations(args.db, args.sessionId, args.messages, stableIdResolver, args.tagger, fallbackIndex.guardIndexes),
     ...guardPiMessageAllocations(args.db, args.sessionId, entryFingerprintByMessageId)
@@ -46205,6 +46889,62 @@ async function runPipeline(args) {
   const protectionWindowForPass = getProtectionWindowForSession(args.db, args.sessionId, protectionFloorResolution.floor);
   const protectedTagNumbersForPass = usesTokenProtection ? protectionWindowForPass.protectedTagNumbers : newestActiveTagNumbersByCount(getActiveTagsBySession2(args.db, args.sessionId), args.protectedTags);
   const pendingOperationTags = pendingOps.length > 0 ? getTagsForPendingOperations2(args.db, args.sessionId, pendingOps.map((operation) => operation.tagId), usesTokenProtection ? 0 : args.protectedTags, RECENT_TOOL_SKELETON_WINDOW) : [];
+  if (!args.sessionMeta.isSubagent && args.schedulerDecision === "execute") {
+    args.evaluateHistorianBeforeReclaim?.({
+      activeTags: getActiveTagsBySession2(args.db, args.sessionId),
+      eligiblePendingDropTagIds,
+      strictThinkingKept: protectedSignedPrefix
+    });
+  }
+  rideSignals.executeReclaim = originateExecuteReclaim({
+    db: args.db,
+    sessionId: args.sessionId,
+    primaryExecute: !args.sessionMeta.isSubagent && args.schedulerDecision === "execute" && args.contextUsage.percentage < forceMaterializationPercentage,
+    alreadyBusting: isCacheBustingPass || identityRebuild,
+    summaryCanCome: args.sessionMeta.compartmentInProgress || inFlightHistorian.has(args.sessionId) || (prefixPreflightContended || protectedSignedPrefix) && (deferredHistoryRefreshSessions.has(args.sessionId) || deferredMaterializationSessions.has(args.sessionId) || historyRefreshSessions.has(args.sessionId)) || readExecuteReclaimState(args.db, args.sessionId).floorOrdinal !== null,
+    reclaimableTokens: estimateExecuteReclaimTokens({
+      db: args.db,
+      sessionId: args.sessionId,
+      pendingOps,
+      tags: pendingOperationTags,
+      targets: newTargets,
+      protectedTagIds: new Set([
+        ...protectedTagNumbersForPass,
+        ...protectedToolTags
+      ]),
+      probePreparation: (targets) => {
+        const saved = nativeRemovalInputs;
+        const rollback = Symbol("execute removal probe");
+        const allowed = new Set;
+        try {
+          nativeRemovalInputs = saved && new Map(saved);
+          probingExecuteRemoval = true;
+          args.db.transaction(() => {
+            for (const [number, target] of targets) {
+              if (target.prepareDrop?.() !== false)
+                allowed.add(number);
+            }
+            throw rollback;
+          }).immediate();
+        } catch (error) {
+          if (error !== rollback)
+            allowed.clear();
+        } finally {
+          nativeRemovalInputs = saved;
+          probingExecuteRemoval = false;
+        }
+        return allowed;
+      }
+    }),
+    usableWindow: args.usableSoft ?? args.contextUsage.inputTokens / (args.contextUsage.percentage / 100)
+  });
+  if (rideSignals.executeReclaim) {
+    isCacheBustingPass = reclaimRidePermitted(rideSignals, ridePermissionGate);
+    publishedWorkDrainAllowed = isCacheBustingPass;
+    shouldRunHeuristics ||= isCacheBustingPass && args.heuristics !== undefined;
+    stripUnheldSignedTurnOnBust();
+    applyTemporalOnRide();
+  }
   const deferredMaterialize = canConsumeDeferredLate && deferredMaterializationWasPending;
   const deferredHistoryRefresh = canConsumeDeferredLate && deferredHistoryRefreshWasPending;
   const shouldApplyPendingOps = publishedWorkDrainAllowed;
@@ -46937,6 +47677,8 @@ async function runPipeline(args) {
         servedTagNumbers.add(tag.tagNumber);
     }
   }
+  if (bustedThisPass)
+    clearExecuteReclaimState(args.db, args.sessionId);
   return {
     messages: outputMessages,
     recoveryNormalized,
@@ -51097,6 +51839,7 @@ function resolveHistorianFromConfig(config, harness = PI_HARNESS_KIND, modelRegi
   return {
     runner: new PiSubagentRunner,
     model,
+    modelConfigKey: resolved.primary?.sourceConfigKey,
     fallbackModels,
     historianChunkTokens,
     historianContextLimit: resolveKnownHistorianContextLimit(model),