@cortexkit/pi-magic-context 0.49.15 → 0.49.17

package/dist/index.js

@@ -4,6 +4,7 @@ import {
   harnessOwnsOpenCodeStore2
 } from "./index-0h2mkab2.js";
 import {
+  getDataDir,
   ensureCortexKitArtifactGitignore,
   getProjectMagicContextHistorianDir,
   getMagicContextStorageDir,
@@ -248,7 +249,8 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-hshd96pt.js";
+} from "./index-es03azap.js";
+import"./index-4knyh1kt.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical,
@@ -265,7 +267,7 @@ import {
   DEFAULT_HISTORIAN_TIMEOUT_MS,
   DREAM_TASK_PROMOTION_DEFAULTS,
   LIVE_RELOAD_CONFIG_PATHS
-} from "./index-1k729e4f.js";
+} from "./index-bxmf4dhr.js";
 import {
   FAIL_CLOSED_DOCTOR_COMMAND,
   formatFailClosedBlockingMessage,
@@ -288,8 +290,9 @@ import {
   openCurrentDatabase,
   openDatabaseAsync,
   closeDatabase
-} from "./index-ccsscaap.js";
+} from "./index-469ttgzv.js";
 import {
+  pruneMissingProjectIdentities,
   setHomeProjectPermission,
   ProjectIdentityError,
   resolveProjectIdentityStrict,
@@ -299,7 +302,7 @@ import {
   resolveProjectIdentityForSession,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-6ex901g3.js";
+} from "./index-g7p75667.js";
 import {
   detectThinkingBindingMismatch,
   detectLatestTurnThinkingMismatch,
@@ -458,7 +461,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-75ah9413.js";
+} from "./index-5k2mshvq.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -545,7 +548,7 @@ import {
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2
-} from "./index-j0n09wtp.js";
+} from "./index-ej4eak9d.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -557,7 +560,7 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./index-g4jf772p.js";
+} from "./index-1kcfwk9c.js";
 import {
   inRootAsyncContext2,
   Database2,
@@ -570,7 +573,7 @@ import {
   isTransientSqliteError2,
   withAsyncPrivilegedWriter2,
   indexCoordinationInput2
-} from "./index-asrxgdt4.js";
+} from "./index-rrwv9y2k.js";
 import {
   stableStringify,
   closeQuietly,
@@ -579,19 +582,6 @@ import {
   freezeTemporalDecisions,
   tagIdentityRevisionKey
 } from "./index-jrap43gc.js";
-import {
-  resolveOpenCodeDbPath,
-  assertOpenCodeStoreGeneration,
-  openCodeDbPathExists,
-  recordOpenCodeDbReadFailure,
-  clearOpenCodeDbReadFailure,
-  claimOpenCodeDbDiagnosticOnce
-} from "./index-8976mezv.js";
-import"./index-399p688g.js";
-import {
-  runSessionWarmupWorker,
-  RAW_SUMMARY_TEXT_MAX_CHARS2
-} from "./index-he9s4qsj.js";
 import {
   piHarnessKindFromExecutable
 } from "./index-apgwdby5.js";
@@ -604,11 +594,14 @@ import {
   ownsLkgDirtyFence,
   invalidateCleanLkgRecoveryFence,
   markLkgRecoveryDirty,
+  gaDatabasePath,
   readSessionActivity,
   observeSessionActivity,
   backfillSessionActivity,
   clearCompressionDepth,
   clearCompressionDepthRange,
+  cleanSearchText,
+  matchedSearchSnippet,
   getMessageIndexSourceIdentity2,
   isMessageIndexSourceCurrent2,
   getLastIndexedOrdinal2,
@@ -616,14 +609,25 @@ import {
   isMessageIndexReconciledThrough2,
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
-  sweepOrphanedOpenCodeMessageIndexes2
-} from "./index-a4pk5yv9.js";
+  sweepOrphanedOpenCodeMessageIndexesCooperatively2
+} from "./index-8r2t8fv2.js";
 import {
-  formatSynapseLaneDescriptor
-} from "./index-6dz2ed1v.js";
+  resolveOpenCodeDbPath,
+  assertOpenCodeStoreGeneration,
+  openCodeDbPathExists,
+  recordOpenCodeDbReadFailure,
+  clearOpenCodeDbReadFailure,
+  claimOpenCodeDbDiagnosticOnce
+} from "./index-8976mezv.js";
+import"./index-399p688g.js";
 import {
-  sameProjectDirectory
-} from "./index-djxc8w8c.js";
+  runSessionWarmupWorker,
+  RAW_SUMMARY_TEXT_MAX_CHARS2
+} from "./index-vktahpdj.js";
+import {
+  formatSynapseLaneDescriptor
+} from "./index-d8gc0112.js";
+import"./index-yygsh681.js";
 import {
   buildCanonicalChunkTextFromFts,
   buildCompartmentSummaryFallbackText,
@@ -633,7 +637,7 @@ import {
   replaceCompartmentChunkEmbeddings,
   deleteChunkEmbedBackoffForSession,
   chunkWindowSourceKey
-} from "./index-7qc73yk5.js";
+} from "./index-xnch62s6.js";
 import {
   recordSessionProjectIdentity,
   GIT_SWEEP_LEASE_RENEWAL_MS,
@@ -642,7 +646,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-1mrvw9en.js";
+} from "./index-svgkv4g2.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -668,7 +672,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-nwbhe6qv.js";
+} from "./index-vmcgew7x.js";
 import {
   rememberV1HiddenRun
 } from "./index-6x556c2q.js";
@@ -683,7 +687,7 @@ import {
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-bet4sd3e.js";
+} from "./index-gdjv1nnd.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -733,7 +737,7 @@ import {
   normalizeVerificationFiles,
   indexCommitsForProject,
   embedUnembeddedCommits
-} from "./index-0awvkeb5.js";
+} from "./index-9j809q6f.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -757,18 +761,18 @@ import {
   setMemoryClassification2,
   archiveMemory2,
   getMemoryCountsByStatus2
-} from "./index-hy44m6jc.js";
+} from "./index-e1rza8gp.js";
 import {
   invalidateMemory2
 } from "./index-yhzhdp3m.js";
 import {
   pushNotification2
 } from "./index-q1yc6bs0.js";
-import"./index-9jvktm7k.js";
+import"./index-2mmy81qt.js";
 import {
   cosineSimilarity
-} from "./index-7wagp5jp.js";
-import"./index-46q4e104.js";
+} from "./index-z2rkv0mb.js";
+import"./index-qpq6w67c.js";
 import {
   DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS,
   buildHiddenAgentRegistrations,
@@ -776,9 +780,10 @@ import {
   readHostSystemPrompt,
   subagentStepCap,
   SubagentTelemetry,
+  HISTORIAN_CACHE_TAIL_ENV2,
   HISTORIAN_MAX_OUTPUT_TOKENS_ENV2,
   SUBAGENT_OUTPUT_CEILING_ENV2
-} from "./index-ajfpyk0x.js";
+} from "./index-fa485mqs.js";
 import {
   PiTagHydrationError,
   getPiTagSnapshotView,
@@ -789,8 +794,10 @@ import {
   drainPiTagSnapshotSession,
   assertPiTagSnapshotReady,
   ensurePiTagSnapshotReady
-} from "./index-1vw4f2pe.js";
+} from "./index-dvbjsh98.js";
 import"./index-f18ec69t.js";
+import"./index-1cvyaw9a.js";
+import"./index-z7kbck29.js";
 import {
   __toESM
 } from "./index-22jkk6wg.js";
@@ -800,6 +807,9 @@ import {
 import {
   normalizeProtectedToolName
 } from "./index-674f6qs2.js";
+import {
+  sameProjectDirectory
+} from "./index-wrr9rp9a.js";
 import {
   logSlowWriteTransaction,
   WriteTransactionSteps
@@ -812,7 +822,7 @@ import {
 } from "./index-81nthk8j.js";
 
 // src/index.ts
-import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+import { AsyncLocalStorage as AsyncLocalStorage3 } from "node:async_hooks";
 import { createRequire as createRequire2 } from "node:module";
 import { join as join16, resolve as resolve3 } from "node:path";
 
@@ -3509,7 +3519,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.15",
+  version: "0.49.17",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -5036,14 +5046,14 @@ function throwWithPromptFailure(legacyError, failedAttempts, args, timeoutMs, tr
   });
   throw error;
 }
-async function attemptOnce(client, args, timeoutMs, signal, callContext, label, transport) {
+async function attemptOnce(client, args, timeoutMs, signal, callContext, label, transport, allowModelSuggestions = true) {
   const originalBody = { ...args.body };
   const attemptArgs = copyPromptArgs(args, originalBody);
   try {
     await promptWithTimeout(client, attemptArgs, timeoutMs, signal, transport);
     return;
   } catch (error) {
-    if (isNonRetryable(error, signal))
+    if (isNonRetryable(error, signal) || !allowModelSuggestions)
       throw error;
     const suggestion = parseModelSuggestion(error);
     if (!suggestion || !originalBody.model) {
@@ -5071,7 +5081,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
   const explicitPrimaryLabel = baseBody.model?.providerID && baseBody.model.modelID ? `${baseBody.model.providerID}/${baseBody.model.modelID}` : "primary";
   let lastError = null;
   try {
-    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel, options.transport);
+    await attemptOnce(client, baseArgs, timeoutMs, options.signal, callContext, explicitPrimaryLabel, options.transport, options.allowModelSuggestions);
     return;
   } catch (error) {
     lastError = error;
@@ -5097,7 +5107,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
       ...fallback?.qualifier ? { variant: fallback.qualifier } : {}
     });
     try {
-      await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label, options.transport);
+      await attemptOnce(client, attemptArgs, timeoutMs, options.signal, callContext, label, options.transport, options.allowModelSuggestions);
       log2(`[${callContext}] fallback succeeded with ${label} (attempt ${i + 2}/${fallbacks.length + 1})`);
       return;
     } catch (error) {
@@ -5115,7 +5125,7 @@ async function promptSyncWithModelSuggestionRetry(client, args, options = {}) {
 }
 async function attemptAndValidate(client, args, timeoutMs, signal, callContext, attempt, options) {
   try {
-    await attemptOnce(client, args, timeoutMs, signal, callContext, attempt.label, options.transport);
+    await attemptOnce(client, args, timeoutMs, signal, callContext, attempt.label, options.transport, options.allowModelSuggestions);
   } catch (error) {
     throw {
       error,
@@ -6876,6 +6886,7 @@ function buildHistorianRepairPrompt(originalPrompt, previousOutput, validationEr
     "Return a corrected full XML response for the same existing state and new messages.",
     "Do not skip any displayed raw ordinal or displayed raw range, even if the message looks trivial.",
     "Every displayed message range must belong to exactly one compartment unless it is intentionally left in one trailing suffix marked by <unprocessed_from>.",
+    "If every message in the chunk is covered by a compartment, nothing is unprocessed: set `<unprocessed_from>` to the chunk's last message index + 1.",
     "",
     "Previous invalid XML:",
     previousOutput
@@ -9336,6 +9347,7 @@ async function runHistorianPrompt(args) {
   let handle = null;
   let completion;
   const executor = resolveHiddenCompletionExecutor(args.hiddenCompletionExecutor, client, db, sessionDirectory, "historian");
+  const cacheTail = args.cacheTail ?? (executor.capabilities.harness === "opencode2" ? "skip" : undefined);
   let promptSettled = false;
   let hadUnsettledPrompt = false;
   const startedAt = Date.now();
@@ -9417,6 +9429,7 @@ async function runHistorianPrompt(args) {
       try {
         await promptSyncWithModelSuggestionRetry(client, {
           path: { id: agentSessionId },
+          ...cacheTail !== undefined ? { cacheTail: retryIndex > 0 ? "write" : cacheTail } : {},
           query: { directory: sessionDirectory },
           body: {
             agent: agentId,
@@ -9437,6 +9450,7 @@ async function runHistorianPrompt(args) {
             return executor.attempt(opened, request);
           }, { childSessionId: opened.childSessionId }),
           timeoutMs: timeoutMs ?? DEFAULT_HISTORIAN_TIMEOUT_MS,
+          allowModelSuggestions: false,
           fallbackModels: modelOverride ? undefined : fallbackModels,
           callContext: agentId === HISTORIAN_EDITOR_AGENT ? "historian:editor" : "historian"
         });
@@ -9521,7 +9535,7 @@ async function runFallbackHistorianPass(args) {
   const primary = toModelEntry(args.model);
   for (const candidateInput of [
     ...args.fallbackModels ?? [],
-    ...args.fallbackModelId ? [{ model: args.fallbackModelId }] : []
+    ...!primary && args.fallbackModelId ? [{ model: args.fallbackModelId }] : []
   ]) {
     const candidate = toModelEntry(candidateInput);
     if (!candidate)
@@ -19228,9 +19242,14 @@ async function indexSingleMessageOffThread(db, sessionId, message) {
   return result.inserted;
 }
 async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, options = {}) {
+  if (getHarness2() === "opencode2")
+    openSource = () => new Database2(gaDatabasePath(getDataDir(), process.env.OPENCODE_CHANNEL ?? "latest"), {
+      readonly: true,
+      fileMustExist: true
+    });
   const path = getSqliteDatabasePath2(db);
-  if (!path || getHarness2() !== "opencode")
-    return sweepOrphanedOpenCodeMessageIndexes2(db, openSource, options);
+  if (!path || getHarness2() !== "opencode" && getHarness2() !== "opencode2")
+    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, openSource, options);
   let source = null;
   let sourcePath = null;
   try {
@@ -19242,7 +19261,7 @@ async function sweepOrphanedOpenCodeMessageIndexesOffThread(db, openSource, opti
       source?.close();
   }
   if (!sourcePath)
-    return sweepOrphanedOpenCodeMessageIndexes2(db, () => source, options);
+    return sweepOrphanedOpenCodeMessageIndexesCooperatively2(db, () => source, options);
   const reply = await runSessionWarmupWorker({
     path,
     sessionId: "",
@@ -19398,7 +19417,7 @@ function runTick(origin) {
   if (tickInFlight)
     return;
   tickInFlight = true;
-  log2(`[dreamer] timer tick (${origin}) — projects=${registeredProjects.size}`);
+  log2(`[magic-context] maintenance tick (${origin}) — projects=${registeredProjects.size}`);
   (async () => {
     try {
       const db = openTimerDatabaseOrNull("maintenance tick");
@@ -19448,6 +19467,9 @@ function persistTickOutcome(db, failure) {
   }
 }
 async function runMessageHistoryMaintenance(db) {
+  const prunedIdentities = await pruneMissingProjectIdentities();
+  if (prunedIdentities > 0)
+    log2(`[magic-context] pruned ${prunedIdentities} missing project identities`);
   try {
     await drainStaleLkgSlots(db);
   } catch (error) {
@@ -19681,10 +19703,20 @@ async function sweepGitCommits(args) {
   const holderId = crypto.randomUUID();
   const lease = acquireGitSweepLease(db, projectIdentity, holderId);
   if (!lease.acquired) {
-    const reason = lease.reason === "cooldown_active" ? `cooldown active until ${lease.nextAllowedAt}` : `lease held by ${lease.leaseHolder ?? "another holder"} until ${lease.leaseExpiresAt ?? "unknown"}`;
+    if (lease.reason === "cooldown_active")
+      return;
+    const reason = `lease held by ${lease.leaseHolder ?? "another holder"} until ${lease.leaseExpiresAt ?? "unknown"}`;
     log2(`[git-commits] sweep skipped for ${projectIdentity}: ${reason}`);
     return;
   }
+  if (projectIdentity.startsWith("dir:")) {
+    if (parkGitSweepNonIndexable(db, projectIdentity, holderId)) {
+      log2(`[git-commits] sweep parked for ${projectIdentity}: directory identity has no commits`);
+    } else {
+      releaseGitSweepLease(db, projectIdentity, holderId);
+    }
+    return;
+  }
   const startedAt = Date.now();
   const stopRenewal = startGitSweepLeaseRenewal(db, projectIdentity, holderId);
   log2(`[git-commits] sweep starting for ${projectIdentity} (sinceDays=${gitCommitIndexing.since_days} maxCommits=${gitCommitIndexing.max_commits})`);
@@ -20653,6 +20685,7 @@ class PiSubagentRunner {
       delete parentEnv.MAGIC_CONTEXT_HISTORIAN_TEMPERATURE;
       delete parentEnv[HISTORIAN_MAX_OUTPUT_TOKENS_ENV2];
       delete parentEnv[SUBAGENT_OUTPUT_CEILING_ENV2];
+      delete parentEnv[HISTORIAN_CACHE_TAIL_ENV2];
       try {
         child = inRootAsyncContext2(() => this.spawnImpl(this.invocation.command, [...this.invocation.prefixArgs, ...this.extraArgs, ...args], {
           windowsHide: true,
@@ -20661,6 +20694,7 @@ class PiSubagentRunner {
             ...parentEnv,
             [MAGIC_CONTEXT_PI_SUBAGENT_ENV]: "1",
             MAGIC_CONTEXT_SUBAGENT_PROMPT_FILE: systemPromptPath,
+            [HISTORIAN_CACHE_TAIL_ENV2]: /^(magic-context-)?historian(?:-recomp)?$/.test(options.agent) && options.accountingSubagent !== "historian_editor" ? options.cacheTail : undefined,
             MAGIC_CONTEXT_SUBAGENT_BUDGET_GUARD_FILE: budgetGuardFile,
             MAGIC_CONTEXT_SUBAGENT_PROVENANCE_ONLY: /^(magic-context-)?historian(?:-recomp|-editor)?$/.test(options.agent) ? undefined : "1",
             ...options.temperature !== undefined ? {
@@ -24214,27 +24248,43 @@ function buildReplacementContent(tagId) {
   return `[dropped §${tagId}§]`;
 }
 function applyNewToolDrop(target, options) {
-  if (options.persist && (target?.prepareDrop?.() ?? target?.canDrop?.()) === false) {
+  const plan = planNewToolDrop(target, options, !!options.persist);
+  if (!plan)
     return { result: "incomplete", mode: "full" };
+  options.persist?.(plan.mode);
+  return plan.apply();
+}
+function planNewToolDrop(target, options, prepare, plannedRemovals) {
+  if (prepare && (target?.prepareDrop?.() ?? target?.canDrop?.()) === false) {
+    return;
   }
   if (!target) {
-    options.persist?.("full");
-    return { result: "absent", mode: "full" };
+    return { mode: "full", apply: () => ({ result: "absent", mode: "full" }) };
   }
-  if (options.inWindow && hasSmallToolInput(target) || options.keepSkeleton === true || target.cannotRemove?.() === true || target.wouldStrandConversationEnd?.() === true) {
+  if (options.inWindow && hasSmallToolInput(target) || options.keepSkeleton === true || target.cannotRemove?.() === true || target.wouldStrandConversationEnd?.(plannedRemovals) === true) {
     const strip = target.hasAttachments?.() === true;
-    options.persist?.(strip ? "skeleton_stripped" : "skeleton_real");
+    const mode = strip ? "skeleton_stripped" : "skeleton_real";
     return {
-      result: (strip ? target.skeletonStripped?.() : target.skeletonReal?.()) ?? "absent",
-      mode: strip ? "skeleton_stripped" : "skeleton_real"
+      mode,
+      apply: () => ({
+        result: (strip ? target.skeletonStripped?.() : target.skeletonReal?.()) ?? "absent",
+        mode
+      })
     };
   }
-  options.persist?.("full");
-  const result = target.drop?.() ?? "absent";
-  if (result === "truncated" && target.hasAttachments?.() === true) {
-    return { result: target.skeletonStripped?.() ?? "absent", mode: "skeleton_stripped" };
-  }
-  return { result, mode: result === "truncated" ? "skeleton_real" : "full" };
+  return {
+    mode: "full",
+    apply: () => {
+      const result = target.drop?.() ?? "absent";
+      if (result === "truncated" && target.hasAttachments?.() === true) {
+        return {
+          result: target.skeletonStripped?.() ?? "absent",
+          mode: "skeleton_stripped"
+        };
+      }
+      return { result, mode: result === "truncated" ? "skeleton_real" : "full" };
+    }
+  };
 }
 function applyPersistedToolDrop(db, sessionId, tagNumber, target, options, afterWrite) {
   return applyNewToolDrop(target, {
@@ -24323,6 +24373,7 @@ function prepareLegacyToolSkeletonConversions(db, sessionId, targets, options =
     }
   };
 }
+var PENDING_OPERATION_CHUNK_SIZE = 64;
 function applyPendingOperations(sessionId, db, targets, protectedTagIds, preloadedTags, preloadedPendingOps, syntheticPendingOps = [], editMarkerTagIds = new Set, onTagReduced, onBatchComplete, onEligibilitySnapshot) {
   let didMutateMessage = false;
   let diagnostics;
@@ -24332,153 +24383,184 @@ function applyPendingOperations(sessionId, db, targets, protectedTagIds, preload
     diagnostics.reasons[reason] = (diagnostics.reasons[reason] ?? 0) + 1;
   };
   let admitted = false;
-  try {
-    db.transaction(() => {
-      admitted = true;
-    }).immediate();
-    {
-      const pendingOps = preloadedPendingOps ?? getPendingOps(db, sessionId);
-      onEligibilitySnapshot?.(capturePendingDropEligibility(targets, protectedTagIds));
-      const tags = preloadedTags ?? getTagsByNumbers2(db, sessionId, [
-        ...new Set([
-          ...pendingOps.map((op) => op.tagId),
-          ...syntheticPendingOps.map((op) => op.tagId)
-        ])
-      ]);
-      const tagById = new Map(tags.map((tag) => [tag.tagNumber, tag]));
-      const tagStatusById = new Map(tags.map((tag) => [tag.tagNumber, tag.status]));
-      const tagTypeById = new Map(tags.map((tag) => [tag.tagNumber, tag.type]));
-      const opsToApply = [
-        ...pendingOps.map((op) => ({ op, synthetic: false })),
-        ...syntheticPendingOps.map((op) => ({ op, synthetic: true }))
-      ];
-      diagnostics = {
-        source: pendingOps.length > 0 && syntheticPendingOps.length > 0 ? "mixed" : syntheticPendingOps.length > 0 ? "synthetic" : "pending",
-        total: opsToApply.length,
-        mutated: 0,
-        persistedWithoutMutation: 0,
-        reasons: {}
-      };
-      const skeletonWindow = new Set(preloadedTags ? tags.filter((tag) => tag.type === "tool").map((tag) => tag.tagNumber).sort((left, right) => right - left).slice(0, RECENT_TOOL_SKELETON_WINDOW) : getNewestToolTagNumbers2(db, sessionId, RECENT_TOOL_SKELETON_WINDOW));
-      for (const { op: pendingOp, synthetic } of opsToApply) {
-        let operationMutated = false;
-        const tagStatus = tagStatusById.get(pendingOp.tagId);
-        if (tagStatus === "compacted" || tagStatus === "dropped") {
-          reject("already_reduced");
-          if (!synthetic)
-            removePendingOp(db, sessionId, pendingOp.tagId);
-          continue;
-        }
-        const target = targets.get(pendingOp.tagId);
-        const veto = pendingDropVeto(pendingOp.tagId, target, protectedTagIds);
-        if (veto) {
-          reject(veto);
-          continue;
-        }
-        const isToolTag = tagTypeById.get(pendingOp.tagId) === "tool";
-        if (synthetic) {
-          if (!isToolTag) {
-            reject("synthetic_non_tool");
-            continue;
-          }
-          if (target?.canDrop?.() !== true) {
-            reject("synthetic_target_not_droppable");
-            continue;
-          }
+  let startedAt = 0;
+  const mutations = [];
+  let drainChunk;
+  let hasMore = false;
+  do {
+    admitted = false;
+    startedAt = 0;
+    try {
+      db.transaction(() => {
+        admitted = true;
+        startedAt = performance.now();
+        if (drainChunk) {
+          drainChunk();
+          return;
         }
-        const persistDrop = (mode) => {
-          let startedAt = 0;
-          try {
-            db.transaction(() => {
-              startedAt = performance.now();
-              markTagDropped2(db, sessionId, pendingOp.tagId, mode);
+        const pendingOps = preloadedPendingOps ?? getPendingOps(db, sessionId);
+        onEligibilitySnapshot?.(capturePendingDropEligibility(targets, protectedTagIds));
+        const tags = preloadedTags ?? getTagsByNumbers2(db, sessionId, [
+          ...new Set([
+            ...pendingOps.map((op) => op.tagId),
+            ...syntheticPendingOps.map((op) => op.tagId)
+          ])
+        ]);
+        const tagById = new Map(tags.map((tag) => [tag.tagNumber, tag]));
+        const tagStatusById = new Map(tags.map((tag) => [tag.tagNumber, tag.status]));
+        const tagTypeById = new Map(tags.map((tag) => [tag.tagNumber, tag.type]));
+        const opsToApply = [
+          ...pendingOps.map((op) => ({ op, synthetic: false })),
+          ...syntheticPendingOps.map((op) => ({ op, synthetic: true }))
+        ];
+        diagnostics = {
+          source: pendingOps.length > 0 && syntheticPendingOps.length > 0 ? "mixed" : syntheticPendingOps.length > 0 ? "synthetic" : "pending",
+          total: opsToApply.length,
+          mutated: 0,
+          persistedWithoutMutation: 0,
+          reasons: {}
+        };
+        const skeletonWindow = new Set(preloadedTags ? tags.filter((tag) => tag.type === "tool").map((tag) => tag.tagNumber).sort((left, right) => right - left).slice(0, RECENT_TOOL_SKELETON_WINDOW) : getNewestToolTagNumbers2(db, sessionId, RECENT_TOOL_SKELETON_WINDOW));
+        const plannedRemovals = new Set;
+        const removedTagIds = new Set;
+        const record = (mutated) => {
+          if (!diagnostics)
+            return;
+          if (mutated) {
+            didMutateMessage = true;
+            diagnostics.mutated += 1;
+          } else
+            diagnostics.persistedWithoutMutation += 1;
+        };
+        let cursor = 0;
+        drainChunk = () => {
+          const chunk = opsToApply.slice(cursor, cursor + PENDING_OPERATION_CHUNK_SIZE);
+          cursor += chunk.length;
+          hasMore = cursor < opsToApply.length;
+          for (const { op: pendingOp, synthetic } of chunk) {
+            const tagStatus = tagStatusById.get(pendingOp.tagId);
+            if (tagStatus === "compacted" || tagStatus === "dropped") {
+              reject("already_reduced");
               if (!synthetic)
                 removePendingOp(db, sessionId, pendingOp.tagId);
-            }).immediate();
-          } finally {
-            if (startedAt)
-              logSlowWriteTransaction("apply_pending_operation", startedAt);
-          }
-        };
-        let shouldPersistDrop = false;
-        if (isToolTag) {
-          if (editMarkerTagIds.has(pendingOp.tagId)) {
-            const strip = target?.hasAttachments?.() === true;
-            if (target?.canDrop?.() === false || target?.prepareDrop?.() === false || !target) {
-              reject("edit_marker_incomplete");
               continue;
             }
-            persistDrop(strip ? "edit_marker_stripped" : "edit_marker");
-            const markResult = (strip ? target?.editMarkerStripped?.() : target?.editMarker?.()) ?? "absent";
-            if (markResult === "incomplete" || markResult === "absent") {
-              reject(`edit_marker_${markResult}`);
+            if (removedTagIds.has(pendingOp.tagId)) {
+              reject("drop_incomplete");
               continue;
             }
-            didMutateMessage = true;
-            operationMutated = true;
-            onTagReduced?.({ tagNumber: pendingOp.tagId, mode: "edit_marker" });
-            shouldPersistDrop = true;
-          } else {
-            const { result: dropResult, mode: appliedMode } = applyNewToolDrop(target, {
-              inWindow: skeletonWindow.has(pendingOp.tagId),
-              persist: persistDrop
-            });
-            if (dropResult === "incomplete" || synthetic && dropResult !== "removed" && dropResult !== "truncated") {
-              reject(`drop_${dropResult}`);
+            const target = targets.get(pendingOp.tagId);
+            const veto = pendingDropVeto(pendingOp.tagId, target, protectedTagIds);
+            if (veto) {
+              reject(veto);
               continue;
             }
-            if (dropResult === "removed" || dropResult === "truncated") {
-              didMutateMessage = true;
-              operationMutated = true;
-              onTagReduced?.({
-                tagNumber: pendingOp.tagId,
-                mode: appliedMode === "full" ? "full" : "truncated"
+            const isToolTag = tagTypeById.get(pendingOp.tagId) === "tool";
+            if (synthetic) {
+              if (!isToolTag) {
+                reject("synthetic_non_tool");
+                continue;
+              }
+              if (target?.canDrop?.() !== true) {
+                reject("synthetic_target_not_droppable");
+                continue;
+              }
+            }
+            const persistDrop = (mode) => {
+              markTagDropped2(db, sessionId, pendingOp.tagId, mode);
+              if (!synthetic)
+                removePendingOp(db, sessionId, pendingOp.tagId);
+            };
+            if (isToolTag) {
+              if (editMarkerTagIds.has(pendingOp.tagId)) {
+                const strip = target?.hasAttachments?.() === true;
+                if (target?.canDrop?.() === false || target?.prepareDrop?.() === false || !target) {
+                  reject("edit_marker_incomplete");
+                  continue;
+                }
+                persistDrop(strip ? "edit_marker_stripped" : "edit_marker");
+                mutations.push(() => {
+                  const markResult = (strip ? target?.editMarkerStripped?.() : target?.editMarker?.()) ?? "absent";
+                  if (markResult === "incomplete" || markResult === "absent") {
+                    reject(`edit_marker_${markResult}`);
+                    return;
+                  }
+                  record(true);
+                  onTagReduced?.({
+                    tagNumber: pendingOp.tagId,
+                    mode: "edit_marker"
+                  });
+                });
+              } else {
+                const plan = planNewToolDrop(target, { inWindow: skeletonWindow.has(pendingOp.tagId) }, true, plannedRemovals);
+                if (!plan) {
+                  reject("drop_incomplete");
+                  continue;
+                }
+                persistDrop(plan.mode);
+                if (plan.mode === "full" && target?.drop) {
+                  target.notePlannedRemoval?.(plannedRemovals);
+                  removedTagIds.add(pendingOp.tagId);
+                }
+                mutations.push(() => {
+                  const { result: dropResult, mode: appliedMode } = plan.apply();
+                  if (dropResult === "incomplete" || synthetic && dropResult !== "removed" && dropResult !== "truncated") {
+                    reject(`drop_${dropResult}`);
+                    return;
+                  }
+                  if (dropResult === "removed" || dropResult === "truncated") {
+                    record(true);
+                    onTagReduced?.({
+                      tagNumber: pendingOp.tagId,
+                      mode: appliedMode === "full" ? "full" : "truncated"
+                    });
+                  } else {
+                    reject(`drop_${dropResult}`);
+                    record(false);
+                  }
+                });
+              }
+            } else if (target) {
+              const replacement = buildReplacementContent(pendingOp.tagId);
+              persistDrop();
+              mutations.push(() => {
+                const priorContent = target.getContent?.();
+                const changed = target.setContent(replacement);
+                record(changed);
+                if (changed) {
+                  const originalCharacters = typeof priorContent === "string" ? priorContent.length : tagById.get(pendingOp.tagId)?.byteSize ?? replacement.length;
+                  onTagReduced?.({
+                    tagNumber: pendingOp.tagId,
+                    mode: "partial",
+                    removedCharacters: Math.max(0, originalCharacters - replacement.length)
+                  });
+                } else {
+                  reject("content_unchanged");
+                }
               });
-            } else {
-              reject(`drop_${dropResult}`);
+            } else if (!synthetic) {
+              reject("target_absent");
+              persistDrop();
+              mutations.push(() => record(false));
             }
-            shouldPersistDrop = true;
-          }
-        } else if (target) {
-          const replacement = buildReplacementContent(pendingOp.tagId);
-          const priorContent = target.getContent?.();
-          persistDrop();
-          const changed = target.setContent(replacement);
-          if (changed) {
-            didMutateMessage = true;
-            operationMutated = true;
-            const originalCharacters = typeof priorContent === "string" ? priorContent.length : tagById.get(pendingOp.tagId)?.byteSize ?? replacement.length;
-            onTagReduced?.({
-              tagNumber: pendingOp.tagId,
-              mode: "partial",
-              removedCharacters: Math.max(0, originalCharacters - replacement.length)
-            });
-          } else {
-            reject("content_unchanged");
           }
-          shouldPersistDrop = true;
-        } else if (!synthetic) {
-          reject("target_absent");
-          persistDrop();
-          shouldPersistDrop = true;
-        }
-        if (!shouldPersistDrop) {
-          reject("not_persisted");
-          continue;
-        }
-        if (operationMutated)
-          diagnostics.mutated += 1;
-        else
-          diagnostics.persistedWithoutMutation += 1;
+        };
+        drainChunk();
+      }).immediate();
+    } catch (error) {
+      if (!admitted && /database (?:table )?is locked|sqlite_(busy|locked)/i.test(String(error))) {
+        sessionLog2(sessionId, "pending operations write admission busy; retaining remaining operations for retry");
+        hasMore = false;
+      } else {
+        throw error;
       }
+    } finally {
+      if (startedAt)
+        logSlowWriteTransaction("apply_pending_operations", startedAt);
     }
-  } catch (error) {
-    if (!admitted && /database (?:table )?is locked|sqlite_(busy|locked)/i.test(String(error))) {
-      sessionLog2(sessionId, "pending operations write admission busy; retaining prior bytes for retry");
-      return false;
-    }
-    throw error;
-  }
+    for (const mutate of mutations.splice(0))
+      mutate();
+  } while (hasMore);
   if (diagnostics) {
     onBatchComplete?.(diagnostics);
     if (diagnostics.total > 0 && diagnostics.mutated === 0) {
@@ -26620,6 +26702,41 @@ ${typeof state?.output === "string" ? state.output : JSON.stringify(state?.outpu
   };
 }
 
+// ../plugin/src/hooks/magic-context/transform-stage-logger.ts
+import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
+var SLOW_STAGE_MS = 100;
+var passes = new AsyncLocalStorage2;
+async function withTransformTimingSummary(run) {
+  const pass = {
+    stages: [],
+    slow: [],
+    closed: false,
+    sessionId: undefined
+  };
+  return passes.run(pass, async () => {
+    try {
+      return await run();
+    } finally {
+      pass.closed = true;
+      if (pass.sessionId)
+        sessionLog2(pass.sessionId, `transform stages: ${pass.stages.join(" ")} slow>=${SLOW_STAGE_MS}ms=[${pass.slow.join(",")}]`);
+    }
+  });
+}
+function logTransformElapsed(sessionId, stage, elapsedMs, extra) {
+  const elapsed = elapsedMs.toFixed(1);
+  const suffix = extra ? ` ${extra}` : "";
+  const pass = passes.getStore();
+  if (pass && !pass.closed) {
+    pass.sessionId = sessionId;
+    pass.stages.push(`${stage}=${elapsed}ms${extra ? `(${extra})` : ""}`);
+    if (elapsedMs >= SLOW_STAGE_MS)
+      pass.slow.push(stage);
+  }
+  if (elapsedMs >= SLOW_STAGE_MS)
+    sessionLog2(sessionId, `transform stage: stage=${stage} elapsed=${elapsed}ms${suffix}`);
+}
+
 // ../plugin/src/shared/recovery-reasoning-prefix.ts
 function recoveryReasoningPrefixes(messages, partsKey) {
   const prefixes = [];
@@ -27065,12 +27182,12 @@ class ConversationEndGuard {
         this.end = message;
     }
   }
-  wouldStrand(occurrences) {
+  wouldStrand(occurrences, plannedRemovals) {
     const end = this.end;
     if (!end || !occurrences.some((occ) => occ.message === end))
       return false;
     const leaving = new Set(occurrences.map((occ) => partKey(occ.part)));
-    const survives = (part) => !leaving.has(partKey(part)) && !this.removed.has(partKey(part));
+    const survives = (part) => !leaving.has(partKey(part)) && !this.removed.has(partKey(part)) && !plannedRemovals?.has(partKey(part));
     return end.info.role === "assistant" ? !end.parts.some((part) => part.kind === "tool_result" && survives(part)) : !end.parts.some((part) => partHasContent(part) && survives(part));
   }
   noteRemoved(occurrences) {
@@ -27397,8 +27514,12 @@ function buildAggregateTarget(tagId, occurrences, requiresToolArcSkeleton, conve
       }
       return null;
     },
-    wouldStrandConversationEnd() {
-      return conversationEnd?.wouldStrand(occurrences) ?? false;
+    wouldStrandConversationEnd(plannedRemovals) {
+      return conversationEnd?.wouldStrand(occurrences, plannedRemovals) ?? false;
+    },
+    notePlannedRemoval(plannedRemovals) {
+      for (const occ of occurrences)
+        plannedRemovals.add(partKey(occ.part));
     },
     editMarker() {
       const sentinel = `[dropped §${tagId}§]`;
@@ -27486,7 +27607,8 @@ function buildToolTarget(part, message, tagId) {
 }
 
 // ../plugin/src/hooks/magic-context/auto-search-deadline.ts
-var AUTO_SEARCH_TIMEOUT_MS = 3000;
+var AUTO_SEARCH_TIMEOUT_MS = 1000;
+var AUTO_SEARCH_VECTOR_TIMEOUT_MS = 200;
 var operationDeadlines = new WeakMap;
 function autoSearchDeadlineUnixMs(signal) {
   const deadline = signal && operationDeadlines.get(signal);
@@ -27599,32 +27721,32 @@ function formatAge(committedAtMs) {
   const years = Math.floor(days / 365);
   return years === 1 ? "1y ago" : `${years}y ago`;
 }
-function renderFragment(result, charCap, wordRules) {
+function renderFragment(result, charCap, wordRules, query) {
   switch (result.source) {
     case "memory": {
-      const compressed = cavemanCompress(result.content, "ultra", CURRENT_CAVEMAN_RULES, wordRules);
+      const compressed = cavemanCompress(cleanSearchText(result.content), "ultra", CURRENT_CAVEMAN_RULES, wordRules);
       return truncate2(compressed, charCap);
     }
     case "git_commit": {
-      const subject = result.content.split(/\r?\n/)[0] ?? result.content;
+      const subject = cleanSearchText(result.content.split(/\r?\n/)[0] ?? result.content);
       const body = truncate2(subject, Math.max(10, charCap - 20));
       return `commit ${result.shortSha} ${formatAge(result.committedAtMs)}: ${body}`;
     }
     case "message": {
-      const compressed = cavemanCompress(result.content, "ultra", CURRENT_CAVEMAN_RULES, wordRules);
+      const compressed = cavemanCompress(query ? matchedSearchSnippet(result.content, query, charCap) : cleanSearchText(result.content), "ultra", CURRENT_CAVEMAN_RULES, wordRules);
       return truncate2(compressed, charCap);
     }
     case "compartment": {
-      const source = result.snippet ?? result.title;
+      const source = cleanSearchText(result.title);
       const compressed = cavemanCompress(source, "ultra", CURRENT_CAVEMAN_RULES, wordRules);
       return truncate2(compressed, charCap);
     }
     case "primer": {
-      const compressed = cavemanCompress(result.content, "ultra", CURRENT_CAVEMAN_RULES, wordRules);
+      const compressed = cavemanCompress(cleanSearchText(result.content), "ultra", CURRENT_CAVEMAN_RULES, wordRules);
       return truncate2(compressed, charCap);
     }
     case "note": {
-      const compressed = cavemanCompress(result.content, "ultra", CURRENT_CAVEMAN_RULES, wordRules);
+      const compressed = cavemanCompress(cleanSearchText(result.content), "ultra", CURRENT_CAVEMAN_RULES, wordRules);
       return truncate2(compressed, charCap);
     }
   }
@@ -27635,7 +27757,7 @@ function buildAutoSearchHint(results, options = {}) {
   const picks = results.slice(0, maxFragments);
   const lines = [];
   for (const result of picks) {
-    const fragment = renderFragment(result, fragmentCharCap, options.wordRules ?? "english");
+    const fragment = renderFragment(result, fragmentCharCap, options.wordRules ?? "english", options.query ?? "");
     if (fragment.length === 0)
       continue;
     lines.push(`- ${fragment}`);
@@ -27658,6 +27780,9 @@ ${trimmedBody}…
   }
   return wrapped;
 }
+function selectAutoSearchResults(results, threshold) {
+  return results.filter((result) => (result.relevanceScore ?? result.score) >= threshold);
+}
 
 // ../plugin/src/hooks/magic-context/auto-search-worker-client.ts
 import { Worker } from "node:worker_threads";
@@ -27753,6 +27878,63 @@ async function searchAutoHint(db, sessionId, projectPath, query, options, entry
   return executeAutoSearchWorker(db, sessionId, projectPath, query, options, entry, "search");
 }
 var pendingBackfills = new WeakMap;
+var searchWorkers = new WeakMap;
+var liveSearchWorkers = new Set;
+var MAX_IDLE_SEARCH_WORKERS = 4;
+var SEARCH_WORKER_IDLE_MS = 5 * 60000;
+var workersCreated = 0;
+var workersReused = 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) {
+      const current = slot;
+      await new Promise((resolve) => {
+        const done = () => {
+          signal.removeEventListener("abort", done);
+          resolve();
+        };
+        signal.addEventListener("abort", done, { once: true });
+        current.busy?.then(done);
+        if (signal.aborted)
+          done();
+      });
+      continue;
+    }
+    const fresh = !slot;
+    if (!slot) {
+      const worker = inRootAsyncContext2(() => new Worker(entry, { workerData: { ...input, persistent: true } }));
+      slot = {
+        worker,
+        dispose() {
+          clearTimeout(this.idleTimer);
+          if (pool.get(key) === this)
+            pool.delete(key);
+          liveSearchWorkers.delete(this);
+          worker.terminate();
+          worker.unref();
+        }
+      };
+      workersCreated++;
+      pool.set(key, slot);
+      liveSearchWorkers.add(slot);
+      const current = slot;
+      worker.on("error", () => current.dispose());
+      worker.on("exit", () => current.dispose());
+    } else
+      workersReused++;
+    clearTimeout(slot.idleTimer);
+    const current = slot;
+    current.busy = new Promise((resolve) => {
+      current.release = resolve;
+    });
+    current.worker.ref();
+    return { slot: current, fresh };
+  }
+  return null;
+}
 function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
   if (isEmbeddingHostBusy2())
     return Promise.resolve();
@@ -27817,6 +27999,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     query,
     options: {
       ...serializable,
+      autoHint: true,
       backfillMemoryEmbeddings: false,
       countRetrievals: false,
       measurementDisabled: true
@@ -27826,8 +28009,20 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     snapshot,
     deadlineUnixMs: autoSearchDeadlineUnixMs(deadlineSignal)
   };
+  let lease;
+  try {
+    lease = await acquireSearchWorker(db, `${input.harness}\x00${projectPath}\x00${job}\x00${entry.href}`, entry, input, signal);
+  } catch (error) {
+    lifecycle.done();
+    throw error;
+  }
+  if (!lease) {
+    lifecycle.done();
+    return [];
+  }
+  const { slot, fresh } = lease;
+  const worker = slot.worker;
   return new Promise((resolve, reject) => {
-    const worker = inRootAsyncContext2(() => new Worker(entry, { workerData: input }));
     let settled = false;
     const finish = (results, error) => {
       if (settled)
@@ -27836,7 +28031,25 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
       signal?.removeEventListener("abort", abort);
       lifecycle.signal.removeEventListener("abort", abort);
       lifecycle.done();
-      worker.terminate();
+      worker.off("message", onMessage);
+      worker.off("error", onError);
+      worker.off("exit", onExit);
+      if (error || signal.aborted || entry.href !== defaultAutoSearchWorkerEntry().href)
+        slot.dispose();
+      else {
+        slot.idleTimer = setTimeout(() => slot.dispose(), SEARCH_WORKER_IDLE_MS);
+        slot.idleTimer.unref?.();
+      }
+      const release = slot.release;
+      slot.busy = undefined;
+      slot.release = undefined;
+      release?.();
+      const reusable = liveSearchWorkers.delete(slot);
+      if (reusable)
+        liveSearchWorkers.add(slot);
+      const idle = [...liveSearchWorkers].filter((candidate) => !candidate.busy);
+      for (const prior of idle.slice(0, Math.max(0, idle.length - MAX_IDLE_SEARCH_WORKERS)))
+        prior.dispose();
       worker.unref();
       if (error)
         reject(error);
@@ -27846,9 +28059,9 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     const abort = () => finish([]);
     signal?.addEventListener("abort", abort, { once: true });
     lifecycle.signal.addEventListener("abort", abort, { once: true });
-    worker.on("error", (error) => finish([], error));
-    worker.on("exit", (code) => finish([], new Error(`auto-search worker exited (${code})`)));
-    worker.on("message", async (reply) => {
+    const onError = (error) => finish([], error);
+    const onExit = (code) => finish([], new Error(`auto-search worker exited (${code})`));
+    const onMessage = async (reply) => {
       if (settled)
         return;
       if (reply.kind === "result") {
@@ -27867,7 +28080,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
       const response = { id: reply.id };
       try {
         if (reply.kind === "query")
-          response.result = await (job === "backfill" ? embedTextForProject2(projectPath, reply.text, signal, "query") : embedQuery?.(reply.text, signal)) ?? null;
+          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);
@@ -27882,13 +28095,49 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
         response.error = error instanceof Error ? error.message : String(error);
       }
       response.embeddingHostBusy = isEmbeddingHostBusy2();
-      if (!settled && !signal?.aborted)
-        worker.postMessage(response);
-    });
+      if (!settled && !signal?.aborted) {
+        try {
+          worker.postMessage(response);
+        } catch (error) {
+          finish([], error instanceof Error ? error : new Error(String(error)));
+        }
+      }
+    };
+    worker.on("error", onError);
+    worker.on("exit", onExit);
+    worker.on("message", onMessage);
     if (signal?.aborted)
       abort();
+    else if (!fresh) {
+      try {
+        worker.postMessage({ kind: "run", input });
+      } catch (error) {
+        finish([], error instanceof Error ? error : new Error(String(error)));
+      }
+    }
   });
 }
+async function boundedHintEmbedding(embed, text, signal) {
+  const controller = new AbortController;
+  const combined = AbortSignal.any([signal, controller.signal]);
+  let timer;
+  try {
+    return await Promise.race([
+      Promise.resolve().then(() => embed?.(text, combined) ?? null),
+      new Promise((resolve) => {
+        timer = setTimeout(() => {
+          resolve(null);
+          controller.abort();
+        }, AUTO_SEARCH_VECTOR_TIMEOUT_MS);
+      })
+    ]);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function defaultAutoSearchWorkerEntry() {
+  return new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./auto-search-worker.ts" : "./auto-search-worker.js", import.meta.url);
+}
 var messageSearchWorkerFallbacks = new Map;
 
 // src/auto-search-pi.ts
@@ -28078,6 +28327,8 @@ async function runAutoSearchHintForPi(args) {
         const gitCommitsEnabled = snapshot?.gitCommitEnabled ?? false;
         const searchOptions = {
           limit: 10,
+          maxMessageOrdinal: Math.max(0, getLastCompartmentEndMessage(db, sessionId)),
+          excludeMessageId: userMsgId,
           memoryEnabled,
           embeddingEnabled,
           gitCommitsEnabled,
@@ -28119,13 +28370,15 @@ async function runAutoSearchHintForPi(args) {
         return messages;
       }
       const scoreThreshold = options.scoreThreshold ?? DEFAULT_SCORE_THRESHOLD;
-      if (results[0].score < scoreThreshold) {
-        sessionLog2(sessionId, `auto-search: top score ${results[0].score.toFixed(3)} below threshold ${scoreThreshold}`);
+      results = selectAutoSearchResults(results, scoreThreshold);
+      if (results.length === 0) {
+        sessionLog2(sessionId, `auto-search: no fragment meets relevance threshold ${scoreThreshold}`);
         await writeNoHintAndReconcile("below-threshold");
         return messages;
       }
       const hintText = buildAutoSearchHint(results, {
-        wordRules: options.wordRules
+        wordRules: options.wordRules,
+        query: rawPrompt
       });
       if (!hintText) {
         await writeNoHintAndReconcile("empty");
@@ -28558,6 +28811,7 @@ async function runHistorianSubagentWithTransientRetriesGuarded(args) {
       args.onDispatch?.();
       result = await args.runner.run({
         ...args.options,
+        cacheTail: retryIndex > 0 ? "write" : args.options.cacheTail ?? "skip",
         fallbackModels: undefined
       });
     } catch (error) {
@@ -28585,7 +28839,7 @@ async function runHistorianSubagentWithTransientRetriesGuarded(args) {
   }
   return historianAbortResult(startedAt);
 }
-function buildHistorianFallbackChain(primaryModel, primaryThinkingLevel, fallbackModels, fallbackModelId) {
+function buildHistorianFallbackChain(primaryModel, primaryThinkingLevel, fallbackModels) {
   const seen = new Set([
     `${primaryModel}\x00${primaryThinkingLevel ?? ""}`
   ]);
@@ -28596,13 +28850,7 @@ function buildHistorianFallbackChain(primaryModel, primaryThinkingLevel, fallbac
     if (!entry.model || seen.has(key))
       continue;
     seen.add(key);
-    chain.push({ entry, kind: "configured" });
-  }
-  if (fallbackModelId) {
-    const entry = { model: fallbackModelId };
-    const key = `${entry.model}\x00`;
-    if (!seen.has(key))
-      chain.push({ entry, kind: "session" });
+    chain.push(entry);
   }
   return chain;
 }
@@ -29005,9 +29253,11 @@ ${chunkText}`,
       });
       let validatedPass = await validateHistorianResult(firstResult, sessionId, chunk, priorCompartments, sequenceOffset);
       let validatedDraftText = firstResult.ok ? firstResult.assistantText : null;
+      let fallbackPrompt = prompt;
       if (validatedPass.kind === "validation-failed") {
         sessionLog2(sessionId, `historian: first pass validation failed, retrying with repair prompt: ${validatedPass.error}`);
         const repairPrompt = buildHistorianRepairPrompt(prompt, validatedPass.rawText, validatedPass.error, deps.language);
+        fallbackPrompt = repairPrompt;
         const repairResult = await runHistorianSubagentWithTransientRetries({
           runner,
           sessionId,
@@ -29034,31 +29284,31 @@ ${chunkText}`,
           validatedDraftText = repairResult.assistantText;
         }
       }
-      const fallbackChain = buildHistorianFallbackChain(historianModel, thinkingLevel, fallbackModels, fallbackModelId);
+      const fallbackChain = buildHistorianFallbackChain(historianModel, thinkingLevel, fallbackModels);
       if (validatedPass.kind !== "ok" && !(validatedPass.kind === "spawn-failed" && validatedPass.reason === "abort") && fallbackChain.length > 0) {
         for (let i = 0;i < fallbackChain.length; i += 1) {
           const candidate = fallbackChain[i];
-          sessionLog2(sessionId, `historian: escalating to ${candidate.kind === "session" ? "session-model last resort" : "configured fallback model"} ${candidate.entry.model}`);
+          sessionLog2(sessionId, `historian: escalating to configured fallback model ${candidate.model}`);
           const fbResult = await runHistorianSubagentWithTransientRetries({
             runner,
             sessionId,
-            passLabel: candidate.kind === "session" ? "fallback-session" : "fallback",
+            passLabel: "fallback",
             retryBackoffMs,
             options: {
               agent: HISTORIAN_AGENT_NAME,
               systemPrompt: historianSystemPrompt,
-              userMessage: prompt,
-              model: candidate.entry.model,
+              userMessage: fallbackPrompt,
+              model: candidate.model,
               timeoutMs: historianTimeoutMs,
               cwd: directory,
               signal,
-              thinkingLevel: candidate.entry.qualifier,
+              thinkingLevel: candidate.qualifier,
               temperature,
               maxOutputTokens,
               onProgress: buildProgressLogger("fallback"),
               accountingSessionId: sessionId,
               accountingSubagent: "historian",
-              accountingTask: candidate.kind === "session" ? "fallback-session" : "fallback"
+              accountingTask: "fallback"
             }
           });
           const fbPass = await validateHistorianResult(fbResult, sessionId, chunk, priorCompartments, sequenceOffset);
@@ -34028,6 +34278,54 @@ function isSentinelPart(part) {
   return p.type === "text" && typeof p.text === "string" && (p.text === "" || p.text === WHOLE_MESSAGE_PLACEHOLDER_TEXT);
 }
 
+// src/pi-append-compaction.ts
+var loggedIncompatibleHost = false;
+var failedWrites = new WeakMap;
+function adaptPiAppendCompaction(sessionManager) {
+  if (!sessionManager || typeof sessionManager !== "object")
+    return;
+  const host = sessionManager;
+  const append = host.appendCompaction;
+  if (typeof append !== "function")
+    return;
+  if (failedWrites.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") {
+    if (!loggedIncompatibleHost) {
+      loggedIncompatibleHost = true;
+      log2(`ERROR: compaction marker disabled: incompatible host binding harness=${harness} arity=${append.length} getEntry=${typeof host.getEntry}; leaving marker pending`);
+    }
+    return;
+  }
+  const getEntry = host.getEntry.bind(host);
+  return (summary, firstKeptEntryId, tokensBefore, details, fromHook) => {
+    const previousFailure = failedWrites.get(host);
+    if (previousFailure)
+      throw previousFailure;
+    let id;
+    if (harness === "pi") {
+      id = append.call(host, summary, firstKeptEntryId, tokensBefore, details, fromHook);
+    } else if (append.length === 7) {
+      id = append.call(host, summary, undefined, firstKeptEntryId, tokensBefore, details, fromHook);
+    } else {
+      id = append.call(host, summary, undefined, firstKeptEntryId, tokensBefore, { details, fromExtension: fromHook });
+    }
+    try {
+      const entry = typeof id === "string" && id.length > 0 ? getEntry(id) : undefined;
+      if (entry?.type !== "compaction" || entry.firstKeptEntryId !== firstKeptEntryId || entry.details?.source !== "magic-context") {
+        throw new Error("Compaction marker read-back mismatch");
+      }
+    } catch {
+      const error = new Error("Compaction marker read-back failed; writes disabled for this session manager until restart");
+      failedWrites.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;
+    }
+    return id;
+  };
+}
+
 // src/pi-context-budget.ts
 var PI_CONTEXT_BUDGET = {
   hostDeadlineMs: 30000,
@@ -34352,6 +34650,87 @@ function isOmpUnmanagedCaptureRequest(payload) {
 // src/pi-dispatch-chain.ts
 import { isDeepStrictEqual } from "node:util";
 
+// src/pi-dispatch-agent-history.ts
+function object(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+var DEVELOPER_ORIGIN = Symbol("custom developer history");
+function piIsDeveloperHistory(message) {
+  return message.role === "developer" || Reflect.get(message, DEVELOPER_ORIGIN) === true;
+}
+function piAgentHistory(messages, api) {
+  return messages.flatMap((value) => {
+    const message = object(value);
+    if (!message)
+      return [value];
+    if (message.role === "compactionSummary") {
+      return [
+        {
+          ...message,
+          role: "user",
+          content: message.blocks !== undefined ? [
+            { type: "text", text: message.summary },
+            ...Array.isArray(message.blocks) ? message.blocks : []
+          ] : [
+            { type: "text", text: "Compaction context envelope" },
+            ...Array.isArray(message.images) ? message.images : []
+          ]
+        }
+      ];
+    }
+    if (message.role !== "custom" && message.role !== "hookMessage")
+      return [value];
+    if (typeof message.content !== "string" && !Array.isArray(message.content))
+      return [];
+    const content = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content;
+    const userInvoked = message.role === "custom" && message.attribution === "user";
+    if (userInvoked && message.customType === "collab-prompt") {
+      const text = content.filter((part) => object(part)?.type === "text").map((part) => object(part)?.text).join(`
+`);
+      return [
+        {
+          ...message,
+          role: "user",
+          content: [
+            {
+              type: "text",
+              text: text.length ? "User interjection envelope" : ""
+            },
+            ...content.filter((part) => object(part)?.type === "image")
+          ]
+        }
+      ];
+    }
+    if (userInvoked && message.customType === "skill-prompt")
+      return [{ ...message, role: "user", content }];
+    const images = content.filter((part) => object(part)?.type === "image");
+    const developerRole = api === "ollama-chat" && message.attribution !== "user" ? "developer" : "user";
+    if (!images.length)
+      return [
+        { ...message, role: developerRole, content, [DEVELOPER_ORIGIN]: true }
+      ];
+    const texts = content.filter((part) => object(part)?.type === "text");
+    return [
+      ...texts.length ? [
+        {
+          ...message,
+          role: developerRole,
+          content: texts,
+          [DEVELOPER_ORIGIN]: true
+        }
+      ] : [],
+      {
+        ...message,
+        role: "user",
+        content: [
+          { type: "text", text: `Images attached to ${message.customType}.` },
+          ...images
+        ]
+      }
+    ];
+  });
+}
+
 // src/pi-dispatch-tool-ids.ts
 function record4(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
@@ -34423,20 +34802,20 @@ function piToolCallWireId(id, model, source) {
 }
 
 // src/pi-dispatch-chain-tail.ts
-function object(value) {
+function object2(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 var OMITTED_IMAGE = "[image omitted: model does not support vision]";
 function piEncodeChainTail(messages, assistant, responseItems, model) {
-  const harmony = object(model.identity)?.class === "gpt-oss";
+  const harmony = object2(model.identity)?.class === "gpt-oss";
   const text = (value) => {
     const wellFormed = value.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "�");
     return harmony ? wellFormed.replace(/<\|(start|end|message|channel|constrain|return|call)\|>/g, "<\\|$1\\|>") : wellFormed;
   };
   const supportsImages = model.input?.includes("image") === true;
   const image = (block) => {
-    const detail = block.detail === "original" && object(model.compat)?.supportsImageDetailOriginal !== true ? "auto" : block.detail ?? "auto";
-    const file = object(block.providerFile);
+    const detail = block.detail === "original" && object2(model.compat)?.supportsImageDetailOriginal !== true ? "auto" : block.detail ?? "auto";
+    const file = object2(block.providerFile);
     if (file?.provider === "openai" && typeof file.id === "string" && file.id)
       return { type: "input_image", detail, file_id: file.id };
     if (typeof block.url !== "string" && (typeof block.mimeType !== "string" || typeof block.data !== "string"))
@@ -34449,9 +34828,21 @@ function piEncodeChainTail(messages, assistant, responseItems, model) {
   };
   const items = [];
   for (const value of messages) {
-    const message = object(value);
+    let message = object2(value);
     if (!message || message.providerPayload !== undefined)
       return;
+    if (message.role === "custom" || message.role === "hookMessage") {
+      if (typeof message.customType !== "string" || message.attribution === "user")
+        return;
+      const converted = piAgentHistory([message], model.api);
+      const developer = object2(converted[0]);
+      if (converted.length !== 1 || !developer || !piIsDeveloperHistory(developer))
+        return;
+      message = {
+        ...developer,
+        role: model.api === "openai-codex-responses" ? "developer" : "user"
+      };
+    }
     const user = message.role === "user" || message.role === "developer";
     if (!user && message.role !== "toolResult")
       return;
@@ -34462,7 +34853,7 @@ function piEncodeChainTail(messages, assistant, responseItems, model) {
     const images = [];
     const ordered = [];
     for (const value of content) {
-      const block = object(value);
+      const block = object2(value);
       if (block?.type === "text" && typeof block.text === "string") {
         texts.push(block.text);
         if (!user || block.text.trim())
@@ -34490,7 +34881,7 @@ function piEncodeChainTail(messages, assistant, responseItems, model) {
     if (typeof message.toolCallId !== "string" || message.providerMetadata !== undefined)
       return;
     const id = piToolCallWireId(message.toolCallId, model, assistant);
-    const call = responseItems.map(object).find((item) => item?.call_id === id);
+    const call = responseItems.map(object2).find((item) => item?.call_id === id);
     if (!id || call?.type !== "function_call" && call?.type !== "custom_tool_call")
       return;
     const joined = texts.join(`
@@ -34507,7 +34898,7 @@ ${OMITTED_IMAGE}` : OMITTED_IMAGE : joined);
 }
 
 // src/pi-dispatch-chain.ts
-function object2(value) {
+function object3(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function piChainCapableApi(api) {
@@ -34521,14 +34912,14 @@ function piPreparedHistory(messages, model) {
     if (!fields)
       return;
     snapshots.push({ id: "", fields });
-    const source = object2(message);
+    const source = object3(message);
     responseIds.push(source?.role === "assistant" && typeof source.responseId === "string" && source.responseId.length > 0 ? source.responseId : undefined);
   }
   const prepared = { snapshots, responseIds };
   let index = responseIds.length - 1;
   while (index >= 0 && responseIds[index] === undefined)
     index--;
-  const assistant = object2(messages[index]);
+  const assistant = object3(messages[index]);
   const response = piChainResponse(assistant);
   if (model && assistant && response) {
     const delta = piEncodeChainTail(messages.slice(index + 1), assistant, response.responseItems, model);
@@ -34538,7 +34929,7 @@ function piPreparedHistory(messages, model) {
   return prepared;
 }
 function piChainedRequest(payload) {
-  const body = object2(payload);
+  const body = object3(payload);
   if (!body || body.previous_response_id === undefined)
     return;
   const id = body.previous_response_id;
@@ -34547,14 +34938,14 @@ function piChainedRequest(payload) {
   return { previousResponseId: id, delta: body.input };
 }
 function piChainResponse(message) {
-  const source = object2(message);
+  const source = object3(message);
   if (source?.role !== "assistant")
     return;
   if (source.stopReason !== "stop" && source.stopReason !== "toolUse")
     return;
   if (typeof source.responseId !== "string" || !source.responseId)
     return;
-  const payload = object2(source.providerPayload);
+  const payload = object3(source.providerPayload);
   if (payload?.type !== "openaiResponsesHistory" || payload.dt !== true || !Array.isArray(payload.items))
     return;
   return {
@@ -34744,74 +35135,6 @@ function piHasManagedSignature(payload, signature) {
   return false;
 }
 
-// src/pi-dispatch-agent-history.ts
-function object3(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
-}
-function piAgentHistory(messages, api) {
-  return messages.flatMap((value) => {
-    const message = object3(value);
-    if (!message)
-      return [value];
-    if (message.role === "compactionSummary") {
-      return [
-        {
-          ...message,
-          role: "user",
-          content: message.blocks !== undefined ? [
-            { type: "text", text: message.summary },
-            ...Array.isArray(message.blocks) ? message.blocks : []
-          ] : [
-            { type: "text", text: "Compaction context envelope" },
-            ...Array.isArray(message.images) ? message.images : []
-          ]
-        }
-      ];
-    }
-    if (message.role !== "custom" && message.role !== "hookMessage")
-      return [value];
-    if (typeof message.content !== "string" && !Array.isArray(message.content))
-      return [];
-    const content = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content;
-    const userInvoked = message.role === "custom" && message.attribution === "user";
-    if (userInvoked && message.customType === "collab-prompt") {
-      const text = content.filter((part) => object3(part)?.type === "text").map((part) => object3(part)?.text).join(`
-`);
-      return [
-        {
-          ...message,
-          role: "user",
-          content: [
-            {
-              type: "text",
-              text: text.length ? "User interjection envelope" : ""
-            },
-            ...content.filter((part) => object3(part)?.type === "image")
-          ]
-        }
-      ];
-    }
-    if (userInvoked && message.customType === "skill-prompt")
-      return [{ ...message, role: "user", content }];
-    const images = content.filter((part) => object3(part)?.type === "image");
-    const developerRole = api === "ollama-chat" && message.attribution !== "user" ? "developer" : "user";
-    if (!images.length)
-      return [{ ...message, role: developerRole, content }];
-    const texts = content.filter((part) => object3(part)?.type === "text");
-    return [
-      ...texts.length ? [{ ...message, role: developerRole, content: texts }] : [],
-      {
-        ...message,
-        role: "user",
-        content: [
-          { type: "text", text: `Images attached to ${message.customType}.` },
-          ...images
-        ]
-      }
-    ];
-  });
-}
-
 // src/pi-dispatch-chat-history.ts
 var MAX_EXACT_UNITS = 32 * 1024 * 1024;
 var IMAGE_CAPTION = "Attached image(s) from tool result:";
@@ -35282,7 +35605,7 @@ function messageStructure(value) {
     "bashExecution",
     "pythonExecution"
   ].includes(String(message.role)) ? "user" : message.role;
-  if (role !== "user" && role !== "assistant" && role !== "toolResult")
+  if (role !== "user" && role !== "assistant" && role !== "toolResult" && role !== "system")
     return;
   const row = { role, calls: [], results: [] };
   if (ORPHAN_NOTE in message && typeof message.content === "string") {
@@ -35511,6 +35834,28 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
   }
   if (!valid)
     return;
+  const positionedRows = [...byIndex];
+  for (let position = positionedRows.length - 1;position >= 0; position--) {
+    const [index, row] = positionedRows[position];
+    const source = object7(projectedMessages[index]);
+    if (!source)
+      return;
+    const content = source.content;
+    const parts = typeof content === "string" ? [{ type: "text", text: content }] : content;
+    const textOnly = Array.isArray(parts) && parts.every((part) => object7(part)?.type === "text" && typeof object7(part)?.text === "string");
+    if (piIsDeveloperHistory(source) && source.attribution !== "user") {
+      const previous = rows[position - 1];
+      const next = rows[position + 1];
+      if (model?.api === "ollama-chat" || model?.api === "anthropic-messages" && object7(model.compat)?.supportsMidConversationSystem === true && textOnly && (previous?.role === "user" || previous?.role === "toolResult") && (!next || next.role === "assistant"))
+        row.role = "system";
+    }
+    if (row.role === "system") {
+      if (!textOnly)
+        return;
+      const texts = parts.map((part) => part.text);
+      row.systemText = model?.api === "anthropic-messages" ? texts.filter((text) => text.trim()).map((text) => new TextDecoder().decode(new TextEncoder().encode(text))) : texts;
+    }
+  }
   const responsesApi = responsesLane(model?.api);
   let responsesMessages = responsesApi ? [] : undefined;
   if (responsesMessages) {
@@ -35684,7 +36029,7 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
         continue;
       }
     }
-    const row = messageStructure(ollama && message.role === "system" ? { ...message, role: "user" } : message);
+    const row = messageStructure(message);
     if (!row)
       return;
     row.wireContent = message.content;
@@ -35823,7 +36168,7 @@ function safeRole(row, readable) {
     return "unreadable";
   if (!row)
     return "missing";
-  return ["user", "assistant", "toolResult"].includes(row.role) ? row.role : "unknown";
+  return ["user", "assistant", "toolResult", "system"].includes(row.role) ? row.role : "unknown";
 }
 function safeCount(value) {
   return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : "unreadable";
@@ -35903,6 +36248,14 @@ function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
       const actual = rows[i];
       if (actual.role !== expected.role)
         return structureDetail(i, expectedRows, rows, "role");
+      if (expected.systemText !== undefined) {
+        const texts = expected.systemText;
+        const content = actual.wireContent;
+        const actualTexts = typeof content === "string" ? [content] : Array.isArray(content) && content.every((part) => object7(part)?.type === "text" && typeof object7(part)?.text === "string") ? content.map((part) => part.text) : undefined;
+        if (!actualTexts || (typeof content === "string" ? content !== texts.join(`
+`) : JSON.stringify(actualTexts) !== JSON.stringify(texts)))
+          return structureDetail(i, expectedRows, rows, "content");
+      }
       if (imageProjection && !piMatchesImages(actual.images ?? [], expected.images ?? []))
         return structureDetail(i, expectedRows, rows, "content");
       if (expected.responseTexts !== undefined && (expected.responseTexts.length !== actual.responseTexts?.length || expected.responseTexts.some((text, index) => text !== actual.responseTexts?.[index])))
@@ -41238,13 +41591,12 @@ function buildPiTextIdentityPlan(db, sessionId, tagger, transcript, reuseCandida
 }
 var piBranchProjectionBySession = new Map;
 var piBranchLookupByProjection = new WeakMap;
-function logTransformElapsed(sessionId, stage, elapsedMs, extra) {
-  const suffix = extra ? ` ${extra}` : "";
+function logTransformElapsed2(sessionId, stage, elapsedMs, extra) {
   recordPiTransformTiming({ sessionId, stage, elapsedMs, extra });
-  sessionLog2(sessionId, `transform stage: stage=${stage} elapsed=${elapsedMs.toFixed(1)}ms${suffix}`);
+  logTransformElapsed(sessionId, stage, elapsedMs, extra);
 }
 function logTransformTiming(sessionId, stage, start, extra) {
-  logTransformElapsed(sessionId, stage, performance.now() - start, extra);
+  logTransformElapsed2(sessionId, stage, performance.now() - start, extra);
 }
 function piVariantChangeBustsProviderCache(providerID, modelID) {
   return variantChangeBustsProviderCache(providerID, modelID);
@@ -41883,7 +42235,7 @@ function stripMcOwnedPiCompactionSummary(messages, entryIds, branchEntries) {
       break;
     }
   }
-  if (compaction?.fromHook !== true)
+  if (compaction?.fromHook !== true && compaction?.fromExtension !== true)
     return false;
   const details = compaction.details;
   if (details?.source !== "magic-context")
@@ -42671,7 +43023,7 @@ function loadPiHistorianStateSnapshot(db, sessionId) {
 }
 function registerPiContextHandler(pi, baseOptions) {
   const tagger = createTagger();
-  const lkgCoordinator = createPiLkgCoordinator(baseOptions.db, undefined, ({ sessionId, elapsedMs, reusedPrefix }) => logTransformElapsed(sessionId, "lkgCapture", elapsedMs, `reusedPrefix=${reusedPrefix}`));
+  const lkgCoordinator = createPiLkgCoordinator(baseOptions.db, undefined, ({ sessionId, elapsedMs, reusedPrefix }) => logTransformElapsed2(sessionId, "lkgCapture", elapsedMs, `reusedPrefix=${reusedPrefix}`));
   const schedulerCache = new WeakMap;
   const DEFAULT_SCHEDULER_CONFIG = {
     executeThresholdPercentage: 65
@@ -42708,7 +43060,7 @@ function registerPiContextHandler(pi, baseOptions) {
     variantChangeLogObserverForTests?.(message);
     sessionLog2(sessionId, message);
   });
-  const contextHandler = async (event, ctx, budget) => {
+  const runHandler = async (event, ctx, budget) => {
     budget.assertOutcome();
     const passSessionId = ctx.sessionManager ? resolveSessionId2(ctx) : undefined;
     const generation = Symbol();
@@ -43731,10 +44083,7 @@ function registerPiContextHandler(pi, baseOptions) {
             messages: inputForThinkingFit,
             forceSignedRebuildForFit: true,
             forceMaterialization: true,
-            contextUsage: {
-              ...pipelineArgs.contextUsage,
-              percentage: Math.max(95, pipelineArgs.contextUsage.percentage)
-            }
+            contextUsage: pipelineArgs.contextUsage
           }));
           observePipelineResultForTests(sessionId, result);
           fitReclaimedThisPass = true;
@@ -43845,7 +44194,7 @@ function registerPiContextHandler(pi, baseOptions) {
                     sessionMeta: freshMeta
                   }) : undefined,
                   contextUsage: {
-                    percentage: fitCase === "over-window-proof" ? Math.max(95, usagePercentage) : usagePercentage,
+                    percentage: usagePercentage,
                     inputTokens: usageInputTokens
                   }
                 }));
@@ -44095,6 +44444,7 @@ function registerPiContextHandler(pi, baseOptions) {
       return;
     }
   };
+  const contextHandler = (...args) => withTransformTimingSummary(async () => await runHandler(...args) ?? undefined);
   registerPiGuardedContext(pi, contextHandler, {
     compactionOff: (ctx) => (baseOptions.resolveForProject?.(ctx.cwd) ?? baseOptions).compactionOff === true,
     onRefusal: (ctx, budget, message, isCurrent) => {
@@ -44347,10 +44697,7 @@ function spawnPiHistorianRun(args) {
   historian.onStatusChange?.(ctx, sessionId);
 }
 function resolvePiAppendCompaction(ctx) {
-  const sm = ctx.sessionManager;
-  if (typeof sm?.appendCompaction !== "function")
-    return;
-  return sm.appendCompaction.bind(sm);
+  return adaptPiAppendCompaction(ctx.sessionManager);
 }
 function guardedPiAppendCompaction(ctx, assertCurrentPass) {
   const append = resolvePiAppendCompaction(ctx);
@@ -46399,10 +46746,12 @@ function createPiHistorianClient(args) {
     }
     const promptText = extractPromptText(body.parts);
     const modelOverride = readBodyModel(body);
+    const cacheTail = input && typeof input === "object" && "cacheTail" in input ? input.cacheTail : undefined;
     const result = await args.runner.run({
       agent: "magic-context-historian",
       systemPrompt: args.systemPrompt,
       userMessage: promptText,
+      ...cacheTail === "write" || cacheTail === "skip" ? { cacheTail } : {},
       model: modelOverride?.model ?? args.model,
       fallbackModels: modelOverride ? undefined : args.fallbackModels,
       timeoutMs: args.timeoutMs,
@@ -49751,9 +50100,9 @@ var PI_STARTUP_MAINTENANCE_SCHEDULED = Symbol.for("magic-context.pi.startup-main
 function getPiChildInitContext() {
   const globals = globalThis;
   const existing = globals[PI_CHILD_INIT_CONTEXT];
-  if (existing instanceof AsyncLocalStorage2)
+  if (existing instanceof AsyncLocalStorage3)
     return existing;
-  const context = new AsyncLocalStorage2;
+  const context = new AsyncLocalStorage3;
   globals[PI_CHILD_INIT_CONTEXT] = context;
   return context;
 }