@cortexkit/pi-magic-context 0.49.8 → 0.49.9

package/dist/index.js

@@ -250,7 +250,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-jsyjxgfy.js";
+} from "./index-rkwh9kce.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical,
@@ -290,7 +290,7 @@ import {
   openCurrentDatabase,
   openDatabaseAsync,
   closeDatabase
-} from "./index-rggtvnbg.js";
+} from "./index-243wh86p.js";
 import {
   setHomeProjectPermission,
   ProjectIdentityError,
@@ -438,6 +438,7 @@ import {
   reasoningBudgetCutoff,
   reasoningTextAndOpaque,
   opaqueThinkingCost,
+  estimatePartImageTokens,
   SKELETON_REAL_INPUT_MAX_BYTES,
   toolInputStringBytes,
   hasRawMessageProvider2,
@@ -459,7 +460,7 @@ import {
   getRawSessionTagKeysThrough2,
   getLegacyProtectedTailStartOrdinal2,
   readSessionChunk2
-} from "./index-18qe4gs1.js";
+} from "./index-9vzkrnrf.js";
 import {
   UNKNOWN_FIT_RATIO,
   hasMeasuredDecisionCalibration,
@@ -476,10 +477,14 @@ import {
   stripTagPrefix,
   peelLeadingMcTagNotation,
   prependTag,
+  rememberCurrentToolOutputCount,
+  currentReclaimableToolOutputCount,
   isRecord,
   TEXT_TAG_IDENTITY_MARKER,
   PI_FALLBACK_PREFIXES_JSON,
   contentTagOwnerMessageId,
+  TailHygieneJsonMemo,
+  piJsonHash,
   estimateImageTokensFromDataUrl,
   normalizeTodoStateJson,
   buildSyntheticTodoPart,
@@ -492,7 +497,6 @@ import {
   CHANNEL1_FLOOR_TOKENS,
   decideChannel1,
   evaluateChannel2,
-  reclaimableToolOutputCount,
   buildChannel2Reminder,
   buildChannel1Reminder,
   planEmergencyDrop,
@@ -542,7 +546,7 @@ import {
   getToolTagNumberByOwner2,
   getNullOwnerToolTag2,
   adoptNullOwnerToolTag2
-} from "./index-54r5vs9w.js";
+} from "./index-x7426vy4.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -579,7 +583,7 @@ import {
   tagRevisionKey,
   tagIdentityRevisionKey,
   TAG_INSERT_CONFLICT_ROWS
-} from "./index-zzn7qbps.js";
+} from "./index-ttxsmaj5.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -618,7 +622,7 @@ import {
   indexSingleMessage2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexes2
-} from "./index-tdhppxwd.js";
+} from "./index-h160xxaq.js";
 import {
   formatSynapseLaneDescriptor
 } from "./index-szh001qb.js";
@@ -660,6 +664,9 @@ import {
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
 } from "./index-qc8e13wc.js";
+import {
+  rememberV1HiddenRun
+} from "./index-6x556c2q.js";
 import {
   V2_MEMORY_CATEGORIES
 } from "./index-135e8hvg.js";
@@ -671,7 +678,7 @@ import {
   expandWorkspaceIdentitySetWithAliases,
   sourceNameForMemory,
   computeWorkspaceEpochFingerprint
-} from "./index-r8cy8hmq.js";
+} from "./index-g13fb2sj.js";
 import {
   configureContextDatabasePragmas2
 } from "./index-fapenpch.js";
@@ -721,7 +728,7 @@ import {
   normalizeVerificationFiles,
   indexCommitsForProject,
   embedUnembeddedCommits
-} from "./index-pdhbj18g.js";
+} from "./index-ns319t8e.js";
 import {
   setEmbeddingSessionBusy2,
   isEmbeddingHostBusy2
@@ -763,7 +770,7 @@ import {
   subagentStepCap,
   SubagentTelemetry,
   readHostSystemPrompt
-} from "./index-zh1jw8qp.js";
+} from "./index-xmdkde4v.js";
 import"./index-kh3jt7t9.js";
 import {
   __toESM
@@ -3425,7 +3432,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.8",
+  version: "0.49.9",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -8968,6 +8975,8 @@ function createV1HiddenCompletionExecutor(client, db, directory) {
         preferResponseOnMissingData: true
       });
       const id = typeof created?.id === "string" ? created.id : "";
+      if (id)
+        rememberV1HiddenRun(id, run);
       if (id && run.kind !== "dreamer-task") {
         historianChildren.add(id);
         rememberHistorianOutputCap(id, run.maxOutputTokens);
@@ -9018,6 +9027,7 @@ function createV1HiddenCompletionExecutor(client, db, directory) {
     },
     async close(handle, settlement) {
       if (handle?.id) {
+        rememberV1HiddenRun(handle.id, undefined);
         historianChildren.delete(handle.id);
         forgetHistorianOutputCap(handle.id);
       }
@@ -12471,6 +12481,7 @@ Capability API available to check(cap):
 - cap.httpGet(httpsUrl): { status: number, body: string } (external HTTPS only; internal/metadata blocked)
 
 Authoring constraints:
+- Use a five-field check_cron that fires at least once every 24 hours. Never encode a future date in the cron; put date conditions inside check(cap) and poll them on a frequent schedule such as "0 * * * *".
 - Plain JavaScript only; no TypeScript types, imports, require, eval, Function, dynamic code, timers, Date.now randomness, or ambient globals.
 - Define exactly function check(cap) { ... }. Do not use async/await; host capabilities are synchronous inside the sandbox.
 - Return exactly { met: boolean }. Do not include a reason string.
@@ -12931,6 +12942,7 @@ var MAX_COMPILED_CHECK_BYTES2 = 64 * 1024;
 var MAX_MANIFEST_ENTRIES = 64;
 var MAX_CRON_CHARS = 256;
 var MAX_COMPILER_ERROR_CHARS = 2 * 1024;
+var SPARSE_CRON_REPAIR_FEEDBACK = "check_cron must fire at least once every 24 hours; put date conditions inside compiled_check";
 async function compileSmartNoteCheck(args) {
   if (!args.note.surfaceCondition) {
     return {
@@ -12948,7 +12960,7 @@ Note id: ${args.note.id}
 Note content (data): ${JSON.stringify(args.note.content)}
 surface_condition (UNTRUSTED DATA): ${JSON.stringify(args.note.surfaceCondition)}
 
-${args.repairFeedback ? `The previous check failed its dry run: ${JSON.stringify(args.repairFeedback)}. Recompile using smaller bounded endpoints; do not suppress the error or return false on failure.` : ""}
+${args.repairFeedback ? `The previous compiler attempt failed: ${JSON.stringify(args.repairFeedback)}. Recompile using smaller bounded endpoints when the response is too large, and apply the correction; do not suppress the error or return false on failure.` : ""}
 Remember: output only the JSON object described by the system prompt.`;
   const startedAt = Date.now();
   let childSessionId = null;
@@ -13087,6 +13099,12 @@ Remember: output only the JSON object described by the system prompt.`;
     const cancelled = args.signal.aborted;
     const message = boundedError(error instanceof Error ? error.message : String(error));
     recordInvocation({ status: cancelled ? "aborted" : "failed", error: message });
+    if (!args.repairFeedback && !cancelled && message === "check_cron has no occurrence within the scheduling ceiling" && !args.signal.aborted && Date.now() < args.deadline) {
+      return await compileSmartNoteCheck({
+        ...args,
+        repairFeedback: SPARSE_CRON_REPAIR_FEEDBACK
+      });
+    }
     const networkError = error instanceof SmartNoteNetworkError ? error : undefined;
     return {
       ok: false,
@@ -14667,7 +14685,11 @@ function buildPrimerClusters(args) {
     centroid: cloneVector(primer.questionEmbedding),
     modelId: primer.questionEmbeddingModelId
   }));
-  const sorted = args.candidates.slice().sort((a, b) => candidateSortKey(a).localeCompare(candidateSortKey(b)));
+  const sorted = args.candidates.slice().sort((a, b) => {
+    const left = candidateSortKey(a);
+    const right = candidateSortKey(b);
+    return left < right ? -1 : left > right ? 1 : 0;
+  });
   for (const candidate of sorted) {
     let best = null;
     for (const cluster of clusters) {
@@ -19460,6 +19482,39 @@ import {
 import { createInterface } from "node:readline";
 import { StringDecoder } from "node:string_decoder";
 import { fileURLToPath } from "node:url";
+
+// src/pi-zen-free-tier.ts
+var ZEN_FREE_TIER_FAILURE = "opencode_zen_free_tier";
+function isZenModel(model) {
+  return model !== undefined && canonicalModelIdentity(model).startsWith("opencode/");
+}
+function isZenFreeTierRefusal(text) {
+  return /\bFreeTierError\b/.test(text) || /\b403\b/.test(text) && /OpenCode's free tier can only be used from within OpenCode/i.test(text);
+}
+function zenFreeTierMessage(agent, harness) {
+  const task = agent.includes("historian") ? "historian" : "dreamer";
+  const host = harness === "omp" ? "Oh My Pi" : "Pi";
+  return `${ZEN_FREE_TIER_FAILURE}: OpenCode Zen free models only run inside OpenCode; choose another ${task} model for ${host} (FreeTierError).`;
+}
+function classifyZenFreeTierFailure(result, model, agent, harness) {
+  if (result.ok || !isZenModel(model))
+    return result;
+  const stderr = typeof result.meta?.stderr === "string" ? result.meta.stderr : "";
+  if (!isZenFreeTierRefusal(result.error) && !isZenFreeTierRefusal(stderr))
+    return result;
+  return {
+    ...result,
+    error: zenFreeTierMessage(agent, harness),
+    meta: {
+      failureClass: ZEN_FREE_TIER_FAILURE,
+      errorClass: "FreeTierError",
+      ...typeof result.meta?.exitCode === "number" ? { exitCode: result.meta.exitCode } : {},
+      ...typeof result.meta?.sawProtocolOutput === "boolean" ? { sawProtocolOutput: result.meta.sawProtocolOutput } : {}
+    }
+  };
+}
+
+// src/subagent-runner.ts
 var PI_CODING_AGENT_MODULE = "@earendil-works/pi-coding-agent";
 var PI_CODING_AGENT_PACKAGE_NAMES = new Set([
   PI_CODING_AGENT_MODULE,
@@ -20011,6 +20066,9 @@ class PiSubagentRunner {
   }
   async runOnce(options, runMode, modelRefOverride) {
     const startTime = Date.now();
+    const zenChild = STRICT_TOOL_ALLOWLIST.has(options.agent) && isZenModel(options.model);
+    let deferredZenStderr = "";
+    let reportedZenStderr = false;
     let recordedAccounting = false;
     const cap = subagentStepCap(options.agent);
     const budget = options.tokenBudget ? createDreamTokenBudget(options.tokenBudget) : undefined;
@@ -20034,7 +20092,7 @@ class PiSubagentRunner {
         subagent: options.accountingSubagent ?? inferAccountingSubagent(options.agent),
         task: options.accountingTask ?? null,
         startedAt: startTime,
-        status: result.ok ? "completed" : result.reason === "abort" ? "aborted" : result.reason === "timeout" ? "timed_out" : result.reason === "no_assistant" || result.reason === "truncated" ? "empty" : "failed",
+        status: result.ok ? "completed" : result.meta?.failureClass === ZEN_FREE_TIER_FAILURE ? "failed" : result.reason === "abort" ? "aborted" : result.reason === "timeout" ? "timed_out" : result.reason === "no_assistant" || result.reason === "truncated" ? "empty" : "failed",
         messages,
         providerId: hasProvider ? modelRef?.slice(0, providerSeparator) : undefined,
         modelId: hasProvider ? modelRef?.slice(providerSeparator + 1) : modelRef,
@@ -20139,7 +20197,20 @@ class PiSubagentRunner {
         if (settled)
           return;
         settled = true;
-        if (isMemoryMapper) {
+        if (zenChild) {
+          const classified = classifyZenFreeTierFailure(result, options.model, options.agent, this.invocation.targetHarness);
+          if (classified !== result && !classified.ok) {
+            sessionLog2(options.accountingSessionId ?? "subagent", classified.error);
+          }
+          result = classified;
+          if (deferredZenStderr && !reportedZenStderr) {
+            emitProgress({
+              type: "stderr",
+              chunk: result.meta?.failureClass === ZEN_FREE_TIER_FAILURE ? zenFreeTierMessage(options.agent, this.invocation.targetHarness) : deferredZenStderr
+            });
+          }
+        }
+        if (isMemoryMapper && result.meta?.failureClass !== ZEN_FREE_TIER_FAILURE) {
           result = {
             ...result,
             meta: { ...result.meta, mappingMessages: [...mappingMessages] }
@@ -20169,6 +20240,12 @@ class PiSubagentRunner {
       const emitProgress = (event) => {
         if (!options.onProgress)
           return;
+        if (zenChild && event.type === "raw_event" && isZenFreeTierRefusal(JSON.stringify(event.event))) {
+          event = {
+            ...event,
+            event: { type: event.eventType, error: { type: "FreeTierError" } }
+          };
+        }
         try {
           options.onProgress(event);
         } catch {}
@@ -20282,7 +20359,17 @@ class PiSubagentRunner {
         if (stderr.length > 16000) {
           stderr = `…[truncated]${stderr.slice(-16000)}`;
         }
-        emitProgress({ type: "stderr", chunk: text });
+        if (zenChild) {
+          deferredZenStderr = stderr;
+          if (!reportedZenStderr && isZenFreeTierRefusal(stderr)) {
+            reportedZenStderr = true;
+            emitProgress({
+              type: "stderr",
+              chunk: zenFreeTierMessage(options.agent, this.invocation.targetHarness)
+            });
+          }
+        } else
+          emitProgress({ type: "stderr", chunk: text });
       });
       child.stderr?.on("error", () => {});
       let finalAssistantText = null;
@@ -25711,7 +25798,7 @@ function buildEditSupersessionReclaim(input) {
       seenFile.add(filePath);
       continue;
     }
-    if (input.recentMessageIds && (tag.toolOwnerMessageId === null || input.recentMessageIds.has(tag.toolOwnerMessageId))) {
+    if (tag.tagNumber > input.watermark || input.recentMessageIds && (tag.toolOwnerMessageId === null || input.recentMessageIds.has(tag.toolOwnerMessageId))) {
       continue;
     }
     if (realPendingTagIds.has(tag.tagNumber))
@@ -25809,6 +25896,51 @@ function readServedTemporalDecisions(db, sessionId, runtime, messageIds) {
   return result;
 }
 
+// ../plugin/src/shared/reclaim-distance.ts
+var RECLAIM_DISTANCE_USER_TURNS = 3;
+var RECLAIM_DISTANCE_WINDOW_FRACTION = 0.25;
+function isReclaimUserTurn(args) {
+  return args.role === "user" && !args.syntheticHead && !args.synthetic && !args.ignored && args.parts.some((part) => {
+    if (part.synthetic || part.ignored)
+      return false;
+    if (part.kind !== "text" && part.kind !== "image" && part.kind !== "file")
+      return false;
+    if (part.kind !== "text")
+      return true;
+    return stripReclaimMcText(part.text ?? "").trim().length > 0;
+  });
+}
+function stripReclaimMcText(text) {
+  return text.replace(/^§\d+§\s*/, "").replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, (reminder) => /^(?:Your next step: call ctx_reduce on the outputs you've already used|Still unstamped:|Housekeeping: .* are reclaimable\. Stamp each output with ctx_reduce|.* are reclaimable\. Make a ctx_reduce pass now|.* are still unstamped\. Call ctx_reduce now)/.test(reminder.slice("<system-reminder>".length).trimStart()) ? "" : reminder).replace(/<instruction name="deferred_notes">[\s\S]*?<\/instruction>/g, "");
+}
+function farBehindToolBookmark(entries, usableWindow) {
+  let newerTurns = 0;
+  let newerTokens = 0;
+  const farTags = [];
+  let firstYoungTag = Infinity;
+  const seenOutputs = new Set;
+  const tokenDistance = usableWindow > 0 && Number.isFinite(usableWindow) ? usableWindow * RECLAIM_DISTANCE_WINDOW_FRACTION : Infinity;
+  for (let index = entries.length - 1;index >= 0; index--) {
+    const entry = entries[index];
+    if (!entry)
+      continue;
+    const tag = entry.toolOutputTag;
+    if (tag !== undefined && !seenOutputs.has(tag)) {
+      seenOutputs.add(tag);
+      if (newerTurns >= RECLAIM_DISTANCE_USER_TURNS || newerTokens >= tokenDistance) {
+        farTags.push(tag);
+      } else {
+        firstYoungTag = Math.min(firstYoungTag, tag);
+      }
+    }
+    if (entry.userTurn)
+      newerTurns++;
+    if (Number.isFinite(entry.tokens) && entry.tokens > 0)
+      newerTokens += entry.tokens;
+  }
+  return farTags.reduce((bookmark, tag) => tag < firstYoungTag ? Math.max(bookmark, tag) : bookmark, 0);
+}
+
 // ../plugin/src/hooks/magic-context/tool-reclaim.ts
 function buildSyntheticToolReclaimOps(input) {
   const watermark = Math.max(0, input.watermark);
@@ -25840,10 +25972,74 @@ function buildSyntheticToolReclaimOps(input) {
   }
   return synthetic;
 }
-function advanceToolReclaimWatermarkToCurrentMax(db, sessionId) {
-  const maxTagNumber = getMaxTagNumberBySession2(db, sessionId);
-  advanceToolReclaimWatermark(db, sessionId, maxTagNumber);
-  return maxTagNumber;
+function advanceToolReclaimWatermarkByDistance(db, sessionId, entries, usableWindow) {
+  const bookmark = farBehindToolBookmark(entries, usableWindow);
+  advanceToolReclaimWatermark(db, sessionId, bookmark);
+  return bookmark;
+}
+function toolReclaimDistanceEntries(messages, targets) {
+  const outputTags = new Map;
+  for (const [tag, target] of targets) {
+    for (const location of target.mutationParts ?? []) {
+      const part = distancePart(location.part);
+      if (part.kind === "tool_result" || part.kind === "tool")
+        outputTags.set(location.part, tag);
+    }
+  }
+  const entries = [];
+  for (const message of messages) {
+    const parts = message.parts.map(distancePart);
+    let userTurn = isReclaimUserTurn({ ...message.info, parts });
+    for (const [index, part] of parts.entries()) {
+      const authored = isReclaimUserTurn({ role: "user", parts: [part] });
+      entries.push({
+        tokens: message.info.syntheticHead ? 0 : estimateTokens(stripReclaimMcText(part.text ?? "")) + part.imageTokens,
+        userTurn: userTurn && authored,
+        toolOutputTag: outputTags.get(message.parts[index])
+      });
+      if (authored)
+        userTurn = false;
+    }
+  }
+  return entries;
+}
+function distancePart(raw) {
+  if (!raw || typeof raw !== "object")
+    return { kind: "structural", imageTokens: 0 };
+  const part = raw;
+  const provenance = { synthetic: part.synthetic === true, ignored: part.ignored === true };
+  if (typeof part.getText === "function") {
+    const text = part.getText();
+    return {
+      ...provenance,
+      kind: String(part.kind),
+      text: typeof text === "string" ? text : undefined,
+      imageTokens: typeof part.imageTokens === "function" ? Number(part.imageTokens()) : 0
+    };
+  }
+  const metadata = { ...provenance, imageTokens: estimatePartImageTokens(raw) };
+  if (part.type === "tool") {
+    const state = part.state;
+    return {
+      ...metadata,
+      kind: "tool",
+      text: `${JSON.stringify(state?.input ?? {})}
+${typeof state?.output === "string" ? state.output : JSON.stringify(state?.output ?? "")}`
+    };
+  }
+  if (part.type === "tool_use")
+    return { ...metadata, kind: "tool_use", text: JSON.stringify(part.input ?? {}) };
+  if (part.type === "tool_result")
+    return {
+      ...metadata,
+      kind: "tool_result",
+      text: typeof part.content === "string" ? part.content : JSON.stringify(part.content ?? "")
+    };
+  return {
+    ...metadata,
+    kind: String(part.type),
+    text: typeof part.text === "string" ? part.text : typeof part.thinking === "string" ? part.thinking : undefined
+  };
 }
 
 // ../plugin/src/shared/recovery-reasoning-prefix.ts
@@ -28606,6 +28802,8 @@ ${chunkText}`,
   }
 }
 function piSubagentFailureReason(failure) {
+  if (failure.meta?.failureClass === ZEN_FREE_TIER_FAILURE)
+    return ZEN_FREE_TIER_FAILURE;
   if (PRODUCER_PROMPT_FIT_FAILURE_PATTERN.test(failure.error))
     return failure.error;
   if (["step_limit", "token_budget", "invalid_prompt"].includes(failure.reason)) {
@@ -28914,6 +29112,59 @@ function recordPiTransformTiming(sample) {
 // src/ctx-reduce-nudge-pi.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
 
+// src/provider-visible-parts-pi.ts
+function isRecord4(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+var PART_FIELDS = {
+  text: ["type", "text", "textSignature"],
+  thinking: ["type", "thinking", "thinkingSignature", "redacted"],
+  image: ["type", "data", "mimeType"],
+  toolCall: [
+    "type",
+    "id",
+    "name",
+    "arguments",
+    "thoughtSignature",
+    "namespace"
+  ]
+};
+var MESSAGE_FIELDS = [
+  "role",
+  "provider",
+  "api",
+  "model",
+  "stopReason",
+  "toolCallId",
+  "toolName",
+  "isError"
+];
+function pick(value, fields) {
+  const view = {};
+  for (const field of fields) {
+    if (Object.hasOwn(value, field))
+      view[field] = value[field];
+  }
+  return view;
+}
+function providerVisiblePiPart(value, providerApi) {
+  if (providerApi === "pi-messages")
+    return value;
+  if (Array.isArray(value))
+    return value.map((part) => providerVisiblePiPart(part, providerApi));
+  if (!isRecord4(value))
+    return value;
+  if (typeof value.role === "string") {
+    const view = pick(value, MESSAGE_FIELDS);
+    if (Object.hasOwn(value, "content")) {
+      view.content = Array.isArray(value.content) ? value.content.map((part) => providerVisiblePiPart(part, providerApi)) : typeof value.content === "string" ? value.content : undefined;
+    }
+    return view;
+  }
+  const type = typeof value.type === "string" ? value.type : "";
+  return pick(value, Object.hasOwn(PART_FIELDS, type) ? PART_FIELDS[type] : ["type"]);
+}
+
 // src/tail-hygiene-walk-pi.ts
 var TAG_PREFIX = /^§(\d+)§\s*/;
 var SYNTHETIC_TODO_PREFIX = "mc_synthetic_todo_";
@@ -28927,7 +29178,7 @@ function clearPiTailHygieneContentMemo() {
 }
 var FNV1A_32_OFFSET = 2166136261;
 var FNV1A_32_PRIME = 16777619;
-function isRecord4(value) {
+function isRecord5(value) {
   return value !== null && typeof value === "object";
 }
 function fnv1a32(value) {
@@ -28942,7 +29193,7 @@ function safeStableStringify(value) {
   const seen = new Set;
   try {
     return JSON.stringify(value, (_key, current) => {
-      if (!isRecord4(current) || Array.isArray(current))
+      if (!isRecord5(current) || Array.isArray(current))
         return current;
       if (seen.has(current))
         return "[Circular]";
@@ -29001,7 +29252,7 @@ function messageIdentity(message, index, stableId) {
   const resolved = stableId?.(message, index);
   if (resolved)
     return resolved;
-  if (isRecord4(message)) {
+  if (isRecord5(message)) {
     if (typeof message.responseId === "string" && message.responseId.length > 0) {
       return `response:${message.responseId}`;
     }
@@ -29061,13 +29312,13 @@ function collectToolArcs(input) {
   const messageIds = input.messages.map((message, index) => messageIdentity(message, index, input.stableId));
   for (let messageIndex = 0;messageIndex < input.messages.length; messageIndex += 1) {
     const raw = input.messages[messageIndex];
-    if (!isRecord4(raw))
+    if (!isRecord5(raw))
       continue;
     const role = raw.role;
     if (role === "assistant" && Array.isArray(raw.content)) {
       for (let partIndex = 0;partIndex < raw.content.length; partIndex += 1) {
         const part = raw.content[partIndex];
-        if (!isRecord4(part) || part.type !== "toolCall")
+        if (!isRecord5(part) || part.type !== "toolCall")
           continue;
         if (typeof part.id !== "string" || part.id.length === 0)
           continue;
@@ -29078,7 +29329,7 @@ function collectToolArcs(input) {
           ownerId,
           ownerIndex: messageIndex,
           toolName: typeof part.name === "string" ? part.name : null,
-          sentinel: isRecord4(part.arguments) && typeof part.arguments.__magic_context_dropped__ === "string",
+          sentinel: isRecord5(part.arguments) && typeof part.arguments.__magic_context_dropped__ === "string",
           parts: [part]
         };
         arcs.push(arc);
@@ -29110,7 +29361,7 @@ function collectToolArcs(input) {
     if (!Array.isArray(raw.content))
       continue;
     for (const part of raw.content) {
-      if (!isRecord4(part))
+      if (!isRecord5(part))
         continue;
       arc.parts.push(part);
       arcByPart.set(part, arc);
@@ -29311,11 +29562,20 @@ function attributeTags(input, arcs, messageIds) {
   }
   return { messageTags, tagsByNumber };
 }
-function excludedDraft(key, value) {
+var partJsonMemo = new TailHygieneJsonMemo;
+var excludedViews = new WeakMap;
+function excludedDraftForApi(key, value, providerApi) {
+  let view = value !== null && typeof value === "object" ? excludedViews.get(value) : undefined;
+  if (view === undefined) {
+    view = providerVisiblePiPart(value, providerApi);
+    if (value !== null && typeof value === "object")
+      excludedViews.set(value, view);
+  }
   return {
     key,
     kind: "excluded",
-    content: typeof value === "string" ? value : safeStableStringify(value),
+    content: "",
+    contentHash: partJsonMemo.get(key, view, () => typeof view === "string" ? partHash("excluded", view) : piJsonHash(view, () => safeStableStringify(view)), true),
     tokens: 0
   };
 }
@@ -29340,7 +29600,7 @@ function finalizeParts(drafts, pendingDropTagNumbers, protectedTagNumbers, newes
     u += uTokens;
     return {
       key: draft.key,
-      contentHash: partHash(draft.kind, draft.content),
+      contentHash: draft.contentHash ?? partHash(draft.kind, draft.content),
       kind: draft.kind,
       tokens,
       uTokens,
@@ -29360,6 +29620,19 @@ function finalizeParts(drafts, pendingDropTagNumbers, protectedTagNumbers, newes
   };
 }
 function measurePiTailHygiene(input) {
+  partJsonMemo.beginPass();
+  excludedViews = new WeakMap;
+  let providerApi = input.providerApi;
+  if (providerApi === undefined) {
+    for (let index = input.messages.length - 1;index >= 0; index--) {
+      const message = input.messages[index];
+      if (isRecord5(message) && message.role === "assistant" && typeof message.api === "string") {
+        providerApi = message.api;
+        break;
+      }
+    }
+  }
+  const excludedDraft = (key, value) => excludedDraftForApi(key, value, providerApi);
   const { arcs, arcByPart, messageIds } = collectToolArcs(input);
   const { messageTags, tagsByNumber } = attributeTags(input, arcs, messageIds);
   const drafts = [];
@@ -29370,7 +29643,7 @@ function measurePiTailHygiene(input) {
     if (messageIndex === input.messages.length - 1)
       newestMessagePartStart = drafts.length;
     const messageKey = messageIds[messageIndex] ?? `pi-message:${messageIndex}`;
-    if (!isRecord4(raw)) {
+    if (!isRecord5(raw)) {
       drafts.push(excludedDraft(`${messageKey}\x00excluded`, raw));
       continue;
     }
@@ -29409,7 +29682,7 @@ function measurePiTailHygiene(input) {
     for (let partIndex = 0;partIndex < raw.content.length; partIndex += 1) {
       const part = raw.content[partIndex];
       const key = `${messageKey}\x00${partIndex}`;
-      if (!isRecord4(part)) {
+      if (!isRecord5(part)) {
         drafts.push(excludedDraft(`${key}\x00excluded`, part));
         continue;
       }
@@ -29479,7 +29752,7 @@ function measurePiTailHygiene(input) {
           drafts.push(excludedDraft(`${key}\x00toolInput`, part));
           continue;
         }
-        const content = safeStableStringify(part.arguments);
+        const content = partJsonMemo.get(`${key}\x00input`, part.arguments, () => safeStableStringify(part.arguments));
         if (!content) {
           drafts.push(excludedDraft(`${key}\x00toolInput`, part));
         } else {
@@ -29529,7 +29802,7 @@ function refreshPiTailHygieneBaseline(input) {
     })
   };
   const now = input.now ?? Date.now();
-  const refrozen = (mismatch) => ({
+  const refrozen = (mismatch) => rememberCurrentToolOutputCount({
     ...freezeTailHygieneMeasurement(measured),
     protectedToolsPolicy,
     hygieneUnitsVersion: frozenCalibration.hygieneUnitsVersion,
@@ -29543,7 +29816,7 @@ function refreshPiTailHygieneBaseline(input) {
     channel1PostReduceGrace: input.previous?.channel1PostReduceGrace,
     lastPrefixMismatch: mismatch,
     realUserTurnCount: rawMeasured.realUserTurnCount
-  });
+  }, measured);
   if (input.cacheBusting || !input.previous)
     return refrozen();
   const prefix = compareMeasuredTailPrefix(input.previous.baselineParts, measured.parts);
@@ -29557,7 +29830,7 @@ function refreshPiTailHygieneBaseline(input) {
     if (part.kind !== "toolOutput" || !part.protected)
       turnDeltaU += part.uTokens;
   }
-  return {
+  return rememberCurrentToolOutputCount({
     ...input.previous,
     protectedToolsPolicy,
     turnDeltaU,
@@ -29567,7 +29840,7 @@ function refreshPiTailHygieneBaseline(input) {
     contentSignature: measured.contentSignature,
     lastPrefixMismatch: undefined,
     realUserTurnCount: rawMeasured.realUserTurnCount
-  };
+  }, measured);
 }
 function effectivePiTailHygiene(baseline) {
   const t = Math.ceil(Math.max(0, baseline.baselineT + baseline.turnDeltaT));
@@ -29577,7 +29850,7 @@ function effectivePiTailHygiene(baseline) {
 function measurePiToolResultDelta(content) {
   let tokens = 0;
   for (const part of content) {
-    if (!isRecord4(part))
+    if (!isRecord5(part))
       continue;
     if (part.type === "text" && typeof part.text === "string") {
       const text = stripChannel1ReminderSpans(part.text);
@@ -29680,7 +29953,7 @@ function maybeChannel1ReminderForToolResult(args) {
   }
   const block = {
     type: "text",
-    text: buildChannel1Reminder(decision.level, decision.undroppedTokens, reclaimableToolOutputCount(state.baselineParts), currentReclaimHints(db, sessionId, state.oldestReclaimableToolTags), decision.sticky)
+    text: buildChannel1Reminder(decision.level, decision.undroppedTokens, currentReclaimableToolOutputCount(state), currentReclaimHints(db, sessionId, state.oldestReclaimableToolTags), decision.sticky)
   };
   setChannel1NudgeState(db, sessionId, {
     ...nextNudgeState,
@@ -29718,7 +29991,7 @@ function maybeDeliverChannel2Pi(pi, db, sessionId) {
   try {
     const message = {
       customType: CHANNEL2_NUDGE_CUSTOM_TYPE,
-      content: buildChannel2Reminder(undropped, reclaimableToolOutputCount(baseline.baselineParts), currentReclaimHints(db, sessionId, baseline.oldestReclaimableToolTags)),
+      content: buildChannel2Reminder(undropped, currentReclaimableToolOutputCount(baseline), currentReclaimHints(db, sessionId, baseline.oldestReclaimableToolTags)),
       display: false,
       details: { kind: "channel-2-ceiling-nudge" }
     };
@@ -35649,6 +35922,7 @@ function createPiFallbackIndex() {
 import { createHash as createHash12, randomUUID as randomUUID4 } from "node:crypto";
 
 // src/tokenize-pi-messages.ts
+var PI_IMAGE_TOKENS = 1200;
 function tokenizePiMessages(messages, options) {
   let conversation = 0;
   let toolCall = 0;
@@ -35706,7 +35980,7 @@ function tokenizePiMessages(messages, options) {
               }
               break;
             case "image":
-              conversation += 1200;
+              conversation += PI_IMAGE_TOKENS;
               break;
             case "toolCall":
               if (typeof p.name === "string")
@@ -35735,7 +36009,7 @@ function tokenizePiMessages(messages, options) {
           if (p.type === "text" && typeof p.text === "string") {
             toolCall += estimateTokens(p.text);
           } else if (p.type === "image") {
-            toolCall += 1200;
+            toolCall += PI_IMAGE_TOKENS;
           }
         }
       }
@@ -38309,6 +38583,13 @@ function stripThinkingParts(message) {
   assistant.content = strippedContent;
   return before - strippedContent.length;
 }
+
+class PiThinkingBindingRecoveryRefusal extends EmergencyFailClosedError {
+  constructor() {
+    super("Pi thinking-binding recovery has no valid new strip shape; this turn was not sent. Send a new message or start a new session.", { code: "pi_thinking_binding_no_valid_shape" });
+    this.name = "PiThinkingBindingRecoveryRefusal";
+  }
+}
 function applyPiThinkingBindingRecovery(args) {
   const protectedMessages = latestAssistantTurnMessages(args.messages);
   const frozenEntryIds = frozenBindingEntryIds(args.db, args.sessionId);
@@ -38318,14 +38599,17 @@ function applyPiThinkingBindingRecovery(args) {
   if (flagTarget) {
     const entryIds = new Set;
     for (let index = 0;index < args.messages.length; index += 1) {
-      if (protectedMessages.has(args.messages[index]))
+      if (!hasThinkingPart(args.messages[index]))
         continue;
       const entryId = args.entryIds[index];
-      if (entryId && hasThinkingPart(args.messages[index]))
-        entryIds.add(entryId);
+      if (!entryId)
+        throw new PiThinkingBindingRecoveryRefusal;
+      entryIds.add(entryId);
     }
     const newEntryIds = [...entryIds].filter((id) => !frozenEntryIds.has(id));
-    if (newEntryIds.length === 0 || addMergedReasoningStrippedIds(args.db, args.sessionId, [
+    if (newEntryIds.length === 0)
+      throw new PiThinkingBindingRecoveryRefusal;
+    if (addMergedReasoningStrippedIds(args.db, args.sessionId, [
       ...newEntryIds.map(thinkingBindingRecoveryFrozenId),
       ...args.endOfPassOrder ? [THINKING_BINDING_STRIP_ORDER_END_MARKER] : []
     ])) {
@@ -38333,7 +38617,8 @@ function applyPiThinkingBindingRecovery(args) {
         frozenEntryIds.add(id);
       applied = { flagTarget, entryIds: [...entryIds] };
       reportBindingRecovery(args.sessionId, args.report, `thinking-binding recovery consumed on context pass target=${flagTarget} entries=${applied.entryIds.length} [${applied.entryIds.join(",")}]`);
-    }
+    } else
+      throw new PiThinkingBindingRecoveryRefusal;
   }
   const restoringActiveTurn = latestThinkingRecoveryCoversActiveTurn({
     db: args.db,
@@ -38350,6 +38635,12 @@ function applyPiThinkingBindingRecovery(args) {
   }
   return applied;
 }
+function hasUnfrozenPiThinking(args) {
+  return isPrefixBoundThinkingModel(args.provider, args.model) && args.messages.some((message, index) => {
+    const entryId = args.entryIds[index];
+    return hasThinkingPart(message) && (!entryId || !args.frozen.has(entryId));
+  });
+}
 function applyPiProactiveThinkingStrip(args) {
   if (!args.cacheBustingPass)
     return null;
@@ -39606,6 +39897,12 @@ function createOpaqueTranscriptMessage(working, index, sessionId, _markDirty, en
 function createPiUserStringPart(working, messageIndex, markDirty) {
   return {
     kind: "text",
+    get synthetic() {
+      return working[messageIndex].synthetic;
+    },
+    get ignored() {
+      return working[messageIndex].ignored;
+    },
     id: undefined,
     getText() {
       const msg = working[messageIndex];
@@ -39645,6 +39942,12 @@ function createPiUserArrayPart(working, messageIndex, partIndex, markDirty) {
   const kind = classifyContent(part);
   return {
     kind,
+    synthetic: msg.synthetic || part?.synthetic,
+    ignored: msg.ignored || part?.ignored,
+    imageTokens() {
+      const current = working[messageIndex].content;
+      return Array.isArray(current) && current[partIndex]?.type === "image" ? PI_IMAGE_TOKENS : 0;
+    },
     id: undefined,
     getText() {
       const current = working[messageIndex].content;
@@ -39851,6 +40154,9 @@ function createPiToolResultPart(working, messageIndex, partIndex, markDirty) {
   return {
     kind,
     id: msg.toolCallId,
+    imageTokens() {
+      return working[messageIndex].content[partIndex]?.type === "image" ? PI_IMAGE_TOKENS : 0;
+    },
     remove() {
       return markToolRemoval(working, messageIndex, partIndex);
     },
@@ -39995,6 +40301,15 @@ var afterFallbackAdoptionForTests;
 var pendingDecisionLogObserverForTests;
 var mutationGateObserverForTests;
 var lkgRecoveryLogObserverForTests;
+var pipelineResultObserverForTests;
+function observePipelineResultForTests(sessionId, result) {
+  pipelineResultObserverForTests?.(sessionId, {
+    prefixBustPermitted: result.prefixBustPermitted,
+    bustedThisPass: result.bustedThisPass,
+    identityRebuilt: result.identityRebuilt,
+    signedPrefixRewritten: result.signedPrefixRewritten
+  });
+}
 var variantChangeLogObserverForTests;
 var beforePipelineForTests;
 function logPiLkgRecovery(sessionId, message) {
@@ -42186,6 +42501,7 @@ function registerPiContextHandler(pi, baseOptions) {
         protectedTokens: options.protectedTokens,
         protectedTokenTierOverrides: options.protectedTokenTierOverrides,
         usableSoft: windowGeometry?.usableSoft ?? usageContextLimit ?? 200000,
+        reclaimUsableWindow: windowGeometry?.usableSoft ?? usageContextLimit ?? 0,
         heuristics: options.heuristics,
         emergencyCeilingTokens,
         injection: options.injection ? {
@@ -42257,6 +42573,7 @@ function registerPiContextHandler(pi, baseOptions) {
         }
       };
       let result = await budget.waitMandatory(runPipeline(pipelineArgs));
+      observePipelineResultForTests(sessionId, result);
       logTransformTiming(sessionId, "runPipeline", tRunPipeline);
       if (result.identityRebuilt || result.lkgFrozenReleaseReason)
         schedulerDecision = "execute";
@@ -42432,7 +42749,7 @@ function registerPiContextHandler(pi, baseOptions) {
         hostEditBeforeNewestThinking = stickyBefore === null || [...stickyAfter].some((key) => !stickyBefore.has(key)) || JSON.stringify(getPersistedTodoSyntheticAnchor(options.db, sessionId)) !== todoAnchorBefore;
       } catch {}
       const outputEntryIds = resolvePiLkgOutputEntryIds(outputMessages, result.syntheticLeadingCount, (message) => result.lkgEntryIdByRef.get(message) ?? result.postCommitEntryIdByRef.get(message) ?? bindingEntryIdByRef.get(message)).map((entryId) => entryId ?? undefined);
-      const thinkingBindingRecoveryApplied = bindingStripOrder === "end" && !result.signedPrefixRewritten ? applyPiThinkingBindingRecovery({
+      const thinkingBindingRecoveryApplied = bindingStripOrder === "end" && (!result.signedPrefixRewritten || !result.prefixBustPermitted) ? applyPiThinkingBindingRecovery({
         db: options.db,
         sessionId,
         messages: outputMessages,
@@ -42454,7 +42771,7 @@ function registerPiContextHandler(pi, baseOptions) {
             entryIds: outputEntryIds,
             provider: lkgProviderKey ?? undefined,
             model: ctx.model?.id,
-            cacheBustingPass: !!recovery.rebuildReason || result.signedPrefixRewritten || result.prefixBustPermitted && !result.strictThinkingKept && (isCacheBusting || result.prefixRebuildAlreadyPriced || result.executedWorkThisPass && (result.prefixEditBesidesReasoningTrim || hostEditBeforeNewestThinking)),
+            cacheBustingPass: result.prefixBustPermitted && !result.strictThinkingKept && (result.signedPrefixRewritten || isCacheBusting || result.prefixRebuildAlreadyPriced || result.executedWorkThisPass && (result.prefixEditBesidesReasoningTrim || hostEditBeforeNewestThinking)),
             stripActiveTurn: result.signedPrefixRewritten,
             requirePersistence: !!recovery.rebuildReason,
             report: (line) => sessionLog2(sessionId, line)
@@ -42497,6 +42814,7 @@ function registerPiContextHandler(pi, baseOptions) {
           const previousBaseline = getPiChannel1Baseline(sessionId);
           const baseline = refreshPiTailHygieneBaseline({
             messages: outputMessages,
+            providerApi: ctx.model?.api,
             tags,
             tagCacheKey: result.channelBaselineSnapshot.tagCacheKey,
             protectedTagNumbers,
@@ -42636,6 +42954,7 @@ function registerPiContextHandler(pi, baseOptions) {
               percentage: Math.max(95, pipelineArgs.contextUsage.percentage)
             }
           }));
+          observePipelineResultForTests(sessionId, result);
           fitReclaimedThisPass = true;
           inputForFitReclaim = undefined;
           outputMessages = result.messages;
@@ -42647,7 +42966,7 @@ function registerPiContextHandler(pi, baseOptions) {
             entryIds: retryIds.map((id) => id ?? undefined),
             provider: ctx.model?.provider,
             model: ctx.model?.id,
-            cacheBustingPass: true,
+            cacheBustingPass: result.prefixBustPermitted,
             stripActiveTurn: true
           });
           estimate = estimatePiOutgoingInputTokens(outputMessages, envelope, undefined, rawFallbackLimit);
@@ -42748,6 +43067,7 @@ function registerPiContextHandler(pi, baseOptions) {
                   }
                 }));
                 outputMessages = result.messages;
+                observePipelineResultForTests(sessionId, result);
                 injectTodo();
                 if (upperCursor)
                   recordPiUpperEstimateReclaim(options.db, currentUpperCursor() ?? upperCursor, reservation);
@@ -42759,7 +43079,7 @@ function registerPiContextHandler(pi, baseOptions) {
                   entryIds: resolvePiLkgOutputEntryIds(outputMessages, result.syntheticLeadingCount, (message) => result.lkgEntryIdByRef.get(message) ?? result.postCommitEntryIdByRef.get(message)).map((id) => id ?? undefined),
                   provider: ctx.model?.provider,
                   model: ctx.model?.id,
-                  cacheBustingPass: result.bustedThisPass,
+                  cacheBustingPass: result.prefixBustPermitted,
                   stripActiveTurn: result.signedPrefixRewritten
                 });
                 estimate = estimatePiOutgoingInputTokens(outputMessages, envelope, undefined, outgoingFitLimit);
@@ -43631,29 +43951,37 @@ async function runPipeline(args) {
   let activeThinkingTurn = hasActiveAnthropicThinkingTurn(args.messages, args.resolvedProviderID, args.resolvedModelID);
   let protectedSignedPrefix = activeThinkingTurn && args.reasoningClearing?.prefixBound === true;
   let rewritingSignedPrefix = false;
+  let isCacheBustingPass = args.recoveryRebuildReason === "lkg_recovery_input_rebuild" || (!!args.recoveryRebuildReason || args.forceSignedRebuildForFit === true) && hasUnfrozenPiThinking({
+    messages: args.messages,
+    entryIds: args.messages.map((message, index) => args.lkgEntryIds?.[index] ?? resolvePiRealStableId(message, index, args.entryIds, args.entryIdByRef ?? undefined)),
+    frozen: frozenBindingEntryIds(args.db, args.sessionId),
+    provider: args.resolvedProviderID,
+    model: args.resolvedModelID
+  });
   let workingForRewrite;
-  const stripForPrefixRewrite = () => {
+  const stripForPrefixRewrite = (permitRewrite = true) => {
+    isCacheBustingPass ||= permitRewrite;
     const messages = workingForRewrite ?? args.messages;
     const result = applyPiProactiveThinkingStrip({
       db: args.db,
       sessionId: args.sessionId,
       messages,
-      entryIds: messages.map((message, index) => resolvePiStableId(message, index, args.entryIds, args.entryIdByRef ?? undefined)),
+      entryIds: messages.map((message, index) => args.lkgEntryIds?.[index] ?? resolvePiRealStableId(message, index, args.entryIds, args.entryIdByRef ?? undefined)),
       provider: args.resolvedProviderID,
       model: args.resolvedModelID,
-      cacheBustingPass: true,
+      cacheBustingPass: isCacheBustingPass,
       stripActiveTurn: true,
       persistOnly: true,
       requirePersistence: !!args.recoveryRebuildReason
     });
-    if (activeThinkingTurn && !result)
+    if (activeThinkingTurn && isCacheBustingPass && !result)
       throw new Error("Cannot persist signed thinking omission before prefix rewrite");
     rewritingSignedPrefix = true;
     activeThinkingTurn = false;
     protectedSignedPrefix = false;
   };
   if (args.recoveryRebuildReason || args.forceSignedRebuildForFit && protectedSignedPrefix)
-    stripForPrefixRewrite();
+    stripForPrefixRewrite(isCacheBustingPass);
   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);
@@ -43888,13 +44216,13 @@ async function runPipeline(args) {
   const heldIdleExpiryRebuild = protectedSignedPrefix && piHardSignals?.cacheExpired === true;
   const rideSignals = {
     subagentExecute: args.sessionMeta.isSubagent && args.schedulerDecision === "execute",
-    hardFold: foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild,
+    hardFold: foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild || isCacheBustingPass,
     force: (args.forceMaterialization === true || emergencyDropEligible) && (args.contextUsage.percentage >= 95 || getEmergencyInputSample(args.db, args.sessionId) === 0),
     explicitFlush: hasPendingMaterializeSignal || deferredMaterializeEligible && !prefixPreflightContended,
     publishedHistory: !prefixPreflightContended && (args.isCacheBusting || publishedM1RefreshedThisPass || canConsumeDeferredLate && deferredHistoryWasPendingAtPassStart)
   };
   let prefixMutationAllowed = !protectedSignedPrefix || firstRenderBust || heldIdleExpiryRebuild || emergencyDropEligible;
-  let isCacheBustingPass = prefixMutationAllowed && hasReclaimRide(rideSignals);
+  isCacheBustingPass = prefixMutationAllowed && hasReclaimRide(rideSignals);
   let publishedWorkDrainAllowed = isCacheBustingPass;
   const usesTokenProtection = args.protectedTokenTierOverrides !== undefined || args.protectedTokens !== undefined;
   const resolveProtectionFloor = () => resolveEpochFloorForPass(args.db, args.sessionId, {
@@ -43905,7 +44233,7 @@ async function runPipeline(args) {
     onRejectedProjectOverride: (warning) => sessionLog2(args.sessionId, warning)
   });
   let protectionFloorResolution = resolveProtectionFloor();
-  let shouldRunHeuristics = args.heuristics !== undefined && isCacheBustingPass && (rideSignals.publishedHistory || args.forceMaterialization === true || hasPendingMaterializeSignal || deferredMaterializeEligible || foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild || rideSignals.subagentExecute || args.schedulerDecision === "execute" && !alreadyRanHeuristicsThisTurn);
+  let shouldRunHeuristics = args.heuristics !== undefined && isCacheBustingPass && (rideSignals.publishedHistory || args.forceMaterialization === true || hasPendingMaterializeSignal || deferredMaterializeEligible || foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild || args.recoveryRebuildReason !== undefined && isCacheBustingPass || rideSignals.subagentExecute || args.schedulerDecision === "execute" && !alreadyRanHeuristicsThisTurn);
   let unavoidableCarriedIdentityRebuild = false;
   if (protectedSignedPrefix && readPiIdentityRebuilds(args.db, args.sessionId).length > 0) {
     args.tryReplayHeldIdentityRebuild?.();
@@ -44138,6 +44466,7 @@ async function runPipeline(args) {
   const deferredHistoryRefreshWasPending = deferredHistoryWasPendingAtPassStart;
   const shouldReadPendingOps = !args.compactionOff && (publishedWorkDrainAllowed || args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || foldExecutedThisPass || firstRenderBust);
   const pendingOps = shouldReadPendingOps ? getPendingOps(args.db, args.sessionId) : [];
+  const reclaimDistance = isCacheBustingPass ? toolReclaimDistanceEntries(mutationView, targets) : [];
   const protectedToolTags = protectedToolTagNumbers(getActiveTagsBySession2(args.db, args.sessionId), args.protectedTools);
   for (const number of identityAdoption.protectedTagNumbers)
     protectedToolTags.add(number);
@@ -44452,6 +44781,7 @@ async function runPipeline(args) {
         }
       }
       const editReclaim = buildEditSupersessionReclaim({
+        watermark: reclaimMeta.toolReclaimWatermark ?? 0,
         db: args.db,
         sessionId: args.sessionId,
         targets: newTargets,
@@ -44579,7 +44909,7 @@ async function runPipeline(args) {
     setEmergencyDropSample(args.db, args.sessionId, args.contextUsage.inputTokens);
   }
   if (toolReclaimApplicationOpportunity) {
-    advanceToolReclaimWatermarkToCurrentMax(args.db, args.sessionId);
+    advanceToolReclaimWatermarkByDistance(args.db, args.sessionId, reclaimDistance, args.reclaimUsableWindow ?? 0);
   }
   if (autoReclaimTargetCount > 0) {
     sessionLog2(args.sessionId, `tool reclaim auto-drop: targets=${autoReclaimTargetCount} mutated=${autoReclaimDidMutate}`);
@@ -44879,7 +45209,7 @@ async function runPipeline(args) {
     prefixMutationAllowed,
     strictThinkingKept: protectedSignedPrefix,
     signedPrefixRewritten: rewritingSignedPrefix,
-    prefixRebuildAlreadyPriced: firstRenderBust || heldIdleExpiryRebuild,
+    prefixRebuildAlreadyPriced: firstRenderBust || heldIdleExpiryRebuild || !!args.recoveryRebuildReason && isCacheBustingPass,
     identityRebuilt: identityRebuild,
     servedTagNumbers,
     heuristicsExecuted,
@@ -46099,7 +46429,7 @@ function formatThresholdPercent(value) {
 }
 
 // ../plugin/src/shared/status-view-check.ts
-function isRecord5(value) {
+function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isNumber(value) {
@@ -46177,28 +46507,28 @@ class OptionalFields {
   }
 }
 function isWindowGeometry(value) {
-  if (!isRecord5(value) || !isNumber(value.usableSoft) || !isRecord5(value.derivation))
+  if (!isRecord6(value) || !isNumber(value.usableSoft) || !isRecord6(value.derivation))
     return false;
   const derivation = value.derivation;
   return isNumber(derivation.window) && isNumber(derivation.reserve) && isString(derivation.reserveSource);
 }
 function isTailHygiene(value) {
-  return isRecord5(value) && isNumber(value.u) && isNumber(value.t) && isNumber(value.severity) && isBoolean(value.evaluable);
+  return isRecord6(value) && isNumber(value.u) && isNumber(value.t) && isNumber(value.severity) && isBoolean(value.evaluable);
 }
 function isCompactionMarker(value) {
-  return isRecord5(value) && (value.code === null || value.code === "MC-C11") && isNumber(value.attempts) && (value.lastError === null || isString(value.lastError));
+  return isRecord6(value) && (value.code === null || value.code === "MC-C11") && isNumber(value.attempts) && (value.lastError === null || isString(value.lastError));
 }
 function isTickFailure(value) {
-  return isRecord5(value) && isString(value.stage) && isNumber(value.at);
+  return isRecord6(value) && isString(value.stage) && isNumber(value.at);
 }
 function isConfigParseFailure(value) {
-  return isRecord5(value);
+  return isRecord6(value);
 }
 function isConfigReloadFailure(value) {
-  return isRecord5(value) && isString(value.path) && isString(value.message);
+  return isRecord6(value) && isString(value.path) && isString(value.message);
 }
 function isUnconfirmedMigrationHolders(value) {
-  return isRecord5(value) && Array.isArray(value.pids) && value.pids.every(isNumber) && isNumber(value.fromVersion) && isNumber(value.toVersion);
+  return isRecord6(value) && Array.isArray(value.pids) && value.pids.every(isNumber) && isNumber(value.fromVersion) && isNumber(value.toVersion);
 }
 function isNullableNumber(value) {
   return value === null || isNumber(value);
@@ -46210,7 +46540,7 @@ function isCacheTtlSource(value) {
   return isString(value);
 }
 function checkStatusViewSource(candidate) {
-  if (!isRecord5(candidate))
+  if (!isRecord6(candidate))
     return { ok: false, fields: ["(the payload is not an object)"] };
   const missing = [];
   const numbers = {};
@@ -46249,7 +46579,7 @@ function checkStatusViewSource(candidate) {
     lastDreamerRunAt: optional.read("lastDreamerRunAt", isNullableNumber),
     dreamerUnsupportedTasks: optional.readArray("dreamerUnsupportedTasks", isString),
     dreamerSkipped: optional.readArray("dreamerSkipped", isString),
-    dreamerFailures: optional.readArray("dreamerFailures", (value) => isRecord5(value) && isString(value.task) && isString(value.error)),
+    dreamerFailures: optional.readArray("dreamerFailures", (value) => isRecord6(value) && isString(value.task) && isString(value.error)),
     dreamerTickFailure: optional.read("dreamerTickFailure", (value) => value === null || isTickFailure(value)),
     sessionNoteCount: optional.read("sessionNoteCount", isNumber),
     readySmartNoteCount: optional.read("readySmartNoteCount", isNumber),