pi-smart-compact 10.2.0 → 10.3.0

package/dist/index.js

@@ -5,7 +5,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 
 // src/constants.ts
-var VERSION = "10.2.0";
+var VERSION = "10.3.0";
 var OPTIONAL_COMPONENTS = {
   mnemopi: { name: "@oh-my-pi/pi-mnemopi", version: "18.3.1", enables: "Mnemopi memory store" },
   bun: { name: "bun", version: "1.4.2", enables: "Mnemopi worker runtime when no Bun 1.3.14+ is on PATH" },
@@ -2157,6 +2157,8 @@ function extractToolPath(args) {
   return;
 }
 function isInstructionSource(args) {
+  if (typeof args.qualified_name === "string" && /(?:^|[./])(?:AGENTS|CLAUDE|GEMINI|SKILL|copilot-instructions|skills?)(?:[./]|$)/i.test(args.qualified_name))
+    return true;
   return PATH_KEYS.some((key) => {
     const source = typeof args[key] === "string" ? args[key].replaceAll("\\", "/") : "";
     return /(?:^|\/)(?:AGENTS|CLAUDE|GEMINI|SKILL|copilot-instructions)\.md$/i.test(source) || /(?:^|\/)skills?\//i.test(source);
@@ -2176,7 +2178,24 @@ var READ_ONLY_TOOLS = new Set([
   "read_url_content",
   "find_text_in_url_content",
   "summarize_url_content",
-  "get_search_content"
+  "get_search_content",
+  "fetch_content",
+  "lens_diagnostics",
+  "effective_config",
+  "ast_grep_search",
+  "search_graph",
+  "trace_path",
+  "get_code_snippet",
+  "get_file_outline",
+  "query_graph",
+  "get_architecture",
+  "search_code",
+  "get_graph_schema",
+  "index_status",
+  "check_index_coverage",
+  "detect_changes",
+  "compare_graphs",
+  "list_projects"
 ]);
 function isReadOnlyResearchTool(toolName, input) {
   if (isInstructionSource(input))
@@ -9304,6 +9323,7 @@ async function attemptNativeCompaction(rc, priorAttempts) {
     };
   }
   const prefix = rc.msgs.slice(0, cut);
+  const messages = prefix.map((entry) => entry.message);
   const prefixTokens = prefix.reduce((sum, entry) => sum + rc.estimator.message(entry.message), 0);
   const totalEstimate = rc.msgs.reduce((sum, entry) => sum + rc.estimator.message(entry.message), 0);
   const retainedTailTokens = Math.max(0, totalEstimate - prefixTokens);
@@ -9337,9 +9357,11 @@ async function attemptNativeCompaction(rc, priorAttempts) {
   nestedRequests++;
   try {
     const stream = rc.ctx.modelRegistry.streamSimple(model, {
-      systemPrompt: rc.ctx.getSystemPrompt(),
-      messages: prefix.map((entry) => entry.message),
-      tools: toolSource()
+      messages,
+      ...messages[0]?.role === "system" ? {} : {
+        systemPrompt: rc.ctx.getSystemPrompt(),
+        tools: toolSource()
+      }
     }, {
       signal: rc.cancellation.signal,
       fetch: wrapper.fetch,
@@ -13232,7 +13254,7 @@ function eligible(event) {
   if (event.isError || !event.content.length || event.content.some((block) => block.type !== "text") || Array.isArray(event.details) || event.details !== undefined && event.details !== null && !isRecord2(event.details) || isRecord2(event.details) && Object.hasOwn(event.details, ARTIFACT_DETAILS_KEY))
     return false;
   const tool = normalizeToolName(event.toolName);
-  if (["read", "read_symbol", "read_enclosing", "smart_context"].includes(tool) || !isReadOnlyResearchTool(tool, event.input))
+  if (["read", "read_symbol", "read_enclosing", "get_code_snippet", "smart_context"].includes(tool) || !isReadOnlyResearchTool(tool, event.input))
     return false;
   return true;
 }
@@ -13310,6 +13332,7 @@ function branchToolArtifacts(branch, ownedReferences) {
 // src/app/context-operations.ts
 var CONTEXT_CONTROL_TYPE = "smart-compact-context";
 var CONTEXT_REPORT_TYPE = "smart-compact-rewind";
+var ATTENTION_CUSTOM_TYPE = "smart-compact-attention";
 var MAX_CONTEXT_EDITS = 512;
 var MAX_TRIM_EDITS = 32;
 var MIN_TRIM_CHARS = 4096;
@@ -13659,8 +13682,8 @@ function planContextRewind(branch, sessionId, checkpointId, report, readerApi) {
   if (!state.checkpoint || state.checkpoint.id !== checkpointId) {
     throw new Error(state.invalidReason ?? "No matching active checkpoint; create one before research.");
   }
-  const suffixIds = new Set(branch.slice(state.checkpointIndex + 1).map((entry) => entry.id));
-  const targets = [...removableResearch(branch)].filter((id) => suffixIds.has(id));
+  const research = removableResearch(branch);
+  const targets = branch.slice(state.checkpointIndex + 1).filter((entry) => research.has(entry.id) || entry.type === "custom_message" && entry.customType === ATTENTION_CUSTOM_TYPE).map((entry) => entry.id);
   if (targets.length > MAX_CONTEXT_EDITS)
     throw new Error("Research exceeds the rewind edit limit; compact instead.");
   const targetSet = new Set(targets);
@@ -16808,8 +16831,8 @@ function createSettledAutoTrigger(options = {}) {
 }
 
 // src/app/context-attention.ts
-var ATTENTION_CUSTOM_TYPE = "smart-compact-attention";
 var CONTEXT_TOOL_NAME = "smart_context";
+var COMPACTION_TOOL_NAME = "smart_compact";
 var LOADER_TOOL_NAME = "smart_tools";
 function registerContextAttention(pi, deps) {
   let noted = null;
@@ -16820,12 +16843,12 @@ function registerContextAttention(pi, deps) {
   pi.on("session_before_switch", clear);
   pi.on("session_before_fork", clear);
   pi.on("session_tree", clear);
-  pi.on("message_end", (event, ctx) => {
-    const message = event.message;
-    if (message.role !== "assistant")
-      return;
+  pi.on("session_compact", clear);
+  pi.on("model_select", clear);
+  pi.on("session_shutdown", clear);
+  const attention = (ctx) => {
     const settings = deps.config();
-    if (!settings.contextNavigationEnabled || !settings.contextGuidanceEnabled || settings.toolLoading === "off")
+    if (!settings.contextGuidanceEnabled || settings.toolLoading === "off")
       return;
     const sessionId = resolveSessionId(ctx);
     const pressure = contextPressure(ctx, settings);
@@ -16837,51 +16860,84 @@ function registerContextAttention(pi, deps) {
     }
     if (noted?.sessionId === sessionId && (noted.band === band || noted.band === "compaction"))
       return;
-    if (message.content.some((block) => block.type === "toolCall" && (block.name === NAVIGATION_TOOL_NAME || block.name === CONTEXT_TOOL_NAME)))
-      return;
-    const midTurn = message.stopReason === "toolUse";
-    if (!midTurn && band === "compaction" && settings.autoTrigger)
-      return;
     if (!deps.canAgentAct(ctx))
       return;
     const active = new Set(pi.getActiveTools());
-    const content = renderAttention(band, pressure.percent, settings, ctx, active, deps.reachable);
+    const content = renderAttention(band, pressure.percent, settings, ctx, active, deps.reachable, deps.canCleanup(ctx));
     if (!content)
       return;
     noted = { sessionId, band };
-    pi.sendMessage({ customType: ATTENTION_CUSTOM_TYPE, content, display: true, details: { band, percent: pressure.percent } }, { deliverAs: midTurn ? "steer" : "nextTurn" });
+    return { customType: ATTENTION_CUSTOM_TYPE, content, display: true, details: { band, percent: pressure.percent } };
+  };
+  pi.on("before_agent_start", (_event, ctx) => {
+    const message = attention(ctx);
+    if (message)
+      return { message };
+  });
+  pi.on("message_end", (event, ctx) => {
+    const message = event.message;
+    if (message.role !== "assistant" || message.stopReason !== "toolUse")
+      return;
+    if (message.content.some((block) => block.type === "toolCall" && [NAVIGATION_TOOL_NAME, CONTEXT_TOOL_NAME, COMPACTION_TOOL_NAME].includes(block.name)))
+      return;
+    const note = attention(ctx);
+    if (note)
+      pi.sendMessage(note, { deliverAs: "steer" });
   });
 }
-function renderAttention(band, percent, settings, ctx, active, reachable) {
+function renderAttention(band, percent, settings, ctx, active, reachable, canCleanup) {
   const lines = [];
   const load = (group, tool) => active.has(tool) ? "" : reachable(group) && active.has(LOADER_TOOL_NAME) ? ` Load it first: ${LOADER_TOOL_NAME} load ${group}.` : null;
-  const navigation = load("navigation", NAVIGATION_TOOL_NAME);
+  const navigation = settings.contextNavigationEnabled ? load("navigation", NAVIGATION_TOOL_NAME) : null;
   const history = load("history", CONTEXT_TOOL_NAME);
-  if (navigation !== null) {
-    lines.push((band === "compaction" ? `- Anchor now: ${NAVIGATION_TOOL_NAME} anchor with a name and a concise handoff (done / in progress / next step). The summary starts from it and the prompt cache stays warm up to it.` : `- Finishing a unit of work? ${NAVIGATION_TOOL_NAME} anchor with a concise handoff; safe cleanup is queued automatically and the prefix up to the anchor stays cached.`) + navigation);
-  }
+  let checkpointLabel;
+  let trimmable = 0;
   if (history !== null) {
-    const branch = ctx.sessionManager.getBranch();
-    let trimmable = 0;
-    let blocked = false;
     try {
-      const plan = planContextTrim(branch, inspectContext(branch, resolveSessionId(ctx)).checkpoint?.originId, { readerApi: ctx.model?.api });
-      blocked = Boolean(plan.blockedReason);
-      trimmable = plan.entries.filter((entry) => entry.type === "context_edit").length;
-    } catch {
-      blocked = true;
-    }
-    if (!blocked) {
+      const branch = ctx.sessionManager.getBranch();
+      const checkpoint = inspectContext(branch, resolveSessionId(ctx)).checkpoint;
+      checkpointLabel = checkpoint?.label;
+      if (canCleanup && !checkpoint) {
+        const plan = planContextTrim(branch, undefined, { readerApi: ctx.model?.api });
+        if (!plan.blockedReason)
+          trimmable = plan.entries.filter((entry) => entry.type === "context_edit").length;
+      }
+    } catch {}
+  }
+  if (navigation !== null && checkpointLabel === undefined) {
+    lines.push(`- Finishing a unit of work? ${NAVIGATION_TOOL_NAME} anchor with a concise handoff (done / in progress / next step). An anchor alone does not reduce context; cleanup depends on safety and preparation gates.${navigation}`);
+  }
+  if (history !== null) {
+    if (checkpointLabel !== undefined) {
+      const next = canCleanup ? `Finish with ${CONTEXT_TOOL_NAME} rewind(report) before implementation or your final answer. No pressure required; safety checks still apply.` : "Prepared/running compaction or unavailable recovery takes priority. Preserve findings and check status; do not replace the checkpoint or retry in a loop.";
+      lines.push(`- Research checkpoint ${JSON.stringify(checkpointLabel)} is active. ${next}${history}`);
+    } else {
       if (trimmable > 0)
         lines.push(`- ${CONTEXT_TOOL_NAME} trim: ${trimmable} archived tool output${trimmable === 1 ? "" : "s"} eligible now.${history}`);
-      lines.push(`- Starting a large read-only detour? ${CONTEXT_TOOL_NAME} checkpoint first, then rewind(report) when done keeps the findings and drops the research.${trimmable > 0 ? "" : history}`);
+      lines.push(`- Starting a large read-only detour? ${CONTEXT_TOOL_NAME} checkpoint first; rewind(report) afterward before implementation or your final answer. No pressure required; safety checks still apply. Keep findings and evidence in the report.${trimmable > 0 ? "" : history}`);
     }
   }
+  if (band === "compaction" && !settings.autoTrigger) {
+    const compaction = load("compaction", COMPACTION_TOOL_NAME);
+    if (compaction !== null)
+      lines.push(`- ${COMPACTION_TOOL_NAME} stages a summary (or reports an existing one); the user runs /compact within its staging TTL to apply it. Staging does not shrink context.${compaction}`);
+  }
   if (!lines.length)
     return null;
   const where = percent === null ? "" : ` ${Math.round(percent)}% of the policy window`;
-  const head = band === "compaction" ? `Context attention:${where} (compaction band). ` + (settings.autoTrigger ? "Compaction prepares now and applies when the turn settles." : "Automatic compaction is off here; the user runs /smart-compact.") : `Context attention:${where} (cleanup band). ` + (settings.autoTrigger ? `Automatic compaction prepares at ${settings.minContextPercent}%.` : "Automatic compaction is off here.");
-  return `${head}
+  let automatic;
+  if (!settings.autoTrigger)
+    automatic = "Automatic compaction is off here; the user can run /smart-compact.";
+  else if (settings.autoTriggerStrategy === "native-hook")
+    automatic = "Preparation runs when Pi requests compaction; this strategy has no settled trigger.";
+  else if (band === "compaction")
+    automatic = "Automatic compaction is requested when the turn settles if pressure remains.";
+  else {
+    automatic = `Automatic compaction is requested at ${settings.minContextPercent}% when the turn settles.`;
+    if (settings.autoTriggerStrategy === "background")
+      automatic = "Background preparation can start in the cleanup band. " + automatic;
+  }
+  return `Context attention:${where} (${band} band). ${automatic}
 ${lines.join(`
 `)}`;
 }
@@ -16890,19 +16946,26 @@ ${lines.join(`
 var FOREIGN_REBUILD_WARN_COUNT = 3;
 var num = (value) => typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
 var tallies = (keys) => Object.fromEntries(keys.map((key) => [key, { count: 0, uncached: 0 }]));
-var cacheLifetimeMs = (usage) => num(usage?.cacheWrite1h) > 0 ? ONE_HOUR_MS : FIVE_MINUTES_MS;
+function cacheLifetimeMs(usage, promptCache) {
+  const tiers = [promptCache?.short, promptCache?.long].filter((value) => value !== undefined);
+  if (!tiers.length || tiers.some((value) => !Number.isFinite(value) || value <= 0 || !Number.isFinite(value * 1000)))
+    return null;
+  return Math.max(...tiers.map((value) => value * 1000), num(usage?.cacheWrite1h) > 0 ? ONE_HOUR_MS : 0);
+}
 function createHostCacheLedger() {
   let sessionId = null;
   let summary;
   let previousAt;
   let warmedAt;
-  let lifetimeMs = FIVE_MINUTES_MS;
+  let lifetimeMs = null;
+  let previousRoute;
   let pendingEdit;
   const reset = (id) => {
     sessionId = id;
     previousAt = undefined;
     warmedAt = undefined;
-    lifetimeMs = FIVE_MINUTES_MS;
+    lifetimeMs = null;
+    previousRoute = undefined;
     pendingEdit = undefined;
     summary = {
       sessionId: id,
@@ -16925,7 +16988,7 @@ function createHostCacheLedger() {
     noteCacheWarm(at) {
       warmedAt = Math.max(warmedAt ?? at, at);
     },
-    observe(message, at) {
+    observe(message, at, promptCache) {
       const usage = message.usage;
       if (!usage || typeof usage.input !== "number" || !Number.isFinite(usage.input))
         return null;
@@ -16946,12 +17009,15 @@ function createHostCacheLedger() {
         cacheRead,
         rebuild: false
       };
-      if (previousAt !== undefined) {
+      const route = JSON.stringify([message.provider, message.model]);
+      const sameRoute = route === previousRoute;
+      const currentLifetime = cacheLifetimeMs(usage, promptCache);
+      if (previousAt !== undefined && sameRoute) {
         entry.gapMs = Math.max(0, time - previousAt);
         if (uncached >= Math.max(REBUILD_MIN_TOKENS, 0.5 * prompt)) {
           entry.rebuild = true;
           const alive = Math.max(previousAt, warmedAt ?? previousAt);
-          entry.cause = pendingEdit ? "continuity" : time - alive > lifetimeMs ? "idle-expiry" : "foreign";
+          entry.cause = pendingEdit ? "continuity" : lifetimeMs !== null && currentLifetime !== null && time - alive > Math.max(lifetimeMs, currentLifetime) ? "idle-expiry" : "foreign";
           const cause = summary.rebuilds[entry.cause];
           cause.count++;
           cause.uncached += uncached;
@@ -16975,8 +17041,8 @@ function createHostCacheLedger() {
         if (entry.rebuild)
           summary.cost.rebuildUncached += num(cost.input) + num(cost.cacheWrite);
       }
-      if (cacheWrite > 0)
-        lifetimeMs = cacheLifetimeMs(usage);
+      lifetimeMs = sameRoute && lifetimeMs !== null && currentLifetime !== null ? Math.max(lifetimeMs, currentLifetime) : currentLifetime;
+      previousRoute = route;
       previousAt = time;
       warmedAt = undefined;
       pendingEdit = undefined;
@@ -16993,7 +17059,7 @@ function formatCacheLedgerSummary(summary) {
   const readPercent = prompt ? Math.round(summary.cacheRead / prompt * 100) : 0;
   const { continuity, "idle-expiry": idle, foreign } = summary.rebuilds;
   const total = continuity.count + idle.count + foreign.count;
-  const lines = [`Host prompt cache: ${summary.requests} requests \xB7 ${readPercent}% of prompt tokens read from cache \xB7 ${total} rebuilds`];
+  const lines = [`Host prompt cache: ${summary.requests} requests \xB7 ${readPercent}% of prompt tokens read from cache \xB7 ${total} estimated rebuilds`];
   if (!total)
     return lines;
   const parts = [];
@@ -17002,10 +17068,10 @@ function formatCacheLedgerSummary(summary) {
     parts.push(`${continuity.count} after Continuity edits (${kinds}): ${tokens(continuity.uncached)} uncached`);
   }
   if (idle.count)
-    parts.push(`${idle.count} idle-expiry: ${tokens(idle.uncached)} uncached`);
+    parts.push(`${idle.count} possible idle-expiry: ${tokens(idle.uncached)} uncached`);
   if (foreign.count)
-    parts.push(`${foreign.count} without a Continuity edit: ${tokens(foreign.uncached)} uncached`);
-  lines.push("Rebuilds: " + parts.join(" \xB7 "));
+    parts.push(`${foreign.count} without a Continuity edit (cause unknown): ${tokens(foreign.uncached)} uncached`);
+  lines.push("Rebuild estimates: " + parts.join(" \xB7 "));
   if (summary.cost.total > 0)
     lines.push(`Cost (Pi model pricing): $${summary.cost.total.toFixed(4)} total \xB7 $${summary.cost.rebuildUncached.toFixed(4)} uncached input+cache writes on rebuilds`);
   return lines;
@@ -19277,24 +19343,31 @@ async function loadLineage(ctx, options = {}) {
 // src/app/register-smart-context-tool.ts
 var TOOL_NAME = "smart_context";
 var MAX_REPORT_CHARS = 8000;
+var ACTIVE_CHECKPOINT_ERROR = "A checkpoint is already active. Finish it with rewind(report) before starting another.";
 function formatDeferredTrim(deferred) {
   const tokens = (value) => value >= 1000 ? `${Math.round(value / 1000)}k` : String(value);
   const why = deferred.breakEvenRequests === null ? "the model's cache price is unknown" : `it pays back its cache rewrite only after ${Math.ceil(deferred.breakEvenRequests)} requests (limit ${AUTO_TRIM_BREAK_EVEN_REQUESTS})`;
   const warming = deferred.warmingStopped ? " Prompt-cache warming was stopped so the cache can go cold." : "";
   return `Saves ~${tokens(deferred.savedTokens)} tokens, but ${why}, so it waits for a cold prompt cache.${warming}`;
 }
-function cachedPrefix(branch) {
+function cachedPrefix(branch, model) {
+  let lifetimeMs = cacheLifetimeMs(undefined, model?.promptCache);
+  if (!model || lifetimeMs === null)
+    return null;
   let since;
   for (let index = branch.length - 1;index >= 0; index--) {
     const entry = branch[index];
+    if (entry.type === "compaction" || entry.type === "context_edit" || entry.type === "branch_summary")
+      break;
     if (entry.type !== "message" || entry.message.role !== "assistant")
       continue;
     const message = entry.message;
+    if (message.provider !== model.provider || message.model !== model.id)
+      break;
     since ??= message.timestamp;
-    if ((message.usage?.cacheWrite ?? 0) > 0)
-      return { since, lifetimeMs: cacheLifetimeMs(message.usage) };
+    lifetimeMs = Math.max(lifetimeMs, cacheLifetimeMs(message.usage, model.promptCache) ?? lifetimeMs);
   }
-  return since === undefined ? null : { since, lifetimeMs: FIVE_MINUTES_MS };
+  return since === undefined || !Number.isFinite(since) ? null : { since, lifetimeMs };
 }
 function unchangedSince(branch, leafId) {
   const leaf = branch.findIndex((entry) => entry.id === leafId);
@@ -19334,11 +19407,11 @@ function registerSmartContextTool(pi, options = {}) {
   pi.registerTool({
     name: TOOL_NAME,
     label: "Session Context",
-    description: "Check status for context pressure/gates. Before a large read-only detour, checkpoint; when finished, rewind(report) keeps findings and drops safe research under pressure. plan/trim old output; search/read archived evidence (scope=lineage includes parents). Changes apply after the batch, never roll back files/processes.",
+    description: "For bounded read-only research: checkpoint before exploring, then rewind(report) before implementation or your final answer. Rewind replaces safe exploration with your findings; no pressure required, one active checkpoint. status shows gates; plan/trim follow cleanup policy; search/read recover archived evidence (scope=lineage includes parents). Changes apply after the batch; safety guards remain, files/processes are never rolled back.",
     parameters: Type4.Object({
       action: StringEnum2(["status", "plan", "checkpoint", "rewind", "trim", "read", "search"]),
       label: Type4.Optional(Type4.String({ maxLength: 120, description: "Checkpoint label." })),
-      report: Type4.Optional(Type4.String({ minLength: 1, maxLength: MAX_REPORT_CHARS, description: "Rewind: findings, decisions, failures, next step." })),
+      report: Type4.Optional(Type4.String({ minLength: 1, maxLength: MAX_REPORT_CHARS, description: "Rewind handoff: findings and evidence paths, constraints/decisions, failed attempts, next step." })),
       id: Type4.Optional(Type4.String({ minLength: 1, maxLength: 128, description: "Source ID." })),
       query: Type4.Optional(Type4.String({ minLength: 1, maxLength: 200, description: "Literal text." })),
       line: Type4.Optional(Type4.Integer({ minimum: 1, description: "Read from line." })),
@@ -19460,7 +19533,7 @@ ${page.text}`);
       if (options.canAgentMutate?.(ctx) === false) {
         throw new Error("Agent-requested context changes are disabled by policy; status, plan, search and read stay available.");
       }
-      if (params.action !== "checkpoint" && config().contextPressureOnly && !contextPressure(ctx, config()).cleanup) {
+      if (params.action === "trim" && config().contextPressureOnly && !contextPressure(ctx, config()).cleanup) {
         throw new Error("No context pressure (or usage is unavailable); history left unchanged. Check status. Human commands can request early cleanup.");
       }
       if (params.action !== "checkpoint" && options.canAutoTrim?.(ctx) === false) {
@@ -19470,6 +19543,8 @@ ${page.text}`);
         throw new Error("Context changes are paused while a navigation pivot is pending.");
       if (queued)
         throw new Error("A context change is already queued; wait for the next turn boundary.");
+      if (params.action === "checkpoint" && state.checkpoint)
+        throw new Error(ACTIVE_CHECKPOINT_ERROR);
       if (params.action === "rewind" && !state.checkpoint)
         throw new Error(state.invalidReason ?? "No active checkpoint.");
       const report = params.report?.trim() ?? "";
@@ -19492,7 +19567,8 @@ ${page.text}`);
         text: params.action === "rewind" ? text : text.slice(0, 120),
         signal
       };
-      return reply(`${params.action} queued for the completed tool batch. ${params.action === "rewind" ? "Stop research here; files and processes stay unchanged." : "Use status to inspect the committed state."}`, {
+      const next = params.action === "checkpoint" ? "Explore read-only, then call rewind(report) with findings, evidence, constraints and the next step before implementation or your final answer. Do not nest checkpoints. No pressure required." : params.action === "rewind" ? "Stop research here. After the batch, continue the original task from the retained report. Files and processes are not reverted." : "Use status to inspect the committed state.";
+      return reply(`${params.action} queued for the completed tool batch. ${next}`, {
         display: { state: "queued", action: params.action, label: text.slice(0, 120) }
       });
     },
@@ -19558,7 +19634,7 @@ ${page.text}`);
         mark = null;
         return;
       }
-      const prefix = cachedPrefix(branch);
+      const prefix = cachedPrefix(branch, ctx.model);
       const since = Math.max(prefix?.since ?? 0, warm?.sessionId === sessionId ? warm.at : 0);
       if (!prefix || now() - since <= prefix.lifetimeMs)
         return;
@@ -19579,7 +19655,7 @@ ${page.text}`);
     return changed ? { messages } : undefined;
   };
   const vetoWarming = (event, ctx, sessionId) => {
-    if (config().contextPressureOnly || mark?.sessionId !== sessionId || !unchangedSince(ctx.sessionManager.getBranch(), mark.leafId) || thinkingEditReason(ctx.sessionManager.getBranch(), mark.entries, ctx.model?.api))
+    if (config().contextPressureOnly || mark?.sessionId !== sessionId || !cachedPrefix(ctx.sessionManager.getBranch(), ctx.model) || !unchangedSince(ctx.sessionManager.getBranch(), mark.leafId) || thinkingEditReason(ctx.sessionManager.getBranch(), mark.entries, ctx.model?.api))
       return false;
     const cost = ctx.model?.cost;
     const price = cost ? cost.cacheWrite > 0 ? cost.cacheWrite : cost.input : NaN;
@@ -19613,7 +19689,7 @@ ${page.text}`);
     }
     const settings = config();
     const pressure = contextPressure(ctx, settings).cleanup;
-    if (request && !request.manual && request.action !== "checkpoint" && settings.contextPressureOnly && !pressure) {
+    if (request && !request.manual && !request.userConfirmed && request.action === "trim" && settings.contextPressureOnly && !pressure) {
       return cancelled(event, "Context pressure cleared; history left unchanged.");
     }
     if (!request) {
@@ -19647,6 +19723,8 @@ ${page.text}`);
     let entries;
     try {
       if (request?.action === "checkpoint") {
+        if (state.checkpoint)
+          throw new Error(ACTIVE_CHECKPOINT_ERROR);
         entries = [contextControlEntry({
           version: 1,
           action: "checkpoint",
@@ -19669,7 +19747,7 @@ ${page.text}`);
         if (plan.blockedReason)
           return request ? cancelled(event, plan.blockedReason) : undefined;
         if (request) {
-          entries = trimEntries(plan, request.manual ? "manual" : "agent");
+          entries = trimEntries(plan, request.manual || request.userConfirmed ? "manual" : "agent");
         } else {
           mark = null;
           if (plan.automatic !== "ready")
@@ -19709,6 +19787,7 @@ ${page.text}`);
     return { entries: [...event.entries, ...entries] };
   });
   const requestTrim = (ctx, anchor) => {
+    const userConfirmed = anchor?.userConfirmed === true;
     const sessionId = resolveSessionId(ctx);
     if (isUnresolvedSessionId(sessionId)) {
       return { state: "unavailable", notice: "Context control needs an identifiable session." };
@@ -19722,7 +19801,7 @@ ${page.text}`);
     if (anchor && options.canAutoTrim?.(ctx) === false) {
       return { state: "busy", notice: "Cleanup deferred: prepared/running compaction or unavailable recovery tools take priority." };
     }
-    if (anchor?.callId && (options.canAgentMutate?.(ctx) === false || config().contextPressureOnly && !contextPressure(ctx, config()).cleanup)) {
+    if (anchor?.callId && (options.canAgentMutate?.(ctx) === false || !userConfirmed && config().contextPressureOnly && !contextPressure(ctx, config()).cleanup)) {
       return { state: "unavailable", notice: "Cleanup not requested: no context pressure or agent changes are disabled." };
     }
     const branch = ctx.sessionManager.getBranch();
@@ -19731,7 +19810,7 @@ ${page.text}`);
       return { state: "unavailable", notice: "Anchor origin is no longer on this branch." };
     const anchorBoundary = anchor ? lastAnchorBoundary(branch.slice(0, origin + 1)) ?? null : undefined;
     const plan = planContextTrim(branch, inspectContext(branch, sessionId).checkpoint?.originId, { anchorBoundary, readerApi: ctx.model?.api });
-    if (!plan.entries.length || anchor?.callId && plan.automatic !== "ready") {
+    if (!plan.entries.length || anchor?.callId && !userConfirmed && plan.automatic !== "ready") {
       return { state: "no-eligible", notice: plan.blockedReason ?? (anchor ? "No safe cleanup batch ready; recent turns and protected prefixes stay unchanged." : "No eligible archived output to trim.") };
     }
     mark = null;
@@ -19743,17 +19822,18 @@ ${page.text}`);
       checkpointId: "",
       text: "",
       manual: !anchor?.callId,
+      userConfirmed,
       anchorBoundary,
       signal: anchor?.signal
     };
     return {
       state: "queued",
-      notice: anchor?.callId ? "Anchor cleanup queued for the completed tool batch; prior anchor prefixes and recent turns stay protected. Use status to confirm the committed state." : "Manual trim queued. The first next provider request is not yet trimmed; the change applies at the next completed turn boundary. A pending navigation pivot or newer boundary change cancels it."
+      notice: anchor?.callId ? `${userConfirmed ? "User-confirmed anchor" : "Anchor"} cleanup queued for the completed tool batch; prior anchor prefixes and recent turns stay protected. Use status to confirm the committed state.` : "Manual trim queued. The first next provider request is not yet trimmed; the change applies at the next completed turn boundary. A pending navigation pivot or newer boundary change cancels it."
     };
   };
   return {
     requestManualTrim: (ctx) => requestTrim(ctx),
-    requestAnchorTrim: (ctx, originId, callId, signal) => requestTrim(ctx, { originId, callId, signal }),
+    requestAnchorTrim: (ctx, originId, callId, signal, userConfirmed) => requestTrim(ctx, { originId, callId, signal, userConfirmed }),
     deferredTrim: deferred
   };
 }
@@ -21178,7 +21258,7 @@ var CATEGORIES = [
         setting: {
           id: "contextPressureOnly",
           label: "Cleanup timing",
-          description: "Pressure only (default) leaves roomy cached history alone, including agent trim/rewind/anchor requests. Economic also allows break-even/cold-cache cleanup. Human commands can request early cleanup; safety checks always apply.",
+          description: "Pressure only (default) gates automatic cleanup and autonomous agent trim/anchor requests. A host-confirmed anchor can request one early cleanup without changing this setting. Checkpoint/rewind research is pressure-independent. Economic opts into early cleanup. Safety checks always apply.",
           values: BOOLEAN_VALUES,
           labels: { true: "Pressure only", false: "Economic (opt-in)" }
         }
@@ -24298,6 +24378,11 @@ function registerNavigation(pi, options = {}) {
   let queued;
   let applying;
   let timer;
+  let epoch = 0;
+  const agentAllowed = () => {
+    const settings = config();
+    return settings.toolLoading !== "off" && pi.getActiveTools().includes(NAVIGATION_TOOL_NAME);
+  };
   const scrub = (text) => {
     const settings = config();
     return new SecretScrubber(settings.scrubSecrets, settings.scrubPii).scrubText(text).value;
@@ -24418,7 +24503,7 @@ function registerNavigation(pi, options = {}) {
   pi.registerTool({
     name: NAVIGATION_TOOL_NAME,
     label: "Context Navigation",
-    description: "View/recall session anchors. Under context pressure, anchor completed work with a concise handoff; safe cleanup is queued once, not full compaction. Pivot needs carryover and ends the turn; files/processes are not rolled back.",
+    description: "View/recall session anchors. Anchor completed work under pressure. In pressure-only mode, an explicitly user-requested early anchor requires one-time host confirmation. Safe cleanup is queued once, not full compaction; never claim approval or retry a refusal. Pivot needs carryover and ends the turn; files/processes are not rolled back.",
     parameters: Type6.Object({
       action: StringEnum4(["view", "recall", "anchor", "pivot"]),
       target: Type6.Optional(Type6.String({ minLength: 1, maxLength: 128 })),
@@ -24436,8 +24521,8 @@ function registerNavigation(pi, options = {}) {
       enabled();
       if (signal?.aborted)
         throw new Error("Navigation cancelled.");
-      if (config().toolLoading === "off" || !pi.getActiveTools().includes(NAVIGATION_TOOL_NAME))
-        throw new Error("Load navigation with smart_tools first; respect the user's /tools selection.");
+      if (!agentAllowed())
+        throw new Error("Navigation tool access is disabled or hidden; respect the user's policy and /tools selection.");
       if (params.action === "view") {
         if (params.target) {
           const target = resolveAnchorTarget(ctx.sessionManager, params.target);
@@ -24462,16 +24547,34 @@ Use Pi's /resume to open a different session.`, {
         });
       }
       if (params.action === "anchor") {
-        if (config().contextPressureOnly && !contextPressure(ctx, config()).cleanup) {
-          throw new Error("No context pressure (or usage is unavailable); no anchor added. Use smart_context status. A human can save an early anchor from /smart-compact.");
+        const early = config().contextPressureOnly && !contextPressure(ctx, config()).cleanup;
+        if (early && !ctx.hasUI)
+          throw new Error("No context pressure (or usage is unavailable); early anchor requires host confirmation. No anchor or cleanup requested. A human can use /smart-compact.");
+        let data = anchor(ctx, params.name ?? "", params.summary ?? "");
+        let userConfirmed = false;
+        if (early) {
+          if (ctx.hasPendingMessages())
+            throw new Error("Queued user input takes priority; no anchor or cleanup requested.");
+          const approvalEpoch = epoch;
+          const sessionId = resolveSessionId(ctx);
+          const approved = await ctx.ui.confirm("Save anchor and request early cleanup?", `Anchor: ${data.name}
+
+${data.summary}
+
+Allow this anchor and one safe cleanup without context pressure? Only eligible old tool outputs may be shortened; recent turns, protected prefixes and safety checks stay. No full compaction or file/process rollback. Cleanup can be blocked by prepared work or safety checks. This does not change your settings or authorize future calls.`, { signal });
+          if (approved !== true || signal?.aborted)
+            throw new Error("Anchor not approved or cancelled; no anchor or cleanup requested. Do not retry without a new user request.");
+          if (approvalEpoch !== epoch || sessionId !== resolveSessionId(ctx) || data.targetId !== ctx.sessionManager.getLeafId() || ctx.hasPendingMessages() || !agentAllowed())
+            throw new Error("Anchor confirmation expired: session, history, pending input or tool permissions changed. Nothing was queued.");
+          data = anchor(ctx, data.name, data.summary);
+          userConfirmed = true;
         }
-        const data = anchor(ctx, params.name ?? "", params.summary ?? "");
-        const cleanup = options.onAnchor?.(ctx, data.targetId, callId, signal) ?? "History unchanged; no cleanup controller attached.";
+        const cleanup = options.onAnchor?.(ctx, data.targetId, callId, signal, userConfirmed) ?? "History unchanged; no cleanup controller attached.";
         return { content: [{ type: "text", text: `Anchor: ${data.name}
 
 ${data.summary}
 
-${cleanup}` }], details: { anchor: data } };
+${cleanup}` }], details: { anchor: data, ...userConfirmed ? { userConfirmed: true } : {} } };
       }
       const operation = preparePivot(ctx, params.target ?? "", params.carryover ?? "", params.message);
       operation.callId = callId;
@@ -24548,6 +24651,7 @@ ${operation.carryover}` } };
     footer(ctx);
   });
   const reset = (_event, ctx) => {
+    epoch++;
     cancel();
     applying = undefined;
     footer(ctx);
@@ -24556,17 +24660,23 @@ ${operation.carryover}` } };
   pi.on("session_before_switch", reset);
   pi.on("session_before_fork", reset);
   pi.on("session_before_compact", (_event, ctx) => {
+    epoch++;
     if (queued?.sessionId === resolveSessionId(ctx) || applying?.sessionId === resolveSessionId(ctx))
       return { cancel: true };
   });
   pi.on("session_shutdown", (_event, ctx) => {
+    epoch++;
     cancel();
     applying = undefined;
     ctx.ui.setStatus(STATUS, undefined);
   });
   pi.on("session_tree", (_event, ctx) => {
+    epoch++;
     footer(ctx);
   });
+  pi.on("model_select", () => {
+    epoch++;
+  });
   return {
     isPending: (ctx) => queued?.sessionId === resolveSessionId(ctx) || applying?.sessionId === resolveSessionId(ctx),
     refresh,
@@ -25085,16 +25195,17 @@ function smartCompactExtension(pi) {
   navigation = registerNavigation(pi, {
     config: automaticConfig,
     mutationBlocked: (ctx) => isRunning.isSessionActive(resolveSessionId(ctx)) ? "Compaction is running; wait for it to finish." : undefined,
-    onAnchor: (ctx, originId, callId, signal) => smartContext.requestAnchorTrim(ctx, originId, callId, signal).notice,
+    onAnchor: (ctx, originId, callId, signal, userConfirmed) => smartContext.requestAnchorTrim(ctx, originId, callId, signal, userConfirmed).notice,
     onContextChange: (ctx) => invalidatePreparation(ctx, "branch"),
     onContextEdit: (_ctx, kind) => hostCache.noteContextEdit(kind)
   });
   registerArtifactOffload(pi, automaticConfig, () => toolExposure.reachable("history"));
+  const canAutoTrim = (ctx) => toolExposure.reachable("history") && !background.hasWork() && !pendingRef.isPresent(resolveSessionId(ctx)) && !isRunning.isSessionActive(resolveSessionId(ctx));
   const smartContext = registerSmartContextTool(pi, {
     config: automaticConfig,
     isPaused: pivotQueued,
     canAgentMutate: () => policy.snapshot().agentToolAccess !== "disabled",
-    canAutoTrim: (ctx) => toolExposure.reachable("history") && !background.hasWork() && !pendingRef.isPresent(resolveSessionId(ctx)) && !isRunning.isSessionActive(resolveSessionId(ctx)),
+    canAutoTrim,
     onContextChange: (ctx) => invalidatePreparation(ctx, "branch"),
     onContextEdit: (_ctx, kind) => hostCache.noteContextEdit(kind),
     onCacheWarm: (ctx, at) => {
@@ -25105,6 +25216,7 @@ function smartCompactExtension(pi) {
   registerContextAttention(pi, {
     config: automaticConfig,
     canAgentAct: (ctx) => policy.snapshot().agentToolAccess !== "disabled" && !pivotQueued(ctx) && !isRunning.isSessionActive(resolveSessionId(ctx)),
+    canCleanup: canAutoTrim,
     reachable: (group) => toolExposure.reachable(group)
   });
   registerSmartCompactCommand(pi, {
@@ -25401,12 +25513,13 @@ function smartCompactExtension(pi) {
     const sessionId = resolveSessionId(ctx);
     if (hostCache.sessionId() !== sessionId)
       hostCache.reset(sessionId);
-    if (!hostCache.observe(event.message)?.warn)
+    const promptCache = ctx.model && ctx.model.provider === event.message.provider && ctx.model.id === event.message.model ? ctx.model.promptCache : undefined;
+    if (!hostCache.observe(event.message, undefined, promptCache)?.warn)
       return;
     const { foreign } = hostCache.summary().rebuilds;
     recordIssue({
       key: "cache.foreign-rebuilds",
-      message: "Pi's prompt cache was rebuilt " + foreign.count + " times this session with no Continuity edit before them (" + foreign.uncached.toLocaleString("en-US") + " uncached prompt tokens re-sent). Other extensions, model or tool changes, or Pi's built-in compaction change the prefix too; Home \u203A Readiness & details lists rebuild causes."
+      message: "Pi reported " + foreign.count + " large uncached prompts this session with no Continuity edit before them (" + foreign.uncached.toLocaleString("en-US") + " uncached prompt tokens). Their cause is unknown; model/tool changes and Pi's built-in compaction can also change the prefix. Home \u203A Readiness & details lists rebuild estimates."
     });
   });
   pi.on("message_end", async (event, ctx) => {