@cortexkit/pi-magic-context 0.49.16 → 0.49.18

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-4178cbfw.js";
+} from "./index-xxn1tpnv.js";
+import"./index-4knyh1kt.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical,
@@ -288,8 +290,9 @@ import {
   openCurrentDatabase,
   openDatabaseAsync,
   closeDatabase
-} from "./index-v8d4vgam.js";
+} from "./index-gp928w10.js";
 import {
+  pruneMissingProjectIdentities,
   setHomeProjectPermission,
   ProjectIdentityError,
   resolveProjectIdentityStrict,
@@ -299,7 +302,7 @@ import {
   resolveProjectIdentityForSession,
   beginBootQuietPeriod,
   scheduleAfterBootQuiet
-} from "./index-y5c73caa.js";
+} from "./index-g7p75667.js";
 import {
   detectThinkingBindingMismatch,
   detectLatestTurnThinkingMismatch,
@@ -412,6 +415,7 @@ import {
   computeRawRangeFingerprint,
   invalidateTrueRawTokenCache,
   stripSystemInjection,
+  isFilePart,
   hasUserAnswerMetadata,
   DreamTokenBudgetExceeded,
   TOKEN_BUDGET_FINALIZE_MESSAGE,
@@ -458,7 +462,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-44h64qza.js";
+} from "./index-r9f4f6s1.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -545,7 +549,7 @@ import {
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2
-} from "./index-dne4ja7a.js";
+} from "./index-rhprywn6.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -557,7 +561,7 @@ import {
   estimateTokens,
   estimateFixedPromptTokens,
   normalizeText
-} from "./index-g4jf772p.js";
+} from "./index-1kcfwk9c.js";
 import {
   inRootAsyncContext2,
   Database2,
@@ -570,7 +574,7 @@ import {
   isTransientSqliteError2,
   withAsyncPrivilegedWriter2,
   indexCoordinationInput2
-} from "./index-asrxgdt4.js";
+} from "./index-rrwv9y2k.js";
 import {
   stableStringify,
   closeQuietly,
@@ -579,19 +583,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-qqxqwqhp.js";
 import {
   piHarnessKindFromExecutable
 } from "./index-apgwdby5.js";
@@ -604,11 +595,14 @@ import {
   ownsLkgDirtyFence,
   invalidateCleanLkgRecoveryFence,
   markLkgRecoveryDirty,
+  gaDatabasePath,
   readSessionActivity,
   observeSessionActivity,
   backfillSessionActivity,
   clearCompressionDepth,
   clearCompressionDepthRange,
+  cleanSearchText,
+  matchedSearchSnippet,
   getMessageIndexSourceIdentity2,
   isMessageIndexSourceCurrent2,
   getLastIndexedOrdinal2,
@@ -616,12 +610,25 @@ import {
   isMessageIndexReconciledThrough2,
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
-  sweepOrphanedOpenCodeMessageIndexes2
-} from "./index-fhyy4ave.js";
+  sweepOrphanedOpenCodeMessageIndexesCooperatively2
+} from "./index-fvjthct0.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-vktahpdj.js";
 import {
   formatSynapseLaneDescriptor
-} from "./index-6dz2ed1v.js";
-import"./index-s1xn8qfw.js";
+} from "./index-d8gc0112.js";
+import"./index-yygsh681.js";
 import {
   buildCanonicalChunkTextFromFts,
   buildCompartmentSummaryFallbackText,
@@ -631,7 +638,7 @@ import {
   replaceCompartmentChunkEmbeddings,
   deleteChunkEmbedBackoffForSession,
   chunkWindowSourceKey
-} from "./index-afy3dzf9.js";
+} from "./index-xnch62s6.js";
 import {
   recordSessionProjectIdentity,
   GIT_SWEEP_LEASE_RENEWAL_MS,
@@ -640,7 +647,7 @@ import {
   markGitSweepSuccessAndRelease,
   parkGitSweepNonIndexable,
   releaseGitSweepLease
-} from "./index-mx59cve4.js";
+} from "./index-svgkv4g2.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -666,7 +673,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./index-n3r2d2pr.js";
+} from "./index-vmcgew7x.js";
 import {
   rememberV1HiddenRun
 } from "./index-6x556c2q.js";
@@ -681,7 +688,7 @@ import {
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-tympym62.js";
+} from "./index-gdjv1nnd.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -731,7 +738,7 @@ import {
   normalizeVerificationFiles,
   indexCommitsForProject,
   embedUnembeddedCommits
-} from "./index-xmzhrht0.js";
+} from "./index-d43hmn31.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -755,18 +762,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-657xh9w4.js";
+import"./index-2mmy81qt.js";
 import {
   cosineSimilarity
-} from "./index-p3evwech.js";
-import"./index-46q4e104.js";
+} from "./index-z2rkv0mb.js";
+import"./index-qpq6w67c.js";
 import {
   DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS,
   buildHiddenAgentRegistrations,
@@ -774,9 +781,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,
@@ -787,10 +795,10 @@ import {
   drainPiTagSnapshotSession,
   assertPiTagSnapshotReady,
   ensurePiTagSnapshotReady
-} from "./index-x3k1530z.js";
+} from "./index-4bv5bttd.js";
 import"./index-f18ec69t.js";
 import"./index-1cvyaw9a.js";
-import"./index-ja1c33qa.js";
+import"./index-d21pdr8v.js";
 import {
   __toESM
 } from "./index-22jkk6wg.js";
@@ -815,7 +823,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";
 
@@ -3512,7 +3520,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.16",
+  version: "0.49.18",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -3577,8 +3585,13 @@ var package_default = {
     "@types/bun": "^1.3.10",
     "@types/node": "^22.20.0",
     "omp-coding-agent-1812": "npm:@oh-my-pi/pi-coding-agent@18.12.3",
+    "omp-pi-ai-1889": "npm:@oh-my-pi/pi-ai@18.8.9",
+    "omp-pi-ai-1811": "npm:@oh-my-pi/pi-ai@18.11.3",
+    "omp-pi-ai-1812": "npm:@oh-my-pi/pi-ai@18.12.3",
     "pi-agent-core-087": "npm:@earendil-works/pi-agent-core@0.87.1",
     "pi-ai-086": "npm:@earendil-works/pi-ai@0.86.0",
+    "pi-ai-087": "npm:@earendil-works/pi-ai@0.87.1",
+    "pi-ai-130": "npm:@earendil-works/pi-ai@1.3.0",
     "pi-coding-agent-086": "npm:@earendil-works/pi-coding-agent@0.86.0",
     "pi-coding-agent-087": "npm:@earendil-works/pi-coding-agent@0.87.1",
     "pi-coding-agent-130": "npm:@earendil-works/pi-coding-agent@1.3.0",
@@ -9340,6 +9353,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();
@@ -9421,6 +9435,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,
@@ -19233,9 +19248,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 {
@@ -19247,7 +19267,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: "",
@@ -19403,7 +19423,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");
@@ -19453,6 +19473,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) {
@@ -19686,10 +19709,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})`);
@@ -20658,6 +20691,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,
@@ -20666,6 +20700,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 ? {
@@ -24219,27 +24254,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, {
@@ -24328,6 +24379,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;
@@ -24337,153 +24389,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) {
@@ -24543,6 +24626,12 @@ function applyFlushedStatuses(sessionId, db, targets, preloadedTags) {
 function hasReclaimRide(signals) {
   return signals.hardFold || signals.force || signals.explicitFlush || signals.publishedHistory || signals.subagentExecute === true;
 }
+function prefixMutationPermitted(gate) {
+  return !gate.signedThinkingHold || gate.firstRender || gate.idleExpiry || gate.emergency;
+}
+function reclaimRidePermitted(signals, gate) {
+  return prefixMutationPermitted(gate) && hasReclaimRide(signals);
+}
 var RECLAIM_RIDE_NAMES = [
   "hardFold",
   "force",
@@ -24781,6 +24870,31 @@ function rearmChannel2AfterMeasuredCollapse(input) {
   return casChannel2NudgeState(input.db, input.sessionId, "delivered", "");
 }
 
+// ../plugin/src/hooks/magic-context/file-token-coverage.ts
+function omitIncompleteFileTokenTotals(db, sessionId, messages, totals) {
+  const filesByMessage = new Map;
+  for (const message of messages) {
+    const count = message.parts.filter(isFilePart).length;
+    if (count > 0 && totals.has(message.id))
+      filesByMessage.set(message.id, count);
+  }
+  if (filesByMessage.size === 0)
+    return totals;
+  const rows = db.prepare(`
+        SELECT o.value AS owner, COUNT(t.id) AS count
+        FROM json_each(?) o LEFT JOIN tags t
+          ON t.session_id = ? AND t.type = 'file'
+          AND t.message_id >= o.value || ':file'
+          AND t.message_id < o.value || ':file;'
+        GROUP BY o.value
+    `).all(JSON.stringify([...filesByMessage.keys()]), sessionId);
+  for (const row of rows) {
+    if (row.count < (filesByMessage.get(row.owner) ?? 0))
+      totals.delete(row.owner);
+  }
+  return totals;
+}
+
 // ../plugin/src/hooks/magic-context/protected-tail-boundary.ts
 function describeBoundaryDiagnostics(snapshot) {
   return `boundaryDiagnostics=${JSON.stringify(snapshot.diagnostics ?? { unavailable: true, boundaryReason: snapshot.boundaryReason })}`;
@@ -25005,7 +25119,7 @@ function resolveProtectedTailBoundary(ctx) {
   const offset = Math.max(1, ctx.lastCompartmentEndOrdinal + 1);
   const absoluteMessageCount = getCachedAbsoluteMessageCount2(ctx.sessionId) ?? getRawSessionMessageOrdinalCount2(ctx.sessionId);
   const messages = readRawSessionMessageRange2(ctx.sessionId, Math.max(1, offset - 1), absoluteMessageCount);
-  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id)) ?? ctx.storedTokenTotals;
+  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id), messages) ?? ctx.storedTokenTotals;
   const index = buildTrueRawTokenIndex(ctx.sessionId, messages, {
     providerShapeVersion: ctx.providerShapeVersion,
     cacheNamespace: ctx.cacheNamespace,
@@ -25248,9 +25362,10 @@ function resolveBoundaryContext(args) {
     migrationFloorActive = seedResult.seeded;
   }
   const calibration = sessionDecisionCalibration(args.db, args.sessionId);
-  const storedTokenTotalsForMessages = (messageIds) => {
+  const storedTokenTotalsForMessages = (messageIds, messages = []) => {
     try {
-      return getAllStatusTagTokenTotalsFlat2(args.db, args.sessionId, args.taggerFloor ?? 0, calibration, messageIds).totals;
+      const totals = getAllStatusTagTokenTotalsFlat2(args.db, args.sessionId, args.taggerFloor ?? 0, calibration, messageIds).totals;
+      return omitIncompleteFileTokenTotals(args.db, args.sessionId, messages, totals);
     } catch (error) {
       sessionLog2(args.sessionId, "protected-tail stored-token map unavailable (live fallback):", error);
       return;
@@ -25285,7 +25400,7 @@ function resolveWrapupProtectedTailBoundary(args) {
   const offset = Math.max(1, ctx.lastCompartmentEndOrdinal + 1);
   const absoluteMessageCount = getCachedAbsoluteMessageCount2(ctx.sessionId) ?? getRawSessionMessageOrdinalCount2(ctx.sessionId);
   const messages = readRawSessionMessageRange2(ctx.sessionId, Math.max(1, offset - 1), absoluteMessageCount);
-  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id)) ?? ctx.storedTokenTotals;
+  const storedTotals = ctx.storedTokenTotalsForMessages?.(messages.map((m) => m.id), messages) ?? ctx.storedTokenTotals;
   const index = buildTrueRawTokenIndex(ctx.sessionId, messages, {
     providerShapeVersion: ctx.providerShapeVersion,
     cacheNamespace: ctx.cacheNamespace,
@@ -25783,8 +25898,9 @@ function checkCompartmentTrigger(db, sessionId, sessionMeta, usage, _previousPer
   const canClearReasoning = reasoningProjection?.canClearReasoning ?? modelAcceptsEmptyContent(reasoningProjection?.providerID);
   const projectedPostDropPercentage = estimateProjectedPostDropPercentage(db, sessionId, usage, preloadedActiveTags ?? getActiveTagsBySession2(db, sessionId), keepReasoningTokens, sessionMeta.clearedReasoningThroughTag, canClearReasoning, reasoningProjection?.budgetCutoff, eligiblePendingDropTagIds);
   const relativePostDropTarget = executeThresholdPercentage * POST_DROP_TARGET_RATIO;
+  const ridePermitted = reclaimRide !== undefined && (reclaimRide.permission ? reclaimRidePermitted(reclaimRide, reclaimRide.permission) : hasReclaimRide(reclaimRide));
   const rideLabel = reclaimRide ? reclaimRideLabel(reclaimRide) : "ride=none";
-  const dropsCanLand = reclaimRide !== undefined && hasReclaimRide(reclaimRide);
+  const dropsCanLand = ridePermitted;
   const forceMaterializationPercentage = escalationBands(executeThresholdPercentage).forceMaterializationPercentage;
   if (usage.percentage >= forceMaterializationPercentage) {
     if (dropsCanLand && projectedPostDropPercentage !== null && projectedPostDropPercentage <= relativePostDropTarget) {
@@ -26278,6 +26394,101 @@ function opencodeReasoningBudgetStatus(messages, budget, prefixBound, proseRatio
   };
 }
 
+// ../plugin/src/hooks/magic-context/signed-thinking-hold.ts
+var HEAVY_REASONING_TOKENS = 1500;
+var HEAVY_REASONING_WINDOW_STEPS = 15;
+var HOLD_CAP_POINTS = 10;
+var REASONING_TYPES = new Set(["reasoning", "thinking"]);
+function role2(message) {
+  if (!isRecord(message))
+    return;
+  return isRecord(message.info) ? message.info.role : message.role;
+}
+function parts(message) {
+  if (!isRecord(message))
+    return [];
+  if (Array.isArray(message.parts))
+    return message.parts;
+  return Array.isArray(message.content) ? message.content : [];
+}
+function recordedReasoningTokens(message) {
+  if (!isRecord(message))
+    return;
+  const info = isRecord(message.info) ? message.info : undefined;
+  const candidates = [];
+  if (info && isRecord(info.tokens))
+    candidates.push(info.tokens.reasoning);
+  if (isRecord(message.usage)) {
+    candidates.push(message.usage.reasoning, message.usage.reasoningTokens);
+  }
+  for (const value of candidates) {
+    if (typeof value === "number" && Number.isFinite(value) && value > 0)
+      return value;
+  }
+  return;
+}
+function stepReasoningTokens(message, estimateTextTokens) {
+  let text = "";
+  let opaque = false;
+  for (const part of parts(message)) {
+    if (!isRecord(part))
+      continue;
+    const type = String(part.type ?? part.kind);
+    if (type === "redacted_thinking" || part.redacted === true) {
+      opaque = true;
+      continue;
+    }
+    if (!REASONING_TYPES.has(type))
+      continue;
+    const body = typeof part.thinking === "string" ? part.thinking : typeof part.text === "string" ? part.text : "";
+    if (body.length > 0)
+      text += body;
+    else
+      opaque = true;
+  }
+  if (!text && !opaque)
+    return 0;
+  return reasoningStepCost(recordedReasoningTokens(message), text ? estimateTextTokens(text) : 0, opaque);
+}
+function decideSignedThinkingHold(args) {
+  const capPercentage = args.executeThresholdPercentage + HOLD_CAP_POINTS;
+  let heavyStepsBack = null;
+  let heavyStepTokens = 0;
+  const start = latestAssistantTurnStart(args.messages);
+  let stepsBack = 0;
+  for (let index = args.messages.length - 1;index >= start; index--) {
+    const message = args.messages[index];
+    if (role2(message) !== "assistant" || parts(message).length === 0)
+      continue;
+    stepsBack++;
+    if (stepsBack > HEAVY_REASONING_WINDOW_STEPS)
+      break;
+    const tokens = stepReasoningTokens(message, args.estimateTextTokens);
+    if (tokens > HEAVY_REASONING_TOKENS) {
+      heavyStepsBack = stepsBack;
+      heavyStepTokens = tokens;
+      break;
+    }
+  }
+  if (heavyStepsBack === null)
+    return {
+      held: false,
+      reason: "no_recent_heavy_reasoning",
+      heavyStepsBack,
+      heavyStepTokens,
+      capPercentage
+    };
+  if (!(args.usagePercentage < capPercentage))
+    return { held: false, reason: "above_cap", heavyStepsBack, heavyStepTokens, capPercentage };
+  return {
+    held: true,
+    reason: "heavy_reasoning",
+    heavyStepsBack,
+    heavyStepTokens,
+    capPercentage
+  };
+}
+
 // ../plugin/src/hooks/magic-context/strict-thinking-prefix.ts
 function servedPrefixMatches(args) {
   const heads = args.messages?.slice(0, 2);
@@ -26625,6 +26836,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 = [];
@@ -27070,12 +27316,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) {
@@ -27402,8 +27648,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}§]`;
@@ -27491,7 +27741,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);
@@ -27604,32 +27855,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);
     }
   }
@@ -27640,7 +27891,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}`);
@@ -27663,6 +27914,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";
@@ -27758,6 +28012,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();
@@ -27822,6 +28133,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     query,
     options: {
       ...serializable,
+      autoHint: true,
       backfillMemoryEmbeddings: false,
       countRetrievals: false,
       measurementDisabled: true
@@ -27831,8 +28143,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)
@@ -27841,7 +28165,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);
@@ -27851,9 +28193,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") {
@@ -27872,7 +28214,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);
@@ -27887,13 +28229,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
@@ -28083,6 +28461,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,
@@ -28124,13 +28504,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");
@@ -28563,6 +28945,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) {
@@ -34029,6 +34412,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,
@@ -34838,10 +35269,50 @@ function piHasManagedSignature(payload, signature) {
   return false;
 }
 
+// src/pi-dispatch-tool-pairing.ts
+var RESPONSES_APIS = new Set([
+  "openai-responses",
+  "openai-codex-responses",
+  "azure-openai-responses"
+]);
+function object4(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
+}
+function piResponsesCallComponent(id) {
+  const pipe = id.indexOf("|");
+  return pipe <= 0 ? id : id.slice(0, pipe);
+}
+function piToolCallPairing(messages) {
+  const responsesComponents = new Set;
+  const opaqueCompositeIds = new Set;
+  for (const value of messages) {
+    const message = object4(value);
+    if (message?.role !== "assistant" || !Array.isArray(message.content))
+      continue;
+    const responses = RESPONSES_APIS.has(String(message.api));
+    for (const part of message.content) {
+      const block = object4(part);
+      if (block?.type !== "toolCall" || typeof block.id !== "string")
+        continue;
+      if (responses)
+        responsesComponents.add(piResponsesCallComponent(block.id));
+      else if (block.id.includes("|"))
+        opaqueCompositeIds.add(block.id);
+    }
+  }
+  return (id) => {
+    const pipe = id.indexOf("|");
+    if (pipe <= 0 || opaqueCompositeIds.has(id))
+      return id;
+    const prefix = id.slice(0, pipe);
+    return responsesComponents.has(prefix) ? prefix : id;
+  };
+}
+
 // src/pi-dispatch-chat-history.ts
 var MAX_EXACT_UNITS = 32 * 1024 * 1024;
 var IMAGE_CAPTION = "Attached image(s) from tool result:";
-function object4(value) {
+function object5(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function omitsAssistant(message, model, compat) {
@@ -34850,7 +35321,7 @@ function omitsAssistant(message, model, compat) {
   let thinking = false;
   let hasTextBlock = false;
   for (const value of message.content) {
-    const block = object4(value);
+    const block = object5(value);
     if (!block)
       return false;
     if (block.type === "text") {
@@ -34875,23 +35346,24 @@ function omitsAssistant(message, model, compat) {
 function piChatHistoryPlan(messages, model) {
   if (model?.api !== "openai-completions")
     return;
-  const compat = object4(model.compat) ?? {};
+  const compat = object5(model.compat) ?? {};
+  const pairingId = piToolCallPairing(messages);
   const calls = new Set;
   for (const value of messages) {
-    const message = object4(value);
+    const message = object5(value);
     if (message?.role !== "assistant" || !Array.isArray(message.content))
       continue;
     for (const value of message.content) {
-      const block = object4(value);
+      const block = object5(value);
       if (block?.type === "toolCall" && typeof block.id === "string")
-        calls.add(block.id);
+        calls.add(pairingId(block.id));
     }
   }
   const transformed = [];
   let pending = new Set;
   let exactUnits = 0;
   for (let index = 0;index < messages.length; index++) {
-    const message = object4(messages[index]);
+    const message = object5(messages[index]);
     if (!message)
       return;
     if ((message.role === "bashExecution" || message.role === "pythonExecution") && message.excludeFromContext === true)
@@ -34903,19 +35375,19 @@ function piChatHistoryPlan(messages, model) {
         continue;
       if (Array.isArray(message.content))
         for (const value of message.content) {
-          const block = object4(value);
+          const block = object5(value);
           if (block?.type === "toolCall" && typeof block.id === "string")
-            pending.add(block.id);
+            pending.add(pairingId(block.id));
         }
     }
     if (message.role === "toolResult" && typeof message.toolCallId === "string") {
-      pending.delete(message.toolCallId);
-      if (!calls.has(message.toolCallId)) {
+      pending.delete(pairingId(message.toolCallId));
+      if (!calls.has(pairingId(message.toolCallId))) {
         if (pending.size || typeof message.toolName !== "string" || !Array.isArray(message.content))
           return;
         const parts = [];
         for (const value of message.content) {
-          const part = object4(value);
+          const part = object5(value);
           if (part?.type === "text" && typeof part.text === "string" && part.text.trim())
             parts.push(part.text);
         }
@@ -34948,14 +35420,14 @@ ${parts.join(`
   };
   const vision = model.input?.includes("image") === true && compat.stripImageInput !== true;
   for (const step of transformed) {
-    const message = step.kind === "source" ? object4(messages[step.index]) : undefined;
+    const message = step.kind === "source" ? object5(messages[step.index]) : undefined;
     if (message?.role !== "toolResult")
       flushImages();
     steps.push(step);
     if (message?.role !== "toolResult" || !vision || !Array.isArray(message.content))
       continue;
     for (const value of message.content) {
-      const block = object4(value);
+      const block = object5(value);
       if (block?.type !== "image")
         continue;
       if (compat.requiresAssistantAfterToolResult === true)
@@ -34979,12 +35451,12 @@ ${parts.join(`
 function piMatchesChatImages(content, urls) {
   if (!Array.isArray(content) || content.length !== urls.length + 1)
     return false;
-  const caption = object4(content[0]);
+  const caption = object5(content[0]);
   if (caption?.type !== "text" || caption.text !== IMAGE_CAPTION || Object.keys(caption).length !== 2)
     return false;
   for (let i = 0;i < urls.length; i++) {
-    const block = object4(content[i + 1]);
-    const image = object4(block?.image_url);
+    const block = object5(content[i + 1]);
+    const image = object5(block?.image_url);
     if (block?.type !== "image_url" || Object.keys(block).length !== 2 || !image || Object.keys(image).length !== 1 || image.url !== urls[i])
       return false;
   }
@@ -34992,22 +35464,22 @@ function piMatchesChatImages(content, urls) {
 }
 
 // src/pi-dispatch-image-budget.ts
-function object5(value) {
+function object6(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function piImageBudgetPlan(model) {
-  if (!model?.input?.includes("image") || object5(model.compat)?.stripImageInput === true)
+  if (!model?.input?.includes("image") || object6(model.compat)?.stripImageInput === true)
     return;
   return {
     count: 0,
     api: model.api,
     rows: new Map,
-    hoistToolImages: model.api?.startsWith("google-") === true && object5(model.compat)?.multimodalFunctionResponse !== true || model.api === "bedrock-converse-stream" && model.requiresToolResultImageHoisting === true,
+    hoistToolImages: model.api?.startsWith("google-") === true && object6(model.compat)?.multimodalFunctionResponse !== true || model.api === "bedrock-converse-stream" && model.requiresToolResultImageHoisting === true,
     hoistErrorImages: model.api === "anthropic-messages" || model.api === "bedrock-converse-stream"
   };
 }
 function inputImage(block, api) {
-  const file = object5(block.providerFile);
+  const file = object6(block.providerFile);
   if (api === "ollama-chat")
     return { kind: "bytes", value: String(block.data ?? "") };
   if ((api?.endsWith("responses") && file?.provider === "openai" || api === "anthropic-messages" && file?.provider === "anthropic") && typeof file?.id === "string")
@@ -35027,7 +35499,7 @@ function piRecordImages(plan, row, source) {
     return;
   const images = [];
   for (const value of source.content) {
-    const block = object5(value);
+    const block = object6(value);
     if (block?.type === "image")
       images.push(inputImage(block, plan.api));
   }
@@ -35053,20 +35525,20 @@ function piWireImages(content, ollamaImages) {
     return [];
   const images = [];
   for (const value of content) {
-    const block = object5(value);
+    const block = object6(value);
     if (!block)
       continue;
-    const source = object5(block.source);
-    const inline = object5(block.inlineData);
-    const file = object5(block.fileData);
-    const bedrock = object5(block.image);
+    const source = object6(block.source);
+    const inline = object6(block.inlineData);
+    const file = object6(block.fileData);
+    const bedrock = object6(block.image);
     if (block.type === "image_url" || block.type === "input_image") {
       if (typeof block.file_id === "string")
         images.push({ kind: "file", value: block.file_id });
       else
         images.push({
           kind: "url",
-          value: String(typeof block.image_url === "string" ? block.image_url : object5(block.image_url)?.url)
+          value: String(typeof block.image_url === "string" ? block.image_url : object6(block.image_url)?.url)
         });
     } else if (block.type === "image") {
       if (source?.type === "file")
@@ -35090,7 +35562,7 @@ function piWireImages(content, ollamaImages) {
     else if (bedrock)
       images.push({
         kind: "data",
-        value: String(object5(bedrock.source)?.bytes),
+        value: String(object6(bedrock.source)?.bytes),
         mime: `image/${bedrock.format}`
       });
   }
@@ -35112,11 +35584,11 @@ function piMatchesImages(actual, expected) {
   return true;
 }
 function piWireImageCount(payload) {
-  const body = object5(payload);
+  const body = object6(payload);
   const visit = (value) => {
     if (Array.isArray(value))
       return value.reduce((n, item) => n + visit(item), 0);
-    const block = object5(value);
+    const block = object6(value);
     if (!block)
       return 0;
     if (["image", "image_url", "input_image"].includes(String(block.type)) || block.inlineData || block.fileData || block.image)
@@ -35130,12 +35602,12 @@ function piWireImageCount(payload) {
       block.response
     ].reduce((n, item) => n + visit(item), Array.isArray(block.images) ? block.images.length : 0);
   };
-  return visit(body?.messages ?? body?.input ?? body?.contents ?? object5(body?.request)?.contents);
+  return visit(body?.messages ?? body?.input ?? body?.contents ?? object6(body?.request)?.contents);
 }
 
 // src/pi-dispatch-responses-history.ts
 var MAX_TEXT_UNITS = 32 * 1024 * 1024;
-function object6(value) {
+function object7(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function wellFormed(text) {
@@ -35150,7 +35622,7 @@ function textIdentity2(text, phase) {
 function signaturePhase(block) {
   try {
     if (typeof block.textSignature === "string") {
-      const signature = object6(JSON.parse(block.textSignature));
+      const signature = object7(JSON.parse(block.textSignature));
       if (signature?.v === 1 && typeof signature.id === "string")
         return signature.phase;
     }
@@ -35170,17 +35642,17 @@ ${wellFormed(text)}
   return;
 }
 function piResponsesAssistantTexts(value, model) {
-  const message = object6(value);
+  const message = object7(value);
   if (!message || !Array.isArray(message.content))
     return;
-  if (["length", "error", "aborted"].includes(String(message.stopReason)) && !message.content.some((value) => ["text", "toolCall"].includes(String(object6(value)?.type))))
+  if (["length", "error", "aborted"].includes(String(message.stopReason)) && !message.content.some((value) => ["text", "toolCall"].includes(String(object7(value)?.type))))
     return [];
   const texts = [];
   const blocks = [];
   const sameModel = model !== undefined && typeof model.api === "string" && typeof model.id === "string" && typeof model.provider === "string" && message.api === model.api && message.model === model.id && message.provider === model.provider;
   let units = 0;
   for (const value of message.content) {
-    const block = object6(value);
+    const block = object7(value);
     if (block?.type === "toolCall")
       continue;
     if (block?.type === "thinking") {
@@ -35190,7 +35662,7 @@ function piResponsesAssistantTexts(value, model) {
         return;
       if (!block.thinking.trim())
         continue;
-      const compat = object6(model.compat);
+      const compat = object7(model.compat);
       if (block.summary === false && (compat?.requiresReasoningContentForToolCalls === true || compat?.requiresReasoningContentForAllAssistantTurns === true))
         return;
       const text = demotedThinking(block.thinking, model);
@@ -35210,14 +35682,14 @@ function piResponsesAssistantTexts(value, model) {
     texts.push(textIdentity2(wellFormed(block.text), sameModel ? signaturePhase(block) : undefined));
     blocks.push(block);
   }
-  const payload = object6(message.providerPayload);
+  const payload = object7(message.providerPayload);
   if (message.api !== model?.api || typeof model?.id !== "string" || typeof model?.provider !== "string" || message.model !== model?.id || (payload?.provider ?? message.provider) !== model?.provider || payload?.type !== "openaiResponsesHistory" || payload.dt !== true || !Array.isArray(payload.items))
     return texts;
   const replay = [];
   let bound = 0;
   let output = false;
   for (const value of payload.items) {
-    const item = object6(value);
+    const item = object7(value);
     if (item?.type === "reasoning")
       continue;
     if (item?.type === "function_call" || item?.type === "custom_tool_call") {
@@ -35228,14 +35700,14 @@ function piResponsesAssistantTexts(value, model) {
       return texts;
     const itemTexts = [];
     for (const value of item.content) {
-      const part = object6(value);
+      const part = object7(value);
       const block = blocks[bound];
       if (!block || part?.type !== "output_text" || typeof part.text !== "string")
         return texts;
       let signature;
       try {
         if (typeof block.textSignature === "string")
-          signature = object6(JSON.parse(block.textSignature));
+          signature = object7(JSON.parse(block.textSignature));
       } catch {
         return texts;
       }
@@ -35262,7 +35734,7 @@ function piResponsesWireTexts(value, phase) {
   const texts = [];
   let units = 0;
   for (const partValue of value) {
-    const part = object6(partValue);
+    const part = object7(partValue);
     if (part?.type !== "output_text" || typeof part.text !== "string")
       return;
     units += part.text.length;
@@ -35292,11 +35764,11 @@ var TRANSFORM_MESSAGES_APIS = new Set([
   "devin-agent",
   "apple-foundation-models"
 ]);
-function object7(value) {
+function object8(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : undefined;
 }
 function messageStructure(value) {
-  const message = object7(value);
+  const message = object8(value);
   if (!message)
     return;
   const role = [
@@ -35325,7 +35797,7 @@ function messageStructure(value) {
   }
   if (role === "assistant" && Array.isArray(message.content)) {
     for (const value of message.content) {
-      const block = object7(value);
+      const block = object8(value);
       if (block?.type !== "toolCall" && block?.type !== "tool_use")
         continue;
       if (typeof block.id !== "string")
@@ -35337,41 +35809,249 @@ function messageStructure(value) {
   }
   return row;
 }
-function projectMissingToolResults(messages, api) {
-  const projectOrphans = TRANSFORM_MESSAGES_APIS.has(api ?? "");
+function windowCalls(message) {
+  if (!Array.isArray(message.content))
+    return [];
+  return message.content.flatMap((value) => {
+    const block = object8(value);
+    return block?.type === "toolCall" && typeof block.id === "string" ? [
+      {
+        id: block.id,
+        name: typeof block.name === "string" ? block.name : ""
+      }
+    ] : [];
+  });
+}
+function duplicateSuffix(model) {
+  const compat = object8(model?.compat);
+  if (model?.api === "openai-completions") {
+    if (compat?.requiresMistralToolIds === true)
+      return { prefix: "dup", max: 9 };
+    if (compat?.usesOpenAIToolCallIdLimit === true)
+      return { prefix: "_dup", max: 40 };
+  }
+  if (model?.api === "devin-agent")
+    return { prefix: "_dup", max: 40 };
+  return { prefix: "_dup", max: 64 };
+}
+function appendDuplicateSuffix(id, suffix, max) {
+  const segment = (part) => part.length + suffix.length <= max ? `${part}${suffix}` : `${part.slice(0, Math.max(0, max - suffix.length))}${suffix}`;
+  return id.includes("|") ? id.split("|").map(segment).join("|") : segment(id);
+}
+function projectMissingToolResults(messages, model, host = "omp") {
+  const input = messages.filter((value) => {
+    const message = object8(value);
+    return !((message?.role === "bashExecution" || message?.role === "pythonExecution") && message.excludeFromContext === true);
+  });
+  if (host === "pi")
+    return projectPiToolResults(input);
+  const api = model?.api;
+  if (!TRANSFORM_MESSAGES_APIS.has(api ?? ""))
+    return projectUnmodeledToolResults(messages);
+  const pairingId = piToolCallPairing(input);
+  const { prefix, max } = duplicateSuffix(model);
+  const seen = new Map;
+  const renames = new Map;
+  const realResults = new Map;
+  const validToolUseIds = new Set;
+  const deduplicated = input.map((value, index) => {
+    const message = object8(value);
+    if (message?.role === "toolResult" && typeof message.toolCallId === "string") {
+      let key = pairingId(message.toolCallId);
+      let output = value;
+      const queue = renames.get(key);
+      if (queue?.length) {
+        const replacement = queue.shift();
+        if (!queue.length)
+          renames.delete(key);
+        if (replacement !== undefined) {
+          output = { ...message, toolCallId: replacement };
+          key = pairingId(replacement);
+        }
+      }
+      const entry = { index, message: output, consumed: false };
+      const entries = realResults.get(key);
+      if (entries)
+        entries.push(entry);
+      else
+        realResults.set(key, [entry]);
+      return output;
+    }
+    if (message?.role !== "assistant" || !Array.isArray(message.content))
+      return value;
+    const touched = new Set;
+    let changed = false;
+    const content = message.content.map((part) => {
+      const block = object8(part);
+      if (block?.type !== "toolCall" || typeof block.id !== "string")
+        return part;
+      const key = pairingId(block.id);
+      if (!touched.has(key)) {
+        touched.add(key);
+        renames.delete(key);
+      }
+      const count = seen.get(key) ?? 0;
+      const queue = renames.get(key) ?? [];
+      renames.set(key, queue);
+      if (count === 0) {
+        seen.set(key, 1);
+        queue.push(undefined);
+        return part;
+      }
+      let suffix = count;
+      let replacement = appendDuplicateSuffix(block.id, `${prefix}${suffix}`, max);
+      while (seen.has(pairingId(replacement))) {
+        suffix++;
+        replacement = appendDuplicateSuffix(block.id, `${prefix}${suffix}`, max);
+      }
+      seen.set(key, suffix + 1);
+      seen.set(pairingId(replacement), 1);
+      queue.push(replacement);
+      changed = true;
+      return { ...block, id: replacement };
+    });
+    for (const call of windowCalls({ content }))
+      validToolUseIds.add(pairingId(call.id));
+    return changed ? { ...message, content } : value;
+  });
+  const takeRealResult = (id, afterIndex) => {
+    for (const entry of realResults.get(pairingId(id)) ?? []) {
+      if (entry.consumed || entry.index <= afterIndex)
+        continue;
+      entry.consumed = true;
+      return entry.message;
+    }
+    return;
+  };
+  const projected = [];
+  const answered = new Set;
+  let pending = [];
+  let pendingStart = -1;
+  let aborted = new Map;
+  let abortedTimestamp;
+  let abortedStart = -1;
+  const stub = (call, text, timestamp) => ({
+    role: "toolResult",
+    toolCallId: call.id,
+    toolName: call.name,
+    content: [{ type: "text", text }],
+    isError: true,
+    timestamp
+  });
+  const flush = (boundaryTimestamp) => {
+    for (const call of pending) {
+      const key = pairingId(call.id);
+      if (answered.has(key))
+        continue;
+      projected.push(takeRealResult(call.id, pendingStart) ?? stub(call, "No result provided", boundaryTimestamp));
+      answered.add(key);
+    }
+    pending = [];
+    if (abortedTimestamp === undefined)
+      return;
+    for (const call of aborted.values()) {
+      const key = pairingId(call.id);
+      if (answered.has(key))
+        continue;
+      projected.push(takeRealResult(call.id, abortedStart) ?? stub(call, "aborted", abortedTimestamp));
+      answered.add(key);
+    }
+    aborted = new Map;
+    abortedTimestamp = undefined;
+  };
+  for (let index = 0;index < deduplicated.length; index++) {
+    const value = deduplicated[index];
+    const message = object8(value);
+    if (message?.role === "assistant") {
+      flush(message.timestamp);
+      projected.push(value);
+      const calls = windowCalls(message);
+      const truncated = ["length", "error", "aborted"].includes(String(message.stopReason));
+      if (truncated && Array.isArray(message.content) && !message.content.some((part) => ["toolCall", "text"].includes(String(object8(part)?.type))))
+        continue;
+      if (message.stopReason === "aborted" || message.stopReason === "error") {
+        aborted = new Map(calls.map((call) => [pairingId(call.id), call]));
+        abortedTimestamp = message.timestamp;
+        abortedStart = index;
+      } else if (calls.length) {
+        pending = calls;
+        pendingStart = index;
+      }
+      continue;
+    }
+    if (message?.role !== "toolResult" || typeof message.toolCallId !== "string") {
+      if (message?.role !== "toolResult")
+        flush(message?.timestamp);
+      projected.push(value);
+      continue;
+    }
+    const key = pairingId(message.toolCallId);
+    if (answered.has(key))
+      continue;
+    if (aborted.has(key) || pending.some((call) => pairingId(call.id) === key)) {
+      aborted.delete(key);
+      answered.add(key);
+      projected.push(value);
+      continue;
+    }
+    if (validToolUseIds.has(key))
+      continue;
+    if (typeof message.toolName !== "string" || !Array.isArray(message.content)) {
+      projected.push(value);
+      continue;
+    }
+    if (pending.some((call) => !answered.has(pairingId(call.id))) || aborted.size > 0)
+      continue;
+    const parts = message.content.flatMap((value) => {
+      const part = object8(value);
+      return part?.type === "text" && typeof part.text === "string" && part.text.trim() ? [part.text] : [];
+    });
+    if (!parts.length)
+      continue;
+    const error = message.isError ? ' is-error="true"' : "";
+    const note = `<stale-tool-result tool="${message.toolName}" id="${message.toolCallId}"${error}>
+${parts.join(`
+`)}
+</stale-tool-result>`;
+    projected.push({
+      role: "user",
+      content: api === "ollama-chat" ? note : new TextDecoder().decode(new TextEncoder().encode(note)),
+      timestamp: message.timestamp,
+      [ORPHAN_NOTE]: true
+    });
+  }
+  flush();
+  return projected;
+}
+function projectUnmodeledToolResults(messages) {
   const responsesComponents = new Set;
   const opaqueIds = new Set;
-  const validToolUseIds = projectOrphans ? new Set : undefined;
   const component = (id) => {
     const pipe = id.indexOf("|");
     return pipe > 0 ? id.slice(0, pipe) : id;
   };
   for (const value of messages) {
-    const message = object7(value);
+    const message = object8(value);
     if (message?.role !== "assistant" || !Array.isArray(message.content))
       continue;
     for (const value of message.content) {
-      const block = object7(value);
+      const block = object8(value);
       if (block?.type !== "toolCall" || typeof block.id !== "string")
         continue;
       if ([
         "openai-responses",
         "azure-openai-responses",
         "openai-codex-responses"
-      ].includes(String(message.api))) {
+      ].includes(String(message.api)))
         responsesComponents.add(component(block.id));
-        validToolUseIds?.add(component(block.id));
-      } else {
-        if (block.id.includes("|"))
-          opaqueIds.add(block.id);
-        validToolUseIds?.add(block.id);
-      }
+      else if (block.id.includes("|"))
+        opaqueIds.add(block.id);
     }
   }
   const pairingId = (id) => !opaqueIds.has(id) && responsesComponents.has(component(id)) ? component(id) : id;
   const lastResult = new Map;
   messages.forEach((value, index) => {
-    const message = object7(value);
+    const message = object8(value);
     if (message?.role === "toolResult" && typeof message.toolCallId === "string")
       lastResult.set(pairingId(message.toolCallId), index);
   });
@@ -35402,35 +36082,13 @@ function projectMissingToolResults(messages, api) {
   };
   for (let index = 0;index < messages.length; index++) {
     const value = messages[index];
-    const message = object7(value);
+    const message = object8(value);
     if ((message?.role === "bashExecution" || message?.role === "pythonExecution") && message.excludeFromContext === true)
       continue;
     if (message?.role !== "toolResult")
       flush(message?.timestamp);
     else if (typeof message.toolCallId === "string" && pending.some((call) => pairingId(call.id) === pairingId(String(message.toolCallId))))
       resolved.add(pairingId(message.toolCallId));
-    else if (validToolUseIds && message?.role === "toolResult" && typeof message.toolCallId === "string" && typeof message.toolName === "string" && !validToolUseIds.has(pairingId(message.toolCallId)) && Array.isArray(message.content)) {
-      if (pending.some((call) => !resolved.has(pairingId(call.id))))
-        continue;
-      const parts = message.content.flatMap((value) => {
-        const part = object7(value);
-        return part?.type === "text" && typeof part.text === "string" && part.text.trim() ? [part.text] : [];
-      });
-      if (parts.length) {
-        const error = message.isError ? ' is-error="true"' : "";
-        const note = `<stale-tool-result tool="${message.toolName}" id="${message.toolCallId}"${error}>
-${parts.join(`
-`)}
-</stale-tool-result>`;
-        projected.push({
-          role: "user",
-          content: api === "ollama-chat" ? note : new TextDecoder().decode(new TextEncoder().encode(note)),
-          timestamp: message.timestamp,
-          [ORPHAN_NOTE]: true
-        });
-      }
-      continue;
-    }
     projected.push(value);
     if (message?.role !== "assistant" || !Array.isArray(message.content))
       continue;
@@ -35439,39 +36097,82 @@ ${parts.join(`
     timestamp = message.timestamp;
     if (aborted && typeof timestamp !== "number")
       continue;
-    for (const value of message.content) {
-      const block = object7(value);
-      if (block?.type === "toolCall" && typeof block.id === "string")
-        pending.push({
-          id: block.id,
-          name: typeof block.name === "string" ? block.name : ""
-        });
-    }
+    pending.push(...windowCalls(message));
   }
   flush();
   return projected;
 }
+function projectPiToolResults(messages) {
+  const projected = [];
+  let pending = [];
+  let answered = new Set;
+  const held = [];
+  const close = (timestamp) => {
+    for (const call of pending)
+      if (!answered.has(call.id))
+        projected.push({
+          role: "toolResult",
+          toolCallId: call.id,
+          toolName: call.name,
+          content: [{ type: "text", text: "No result provided" }],
+          isError: true,
+          timestamp
+        });
+    pending = [];
+    answered = new Set;
+    projected.push(...held);
+    held.length = 0;
+  };
+  for (const value of messages) {
+    const message = object8(value);
+    const role = message?.role;
+    if (role === "assistant") {
+      close(message?.timestamp);
+      if (message?.stopReason === "error" || message?.stopReason === "aborted")
+        continue;
+      const calls = message ? windowCalls(message) : [];
+      if (calls.length)
+        pending = calls;
+    } else if (role === "toolResult") {
+      if (typeof message?.toolCallId === "string")
+        answered.add(message.toolCallId);
+    } else if (role === "system" && pending.length) {
+      held.push(value);
+      continue;
+    } else if ([
+      "user",
+      "custom",
+      "bashExecution",
+      "branchSummary",
+      "compactionSummary"
+    ].includes(String(role)))
+      close(message?.timestamp);
+    projected.push(value);
+  }
+  close();
+  return projected;
+}
 function preparePiDispatch(messages, model, omp) {
   let output = messages;
   const structure = buildPiPreparedStructure(messages, model, omp ? (index, source) => {
-    if (object7(source.providerPayload)?.type !== "openaiResponsesHistory")
+    if (object8(source.providerPayload)?.type !== "openaiResponsesHistory")
       return;
     if (output === messages)
       output = messages.slice();
     const { providerPayload: _payload, ...copy } = source;
     output[index] = copy;
-  } : undefined);
+  } : undefined, omp ? "omp" : "pi");
   return { messages: output, structure };
 }
-function buildPiPreparedStructure(messages, model, prepareUser) {
+function buildPiPreparedStructure(messages, model, prepareUser, host = "omp") {
   if (!messages.length || messages.length > MAX_MESSAGES)
     return;
   for (let index = 0;index < messages.length; index++) {
-    const source = object7(messages[index]);
+    const source = object8(messages[index]);
     if (source?.role === "user" || source?.role === "compactionSummary")
       prepareUser?.(index, source);
   }
-  const projectedMessages = projectMissingToolResults(model?.api ? piAgentHistory(messages, model.api) : messages, model?.api);
+  const projectedMessages = projectMissingToolResults(model?.api && host === "omp" ? piAgentHistory(messages, model.api) : messages, model, host);
   if (projectedMessages.length > MAX_MESSAGES)
     return;
   const rows = [];
@@ -35483,7 +36184,7 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
   let valid = true;
   for (let index = 0;index < projectedMessages.length; index++) {
     const message = projectedMessages[index];
-    const source = object7(message);
+    const source = object8(message);
     if (rows.length === 0 && (source?.role === "system" || source?.role === "developer"))
       continue;
     if ((source?.role === "bashExecution" || source?.role === "pythonExecution") && source.excludeFromContext === true)
@@ -35507,7 +36208,7 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
       "azure-openai-responses",
       "openai-codex-responses"
     ].includes(model?.api ?? "") && (source?.role === "user" || source?.role === "developer") && (typeof source.content === "string" ? !source.content.trim() : Array.isArray(source.content) && !source.content.some((value) => {
-      const block = object7(value);
+      const block = object8(value);
       return block?.type === "image" || block?.type === "text" && typeof block.text === "string" && block.text.trim();
     })))
       continue;
@@ -35540,16 +36241,16 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
   const positionedRows = [...byIndex];
   for (let position = positionedRows.length - 1;position >= 0; position--) {
     const [index, row] = positionedRows[position];
-    const source = object7(projectedMessages[index]);
+    const source = object8(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");
+    const textOnly = Array.isArray(parts) && parts.every((part) => object8(part)?.type === "text" && typeof object8(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"))
+      if (model?.api === "ollama-chat" || model?.api === "anthropic-messages" && object8(model.compat)?.supportsMidConversationSystem === true && textOnly && (previous?.role === "user" || previous?.role === "toolResult") && (!next || next.role === "assistant"))
         row.role = "system";
     }
     if (row.role === "system") {
@@ -35622,7 +36323,7 @@ function buildPiPreparedStructure(messages, model, prepareUser) {
     ...responsesMessages ? { responsesMessages } : {},
     ...model?.api ? { api: model.api } : {},
     ...model?.api?.startsWith("google-") ? {
-      googleFunctionIds: object7(model.compat)?.supportsFunctionPartId === true
+      googleFunctionIds: object8(model.compat)?.supportsFunctionPartId === true
     } : {}
   };
 }
@@ -35634,7 +36335,7 @@ function responsesLane(api) {
   ].includes(api ?? "");
 }
 function payloadStructure(payload, ollama = false, responsesItems = false, imageProjection = false) {
-  const body = object7(payload);
+  const body = object8(payload);
   if (!body)
     return;
   const google = piGoogleConversation(payload);
@@ -35649,7 +36350,7 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
     return;
   const rows = [];
   for (const value of messages) {
-    const message = object7(value);
+    const message = object8(value);
     if (!message)
       return;
     if (rows.length === 0 && (message.role === "system" || message.role === "developer"))
@@ -35709,7 +36410,7 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
       continue;
     }
     if (message.role === "user" && Array.isArray(message.content)) {
-      const results = message.content.filter((block) => object7(block)?.type === "tool_result" || bedrock && object7(block)?.toolResult);
+      const results = message.content.filter((block) => object8(block)?.type === "tool_result" || bedrock && object8(block)?.toolResult);
       if (results.length) {
         for (const block of results) {
           const id = bedrock ? block.toolResult?.toolUseId : block.tool_use_id;
@@ -35756,11 +36457,11 @@ function payloadStructure(payload, ollama = false, responsesItems = false, image
     }
     if (Array.isArray(message.tool_calls)) {
       for (const call of message.tool_calls) {
-        const source = object7(call);
+        const source = object8(call);
         if (!source)
           return;
         if (source.id === undefined && ollama) {
-          const fn = object7(source.function);
+          const fn = object8(source.function);
           if (typeof fn?.name !== "string")
             return;
           row.calls.push("");
@@ -35796,7 +36497,7 @@ function googleStructure(contents, imageProjection = false) {
     return;
   const rows = [];
   for (const value of contents) {
-    const message = object7(value);
+    const message = object8(value);
     if (!message || !Array.isArray(message.parts))
       return;
     if (message.role !== "user" && message.role !== "model")
@@ -35811,11 +36512,11 @@ function googleStructure(contents, imageProjection = false) {
     };
     const results = [];
     for (const value of message.parts) {
-      const part = object7(value);
+      const part = object8(value);
       if (!part)
         return;
       if (part.functionCall) {
-        const call = object7(part.functionCall);
+        const call = object8(part.functionCall);
         if (row.role !== "assistant" || typeof call?.name !== "string" || call.id !== undefined && typeof call.id !== "string")
           return;
         row.calls.push(call.id ?? "");
@@ -35823,7 +36524,7 @@ function googleStructure(contents, imageProjection = false) {
         row.callNames.push(call.name);
       }
       if (part.functionResponse) {
-        const result = object7(part.functionResponse);
+        const result = object8(part.functionResponse);
         if (row.role !== "user" || typeof result?.name !== "string" || result.id !== undefined && typeof result.id !== "string")
           return;
         results.push({
@@ -35857,11 +36558,11 @@ function matchesUserText(content, text, api, responses, googleOrBedrock) {
   if (responses || googleOrBedrock) {
     if (!Array.isArray(content) || content.length !== 1)
       return false;
-    const block = object7(content[0]);
+    const block = object8(content[0]);
     return !!block && block.text === text && (responses ? block.type === "input_text" : Object.keys(block).length === 1);
   }
   if ((api === "anthropic-messages" || api === "factory-droid-agent") && Array.isArray(content)) {
-    const block = content.length === 1 ? object7(content[0]) : undefined;
+    const block = content.length === 1 ? object8(content[0]) : undefined;
     return block?.type === "text" && block.text === text;
   }
   return content === text;
@@ -35929,7 +36630,7 @@ function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
       return "comparison=image count";
     const imageProjection = trimmed > 0;
     stage = "wire rows";
-    const body = object7(payload);
+    const body = object8(payload);
     const ollama = prepared?.api === "ollama-chat" && !!body && Array.isArray(body.messages) && body.input === undefined && body.system === undefined && body.inferenceConfig === undefined;
     const responses = body?.messages === undefined && Array.isArray(body?.input);
     rows = payloadStructure(payload, ollama, responses && !!prepared?.responsesMessages, imageProjection);
@@ -35954,7 +36655,7 @@ function piPreparedStructureMismatch(payload, prepared, onImageTrim) {
       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;
+        const actualTexts = typeof content === "string" ? [content] : Array.isArray(content) && content.every((part) => object8(part)?.type === "text" && typeof object8(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");
@@ -41294,13 +41995,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);
@@ -41939,7 +42639,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")
@@ -42727,7 +43427,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
@@ -42764,7 +43464,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();
@@ -43362,6 +44062,14 @@ function registerPiContextHandler(pi, baseOptions) {
         schedulerDeferReason,
         forceMaterialization: forceMaterialization || isEmergency,
         forceMaterializationPercentage,
+        signedThinkingHold: resolvePiSignedThinkingHold({
+          sessionId,
+          db: options.db,
+          messages: event.messages,
+          prefixBound: isPrefixBoundThinkingModel(ctx.model?.provider, ctx.model?.id),
+          usagePercentage,
+          executeThresholdPercentage: effectiveExecuteThresholdPercentage
+        }),
         contextUsage: {
           percentage: usagePercentage,
           inputTokens: usageInputTokens
@@ -43478,7 +44186,8 @@ function registerPiContextHandler(pi, baseOptions) {
             minimumPercentage: usagePercentage,
             liveIsRawBranchEstimate: piLiveUsageIsRawBranchEstimate,
             historianStateSnapshot: historianStateForPass,
-            publishedHistoryRide: isCacheBusting
+            publishedHistoryRide: isCacheBusting,
+            signedThinkingHeld: result.strictThinkingKept
           });
         } catch (error) {
           budget.assertOutcome();
@@ -43871,6 +44580,7 @@ function registerPiContextHandler(pi, baseOptions) {
                     },
                     minimumPercentage: 95,
                     publishedHistoryRide: false,
+                    signedThinkingHeld: result.strictThinkingKept,
                     historianStateSnapshot: loadPiHistorianStateSnapshot(options.db, sessionId)
                   });
                   const pending = inFlightHistorian.get(sessionId);
@@ -44148,6 +44858,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) => {
@@ -44400,10 +45111,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);
@@ -44634,8 +45342,14 @@ Historian previously failed ${failureCount} time(s), so Magic Context is retryin
     const trigger = checkCompartmentTrigger(db, sessionId, sessionMeta, usage, 0, triggerInputs.executeThresholdPercentage, triggerInputs.triggerBudget, triggerInputs.keepReasoningTokens, triggerInputs.commitClusterTrigger, args.activeTags, boundaryContextLimit, () => readPiHistorianTail(db, sessionId, provider), args.taggerFloor, { canClearReasoning: true }, {
       hardFold: false,
       force: usage.percentage >= historianForceMaterializationPercentage && (usage.percentage >= 95 || getEmergencyInputSample(db, sessionId) === 0),
-      explicitFlush: hasPendingMaterialization(sessionId),
-      publishedHistory: args.publishedHistoryRide
+      explicitFlush: hasPendingMaterializationOrigin(pendingMaterializationSessions, sessionId, "user_flush"),
+      publishedHistory: args.publishedHistoryRide,
+      permission: {
+        signedThinkingHold: args.signedThinkingHeld === true,
+        firstRender: false,
+        idleExpiry: false,
+        emergency: usage.percentage >= historianForceMaterializationPercentage
+      }
     }, args.eligiblePendingDropTagIds);
     if (!trigger.shouldFire) {
       sessionLog2(sessionId, `historian trigger eval: shouldFire=false (no trigger condition met)`);
@@ -44736,7 +45450,7 @@ function captureReasoningMutationRollback(messages) {
 async function runCompactionOffPipeline(args) {
   let injectionResult = null;
   if (args.injection) {
-    injectionResult = injectM0M1Pi({
+    const state = {
       sessionId: args.sessionId,
       projectIdentity: args.projectIdentity,
       projectDirectory: args.projectDirectory,
@@ -44747,7 +45461,10 @@ async function runCompactionOffPipeline(args) {
       historyBudgetPolicyIdentity: args.injection.historyBudgetPolicyIdentity,
       muralEnabled: args.injection.muralEnabled === true,
       compactionOff: true
-    }, args.db, args.messages, args.entryIds, false, args.injectionPassSnapshot);
+    };
+    if (args.reasoningClearing?.prefixBound === true && hasActiveAnthropicThinkingTurn(args.messages, args.resolvedProviderID, args.resolvedModelID))
+      state.preparedPrefix = prepareCachedM0M1PiReplay(state, args.db, args.injectionPassSnapshot?.cachedRow);
+    injectionResult = injectM0M1Pi(state, args.db, args.messages, args.entryIds, false, args.injectionPassSnapshot);
   }
   return {
     messages: args.messages,
@@ -44783,6 +45500,27 @@ async function runCompactionOffPipeline(args) {
     lkgEntryIdByRef: new Map
   };
 }
+var signedThinkingHoldLogKeys = new Map;
+function resolvePiSignedThinkingHold(args) {
+  if (!args.prefixBound)
+    return false;
+  let proseRatio;
+  const decision = decideSignedThinkingHold({
+    messages: args.messages,
+    usagePercentage: args.usagePercentage,
+    executeThresholdPercentage: args.executeThresholdPercentage,
+    estimateTextTokens: (text) => {
+      proseRatio ??= sessionDecisionCalibration(args.db, args.sessionId).proseRatio;
+      return estimateTokens(text) * proseRatio;
+    }
+  });
+  const key = `${decision.reason}:${decision.heavyStepsBack ?? "none"}`;
+  if (signedThinkingHoldLogKeys.get(args.sessionId) !== key) {
+    signedThinkingHoldLogKeys.set(args.sessionId, key);
+    sessionLog2(args.sessionId, `signed thinking hold: held=${decision.held} reason=${decision.reason} heavyStepsBack=${decision.heavyStepsBack ?? "none"} heavyStepTokens=${decision.heavyStepTokens} usage=${args.usagePercentage.toFixed(1)}% cap=${decision.capPercentage}%`);
+  }
+  return decision.held;
+}
 async function runPipeline(args) {
   args.assertCurrentPass?.();
   if (args.compactionOff)
@@ -44798,7 +45536,8 @@ async function runPipeline(args) {
     signalPiPendingMaterialization(args.sessionId, "thinking_hold");
   let restoreOriginals;
   let activeThinkingTurn = hasActiveAnthropicThinkingTurn(args.messages, args.resolvedProviderID, args.resolvedModelID);
-  let protectedSignedPrefix = activeThinkingTurn && args.reasoningClearing?.prefixBound === true;
+  const signedTurnOnPrefixBoundModel = args.reasoningClearing?.prefixBound === true && (activeThinkingTurn || activeAnthropicTurnStart(args.messages, true) === undefined && args.messages.some((message) => message.role === "assistant" && Array.isArray(message.content) && message.content.some((part) => part?.type === "thinking" || part?.type === "redacted_thinking")));
+  let protectedSignedPrefix = signedTurnOnPrefixBoundModel && args.signedThinkingHold === true;
   let rewritingSignedPrefix = false;
   let isCacheBustingPass = args.recoveryRebuildReason === "lkg_recovery_input_rebuild" || (!!args.recoveryRebuildReason || args.forceSignedRebuildForFit === true) && hasUnfrozenPiThinking({
     messages: args.messages,
@@ -44829,8 +45568,12 @@ async function runPipeline(args) {
     activeThinkingTurn = false;
     protectedSignedPrefix = false;
   };
-  if (args.recoveryRebuildReason || args.forceSignedRebuildForFit && protectedSignedPrefix)
+  if (args.recoveryRebuildReason || args.forceSignedRebuildForFit && signedTurnOnPrefixBoundModel)
     stripForPrefixRewrite(isCacheBustingPass);
+  const stripUnheldSignedTurnOnBust = () => {
+    if (isCacheBustingPass && signedTurnOnPrefixBoundModel && !protectedSignedPrefix && !rewritingSignedPrefix)
+      stripForPrefixRewrite();
+  };
   const realStableId = (msg, index) => resolvePiRealStableId(msg, index, args.entryIds, args.entryIdByRef ?? undefined);
   const passFallbackIds = settlePiFallbackOccurrences(args.db, args.sessionId, piContentFallbackIds(args.messages, realStableId));
   const stableIdResolver = (msg, index) => realStableId(msg, index) ?? passFallbackIds[index] ?? resolvePiStableId(msg, index);
@@ -45073,9 +45816,16 @@ async function runPipeline(args) {
     explicitFlush: !protectedSignedPrefix && (args.userFlushOrigin === true || hasPendingMaterializationOrigin(pendingMaterializationSessions, args.sessionId, "user_flush")),
     publishedHistory: !prefixPreflightContended && publishedM1RefreshedThisPass
   };
-  let prefixMutationAllowed = !protectedSignedPrefix || firstRenderBust || heldIdleExpiryRebuild || emergencyDropEligible;
-  isCacheBustingPass = prefixMutationAllowed && hasReclaimRide(rideSignals);
+  const ridePermissionGate = {
+    signedThinkingHold: protectedSignedPrefix,
+    firstRender: firstRenderBust,
+    idleExpiry: heldIdleExpiryRebuild,
+    emergency: emergencyDropEligible
+  };
+  let prefixMutationAllowed = prefixMutationPermitted(ridePermissionGate);
+  isCacheBustingPass = reclaimRidePermitted(rideSignals, ridePermissionGate);
   let publishedWorkDrainAllowed = isCacheBustingPass;
+  stripUnheldSignedTurnOnBust();
   const usesTokenProtection = args.protectedTokenTierOverrides !== undefined || args.protectedTokens !== undefined;
   const resolveProtectionFloor = () => resolveEpochFloorForPass(args.db, args.sessionId, {
     configuredOverride: args.protectedTokens,
@@ -45150,6 +45900,7 @@ async function runPipeline(args) {
     deferredMaterializeEligible = canConsumeDeferredLate && deferredMaterializationSessions.has(args.sessionId);
     isCacheBustingPass = prefixMutationAllowed;
     publishedWorkDrainAllowed = isCacheBustingPass;
+    stripUnheldSignedTurnOnBust();
     shouldRunHeuristics = args.heuristics !== undefined;
     if (piM0State && prefixMutationAllowed) {
       try {
@@ -46358,6 +47109,7 @@ function clearContextHandlerSession(sessionId) {
   clearPiChannel1State(sessionId);
   lastHeuristicsTurnIdBySession.delete(sessionId);
   routinePressureAppliedBySession.delete(sessionId);
+  signedThinkingHoldLogKeys.delete(sessionId);
   lastSeenProjectIdentityBySession.delete(sessionId);
   persistedProjectIdentityBySession.delete(sessionId);
   sessionProjectBindingFailureLogAtBySession.delete(sessionId);
@@ -46452,10 +47204,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,
@@ -49804,9 +50558,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;
 }