pi-smart-compact 10.0.0 → 10.1.0

package/dist/index.js

@@ -5,7 +5,7 @@ import {
 } from "@earendil-works/pi-coding-agent";
 
 // src/constants.ts
-var VERSION = "10.0.0";
+var VERSION = "10.1.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" },
@@ -96,14 +96,14 @@ var DEFAULT_CONFIG = {
   summaryThinkingLevel: "minimal",
   segmentationThinkingLevel: "minimal",
   agentToolAccess: "inherit",
-  toolLoading: "lazy",
+  toolLoading: "eager",
   autoTrigger: true,
   showStatus: true,
-  autoTriggerStrategy: "native-hook",
+  autoTriggerStrategy: "settled",
   autoTriggerTimeoutMs: 120000,
   backupEnabled: true,
   backupDir: "",
-  minContextPercent: 60,
+  minContextPercent: 80,
   prepareContextPercent: null,
   maxContextTokens: 0,
   requireApproval: true,
@@ -127,7 +127,8 @@ var DEFAULT_CONFIG = {
   mnemopiDataDir: null,
   visualArchiveEnabled: false,
   artifactOffloadEnabled: false,
-  contextHygieneEnabled: false,
+  contextHygieneEnabled: true,
+  contextPressureOnly: true,
   contextNavigationEnabled: true,
   contextRecallEnabled: true,
   contextPivotEnabled: true,
@@ -1011,6 +1012,7 @@ var BOOLEAN_KEYS = [
   "visualArchiveEnabled",
   "artifactOffloadEnabled",
   "contextHygieneEnabled",
+  "contextPressureOnly",
   "contextNavigationEnabled",
   "contextRecallEnabled",
   "contextPivotEnabled",
@@ -3310,6 +3312,15 @@ function isTransientToolDiagnostic(text) {
   const candidate = text.trim();
   return /\bBrave Search API error\s*\(429\)/i.test(candidate) || /\bnpm error code ENOLOCK\b/i.test(candidate) && /(?:audit|existing lockfile|loadVirtual)/i.test(candidate) || /^Found \d+ occurrences? of edits\[\d+\](?!\w)/i.test(candidate) || /^Unknown JSON field:/i.test(candidate) && /Available fields:/i.test(candidate);
 }
+function resolvesErrorResult(result, retry, tcIdx) {
+  if (!result || result.role !== "toolResult" || result.isError)
+    return false;
+  const resultCall = tcIdx.get(result.toolCallId ?? "");
+  const matches = retry.id == null ? Boolean(resultCall && sameToolOperation(retry, resultCall)) : result.toolCallId === retry.id;
+  if (!matches)
+    return false;
+  return !(classifyToolOperation(retry.arguments, retry.name) === "execute" && hasCommandFailureSignal(extractText(result.content)));
+}
 function catalogErrors(msgs, _tcIdx) {
   const tcIdx = _tcIdx ?? buildToolCallIndex(msgs);
   const errors = [];
@@ -3353,28 +3364,45 @@ function catalogErrors(msgs, _tcIdx) {
       if (msgs[j]?.role !== "assistant")
         continue;
       const blocks = Array.isArray(msgs[j]?.content) ? msgs[j].content : [];
-      const retryTool = blocks.flatMap((block) => flattenToolCallBlock(block)).find((candidate) => sameToolOperation(failedCall, candidate));
-      if (!retryTool)
+      const retryTools = blocks.flatMap((block) => flattenToolCallBlock(block)).filter((candidate) => sameToolOperation(failedCall, candidate));
+      if (!retryTools.length)
         continue;
       err.retryAttempted = true;
-      for (let k = j + 1;k < Math.min(msgs.length, j + ERROR_RESOLVE_WINDOW); k++) {
-        const result = msgs[k];
-        if (result?.role !== "toolResult" || result.isError)
-          continue;
-        const resolved = retryTool.id == null ? (() => {
-          const resultCall = tcIdx.get(result.toolCallId ?? "");
-          return Boolean(resultCall && sameToolOperation(retryTool, resultCall));
-        })() : result.toolCallId === retryTool.id;
-        if (resolved) {
-          err.resolved = true;
-          break;
+      for (const retryTool of retryTools) {
+        for (let k = j + 1;k < Math.min(msgs.length, j + ERROR_RESOLVE_WINDOW); k++) {
+          if (resolvesErrorResult(msgs[k], retryTool, tcIdx)) {
+            err.resolved = true;
+            break;
+          }
         }
+        if (err.resolved)
+          break;
       }
-      break;
+      if (err.resolved)
+        break;
     }
   }
   return errors;
 }
+function collapseDecisionsByQuestion(items) {
+  const order = [];
+  const byQuestion = new Map;
+  for (const item of items) {
+    const key = normalizeFactKey(item.summary);
+    if (!key)
+      continue;
+    const existing = byQuestion.get(key);
+    if (!existing) {
+      order.push(key);
+      byQuestion.set(key, item);
+      continue;
+    }
+    if (item.userResponse && item.userResponse.trim()) {
+      byQuestion.set(key, item);
+    }
+  }
+  return order.map((key) => byQuestion.get(key));
+}
 function extractDecisions(msgs, _tcIdx) {
   const tcIdx = _tcIdx ?? buildToolCallIndex(msgs);
   const decisions = [];
@@ -3385,7 +3413,7 @@ function extractDecisions(msgs, _tcIdx) {
     const question = typeof args === "string" ? args : args?.question ?? args?.prompt ?? "";
     if (!question)
       continue;
-    for (let i = tc.msgIndex + 1;i < Math.min(msgs.length, tc.msgIndex + 4); i++) {
+    for (let i = tc.msgIndex + 1;i < msgs.length; i++) {
       if (msgs[i]?.role === "toolResult" && msgs[i]?.toolCallId === id) {
         decisions.push({
           index: tc.msgIndex,
@@ -3447,11 +3475,12 @@ function isDiagnosticConstraintText(text) {
   const candidate = text.replace(/^\s*[-*]\s+/, "").trim();
   return /^(?:\[[^\]]+\]\s*)?(?:npm\s+(?:error|warn|notice|audit|verbose|info)\b|(?:rg|grep):|command exited\b)/i.test(candidate);
 }
-var OWN_OUTPUT_RE = /(?:verification stopped apply|yield check stopped apply|smart compact failed|do not bypass verification|conversation unchanged|review \/smart-compact metrics|restart pi with debug=smart-compact|smart compact: )/i;
+var OWN_OUTPUT_CONTEXT_RE = /(?:verification stopped apply|yield check stopped apply|smart compact failed|conversation unchanged|review \/smart-compact metrics|restart pi with debug=smart-compact|smart compact: )/i;
+var OWN_OUTPUT_PHRASE_RE = /do not bypass verification/i;
 var COMPLETED_CHECKLIST_RE = /^\[[xX\u2713\u2714]\]\s*\S/;
 function isNonLiveConstraintText(text) {
   const candidate = text.replace(/^\s*[-*]\s+/, "").trim();
-  return isDiagnosticConstraintText(candidate) || isCompactionStatusText(candidate) || OWN_OUTPUT_RE.test(candidate) || COMPLETED_CHECKLIST_RE.test(candidate);
+  return isDiagnosticConstraintText(candidate) || isCompactionStatusText(candidate) || OWN_OUTPUT_CONTEXT_RE.test(candidate) || COMPLETED_CHECKLIST_RE.test(candidate);
 }
 function mineConstraints(msgs) {
   const constraints = [];
@@ -3462,10 +3491,13 @@ function mineConstraints(msgs) {
     const text = extractText(msgs[i].content);
     if (text.length < 10 || text.startsWith("/"))
       continue;
+    const ownOutputMessage = OWN_OUTPUT_CONTEXT_RE.test(text);
     for (const raw of text.split(/\n+/)) {
       const candidate = raw.replace(/^\s*[-*]\s+/, "").trim();
       if (candidate.length < 10 || isNonLiveConstraintText(candidate))
         continue;
+      if (ownOutputMessage && OWN_OUTPUT_PHRASE_RE.test(candidate))
+        continue;
       for (const { re, cat, conf } of CONSTRAINT_PATTERNS) {
         if (!re.test(candidate))
           continue;
@@ -4726,22 +4758,22 @@ function reconcileCachedErrors(errors, deltaMessages, deltaToolCalls, baseMsgCou
       const message = deltaMessages[j];
       if (message.role !== "assistant" || !Array.isArray(message.content))
         continue;
-      const retry = message.content.flatMap(flattenToolCallBlock).find((call) => toolOperationSignature(call.name, call.arguments) === error.operationSignature);
-      if (!retry)
+      const retries = message.content.flatMap(flattenToolCallBlock).filter((call) => toolOperationSignature(call.name, call.arguments) === error.operationSignature);
+      if (!retries.length)
         continue;
       retryAttempted = true;
-      for (let k = j + 1;k < Math.min(deltaMessages.length, j + ERROR_RESOLVE_WINDOW); k++) {
-        const result = deltaMessages[k];
-        if (result.role !== "toolResult" || result.isError)
-          continue;
-        const resultCall = deltaToolCalls.get(result.toolCallId ?? "");
-        const matches = retry.id == null ? Boolean(resultCall && toolOperationSignature(resultCall.name, resultCall.arguments) === error.operationSignature) : result.toolCallId === retry.id;
-        if (matches) {
-          resolved = true;
-          break;
+      for (const retry of retries) {
+        for (let k = j + 1;k < Math.min(deltaMessages.length, j + ERROR_RESOLVE_WINDOW); k++) {
+          if (resolvesErrorResult(deltaMessages[k], retry, deltaToolCalls)) {
+            resolved = true;
+            break;
+          }
         }
+        if (resolved)
+          break;
       }
-      break;
+      if (resolved)
+        break;
     }
     return { ...error, retryAttempted, resolved };
   });
@@ -6579,7 +6611,7 @@ function formatVerificationGap(gap) {
     case "missing-constraint":
       return "Missing constraint: " + gap.text.slice(0, TRUNC.TOPIC_LABEL);
     case "missing-decision":
-      return "Missing decision: " + gap.summary.slice(0, TRUNC.TOPIC_LABEL);
+      return "Missing decision: " + gap.summary.slice(0, TRUNC.TOPIC_LABEL) + (gap.answer ? " \u2192 " + gap.answer.slice(0, TRUNC.TOPIC_LABEL) : "");
     case "missing-goal":
       return "Main goal may be missing from summary";
     case "fabricated-file":
@@ -6757,7 +6789,8 @@ function stemToken(token) {
   return lower;
 }
 function semanticTokens(text) {
-  return (text.normalize("NFKC").match(/[\p{L}\p{N}_-]+/gu) ?? []).map(stemToken).filter((token) => token.length > 2 || NEGATION_MARKERS.has(token));
+  const normalized = text.normalize("NFKC").replace(/[\u{2018}\u{2019}\u{02BC}`\u{00B4}]/gu, "'").replace(/\bcannot\b/gi, "can not").replace(/\b(\w+)n't\b/gi, "$1 not").replace(/^\s*(?:Constraint|Goal|Decision):\s*/i, "");
+  return (normalized.match(/[\p{L}\p{N}_-]+/gu) ?? []).map(stemToken).filter((token) => token.length > 2 || NEGATION_MARKERS.has(token));
 }
 var semanticShapeCache = new Map;
 var semanticFragmentCache = new Map;
@@ -6808,7 +6841,10 @@ function hasSemanticEvidence(source, target) {
   if (!concepts.length)
     return true;
   const required = Math.min(concepts.length, Math.max(1, Math.ceil(concepts.length * 0.6)));
+  const verbatim = sourceTokens.join(" ");
   return semanticFragments(target).some((tokens) => {
+    if (tokens.join(" ") === verbatim)
+      return true;
     const overlap = concepts.filter((concept) => tokens.includes(concept)).length;
     if (overlap < required)
       return false;
@@ -6848,15 +6884,114 @@ function hasSemanticContradiction(source, target) {
   });
 }
 var TEMPORAL_CONSTRAINT_RE = /\b(?:yet|until|before|first|for now|hold off|wait|hen\u00FCz|\u015Fimdilik|\u00F6nce)\b/iu;
+var WH_QUESTION_LEAD_RE = /^(?:why|what|how|when|where|who|whom|which|whose|neden|ni\u00e7in|niye|nas\u0131l|hangi|kim)\b/iu;
+var AUX_QUESTION_LEAD_RE = /^(?:do|does|did|can|could|should|would|will|has|have|had|is|are|was|were|am)\b/i;
+var QUESTION_SUBJECT_RE = /^(?:you|u|i|we|it|they|he|she|this|that|these|those|there)\b/i;
+function looksLikeQuestion(text) {
+  return text.split(/\r?\n/).some((line) => {
+    const trimmed = line.trim();
+    if (trimmed.endsWith("?"))
+      return true;
+    if (WH_QUESTION_LEAD_RE.test(trimmed))
+      return true;
+    const rest = trimmed.replace(AUX_QUESTION_LEAD_RE, "").trim();
+    return AUX_QUESTION_LEAD_RE.test(trimmed) && QUESTION_SUBJECT_RE.test(rest);
+  });
+}
+var FIRST_PERSON_GRANT_RE = /\b(?:i|we)(?:'ve|\s+have)?\s+(?:approv\w+|allow\w+|permitt?\w*|ok(?:ay(?:ed)?)?|confirm\w+|green[- ]?light\w*|sanction\w*)\b/iu;
+var QUOTATION_RE = /\b(?:the log|logs?\b|the (?:output|console|error|diff|dashboard)|according to|it says|it said|they said|reported that|quoted?)\b/iu;
+var DENIAL_RE = /\b(?:denied|deny|refus\w*|forbid\w*|retract\w+|did not ask|didn't ask|never asked|never said|not allowed|not permitted|no permission|without permission|wasn't asked|weren't asked)\b/iu;
+var CRITICISM_RE = /\b(?:why|how come|explain(?:ing|ed)?|tell me|show me|describe|justify|what were you|supposed to|weren't you|shouldn't you|neden|ni\u00e7in|niye|a\u00e7\u0131kla|anlat|nas\u0131l)\b/iu;
+var ACK_STRIP_RE = /^(?:ok(?:ay)?|okey|yes|yep|sure|alright|right|now|actually|please|just|go ahead|go for it|proceed|do it|ship it|approved?|alright then|tamam|olur|onay(?:l\u0131yorum|lanm\u0131\u015ft\u0131r| ver)?|devam(?:\s+et)?|ba\u015fla)[,;:.!\s]+/i;
+var POLICY_GRANT_PREDICATE_RE = /\b(?:are|is|was|were|be|been|remain(?:s|ed)?)\s+(?:now\s+|hereby\s+|officially\s+)?(?:allowed|permitted|approved|authorized|acceptable|optional|fine|okay|ok|enabled|lifted)|\bno longer\s+(?:required|needed|banned|prohibited|forbidden|necessary)|\bcan\s+be\b|\bmay\s+be\b/i;
+function addresseeModalGrant(anchor) {
+  return new RegExp("\\b(?:you|y'?all|we|i)\\s+(?:can|could|may|might)\\s+(?:now\\s+|also\\s+|please\\s+|just\\s+)*(?:[\\p{L}]+\\s+){0,2}" + anchor.replace(/[^\p{L}\p{N}_-]/gu, "\\$&") + "\\b", "iu");
+}
+var IMPERATIVE_LEAD_TOKENS = new Set([
+  "do",
+  "does",
+  "did",
+  "please",
+  "now",
+  "just",
+  "go"
+]);
+var DIRECTIVE_COMPLEMENTS = new Set([
+  "it",
+  "them",
+  "this",
+  "that",
+  "these",
+  "those",
+  "everything",
+  "now",
+  "again",
+  "please",
+  "immediately",
+  "today",
+  "tonight",
+  "away",
+  "ahead",
+  "the",
+  "a",
+  "an",
+  "our",
+  "your",
+  "my",
+  "his",
+  "her",
+  "their"
+]);
+function anchorFollowedByComplement(clause, anchor) {
+  const words = clause.split(/\s+/).map((word) => word.replace(/(^\W+|\W+$)/g, "").toLowerCase()).filter(Boolean);
+  for (let i = 0;i < words.length; i++) {
+    if (stemToken(words[i]) !== anchor)
+      continue;
+    const next = words[i + 1];
+    return next !== undefined && DIRECTIVE_COMPLEMENTS.has(stemToken(next));
+  }
+  return false;
+}
+function positiveImperativeEvidence(release, anchor, allowImperative) {
+  let rest = release.trim();
+  for (let round = 0;round < 3 && ACK_STRIP_RE.test(rest); round++)
+    rest = rest.replace(ACK_STRIP_RE, "").trim();
+  const modalGrant = addresseeModalGrant(anchor);
+  const clauses = rest.split(/\r?\n|[.;]/).flatMap((fragment) => fragment.split(/\s(?:[\u2014\u2013]|-)\s|,\s|;\s|:\s/)).map((clause) => clause.trim()).filter(Boolean);
+  return clauses.some((clause) => {
+    const tokens = semanticTokens(clause);
+    if (!tokens.includes(anchor) || hasEffectiveTargetNegation(tokens, anchor))
+      return false;
+    if (allowImperative && IMPERATIVE_LEAD_TOKENS.has(tokens[0] ?? "") && tokens[1] === anchor)
+      return true;
+    if (POLICY_GRANT_PREDICATE_RE.test(clause))
+      return true;
+    if (modalGrant.test(clause))
+      return true;
+    if (allowImperative && tokens[0] === anchor && anchorFollowedByComplement(clause, anchor))
+      return true;
+    return false;
+  });
+}
 function releasesConstraint(constraint, release) {
-  if (hasSemanticContradiction(constraint, release))
-    return true;
-  if (!TEMPORAL_CONSTRAINT_RE.test(constraint))
+  if (looksLikeQuestion(release))
+    return false;
+  if (CRITICISM_RE.test(release))
+    return false;
+  if (QUOTATION_RE.test(release))
+    return false;
+  if (DENIAL_RE.test(release))
     return false;
   const { anchor, negative } = semanticShape(constraint);
+  const deferral = TEMPORAL_CONSTRAINT_RE.test(constraint);
+  if (hasSemanticContradiction(constraint, release)) {
+    return FIRST_PERSON_GRANT_RE.test(release) || Boolean(anchor) && positiveImperativeEvidence(release, anchor, deferral);
+  }
+  if (!deferral)
+    return false;
   if (!anchor || !negative)
     return false;
-  return semanticFragments(release).some((tokens) => tokens.includes(anchor) && !hasEffectiveTargetNegation(tokens, anchor));
+  return positiveImperativeEvidence(release, anchor, true);
 }
 function isDeterministicallyPatchable(gap) {
   if (gap.kind === "fabricated-file")
@@ -6887,6 +7022,105 @@ function repairSummaryDeterministically(summary, result, extraction, continuity
   }
   return { summary, result, patched };
 }
+function questionOverlapOnLine(question, line) {
+  const { concepts } = semanticShape(question);
+  if (!concepts.length)
+    return 0;
+  const required = Math.min(concepts.length, Math.max(1, Math.ceil(concepts.length * 0.6)));
+  const tokens = semanticTokens(line);
+  const overlap = concepts.filter((concept) => tokens.includes(concept)).length;
+  return overlap >= required ? overlap : 0;
+}
+function exactQuestionOwner(head, questions) {
+  const headKey = normalizeFactKey(head);
+  if (!headKey)
+    return null;
+  let owner = null;
+  let ownerLength = -1;
+  for (const question of questions) {
+    const key = normalizeFactKey(question);
+    if (key && headKey.includes(key) && key.length > ownerLength) {
+      owner = question;
+      ownerLength = key.length;
+    }
+  }
+  return owner;
+}
+function lineBelongsToQuestion(question, head, questions) {
+  if (exactQuestionOwner(head, questions) === question)
+    return true;
+  const own = questionOverlapOnLine(question, head);
+  if (!own)
+    return false;
+  return questions.every((other) => other === question || questionOverlapOnLine(other, head) < own);
+}
+function containsAnswerText(haystack, answer) {
+  const needle = answer.trim().toLowerCase();
+  if (!needle)
+    return false;
+  const escaped = needle.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  return new RegExp("(?<![\\p{L}\\p{N}])" + escaped + "(?![\\p{L}\\p{N}])", "iu").test(haystack);
+}
+function lineCarriesAnswer(haystack, answer) {
+  if (containsAnswerText(haystack, answer))
+    return true;
+  const { concepts } = semanticShape(answer);
+  return concepts.length > 0 && hasSemanticEvidence(answer, haystack);
+}
+function decisionLineSlots(line, question, questions) {
+  let fuzzy = null;
+  for (let index = line.indexOf("\u2192");index >= 0; index = line.indexOf("\u2192", index + 1)) {
+    const candidateHead = line.slice(0, index).replace(/\*+/g, "").trim();
+    const tail = line.slice(index + 1).replace(/\*+/g, "").trim();
+    if (!candidateHead || !tail)
+      continue;
+    if (exactQuestionOwner(candidateHead, questions) === question) {
+      return { head: candidateHead, tail };
+    }
+    if (!fuzzy && lineBelongsToQuestion(question, candidateHead, questions)) {
+      fuzzy = { head: candidateHead, tail };
+    }
+  }
+  return fuzzy;
+}
+function stripDecisionAnswerTails(decisionBody, questions) {
+  return decisionBody.split(/\r?\n/).map((line) => {
+    let fuzzyCut = -1;
+    for (let index = line.indexOf("\u2192");index >= 0; index = line.indexOf("\u2192", index + 1)) {
+      const candidateHead = line.slice(0, index).replace(/\*+/g, "").trim();
+      if (!candidateHead)
+        continue;
+      if (exactQuestionOwner(candidateHead, questions) !== null) {
+        return line.slice(0, index);
+      }
+      if (fuzzyCut < 0 && questions.some((question) => lineBelongsToQuestion(question, candidateHead, questions))) {
+        fuzzyCut = index;
+      }
+    }
+    return fuzzyCut >= 0 ? line.slice(0, fuzzyCut) : line;
+  }).join(`
+`);
+}
+function decisionAnswerPresent(question, answer, decisionBody, questions) {
+  return decisionBody.split(/\r?\n/).some((rawLine) => {
+    const line = rawLine.replace(/^\s*(?:[-*+]\s+)?/, "").trim();
+    return decisionLineSlots(line, question, questions) !== null && lineCarriesAnswer(line, answer);
+  });
+}
+function decisionAnswerConflict(question, answer, decisionBody, questions) {
+  for (const rawLine of decisionBody.split(/\r?\n/)) {
+    const line = rawLine.replace(/^\s*(?:[-*+]\s+)?/, "").trim();
+    const slots = decisionLineSlots(line, question, questions);
+    if (!slots || !slots.tail)
+      continue;
+    if (hasSemanticEvidence(question, slots.tail))
+      continue;
+    if (lineCarriesAnswer(slots.tail, answer))
+      continue;
+    return true;
+  }
+  return false;
+}
 function addGap(accumulator, gap, penalty) {
   accumulator.gaps.push(gap);
   accumulator.score -= penalty;
@@ -6929,10 +7163,14 @@ function collectVerificationEvidence(extraction, continuity, evidence) {
     ...(continuity?.constraints ?? []).flatMap((item) => item.confidence >= 0.8 ? [{ text: item.text }] : []),
     ...steeringConstraints
   ], (item) => item.text).filter((item) => !isNonLiveConstraintText(item.text) && !retired.has(normalizeFactKey(item.text)));
-  const decisions = uniqueByText([
-    ...extraction.decisions.flatMap((item) => item.type === "explicit" ? [{ summary: item.summary }] : []),
-    ...(continuity?.decisions ?? []).flatMap((item) => item.type === "explicit" ? [{ summary: item.summary }] : [])
-  ], (item) => item.summary);
+  const decisionEntries = [
+    ...continuity?.decisions ?? [],
+    ...extraction.decisions
+  ].flatMap((item) => item.type === "explicit" ? [{ summary: item.summary, userResponse: item.userResponse }] : []);
+  const decisions = collapseDecisionsByQuestion(decisionEntries).map((item) => ({
+    summary: item.summary,
+    answer: item.userResponse?.trim() || null
+  }));
   return {
     unresolved,
     resolved,
@@ -7042,11 +7280,25 @@ function verifySemanticCoverage(parsed, collected, accumulator) {
     }
   }
   const decisionBody = findSection(parsed, "decisions")?.body ?? "";
+  const questions = collected.decisions.map((decision) => decision.summary);
+  const decisionQuestionBody = stripDecisionAnswerTails(decisionBody, questions);
   for (const decision of collected.decisions) {
-    if (!hasSemanticEvidence(decision.summary, decisionBody)) {
-      addGap(accumulator, { kind: "missing-decision", summary: decision.summary }, 8);
+    const questionVerified = hasSemanticEvidence(decision.summary, decisionQuestionBody);
+    const answerVerified = !decision.answer || decisionAnswerPresent(decision.summary, decision.answer, decisionBody, questions);
+    if (!questionVerified || !answerVerified) {
+      addGap(accumulator, {
+        kind: "missing-decision",
+        summary: decision.summary,
+        ...decision.answer ? { answer: decision.answer } : {}
+      }, 8);
     }
-    if (hasSemanticContradiction(decision.summary, decisionBody)) {
+    if (decision.answer && decisionAnswerConflict(decision.summary, decision.answer, decisionBody, questions)) {
+      addGap(accumulator, {
+        kind: "inconsistency",
+        detail: "decision-answer-conflict: summary carries a different active answer for " + decision.summary.slice(0, TRUNC.SNIPPET)
+      }, 20);
+    }
+    if (hasSemanticContradiction(decision.summary, decisionQuestionBody)) {
       addGap(accumulator, {
         kind: "inconsistency",
         detail: "semantic-contradiction: decision contradicts " + decision.summary.slice(0, TRUNC.SNIPPET)
@@ -7059,7 +7311,7 @@ function verifyFileReferences(summary, extraction, continuity, evidence, collect
     ...collected.unresolved.map((item) => item.message),
     ...collected.resolved.map((item) => item.message),
     ...collected.constraints.map((item) => item.text),
-    ...collected.decisions.map((item) => item.summary),
+    ...collected.decisions.map((item) => item.answer ? item.summary + " \u2192 " + item.answer : item.summary),
     ...collected.goal ? [collected.goal] : [],
     ...extraction.lastUserMessages,
     ...extraction.timeline.map((item) => item.summary),
@@ -7248,9 +7500,12 @@ function patchDeterministic(summary, gaps, extraction, continuity = null, eviden
       case "missing-constraint":
         canonical = appendToSection(canonical, "constraints", "- " + safe(gap.text, TRUNC.CONSTRAINT_TEXT));
         break;
-      case "missing-decision":
-        canonical = appendToSection(canonical, "decisions", "- **" + safe(gap.summary, TRUNC.DECISION_SUMMARY) + "**");
+      case "missing-decision": {
+        const question = safe(gap.summary, TRUNC.DECISION_SUMMARY);
+        const answer = gap.answer ? safe(gap.answer, TRUNC.USER_RESPONSE) : "";
+        canonical = appendToSection(canonical, "decisions", "- **" + question + "**" + (answer ? " \u2192 " + answer : ""));
         break;
+      }
       case "missing-goal":
         canonical = upsertSection(canonical, "goal", safe(gap.goal, TRUNC.DETAIL) || "Continue the current task.");
         break;
@@ -7309,9 +7564,12 @@ function hasUnclosedMarkdownFence(markdown) {
   }
   return open !== null;
 }
+var TERMINAL_STOP_REASON_RE = /^(?:stop|endturn)$/i;
 function patchResponseIsTruncated(patched, stopReason) {
-  const reason = String(stopReason ?? "");
-  return /(?:length|truncat|max(?:imum)?[_ -]?(?:output[_ -]?)?tokens?|token[_ -]?limit)/i.test(reason) || /\u2026\u2702\d+\s*$/.test(patched) || hasUnclosedMarkdownFence(patched);
+  const reason = String(stopReason ?? "").trim();
+  if (reason && !TERMINAL_STOP_REASON_RE.test(reason))
+    return true;
+  return /\u2026\u2702\d+\s*$/.test(patched) || hasUnclosedMarkdownFence(patched);
 }
 function sectionIdentity(section) {
   return section.kind === "unknown" ? "unknown:" + section.heading.trim().toLowerCase() : section.kind;
@@ -7651,7 +7909,11 @@ function mergeOpenLoops(current, previous) {
 function mergeCompactionStates(previous, current) {
   if (!previous) {
     const active = applyContinuityOverrides(current, current.factOverrides ?? []);
-    return { ...active, openLoops: mergeOpenLoops(active.openLoops, []) };
+    return {
+      ...active,
+      decisions: collapseDecisionsByQuestion(active.decisions).map((item, index) => ({ ...item, id: ID_PREFIX.DECISION + (index + 1) })),
+      openLoops: mergeOpenLoops(active.openLoops, [])
+    };
   }
   const factOverrides = mergeBy(current.factOverrides ?? [], previous.factOverrides ?? [], (item) => item.kind + ":" + item.summaryKey, 50);
   const activeCurrent = applyContinuityOverrides(current, factOverrides);
@@ -7671,7 +7933,17 @@ function mergeCompactionStates(previous, current) {
     }
     return false;
   };
-  const decisions = mergeBy(activeCurrent.decisions, activePrevious.decisions, (item) => normalizeFactKey(item.summary), 30).map((item, index) => ({ ...item, id: ID_PREFIX.DECISION + (index + 1) }));
+  const collapsedCurrent = collapseDecisionsByQuestion(activeCurrent.decisions);
+  const collapsedPrevious = collapseDecisionsByQuestion(activePrevious.decisions);
+  const authoritative = collapseDecisionsByQuestion([
+    ...collapsedPrevious,
+    ...collapsedCurrent
+  ]);
+  const currentKeys = new Set(collapsedCurrent.map((item) => normalizeFactKey(item.summary)));
+  const decisions = [
+    ...authoritative.filter((item) => currentKeys.has(normalizeFactKey(item.summary))),
+    ...authoritative.filter((item) => !currentKeys.has(normalizeFactKey(item.summary)))
+  ].slice(0, 30).map((item, index) => ({ ...item, id: ID_PREFIX.DECISION + (index + 1) }));
   const constraints = mergeBy(activeCurrent.constraints, activePrevious.constraints, (item) => normalizeFactKey(item.text), 30).map((item, index) => ({ ...item, id: "constraint-" + (index + 1) }));
   const unresolvedErrors = mergeBy(activeCurrent.unresolvedErrors, activePrevious.unresolvedErrors.filter((error) => !resolvedKeys.has(normalizeFactKey(error.message))), (item) => normalizeFactKey(item.message), 15).map((item, index) => ({ ...item, id: ID_PREFIX.ERROR + (index + 1) }));
   const openLoops = mergeOpenLoops(activeCurrent.openLoops, activePrevious.openLoops.map((loop) => isResolvedLoop(loop) ? { ...loop, status: "resolved" } : loop));
@@ -7703,8 +7975,8 @@ function mergeCompactionStates(previous, current) {
 function renderContinuityCapsule(state, maxChars = TRUNC.CONTINUITY_CAPSULE, existing = "") {
   const haystack = normalizeFactKey(existing);
   const lines = ["## Continuity Ledger"];
-  const add = (label, value) => {
-    const text = summaryEvidenceLine(value, TRUNC.MESSAGE);
+  const add = (label, value, maxLength = TRUNC.MESSAGE) => {
+    const text = summaryEvidenceLine(value, maxLength);
     if (!text || haystack.includes(normalizeFactKey(text)))
       return;
     const line = "- " + label + ": " + text;
@@ -7716,8 +7988,13 @@ function renderContinuityCapsule(state, maxChars = TRUNC.CONTINUITY_CAPSULE, exi
     add("Goal", state.goal);
   for (const item of state.constraints)
     add("Constraint", item.text);
-  for (const item of state.decisions)
-    add("Decision", item.summary + (item.userResponse ? " \u2192 " + item.userResponse : ""));
+  for (const item of state.decisions) {
+    const question = summaryEvidenceLine(item.summary, TRUNC.DECISION_SUMMARY);
+    const answer = item.userResponse ? summaryEvidenceLine(item.userResponse, TRUNC.USER_RESPONSE) : "";
+    const decisionLine = question + (answer ? " \u2192 " + answer : "");
+    if (decisionLine)
+      add("Decision", decisionLine, decisionLine.length);
+  }
   for (const item of state.unresolvedErrors)
     add("Unresolved error", item.message);
   for (const item of state.resolvedErrors.slice(-5))
@@ -8258,7 +8535,16 @@ function pendingMatchesBranch(pending, branch) {
 }
 function readerSignature(ctx) {
   const model = ctx.model;
-  return model && JSON.stringify([model.provider, model.id, model.api, model.baseUrl, model.contextWindow, model.maxTokens]);
+  const prompt = ctx.getSystemPrompt?.();
+  return model && JSON.stringify([
+    model.provider,
+    model.id,
+    model.api,
+    model.baseUrl,
+    model.contextWindow,
+    model.maxTokens,
+    prompt === undefined ? null : createHash4("sha256").update(prompt).digest("hex")
+  ]);
 }
 function revalidatePending(pending, ctx, reserveTokens = 0) {
   const model = ctx.model;
@@ -8298,7 +8584,7 @@ function revalidatePending(pending, ctx, reserveTokens = 0) {
   };
 }
 function createPendingSlot(opts) {
-  const ttlMs = opts.ttlMs;
+  const ttlMs = () => typeof opts.ttlMs === "function" ? opts.ttlMs() : opts.ttlMs;
   const now = opts.now ?? Date.now;
   const maxEntries = Math.max(1, opts.maxEntries ?? 64);
   const entries = new Map;
@@ -8318,7 +8604,7 @@ function createPendingSlot(opts) {
     const current = now();
     let removedNewest = false;
     for (const [sessionId, entry] of entries) {
-      if (current - entry.createdAt <= ttlMs)
+      if (current - entry.createdAt <= ttlMs())
         continue;
       entries.delete(sessionId);
       if (newestSessionId === sessionId)
@@ -8345,7 +8631,7 @@ function createPendingSlot(opts) {
       const entry = entries.get(currentSessionId);
       if (entry) {
         const ageMs = now() - entry.createdAt;
-        if (ageMs > ttlMs) {
+        if (ageMs > ttlMs()) {
           deleteEntry(currentSessionId);
           prune();
           return { kind: "expired", ageMs };
@@ -10758,6 +11044,7 @@ function buildExplorerRequest(extraction, model, prevSummary, userNote) {
 function explorationToolSupportKey(model) {
   return [model.provider, model.api, model.baseUrl ?? "", model.id].join("\x00");
 }
+var SYNTHESIS_CALL_RESERVE = 2;
 async function exploreConversation(llmMessages, extraction, model, auth, prevSummary, userNote, signal, maxRounds = MAX_EXPLORATION_ROUNDS, notify, services) {
   const svc = services ?? getDefaultServices();
   const request = buildExplorerRequest(extraction, model, prevSummary, userNote);
@@ -10768,6 +11055,10 @@ async function exploreConversation(llmMessages, extraction, model, auth, prevSum
   const now = svc.clock.now();
   const cachedSupport = toolSupport.get(cacheKey, now);
   let supportsTools = cachedSupport === true;
+  if (svc.budget.remainingCalls() <= SYNTHESIS_CALL_RESERVE) {
+    notify?.("Explore skipped \xB7 remaining calls reserved for synthesis", "info");
+    return { report: fallbackExplorationReport(llmMessages), rounds: 0, toolSupported: supportsTools };
+  }
   try {
     if (cachedSupport === false) {
       if (notify)
@@ -10810,7 +11101,7 @@ async function exploreConversation(llmMessages, extraction, model, auth, prevSum
         });
       }
       let rounds = 1;
-      while (rounds < maxRounds) {
+      while (rounds < maxRounds && svc.budget.remainingCalls() > SYNTHESIS_CALL_RESERVE) {
         rounds++;
         let response;
         try {
@@ -10897,6 +11188,9 @@ async function exploreConversation(llmMessages, extraction, model, auth, prevSum
   return { report, rounds: 1, toolSupported: supportsTools };
 }
 async function explorationRetry(model, auth, llmMessages, extraction, userNote, signal, services) {
+  const svc = services ?? getDefaultServices();
+  if (svc.budget.remainingCalls() <= SYNTHESIS_CALL_RESERVE)
+    return fallbackExplorationReport(llmMessages);
   const last5 = llmMessages.slice(-5).map((m) => "[" + m?.role + "] " + extractText(m?.content).slice(0, TRUNC.PREVIEW)).join(`
 `);
   const retryPrompt = `IMPORTANT: Output ONLY valid raw JSON. No markdown. No explanation. No code fences. Just the JSON object.
@@ -10925,7 +11219,7 @@ User steering: ` + userNote : "");
       headers: auth.headers,
       maxTokens: Math.min(4096, getProviderCaps(model.provider).maxOutputTokens),
       signal
-    }, services);
+    }, svc);
     const text = resp.content.filter((c) => c.type === "text").map((c) => c.text).join("").trim();
     return parseExplorationReport(text, llmMessages);
   } catch (e) {
@@ -10965,6 +11259,9 @@ Output ONLY JSON: {"mainGoal":"...","sessionType":"implementation|review|debuggi
   };
 }
 async function directExploration(llmMessages, extraction, model, auth, prevSummary, userNote, signal, services) {
+  const svc = services ?? getDefaultServices();
+  if (svc.budget.remainingCalls() <= SYNTHESIS_CALL_RESERVE)
+    return fallbackExplorationReport(llmMessages);
   const request = buildDirectExplorationRequest(llmMessages, extraction, model, prevSummary, userNote);
   try {
     const resp = await trackedComplete("explore-direct", model, request.context, {
@@ -10972,7 +11269,7 @@ async function directExploration(llmMessages, extraction, model, auth, prevSumma
       headers: auth.headers,
       maxTokens: request.maxTokens,
       signal
-    }, services);
+    }, svc);
     const text = resp.content.filter((c) => c.type === "text").map((c) => c.text).join(`
 `).trim();
     return parseExplorationReport(text, llmMessages);
@@ -11452,6 +11749,8 @@ async function singlePassCompact(request, model, auth, signal, services) {
 `).trim();
   if (!summary.startsWith("##"))
     throw new Error("Single-pass malformed output");
+  if (patchResponseIsTruncated(summary, resp.stopReason))
+    throw new Error("Single-pass truncated output");
   return { summary, llmCalls: 1 };
 }
 function buildBatchRequest(batch, extraction, model, maxOutputTokens) {
@@ -11525,7 +11824,7 @@ async function summarizeBatch(batch, extraction, model, auth, signal, services,
   try {
     sectionMap = await attempt();
   } catch (err) {
-    if (err instanceof BatchSummaryFormatError && /non-terminal stop reason length/.test(err.message) && services?.thinkingLevels.summaryThinkingLevel !== "minimal") {
+    if (err instanceof BatchSummaryFormatError && /non-terminal stop reason length/.test(err.message) && services?.thinkingLevels.summaryThinkingLevel !== "minimal" && (services ?? getDefaultServices()).budget.remainingCalls() > 1) {
       debug("Batch synthesis exhausted the output budget (reasoning shared it); retrying once with minimal reasoning");
       sectionMap = await attempt("minimal");
     } else {
@@ -11604,8 +11903,11 @@ async function assembleLLM(summaries, extraction, report, model, auth, budget, p
     maxTokens: Math.min(budget, getProviderCaps(model.provider).maxOutputTokens),
     signal
   }, services);
-  return resp.content.filter((c) => c.type === "text").map((c) => c.text).join(`
+  const assembled = resp.content.filter((c) => c.type === "text").map((c) => c.text).join(`
 `).trim();
+  if (patchResponseIsTruncated(assembled, resp.stopReason))
+    throw new Error("Assembly truncated output");
+  return assembled;
 }
 function assembleFallback(summaries, extraction, steering = {}, budgetTokens = 6000, continuity = null) {
   const safe = (value, max = TRUNC.PREVIEW_MID) => summaryEvidenceLine(value, max);
@@ -11620,7 +11922,7 @@ function assembleFallback(summaries, extraction, steering = {}, budgetTokens = 6
     constraints.push("- [focus] Preserve detail about: " + safe(steering.focus, TRUNC.CONSTRAINT_TEXT));
   if (steering.note?.trim())
     constraints.push("- [note] " + safe(steering.note, TRUNC.CONSTRAINT_TEXT));
-  const decisions = extraction.decisions.map((item) => {
+  const decisions = collapseDecisionsByQuestion(extraction.decisions).map((item) => {
     const summary = safe(item.summary, TRUNC.DECISION_SUMMARY);
     const response = item.userResponse ? safe(item.userResponse, TRUNC.USER_RESPONSE) : "";
     return summary ? "- **" + summary + "**" + (response ? " \u2192 " + response : "") : "";
@@ -11695,6 +11997,20 @@ function failedChunkSummary(ch) {
 }
 
 // src/app/stage-auth.ts
+function abortableAuth(invoke, signal) {
+  return new Promise((resolve, reject) => {
+    const auth = invoke();
+    const onAbort = () => reject(signal.reason ?? new Error("Stage auth aborted"));
+    signal.addEventListener("abort", onAbort, { once: true });
+    auth.then((value) => {
+      signal.removeEventListener("abort", onAbort);
+      resolve(value);
+    }, (error) => {
+      signal.removeEventListener("abort", onAbort);
+      reject(error);
+    });
+  });
+}
 async function resolveStageAuth(rc, stage) {
   const model = stage === "summary" ? rc.summaryModel : stage === "explore" ? rc.segModel : rc.verifyModel;
   const existing = stage === "summary" ? rc.summaryAuth : stage === "explore" ? rc.segAuth : rc.verifyAuth;
@@ -11715,11 +12031,13 @@ async function resolveStageAuth(rc, stage) {
       rc.verifyAuth = shared;
     return shared;
   }
-  const auth = await rc.ctx.modelRegistry.getApiKeyAndHeaders(model);
+  rc.cancellation.signal.throwIfAborted();
+  const auth = await abortableAuth(() => rc.ctx.modelRegistry.getApiKeyAndHeaders(model), rc.cancellation.signal);
   if (!auth.ok || !auth.apiKey) {
     throw new Error("Authentication unavailable for " + stage + " route " + model.provider + "/" + model.id);
   }
   const resolved = { apiKey: auth.apiKey, headers: auth.headers };
+  rc.cancellation.signal.throwIfAborted();
   if (stage === "summary")
     rc.summaryAuth = resolved;
   else if (stage === "explore")
@@ -11862,7 +12180,7 @@ async function summarizeConversation(rc) {
       cacheable = false;
       generationFallbacks.push("single-pass generation failed");
       recordIssue({ key: "synth.single-pass", message: "Single-pass synthesis used deterministic fallback (" + errorDetail(err) + ").", error: err });
-      rc.notify("Single-pass generation stopped \xB7 using deterministic fallback [" + formatGenerationFailureForUi(err) + "]", "warning");
+      rc.notify("Single-pass generation stopped \xB7 using deterministic fallback [" + formatGenerationFailureForUi(err) + "]", "info");
       finalSummary = assembleFallback([], extraction, { focus: rc.focus, note: rc.userNote }, pc.summaryBudgetTokens, rc.previousState);
       method = "heuristic";
     }
@@ -11960,7 +12278,7 @@ async function summarizeConversation(rc) {
             cacheable = false;
             generationFallbacks.push("1 synthesis batch fallback");
             recordIssue({ key: "synth.batch", message: "Synthesis batch used deterministic fallback (" + errorDetail(err) + ").", error: err });
-            rc.notify("Synthesis batch stopped \xB7 deterministic evidence fallback preserved coverage [" + formatGenerationFailureForUi(err) + "]", "warning");
+            rc.notify("Synthesis batch stopped \xB7 deterministic evidence fallback preserved coverage [" + formatGenerationFailureForUi(err) + "]", "info");
             showProgressOverlay(rc.ctx, {
               phase: 3,
               phaseName: "Synthesize",
@@ -11993,7 +12311,7 @@ async function summarizeConversation(rc) {
           const idx = nextBatch++;
           if (idx >= batchCallLimit)
             return;
-          if (budgetStopped || rc.services.budget.reason()) {
+          if (budgetStopped || rc.services.budget.reason() || rc.services.budget.remainingCalls() <= 1) {
             budgetStopped = true;
             results[idx] = batches[idx].map((chunk) => failedChunkSummary(chunk));
           } else {
@@ -12036,7 +12354,7 @@ async function summarizeConversation(rc) {
       if (failedBatches.length) {
         cacheable = false;
         generationFallbacks.push(failedBatches.length + " synthesis batch fallback(s)");
-        rc.notify(failedBatches.length + " synthesis batch(es) stopped \xB7 deterministic evidence fallback preserved coverage [" + formatGenerationFailureForUi(failedBatches[0]) + "]", "warning");
+        rc.notify(failedBatches.length + " synthesis batch(es) stopped \xB7 deterministic evidence fallback preserved coverage [" + formatGenerationFailureForUi(failedBatches[0]) + "]", "info");
         showProgressOverlay(rc.ctx, {
           phase: 3,
           phaseName: "Synthesize",
@@ -12068,7 +12386,7 @@ async function summarizeConversation(rc) {
       cacheable = false;
       generationFallbacks.push("assembly generation failed");
       recordIssue({ key: "synth.assembly", message: "Assembly used deterministic fallback (" + errorDetail(err) + ").", error: err });
-      rc.notify("Assembly stopped \xB7 using deterministic fallback [" + formatGenerationFailureForUi(err) + "]", "warning");
+      rc.notify("Assembly stopped \xB7 using deterministic fallback [" + formatGenerationFailureForUi(err) + "]", "info");
       method = "heuristic";
       finalSummary = assembleFallback(summaries, extraction, { focus: rc.focus, note: rc.userNote }, pc.summaryBudgetTokens, rc.previousState);
     }
@@ -13113,11 +13431,30 @@ function supersededResults(projection, candidates) {
   });
   return result;
 }
-function planContextTrim(branch, afterId) {
+function thinkingEditReason(branch, entries, readerApi) {
+  if (readerApi && readerApi !== "anthropic-messages")
+    return;
+  const edits = new Map(entries.flatMap((entry) => entry.type === "context_edit" ? [[entry.targetId, entry.replacement]] : []));
+  let changed = false;
+  for (const { sourceEntry, messages } of buildSessionProjection2(branch).entries) {
+    if (edits.has(sourceEntry.id)) {
+      changed = true;
+      if (edits.get(sourceEntry.id) === null)
+        continue;
+    }
+    if (changed && messages.some((message) => message.role === "assistant" && message.api === "anthropic-messages" && message.content.some((block) => block.type === "thinking" && Boolean(block.thinkingSignature)))) {
+      return "Cleanup would invalidate retained signed Anthropic thinking. Use provider-native compaction instead.";
+    }
+  }
+}
+function planContextTrim(branch, afterId, options = {}) {
   if (afterId && !branch.some((entry) => entry.id === afterId))
     throw new Error("Trim boundary is not on the active branch.");
   const candidates = archivableResults(branch);
-  const boundaries = [afterId, lastAnchorBoundary(branch)].filter((id) => Boolean(id));
+  const anchorBoundary = options.anchorBoundary === undefined ? lastAnchorBoundary(branch) : options.anchorBoundary;
+  if (anchorBoundary && !branch.some((entry) => entry.id === anchorBoundary))
+    throw new Error("Anchor boundary is not on the active branch.");
+  const boundaries = [afterId, anchorBoundary].filter((id) => Boolean(id));
   const protectedIds = new Set(boundaries.flatMap((id) => branch.slice(0, branch.findIndex((entry) => entry.id === id) + 1).map((entry) => entry.id)));
   const edited = new Set(branch.flatMap((entry) => entry.type === "context_edit" ? [entry.targetId] : []));
   const projection = buildSessionProjection2(branch).entries;
@@ -13155,6 +13492,18 @@ function planContextTrim(branch, afterId) {
     archives.push({ id, sha256: digest(text), chars: text.length });
     savedChars += text.length - marker.length;
   }
+  const blockedReason = thinkingEditReason(branch, entries, options.readerApi);
+  if (blockedReason)
+    return {
+      entries: [],
+      references: [],
+      archives: [],
+      savedChars: 0,
+      automatic: "signed-thinking",
+      cooldownTurns: 0,
+      superseded: 0,
+      blockedReason
+    };
   const supersededCount = eligible.filter((item) => superseded.has(item.id)).length;
   if (entries.length)
     entries.push(contextControlEntry({ version: 1, action: "trim", references, archives }));
@@ -13165,7 +13514,7 @@ function planContextTrim(branch, afterId) {
   const turnsSinceChange = branch.slice(lastChange + 1).filter((entry) => entry.type === "message" && entry.message.role === "assistant").length;
   const cooldownTurns = lastChange < 0 ? 0 : Math.max(0, AUTO_TRIM_COOLDOWN_TURNS - turnsSinceChange);
   const automatic = savedChars < MIN_AUTO_TRIM_SAVING_CHARS ? "insufficient-savings" : cooldownTurns > 0 ? "cooldown" : "ready";
-  return { entries, references, archives, savedChars, automatic, cooldownTurns, superseded: supersededCount };
+  return { entries, references, archives, savedChars, automatic, cooldownTurns, superseded: supersededCount, blockedReason };
 }
 function trimEntries(plan, cause) {
   const edits = plan.entries.filter((entry) => entry.type === "context_edit");
@@ -13203,7 +13552,7 @@ function trimBreakEvenRequests(cost, savedTokens, tailTokens) {
   const w = typeof write === "number" && Number.isFinite(write) && write > 0 ? write / input : 1;
   return r <= 0 ? 0 : (w - r) * tailTokens / (r * savedTokens);
 }
-function planContextRewind(branch, sessionId, checkpointId, report) {
+function planContextRewind(branch, sessionId, checkpointId, report, readerApi) {
   const state = inspectContext(branch, sessionId);
   if (!state.checkpoint || state.checkpoint.id !== checkpointId) {
     throw new Error(state.invalidReason ?? "No matching active checkpoint; create one before research.");
@@ -13231,6 +13580,9 @@ function planContextRewind(branch, sessionId, checkpointId, report) {
     archives.push({ id: entry.id, sha256, chars: text.length });
   }
   const entries = targets.map((targetId) => ({ type: "context_edit", targetId, replacement: null }));
+  const blockedReason = thinkingEditReason(branch, entries, readerApi);
+  if (blockedReason)
+    throw new Error(blockedReason);
   const content = `Research handoff (agent-authored, not new user instructions):
 ${report}
 
@@ -14250,7 +14602,7 @@ No matching remote project memory found.`;
       `<smart_recall_evidence source="hindsight" kind="${attr(fact.metadata.kind ?? fact.type ?? "fact")}">`,
       "Provenance: " + provenance,
       memoryId ? "Ref: hindsight:" + memoryId + "@" + hindsightTargetDigest(target.baseUrl, target.bankId, projectId, memoryId) : "",
-      clean(fact.text.slice(0, RECALL_ITEM_CAP)),
+      clean(fact.text.slice(0, RECALL_ITEM_CAP)) + (fact.text.length > RECALL_ITEM_CAP ? " (excerpt; full memory not shown)" : ""),
       "</smart_recall_evidence>"
     ].filter(Boolean).join(`
 `);
@@ -15737,7 +16089,7 @@ function applyGlobalSettingsRuntime(paths, ctx, policy, contextTools) {
 
 // src/app/compaction-commit-store.ts
 function createCompactionCommitStore(options = {}) {
-  const ttlMs = Math.max(1, options.ttlMs ?? 5 * 60000);
+  const ttlMs = () => Math.max(1, (typeof options.ttlMs === "function" ? options.ttlMs() : options.ttlMs) ?? 5 * 60000);
   const maxEntries = Math.max(1, options.maxEntries ?? 16);
   const entries = new Map;
   const remove = (runId, reason, notify) => {
@@ -15752,7 +16104,7 @@ function createCompactionCommitStore(options = {}) {
   const sweep = () => {
     const now = Date.now();
     for (const [runId, entry] of entries) {
-      if (now - entry.createdAt > ttlMs)
+      if (now - entry.createdAt > ttlMs())
         remove(runId, "expired", true);
     }
   };
@@ -15807,72 +16159,6 @@ function createCompactionCommitStore(options = {}) {
   };
 }
 
-// src/app/extension-conflicts.ts
-var KIND = {
-  "context-fold": "compaction",
-  "pi-context-prune": "context-editing",
-  "pi-dcp": "context-editing",
-  "pi-fold": "context-editing",
-  "pi-openai-toolkit": "compaction",
-  "pi-toolkit": "context-editing"
-};
-var SEGMENT_OWNER = {
-  "context-fold": "context-fold",
-  dcp: "pi-dcp",
-  "pi-context-prune": "pi-context-prune",
-  "pi-dcp": "pi-dcp",
-  "pi-fold": "pi-fold",
-  "pi-openai-toolkit": "pi-openai-toolkit"
-};
-function segments(info) {
-  const out = new Set;
-  if (!info)
-    return out;
-  for (const text of [info.path ?? "", info.source ?? "", info.baseDir ?? ""]) {
-    for (const raw of text.toLowerCase().split(/[\\/:]+/)) {
-      const segment = raw.replace(/(.)@.*$/, "$1").replace(/\.(?:[cm]?[jt]s|git)$/, "");
-      if (segment)
-        out.add(segment);
-    }
-  }
-  return out;
-}
-function detectExtensionConflicts(registry) {
-  const entries = [
-    ...registry.commands.filter((command) => command.source === "extension").map((command) => ({ name: command.name.toLowerCase(), label: `/${command.name} command`, segments: segments(command.sourceInfo) })),
-    ...registry.tools.map((tool) => ({ name: tool.name.toLowerCase(), label: `${tool.name} tool`, segments: segments(tool.sourceInfo) }))
-  ].filter((entry) => !(entry.segments.has("pi-smart-compact") || entry.name.startsWith("smart_") || entry.name === "smart-compact"));
-  const found = new Map;
-  const add = (name, evidence) => {
-    if (!found.has(name))
-      found.set(name, evidence);
-  };
-  const bareFold = [];
-  for (const entry of entries) {
-    const owner = [...entry.segments].map((segment) => SEGMENT_OWNER[segment]).find(Boolean);
-    if (owner)
-      add(owner, `${entry.label} from ${owner}`);
-    else if (entry.segments.has("pi-toolkit") && entry.name === "context")
-      add("pi-toolkit", `${entry.label} from pi-toolkit`);
-    else if (entry.name === "fold-handoff")
-      add("context-fold", entry.label);
-    else if (entry.name === "prune")
-      add("pi-context-prune", entry.label);
-    else if (entry.name === "fold")
-      bareFold.push(entry);
-  }
-  for (const entry of bareFold)
-    add(found.has("context-fold") ? "context-fold" : "pi-fold", entry.label);
-  return [...found].map(([name, evidence]) => ({ name, kind: KIND[name], evidence })).sort((a, b) => a.name.localeCompare(b.name));
-}
-function conflictNotice(conflicts) {
-  const names = conflicts.map((conflict) => conflict.name);
-  const list = names.length === 1 ? names[0] : `${names.slice(0, -1).join(", ")} and ${names.at(-1)}`;
-  const verb = names.length === 1 ? "also compacts or edits" : "also compact or edit";
-  const evidence = conflicts.map((conflict) => `${conflict.name}: ${conflict.evidence}`).join("; ");
-  return `${list} ${verb} this conversation (${evidence}). Two owners of the same history are not safe in any load order: summaries can be discarded and cache prefixes rewritten twice. Keep only one loaded (Pi: /settings \u203A packages, or the extensions list).`;
-}
-
 // src/app/native-continuity-bridge.ts
 import crypto6 from "crypto";
 import fs13 from "fs";
@@ -16082,89 +16368,6 @@ function createNativeContinuityBridge(opts = {}) {
   };
 }
 
-// src/app/settled-auto-trigger.ts
-function createSettledAutoTrigger(options = {}) {
-  const now = options.now ?? Date.now;
-  const cooldownMs = Math.max(0, options.cooldownMs ?? SETTLED_TRIGGER_COOLDOWN_MS);
-  const active = new Map;
-  const lastCompactionAt = new Map;
-  const noteCompaction = (sessionId) => {
-    if (!isUnresolvedSessionId(sessionId))
-      lastCompactionAt.set(sessionId, now());
-  };
-  const clear = (sessionId) => {
-    active.delete(sessionId);
-    lastCompactionAt.delete(sessionId);
-  };
-  const request = async (ctx, config) => {
-    if (!config.autoTrigger || !["settled", "background"].includes(config.autoTriggerStrategy))
-      return;
-    const sessionId = resolveSessionId(ctx);
-    if (isUnresolvedSessionId(sessionId) || active.has(sessionId))
-      return;
-    const usage = ctx.getContextUsage();
-    const totalTokens = usage?.tokens;
-    if (typeof totalTokens !== "number" || !Number.isFinite(totalTokens) || totalTokens < MIN_TOKEN_THRESHOLD || !ctx.model)
-      return;
-    const contextPercent = safeContextPercent(totalTokens, effectiveContextWindow(ctx.model, config));
-    if (contextPercent < config.minContextPercent)
-      return;
-    const lastCompaction = lastCompactionAt.get(sessionId);
-    if (lastCompaction !== undefined && now() - lastCompaction < cooldownMs)
-      return;
-    if (!ctx.isIdle() || ctx.hasPendingMessages())
-      return;
-    const requestToken = Symbol(sessionId);
-    active.set(sessionId, requestToken);
-    await new Promise((resolve) => {
-      let finished = false;
-      const watchdogMs = options.watchdogMs ?? AUTO_TRIGGER_TIMEOUT_CAP_MS + config.autoTriggerTimeoutMs;
-      const watchdog = setTimeout(() => {
-        reportIssue({
-          key: "auto.settled-no-callback",
-          message: "Pi did not report the automatic compaction result within " + Math.round(watchdogMs / 1000) + "s. The next settled turn may request it again."
-        }, ctx);
-        finish();
-      }, watchdogMs);
-      watchdog.unref?.();
-      const finish = () => {
-        if (finished)
-          return;
-        finished = true;
-        clearTimeout(watchdog);
-        if (active.get(sessionId) === requestToken)
-          active.delete(sessionId);
-        resolve();
-      };
-      try {
-        ctx.compact({
-          onComplete: () => {
-            if (active.get(sessionId) === requestToken)
-              noteCompaction(sessionId);
-            finish();
-          },
-          onError: (error) => {
-            reportIssue({
-              key: "auto.settled-apply",
-              message: "Pi could not run the automatic compaction (" + errorDetail(error) + "). Conversation unchanged. Run /smart-compact manually if context is high.",
-              error
-            }, ctx);
-            finish();
-          }
-        });
-      } catch (error) {
-        reportIssue({
-          key: "auto.settled-apply",
-          message: "Pi could not run the automatic compaction (" + errorDetail(error) + "). Conversation unchanged. Run /smart-compact manually if context is high.",
-          error
-        }, ctx);
-        finish();
-      }
-    });
-  };
-  return { request, noteCompaction, clear };
-}
-
 // src/app/background-preparation.ts
 function recordPreparationDiscard(sessionId, snapshot, reason) {
   return appendMetricsSnapshot(sessionId, {
@@ -16186,11 +16389,31 @@ function preparationWindow(config, window) {
   const startTokens = explicit ? Math.max(MIN_TOKEN_THRESHOLD, window * prepare / 100) : preparationStartTokens(applyTokens);
   return { startTokens, applyTokens };
 }
+function contextPressure(ctx, config) {
+  const raw = ctx.getContextUsage?.()?.tokens;
+  const tokens = typeof raw === "number" && Number.isFinite(raw) && raw >= 0 ? raw : null;
+  const rawWindow = effectiveContextWindow(ctx.model, config);
+  const policyWindow = typeof rawWindow === "number" && Number.isFinite(rawWindow) && rawWindow > 0 ? rawWindow : null;
+  const gates = policyWindow === null ? null : preparationWindow(config, policyWindow);
+  const cleanupTokens = gates ? Math.ceil(gates.startTokens) : null;
+  const compactionTokens = gates ? Math.ceil(Math.max(MIN_TOKEN_THRESHOLD, gates.applyTokens)) : null;
+  return {
+    tokens,
+    modelWindow: ctx.model?.contextWindow ?? null,
+    policyWindow,
+    percent: tokens !== null && policyWindow !== null ? tokens / policyWindow * 100 : null,
+    cleanupTokens,
+    compactionTokens,
+    cleanup: tokens !== null && cleanupTokens !== null && tokens >= cleanupTokens,
+    compaction: tokens !== null && compactionTokens !== null && tokens >= compactionTokens
+  };
+}
 function snapshotContext(ctx) {
   const branch = structuredClone(ctx.sessionManager.getBranch());
   const sessionId = resolveSessionId(ctx);
   const sessionFile = ctx.sessionManager.getSessionFile?.();
   const usage = structuredClone(ctx.getContextUsage());
+  const systemPrompt = ctx.getSystemPrompt?.() ?? "";
   const sessionManager = new Proxy(ctx.sessionManager, {
     get(target, key) {
       if (key === "getBranch")
@@ -16209,20 +16432,21 @@ function snapshotContext(ctx) {
     model: ctx.model && { ...ctx.model },
     hasUI: false,
     getContextUsage: () => usage,
+    getSystemPrompt: () => systemPrompt,
     ui: { ...ctx.ui, notify() {}, setStatus() {}, setWidget() {} }
   };
   return Object.assign(snapshot, { silentBackground: true });
 }
 function signature(ctx, config) {
   const model = ctx.model;
-  return JSON.stringify([model?.provider, model?.id, model?.api, model?.contextWindow, model?.maxTokens, config]);
+  return JSON.stringify([model?.provider, model?.id, model?.api, model?.baseUrl, model?.contextWindow, model?.maxTokens, ctx.getSystemPrompt?.(), config]);
 }
 function enabled(config) {
   return config.autoTrigger && config.autoTriggerStrategy === "background";
 }
 function createBackgroundPreparation(options) {
   const now = options.now ?? Date.now;
-  const ttlMs = options.ttlMs ?? FIVE_MINUTES_MS;
+  const signatureOf = (ctx, config) => signature(ctx, config) + (options.toolSignature?.() ?? "");
   const cooldownMs = options.cooldownMs ?? SETTLED_TRIGGER_COOLDOWN_MS;
   let current = null;
   let lastAttempt;
@@ -16269,9 +16493,9 @@ function createBackgroundPreparation(options) {
       return "config";
     if (task.sessionId !== resolveSessionId(ctx))
       return "session";
-    if (task.signature !== signature(ctx, config))
+    if (task.signature !== signatureOf(ctx, config))
       return "config";
-    if (now() - (task.readyAt ?? task.createdAt) > ttlMs)
+    if (now() - (task.readyAt ?? task.createdAt) > (options.ttlMs ?? config.pendingTtlMs))
       return "ttl";
     const branch = ctx.sessionManager.getBranch();
     const origin = branch.findIndex((entry) => entry.id === task.originId);
@@ -16303,7 +16527,7 @@ function createBackgroundPreparation(options) {
     const task = {
       sessionId,
       originId,
-      signature: signature(ctx, config),
+      signature: signatureOf(ctx, config),
       controller: new AbortController,
       createdAt: now(),
       ctx
@@ -16311,7 +16535,15 @@ function createBackgroundPreparation(options) {
     current = task;
     lastAttempt = { sessionId, at: now() };
     const preparationConfig = { ...config, minContextPercent: startTokens / window * 100 };
-    track(Promise.resolve().then(() => options.prepare(snapshot, preparationConfig, task.controller.signal)).then((pending) => {
+    track(Promise.resolve().then(() => {
+      if (current !== task || task.controller.signal.aborted)
+        return null;
+      if (!valid(task, ctx, config)) {
+        cancel("config");
+        return null;
+      }
+      return options.prepare(snapshot, preparationConfig, task.controller.signal);
+    }).then((pending) => {
       if (pending) {
         task.pending = pending;
         task.readyAt = now();
@@ -16396,6 +16628,83 @@ function createBackgroundPreparation(options) {
   };
 }
 
+// src/app/settled-auto-trigger.ts
+function createSettledAutoTrigger(options = {}) {
+  const now = options.now ?? Date.now;
+  const cooldownMs = Math.max(0, options.cooldownMs ?? SETTLED_TRIGGER_COOLDOWN_MS);
+  const active = new Map;
+  const cooldownStartedAt = new Map;
+  const noteCompaction = (sessionId) => {
+    if (!isUnresolvedSessionId(sessionId))
+      cooldownStartedAt.set(sessionId, now());
+  };
+  const clear = (sessionId) => {
+    active.delete(sessionId);
+    cooldownStartedAt.delete(sessionId);
+  };
+  const request = async (ctx, config) => {
+    if (!config.autoTrigger || !["settled", "background"].includes(config.autoTriggerStrategy))
+      return;
+    const sessionId = resolveSessionId(ctx);
+    if (isUnresolvedSessionId(sessionId) || active.has(sessionId))
+      return;
+    if (!contextPressure(ctx, config).compaction)
+      return;
+    const cooldownStart = cooldownStartedAt.get(sessionId);
+    if (cooldownStart !== undefined && now() - cooldownStart < cooldownMs)
+      return;
+    if (!ctx.isIdle() || ctx.hasPendingMessages())
+      return;
+    const requestToken = Symbol(sessionId);
+    active.set(sessionId, requestToken);
+    await new Promise((resolve) => {
+      let finished = false;
+      const watchdogMs = options.watchdogMs ?? AUTO_TRIGGER_TIMEOUT_CAP_MS + config.autoTriggerTimeoutMs;
+      const watchdog = setTimeout(() => {
+        const hostBusy = typeof ctx.isIdle === "function" ? !ctx.isIdle() : false;
+        reportIssue({
+          key: "auto.settled-no-callback",
+          message: hostBusy ? "Pi is still busy after " + Math.round(watchdogMs / 1000) + "s; the automatic compaction result may still arrive and be applied late. No action needed; automatic retries wait for the cooldown." : "Pi did not report the automatic compaction result within " + Math.round(watchdogMs / 1000) + "s. Automatic retries wait for the cooldown. Run /smart-compact manually if needed."
+        }, ctx);
+        finish();
+      }, watchdogMs);
+      watchdog.unref?.();
+      const finish = () => {
+        if (finished)
+          return;
+        finished = true;
+        clearTimeout(watchdog);
+        if (active.get(sessionId) === requestToken) {
+          active.delete(sessionId);
+          cooldownStartedAt.set(sessionId, now());
+        }
+        resolve();
+      };
+      try {
+        ctx.compact({
+          onComplete: finish,
+          onError: (error) => {
+            reportIssue({
+              key: "auto.settled-apply",
+              message: "Pi could not run the automatic compaction (" + errorDetail(error) + "). Conversation unchanged. Run /smart-compact manually if context is high.",
+              error
+            }, ctx);
+            finish();
+          }
+        });
+      } catch (error) {
+        reportIssue({
+          key: "auto.settled-apply",
+          message: "Pi could not run the automatic compaction (" + errorDetail(error) + "). Conversation unchanged. Run /smart-compact manually if context is high.",
+          error
+        }, ctx);
+        finish();
+      }
+    });
+  };
+  return { request, noteCompaction, clear };
+}
+
 // src/app/host-cache-ledger.ts
 var FOREIGN_REBUILD_WARN_COUNT = 3;
 var num = (value) => typeof value === "number" && Number.isFinite(value) && value > 0 ? value : 0;
@@ -16559,8 +16868,106 @@ function compactionUsage(snapshot, resolveModel) {
 
 // src/app/register-context-tools.ts
 import { StringEnum } from "@earendil-works/pi-ai";
+import { Text as Text4 } from "@earendil-works/pi-tui";
 import { Type as Type3 } from "typebox";
 
+// src/ui/tool-rows.ts
+import { stripVTControlCharacters as stripVTControlCharacters2 } from "util";
+import { Text as Text3, truncateToWidth as truncateToWidth3 } from "@earendil-works/pi-tui";
+import { keyHint } from "@earendil-works/pi-coding-agent";
+var STATUS_COLOR = {
+  done: "success",
+  queued: "dim",
+  pending: "warning",
+  failed: "error",
+  cancelled: "warning",
+  skipped: "dim",
+  info: "muted"
+};
+var STATUS_WORD = {
+  done: "done",
+  queued: "queued",
+  pending: "pending",
+  failed: "failed",
+  cancelled: "cancelled",
+  skipped: "skipped",
+  info: ""
+};
+function sanitizeVisible(text) {
+  return stripVTControlCharacters2(text).replace(/[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F-\u009F]/g, " ");
+}
+function firstTextContent(content) {
+  const text = content?.find((part) => part.type === "text" && part.text)?.text;
+  return text ? sanitizeVisible(text) : "";
+}
+function summarizeLine(text, maxLength = 120) {
+  const single = sanitizeVisible(text).split(/\r?\n/).find((line) => line.trim()) ?? "";
+  const clipped = single.trim().slice(0, maxLength);
+  return clipped + (single.trim().length > maxLength ? "\u2026" : "");
+}
+function statusLabel(theme, status) {
+  const word = STATUS_WORD[status];
+  return word ? theme.fg(STATUS_COLOR[status], word) : "";
+}
+function metaLine(theme, key, value) {
+  return theme.fg("dim", key + ":") + " " + sanitizeVisible(value);
+}
+function previewBlock(lines, expanded, maxCollapsed, maxLength = 160) {
+  const clean = lines.map((line) => sanitizeVisible(line));
+  if (expanded)
+    return clean;
+  const shown = clean.slice(0, maxCollapsed).map((line) => line.slice(0, maxLength));
+  if (clean.length > maxCollapsed) {
+    shown.push("\u2026 (" + (clean.length - maxCollapsed) + " more)");
+  }
+  return shown;
+}
+function allTextParts(content) {
+  return (content ?? []).filter((part) => part.type === "text" && part.text).map((part) => sanitizeVisible(part.text));
+}
+function safeArg(value, maxLength = 120) {
+  if (typeof value !== "string")
+    return "";
+  return sanitizeVisible(value).trim().slice(0, maxLength);
+}
+function expandHint(theme) {
+  try {
+    return theme.fg("dim", keyHint("app.tools.expand", "expand"));
+  } catch {
+    return theme.fg("dim", "expand tool output for full details");
+  }
+}
+function expandedRow(theme, result, summaryLines) {
+  const content = allTextParts(result.content).join(`
+`);
+  const head = summaryLines.filter(Boolean).join(`
+`);
+  return new Text3(head + (content ? `
+` + theme.fg("borderMuted", "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500") + `
+` + content : ""), 0, 0);
+}
+function rawFallbackRow(theme, result, expanded) {
+  const parts = allTextParts(result.content);
+  if (!parts.length) {
+    return new Text3(theme.fg("warning", "No result details available"), 0, 0);
+  }
+  if (expanded)
+    return new Text3(parts.join(`
+`), 0, 0);
+  const joined = parts.join(`
+`);
+  const bounded = truncateToWidth3(joined.split(/\r?\n/)[0] ?? "", 200, "\u2026");
+  return new Text3(bounded + (joined.length > bounded.length ? `
+\u2026 (expanded shows full content)` : ""), 0, 0);
+}
+function tryRow(theme, build, result, expanded) {
+  try {
+    return build();
+  } catch {
+    return rawFallbackRow(theme, result, expanded);
+  }
+}
+
 // src/app/mnemopi-memory.ts
 import { execFile as execFile2 } from "child_process";
 import { existsSync as existsSync5 } from "fs";
@@ -16848,6 +17255,15 @@ function registerContextTools(pi) {
       if (loadConfig().toolLoading === "off" || !pi.getActiveTools().includes("smart_recall"))
         throw new Error("smart_recall is disabled in Pi settings or /tools.");
       return executeRecall(params, signal, ctx);
+    },
+    renderCall(args, theme) {
+      const label = theme.fg("toolTitle", "smart_recall ");
+      const scope = args.scope ? theme.fg("dim", " [" + safeArg(args.scope, 20) + "]") : "";
+      const query = safeArg(args.query, 100);
+      return new Text4(label + theme.fg("muted", query) + scope, 0, 0);
+    },
+    renderResult(result, { expanded }, theme, context) {
+      return tryRow(theme, () => renderRecallRow(result, expanded, theme, context), result, expanded);
     }
   });
   pi.registerTool({
@@ -16882,9 +17298,197 @@ function registerContextTools(pi) {
       if (loadConfig().toolLoading === "off" || !pi.getActiveTools().includes("smart_save_memory"))
         throw new Error("smart_save_memory is disabled in Pi settings or /tools.");
       return executeSaveMemory(params, signal, ctx);
+    },
+    renderCall(args, theme) {
+      const label = theme.fg("toolTitle", "smart_save_memory ");
+      if (args.ref && (args.status ?? "active") === "resolved") {
+        return new Text4(label + theme.fg("muted", "resolve ") + theme.fg("dim", safeArg(args.ref, 80)), 0, 0);
+      }
+      const kind = theme.fg("accent", safeArg(args.kind ?? "memory", 40));
+      const title = safeArg(args.title, 80);
+      return new Text4(label + kind + (title ? " " + theme.fg("muted", title) : ""), 0, 0);
+    },
+    renderResult(result, { expanded }, theme, context) {
+      return tryRow(theme, () => renderSaveRow(result, expanded, theme, context), result, expanded);
     }
   });
 }
+function receiptBuckets(receipts) {
+  const buckets = { done: 0, pending: 0, failed: 0, unknown: 0 };
+  for (const receipt of receipts) {
+    const state = receipt.state ?? "unknown";
+    if (state === "completed" || state === "deleted")
+      buckets.done++;
+    else if (state === "failed")
+      buckets.failed++;
+    else if (state === "unknown")
+      buckets.unknown++;
+    else
+      buckets.pending++;
+  }
+  return buckets;
+}
+function renderRecallRow(result, expanded, theme, context) {
+  if (context.isError) {
+    const head = theme.fg("error", "recall failed:");
+    return expanded ? expandedRow(theme, result, [head]) : new Text4(head + " " + summarizeLine(firstTextContent(result.content), 140), 0, 0);
+  }
+  const details = result.details;
+  if (!details)
+    return rawFallbackRow(theme, result, expanded);
+  const lines = [];
+  if (Array.isArray(details.results)) {
+    const results = details.results;
+    lines.push(statusLabel(theme, results.length ? "done" : "skipped") + " " + theme.fg("muted", results.length + " local match(es)"));
+    if (!expanded) {
+      lines.push(...previewBlock(results.map((item) => "[" + (item.kind ?? "fact") + "] " + summarizeLine(item.title ?? "", 100) + (item.content ? " \u2014 " + summarizeLine(item.content, 80) : "")), false, 3));
+    }
+    return expanded ? expandedRow(theme, result, lines) : new Text4(lines.join(`
+`), 0, 0);
+  }
+  const mnemopi = details.mnemopi;
+  if (mnemopi) {
+    if (mnemopi.state === "recalled") {
+      lines.push(statusLabel(theme, mnemopi.facts?.length ? "done" : "skipped") + " " + theme.fg("muted", (mnemopi.facts?.length ?? 0) + " mnemopi match(es)"));
+      if (!expanded) {
+        lines.push(...previewBlock((mnemopi.facts ?? []).map((fact) => "[" + (fact.kind ?? "fact") + "] " + summarizeLine(fact.title ?? "", 100) + (fact.content ? " \u2014 " + summarizeLine(fact.content, 80) : "")), false, 3));
+      }
+    } else {
+      const status = mnemopi.state === "failed" ? "failed" : mnemopi.state === "skipped" ? "skipped" : "pending";
+      lines.push(statusLabel(theme, status) + " " + theme.fg("muted", "mnemopi " + (mnemopi.state ?? "")));
+      if (mnemopi.reason)
+        lines.push(theme.fg("dim", summarizeLine(mnemopi.reason, 140)));
+    }
+    return expanded ? expandedRow(theme, result, lines) : new Text4(lines.join(`
+`), 0, 0);
+  }
+  const remote = details.remote;
+  if (remote) {
+    if (remote.state === "ok") {
+      const buckets = receiptBuckets(remote.receipts ?? []);
+      lines.push(statusLabel(theme, remote.facts?.length ? "done" : "skipped") + " " + theme.fg("muted", (remote.facts?.length ?? 0) + " remote fact(s)"));
+      if (remote.receipts?.length) {
+        lines.push(metaLine(theme, "prior saves", buckets.done + " completed, " + buckets.pending + " pending, " + buckets.failed + " failed, " + buckets.unknown + " unknown"));
+      }
+      if (!expanded) {
+        lines.push(...previewBlock((remote.facts ?? []).map((fact) => (fact.type ? "[" + fact.type + "] " : "") + summarizeLine(fact.preview ?? "", 110)), false, 3));
+        lines.push(expandHint(theme));
+      }
+    } else {
+      const status = remote.state === "failed" ? "failed" : remote.state === "not-configured" || remote.state === "skipped" ? "skipped" : "pending";
+      lines.push(statusLabel(theme, status) + " " + theme.fg("muted", "hindsight " + (remote.state ?? "")));
+      if (remote.reason)
+        lines.push(theme.fg("dim", summarizeLine(remote.reason, 140)));
+    }
+    return expanded ? expandedRow(theme, result, lines) : new Text4(lines.join(`
+`), 0, 0);
+  }
+  return rawFallbackRow(theme, result, expanded);
+}
+function renderSaveRow(result, expanded, theme, context) {
+  if (context.isError) {
+    const head = theme.fg("error", "save failed:");
+    return expanded ? expandedRow(theme, result, [head]) : new Text4(head + " " + summarizeLine(firstTextContent(result.content), 140), 0, 0);
+  }
+  const details = result.details;
+  if (!details)
+    return rawFallbackRow(theme, result, expanded);
+  const lines = [];
+  const finish = () => expanded ? expandedRow(theme, result, lines) : new Text4(lines.join(`
+`), 0, 0);
+  if (details.approved === false) {
+    lines.push(statusLabel(theme, "cancelled") + " " + theme.fg("muted", "not saved \u2014 user did not approve"));
+    return finish();
+  }
+  if (typeof details.closed === "number") {
+    if (details.closed > 0) {
+      lines.push(statusLabel(theme, "done") + " " + theme.fg("muted", "resolved"));
+      if (expanded && typeof details.ref === "string") {
+        lines.push(metaLine(theme, "ref", details.ref));
+      }
+    } else {
+      lines.push(statusLabel(theme, "skipped") + " " + theme.fg("muted", "no active match \u2014 nothing changed"));
+      if (expanded && typeof details.ref === "string") {
+        lines.push(metaLine(theme, "ref", details.ref));
+      }
+    }
+    return finish();
+  }
+  const local = details.memory;
+  if (local && typeof details.ref === "string") {
+    lines.push(statusLabel(theme, "done") + " " + theme.fg("muted", "saved locally"));
+    const fact = "[" + (local.kind ?? "memory") + "] " + (local.title ?? "");
+    if (fact.trim() !== "[]")
+      lines.push(metaLine(theme, "fact", fact));
+    if (expanded)
+      lines.push(metaLine(theme, "ref", details.ref));
+    else
+      lines.push(expandHint(theme));
+    return finish();
+  }
+  const mnemopi = details.mnemopi;
+  if (mnemopi) {
+    if (mnemopi.state === "saved") {
+      lines.push(statusLabel(theme, "done") + " " + theme.fg("muted", "mnemopi saved"));
+      if (expanded && typeof details.ref === "string")
+        lines.push(metaLine(theme, "ref", details.ref));
+    } else if (mnemopi.state === "resolved") {
+      if (mnemopi.closed) {
+        lines.push(statusLabel(theme, "done") + " " + theme.fg("muted", "mnemopi resolved"));
+      } else {
+        lines.push(statusLabel(theme, "skipped") + " " + theme.fg("muted", "no matching active fact \u2014 nothing changed"));
+      }
+      if (expanded && typeof details.ref === "string")
+        lines.push(metaLine(theme, "ref", details.ref));
+    } else {
+      const status = mnemopi.state === "failed" ? "failed" : "pending";
+      lines.push(statusLabel(theme, status) + " " + theme.fg("muted", "mnemopi " + (mnemopi.state ?? "done")));
+      if (mnemopi.reason)
+        lines.push(theme.fg("dim", summarizeLine(mnemopi.reason, 140)));
+    }
+    return finish();
+  }
+  const remote = details.remote;
+  if (remote) {
+    const state = remote.state ?? "unknown";
+    if (state === "completed") {
+      lines.push(statusLabel(theme, "done") + " " + theme.fg("muted", "saved & searchable"));
+    } else if (state === "accepted") {
+      lines.push(statusLabel(theme, "pending") + " " + theme.fg("muted", "accepted \u2014 not yet searchable"));
+    } else if (state === "failed") {
+      lines.push(statusLabel(theme, "failed") + " " + theme.fg("muted", "not saved"));
+    } else if (state === "not-configured") {
+      lines.push(statusLabel(theme, "skipped") + " " + theme.fg("muted", "hindsight not configured"));
+    } else if (state === "deleted") {
+      lines.push(statusLabel(theme, "done") + " " + theme.fg("muted", "deleted remotely"));
+    } else if (state === "not-found") {
+      lines.push(statusLabel(theme, "skipped") + " " + theme.fg("muted", "already absent \u2014 nothing deleted"));
+    } else if (state === "pending") {
+      lines.push(statusLabel(theme, "pending") + " " + theme.fg("muted", "delete pending remotely"));
+    } else {
+      lines.push(statusLabel(theme, "pending") + " " + theme.fg("muted", "outcome unknown"));
+    }
+    if (remote.title)
+      lines.push(metaLine(theme, "fact", remote.title));
+    if (typeof details.ref === "string" && expanded) {
+      lines.push(metaLine(theme, "ref", details.ref));
+    } else if (typeof details.ref === "string" && (state === "completed" || state === "accepted")) {
+      lines.push(expandHint(theme));
+    }
+    if (expanded || state === "unknown" || state === "failed") {
+      if (remote.operationId)
+        lines.push(metaLine(theme, "operation", remote.operationId));
+      if (remote.documentId)
+        lines.push(metaLine(theme, "document", remote.documentId));
+      if (remote.target)
+        lines.push(metaLine(theme, "server", remote.target));
+    }
+    if (remote.reason)
+      lines.push(theme.fg("dim", summarizeLine(remote.reason, 140)));
+    return finish();
+  }
+  return rawFallbackRow(theme, result, expanded);
+}
 function textResult(text, details = undefined) {
   return { content: [{ type: "text", text }], details };
 }
@@ -16958,7 +17562,10 @@ Not yet searchable remotely: ` + pending.map((receipt) => receipt.documentId + "
   }
   const kinds = params.kinds?.length ? new Set(params.kinds) : null;
   const facts = outcome.facts.filter((fact) => !kinds || !fact.metadata.kind || kinds.has(fact.metadata.kind)).slice(0, params.limit ?? 5);
-  return textResult(formatHindsightFacts(hindsight.target, projectId, facts) + pendingNote, {
+  const buckets = receiptBuckets(refreshed);
+  const receiptSummary = refreshed.length ? "Prior saves: " + buckets.done + " completed, " + buckets.pending + " pending, " + buckets.failed + " failed, " + buckets.unknown + " unknown." : "";
+  return textResult(formatHindsightFacts(hindsight.target, projectId, facts) + pendingNote + (receiptSummary ? `
+` + receiptSummary : ""), {
     remote: {
       state: "ok",
       target: describeHindsightTarget(hindsight.target),
@@ -16966,7 +17573,8 @@ Not yet searchable remotely: ` + pending.map((receipt) => receipt.documentId + "
         id: fact.id,
         documentId: fact.documentId,
         type: fact.type,
-        mentionedAt: fact.mentionedAt
+        mentionedAt: fact.mentionedAt,
+        preview: fact.text.replace(/\s+/g, " ").slice(0, 160)
       })),
       redactions: scrubber.count(),
       receipts: refreshed.map((receipt) => ({
@@ -17085,13 +17693,20 @@ Destination:
     ref: "hindsight:" + memoryId + "@" + digest,
     remote: "receipt" in outcome && outcome.receipt ? {
       state: outcome.state,
+      title,
       documentId: outcome.receipt.documentId,
       operationId: outcome.receipt.operationId,
       target: describeHindsightTarget(hindsight.target),
       ..."reason" in outcome ? { reason: outcome.reason } : {}
     } : outcome
   };
-  return textResult(describeRemoteSave(outcome), details);
+  let text = describeRemoteSave(outcome);
+  if ("receipt" in outcome && outcome.receipt && (outcome.state === "completed" || outcome.state === "accepted")) {
+    text += `
+Title: ` + title + `
+Ref: hindsight:` + memoryId + "@" + digest + (outcome.state === "accepted" ? " (accepted, NOT yet searchable; resolves only after the server completes indexing)" : "");
+  }
+  return textResult(text, details);
 }
 async function resolveMemoryByRef(params, signal, ctx, config, projectId) {
   const ref = params.ref ? parseMemoryRef(params.ref) : null;
@@ -17210,6 +17825,9 @@ function resolveModels(ctx, primary, config, explicit = false) {
   return { segModel, sumModel, verifyModel };
 }
 
+// src/app/register-smart-compact-tool.ts
+import { Text as Text5 } from "@earendil-works/pi-tui";
+
 // src/ui/dashboard-format.ts
 function dashboardPageSize(rows = process.stdout.rows) {
   if (!rows)
@@ -17555,16 +18173,16 @@ function statusClass(status) {
     return "warn";
   return "good";
 }
-function statusLabel(status) {
+function statusLabel2(status) {
   return status ?? "success";
 }
 function badge(status) {
-  const label = statusLabel(status);
+  const label = statusLabel2(status);
   return `<span class="badge ${statusClass(label)}">${escapeHtml(label)}</span>`;
 }
 function summarizeDashboard(entries) {
   const durations = entries.map(metricDuration).filter(Boolean);
-  const success = entries.filter((e) => statusLabel(e.status) === "success").length;
+  const success = entries.filter((e) => statusLabel2(e.status) === "success").length;
   const timeout = entries.filter((e) => e.status === "timeout").length;
   const error = entries.filter((e) => e.status === "error" && e.failureKind !== "cancelled").length;
   const dryRun = entries.filter((e) => e.status === "dry-run").length;
@@ -18075,7 +18693,7 @@ function registerSmartCompactTool(pi, dependencies) {
   pi.registerTool({
     name: "smart_compact",
     label: "Smart Compact",
-    description: "Prepares and stages a verified summary for the next /compact (expires in 5 min; never applies mid-turn). Call only when actual context usage is high; tool=XX% is tool-output share, not fullness.",
+    description: "Prepares and stages a verified summary for the next /compact (configured staging TTL; never applies mid-turn). Call only when actual context usage is high; tool=XX% is tool-output share, not fullness.",
     parameters: {
       type: "object",
       properties: {
@@ -18121,6 +18739,19 @@ function registerSmartCompactTool(pi, dependencies) {
         }
       }
     },
+    renderCall(args, theme) {
+      const label = theme.fg("toolTitle", "smart_compact ");
+      const flags = [
+        safeArg(args.mode, 20),
+        args.dry_run === true ? "dry-run" : "",
+        args.report === true ? "report" : "",
+        args.dashboard === true ? "dashboard" : ""
+      ].filter(Boolean).join(" ");
+      return new Text5(label + theme.fg("muted", flags || "auto"), 0, 0);
+    },
+    renderResult(result, { expanded }, theme, context) {
+      return tryRow(theme, () => renderCompactRow(result, expanded, theme, context), result, expanded);
+    },
     async execute(_id, params, signal, _onUpdate, ctx) {
       if (!policy.isAgentToolEnabled()) {
         return textResult2("smart_compact is hidden from the agent for this session. The user can still run /smart-compact manually.");
@@ -18144,13 +18775,13 @@ function registerSmartCompactTool(pi, dependencies) {
         const dashboard = action === "dashboard" ? writeMetricsDashboard() : null;
         return textResult2(report + (dashboard ? `
 
-Dashboard: ` + dashboard : ""));
+Dashboard: ` + dashboard : ""), { display: { kind: "metrics", dashboard: dashboard !== null } });
       }
       const config = loadConfig();
       const resolvedMode = mode ?? config.mode;
       const sessionId = resolveSessionId(ctx);
       if (!dryRun && pendingRef.peek(sessionId)) {
-        return textResult2("A smart summary is already staged; context is unchanged. Run /compact before the 5-minute staging TTL expires to apply it. No LLM calls were made.");
+        return textResult2("A smart summary is already staged; context is unchanged. Run /compact before the configured staging TTL expires to apply it. No LLM calls were made.");
       }
       const usage = ctx.getContextUsage?.();
       const totalTokens = usage?.tokens ?? 0;
@@ -18194,10 +18825,19 @@ Dashboard: ` + dashboard : ""));
             content: [
               {
                 type: "text",
-                text: (staged.details.method === "native" ? "Native compaction prepared (" + staged.details.model + "; provider state, not EESV-verified). Tokens: " : "Smart summary prepared (" + resolvedMode + " \u2192 " + (staged.details.mode ?? staged.details.profile) + "). Tokens: ") + (staged.tokensBefore ?? 0).toLocaleString() + " \u2014 staged, not applied, for " + Math.round(FIVE_MINUTES_MS / 60000) + " min. Context is unchanged. Run /compact within that time to apply it; expiry discards the candidate."
+                text: (staged.details.method === "native" ? "Native compaction prepared (" + staged.details.model + "; provider state, not EESV-verified). Tokens: " : "Smart summary prepared (" + resolvedMode + " \u2192 " + (staged.details.mode ?? staged.details.profile) + "). Tokens: ") + (staged.tokensBefore ?? 0).toLocaleString() + " \u2014 staged, not applied, for " + config.pendingTtlMs / 60000 + " min. Context is unchanged. Run /compact within that time to apply it; expiry discards the candidate."
               }
             ],
-            details: staged.details
+            details: {
+              ...staged.details,
+              display: {
+                state: "staged",
+                method: staged.details.method,
+                mode: staged.details.mode ?? staged.details.profile ?? resolvedMode,
+                tokens: staged.tokensBefore ?? 0,
+                ttlMinutes: config.pendingTtlMs / 60000
+              }
+            }
           };
         }
         if (outcome.kind === "dry-run") {
@@ -18209,13 +18849,16 @@ Dashboard: ` + dashboard : ""));
                 text: "Dry run finished (" + resolvedMode + ", " + seconds + "s). Pipeline ran successfully; no summary was staged."
               }
             ],
-            details: outcome.details
+            details: {
+              ...outcome.details,
+              display: { state: "dry-run", mode: resolvedMode, seconds: Number(seconds) }
+            }
           };
         }
         if (outcome.kind === "cancelled") {
-          return textResult2("Smart compact cancelled by " + outcome.source + "; no summary was staged.");
+          return textResult2("Smart compact cancelled by " + outcome.source + "; no summary was staged.", { display: { state: "cancelled", source: outcome.source } });
         }
-        return textResult2("Smart compact skipped: " + outcome.reason.replace(/-/g, " ") + ". No summary was staged.");
+        return textResult2("Smart compact skipped: " + outcome.reason.replace(/-/g, " ") + ". No summary was staged.", { display: { state: "skipped" } });
       } catch (error) {
         recordIssue({ key: "tool.smart-compact", message: "smart_compact failed: " + errorDetail(error) + ".", error });
         throw new Error(formatCompactErrorForUi(error));
@@ -18223,13 +18866,42 @@ Dashboard: ` + dashboard : ""));
     }
   });
 }
-function textResult2(text) {
-  return { content: [{ type: "text", text }], details: undefined };
+function textResult2(text, details = undefined) {
+  return { content: [{ type: "text", text }], details };
+}
+function renderCompactRow(result, expanded, theme, context) {
+  if (context.isError) {
+    const head = theme.fg("error", "smart_compact failed:");
+    return expanded ? expandedRow(theme, result, [head]) : new Text5(head + " " + summarizeLine(firstTextContent(result.content), 140), 0, 0);
+  }
+  const display = result.details?.display;
+  if (!display)
+    return rawFallbackRow(theme, result, expanded);
+  const lines = [];
+  if (display.state === "staged") {
+    lines.push(statusLabel(theme, "pending") + " " + theme.fg("muted", "staged \u2014 NOT applied; run /compact within " + (Number(display.ttlMinutes) || 0) + " min"));
+    lines.push(metaLine(theme, "summary", (display.method === "native" ? "native" : String(display.mode ?? "")) + " \xB7 " + (Number(display.tokens) || 0).toLocaleString() + " tokens"));
+  } else if (display.state === "dry-run") {
+    lines.push(statusLabel(theme, "info") + " " + theme.fg("muted", "dry run \u2014 nothing staged"));
+    if (display.seconds)
+      lines.push(metaLine(theme, "pipeline", display.seconds + "s"));
+  } else if (display.state === "cancelled") {
+    lines.push(statusLabel(theme, "cancelled") + " " + theme.fg("muted", "by " + String(display.source ?? "host")));
+  } else if (display.state === "skipped") {
+    lines.push(statusLabel(theme, "skipped") + " " + theme.fg("dim", summarizeLine(firstTextContent(result.content), 140)));
+  } else if (display.kind === "metrics") {
+    lines.push(statusLabel(theme, "info") + " " + theme.fg("muted", "metrics report" + (display.dashboard ? " (dashboard written)" : "")));
+  } else {
+    return rawFallbackRow(theme, result, expanded);
+  }
+  return expanded ? expandedRow(theme, result, lines) : new Text5(lines.join(`
+`), 0, 0);
 }
 
 // src/app/register-smart-context-tool.ts
 import { randomUUID as randomUUID4 } from "crypto";
 import { StringEnum as StringEnum2 } from "@earendil-works/pi-ai";
+import { Text as Text6 } from "@earendil-works/pi-tui";
 import { Type as Type4 } from "typebox";
 
 // src/app/context-evidence.ts
@@ -18477,11 +19149,11 @@ function registerSmartContextTool(pi, options = {}) {
     const current = config();
     return new SecretScrubber(current.scrubSecrets, current.scrubPii).scrubText(text).value;
   };
-  const reply = (text) => ({ content: [{ type: "text", text }], details: undefined });
+  const reply = (text, details = undefined) => ({ content: [{ type: "text", text }], details });
   pi.registerTool({
     name: TOOL_NAME,
     label: "Session Context",
-    description: "Context hygiene: status/search/read archived output (scope=lineage adds parent sessions); plan/trim old output; checkpoint, then rewind(report) drops research. Applies after the batch; no file/process rollback.",
+    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.",
     parameters: Type4.Object({
       action: StringEnum2(["status", "plan", "checkpoint", "rewind", "trim", "read", "search"]),
       label: Type4.Optional(Type4.String({ maxLength: 120, description: "Checkpoint label." })),
@@ -18505,15 +19177,28 @@ function registerSmartContextTool(pi, options = {}) {
       const branch = ctx.sessionManager.getBranch();
       const state = inspectContext(branch, sessionId);
       if (params.action === "plan") {
-        const plan = planContextTrim(branch, state.checkpoint?.originId);
-        return reply(JSON.stringify({
+        const plan = planContextTrim(branch, state.checkpoint?.originId, { readerApi: ctx.model?.api });
+        const payload = {
+          pressure: contextPressure(ctx, config()),
+          blockedReason: plan.blockedReason,
           outputs: plan.references.length,
           superseded: plan.superseded,
           savedChars: plan.savedChars,
           batch: plan.automatic,
           cooldownTurns: plan.cooldownTurns,
-          note: "No changes applied. Automatic hygiene also requires enablement and an uncontested boundary; it commits under pressure, at price break-even, or once the prompt cache is cold. Estimates are not billed-token savings."
-        }));
+          note: "No changes applied. Automatic cleanup requires enablement, a safe batch and an uncontested boundary. Pressure-only is the default; cache economics is opt-in. Estimates are not billed-token savings."
+        };
+        return reply(JSON.stringify(payload), {
+          display: {
+            kind: "plan",
+            pressurePercent: payload.pressure?.percent == null ? null : Math.round(payload.pressure.percent),
+            outputs: payload.outputs,
+            superseded: payload.superseded,
+            savedChars: payload.savedChars,
+            batchReady: payload.batch === "ready",
+            batchReason: payload.blockedReason ?? payload.batch ?? null
+          }
+        });
       }
       const offset = params.offset ?? 0;
       if (params.action === "status" || params.action === "read" || params.action === "search") {
@@ -18530,7 +19215,20 @@ function registerSmartContextTool(pi, options = {}) {
         const evidence = contextEvidence(branch, sessionId, new SecretScrubber(settings.scrubSecrets, settings.scrubPii), lineage);
         if (params.action === "status") {
           const sources = evidence.list.slice(offset, offset + limit);
-          return reply(scrub(JSON.stringify({
+          const plan = planContextTrim(branch, state.checkpoint?.originId, { readerApi: ctx.model?.api });
+          const pressure = contextPressure(ctx, settings);
+          const cleanup = {
+            enabled: settings.contextHygieneEnabled || settings.autoTrigger && settings.autoTriggerStrategy === "background",
+            pressureOnly: settings.contextPressureOnly,
+            maintenanceAvailable: options.canAutoTrim?.(ctx) !== false,
+            batch: plan.automatic,
+            savedChars: plan.savedChars,
+            blockedReason: plan.blockedReason,
+            agentAllowed: options.canAgentMutate?.(ctx) !== false
+          };
+          const payload = {
+            pressure,
+            cleanup,
             checkpoint: state.checkpoint ? { id: state.checkpoint.id, label: state.checkpoint.label } : null,
             rewind: Boolean(state.checkpoint),
             reason: state.invalidReason,
@@ -18546,7 +19244,21 @@ function registerSmartContextTool(pi, options = {}) {
               sources: evidence.list.filter((source) => source.session === parent.sessionId).length
             })) } : {},
             nextOffset: offset + limit < evidence.list.length ? offset + limit : null
-          })));
+          };
+          return reply(scrub(JSON.stringify(payload)), {
+            display: {
+              kind: "status",
+              pressurePercent: pressure.percent == null ? null : Math.round(pressure.percent),
+              cleanupEnabled: cleanup.enabled,
+              cleanupBatchReady: plan.automatic === "ready",
+              cleanupBatchReason: plan.automatic === "ready" ? null : plan.automatic,
+              cleanupBlockedReason: cleanup.blockedReason ?? null,
+              checkpoint: payload.checkpoint?.label ?? null,
+              pending: payload.pending ?? null,
+              archivedOutputs: payload.archivedOutputs,
+              nextOffset: payload.nextOffset
+            }
+          });
         }
         if (params.action === "search") {
           if (!params.query)
@@ -18567,6 +19279,12 @@ ${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) {
+        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) {
+        throw new Error("Prepared/running compaction or unavailable recovery tools take priority; history left unchanged.");
+      }
       if (options.isPaused?.(ctx))
         throw new Error("Context changes are paused while a navigation pivot is pending.");
       if (queued)
@@ -18593,7 +19311,21 @@ ${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."}`);
+      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."}`, {
+        display: { state: "queued", action: params.action, label: text.slice(0, 120) }
+      });
+    },
+    renderCall(args, theme) {
+      const label = theme.fg("toolTitle", "smart_context ");
+      const action = safeArg(args.action, 20);
+      const id = safeArg(args.id, 80);
+      const query = safeArg(args.query, 80);
+      const labelArg = safeArg(args.label, 80);
+      const detail = id ? " " + theme.fg("dim", id) : query ? " " + theme.fg("dim", query) : labelArg ? " " + theme.fg("muted", labelArg) : "";
+      return new Text6(label + theme.fg("accent", action) + detail, 0, 0);
+    },
+    renderResult(result, { expanded }, theme, context) {
+      return tryRow(theme, () => renderSmartContextRow(result, expanded, theme, context), result, expanded);
     }
   });
   const clear = () => {
@@ -18640,7 +19372,8 @@ ${page.text}`);
     if (!current) {
       if (mark?.sessionId !== sessionId)
         return;
-      if (!unchangedSince(branch, mark.leafId)) {
+      const settings = config();
+      if (!settings.contextHygieneEnabled || settings.contextPressureOnly || options.canAutoTrim?.(ctx) === false || !unchangedSince(branch, mark.leafId) || lastAnchorBoundary(branch) !== lastAnchorBoundary(branch.slice(0, branch.findIndex((entry) => entry.id === mark.leafId) + 1)) || thinkingEditReason(branch, mark.entries, ctx.model?.api)) {
         mark = null;
         return;
       }
@@ -18665,7 +19398,7 @@ ${page.text}`);
     return changed ? { messages } : undefined;
   };
   const vetoWarming = (event, ctx, sessionId) => {
-    if (mark?.sessionId !== sessionId || !unchangedSince(ctx.sessionManager.getBranch(), mark.leafId))
+    if (config().contextPressureOnly || mark?.sessionId !== sessionId || !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;
@@ -18683,15 +19416,25 @@ ${page.text}`);
     if (event.outcome !== "completed" || request?.signal?.aborted) {
       return request ? cancelled(event, "The turn did not complete.") : undefined;
     }
-    if (request && !request.manual && (config().toolLoading === "off" || !active()))
+    const requestTool = request?.anchorBoundary !== undefined ? "smart_navigation" : TOOL_NAME;
+    if (request && !request.manual && (config().toolLoading === "off" || !pi.getActiveTools().includes(requestTool)))
       return cancelled(event, "Agent tool access was revoked.");
+    if (request?.anchorBoundary !== undefined && !config().contextNavigationEnabled)
+      return cancelled(event, "Navigation was disabled.");
     if (options.isPaused?.(ctx)) {
       return request ? cancelled(event, "A pending navigation pivot takes priority.") : undefined;
     }
     if (request && !request.manual && options.canAgentMutate?.(ctx) === false) {
       return cancelled(event, "Agent-requested context changes are disabled by policy.");
     }
-    let pressure = false;
+    if (request && !request.manual && request.action !== "checkpoint" && options.canAutoTrim?.(ctx) === false) {
+      return cancelled(event, "Prepared/running compaction or unavailable recovery tools take priority.");
+    }
+    const settings = config();
+    const pressure = contextPressure(ctx, settings).cleanup;
+    if (request && !request.manual && request.action !== "checkpoint" && settings.contextPressureOnly && !pressure) {
+      return cancelled(event, "Context pressure cleared; history left unchanged.");
+    }
     if (!request) {
       const configNow = config();
       const hygiene = configNow.contextHygieneEnabled;
@@ -18700,11 +19443,11 @@ ${page.text}`);
       const enabled = hygiene || configNow.autoTrigger && configNow.autoTriggerStrategy === "background";
       if (!enabled || options.canAutoTrim?.(ctx) === false)
         return;
-      const usage = ctx.getContextUsage()?.tokens;
-      const window = effectiveContextWindow(ctx.model, configNow);
-      pressure = typeof usage === "number" && Number.isFinite(usage) && typeof window === "number" && Number.isFinite(window) && window > 0 && usage >= preparationWindow(configNow, window).startTokens;
-      if (!hygiene && !pressure)
-        return;
+      if ((configNow.contextPressureOnly || !hygiene) && !pressure) {
+        mark = null;
+        if (!applied)
+          return;
+      }
     }
     const branch = ctx.sessionManager.getBranch();
     const sessionId = resolveSessionId(ctx);
@@ -18735,13 +19478,15 @@ ${page.text}`);
           }
         })];
       } else if (request?.action === "rewind") {
-        entries = planContextRewind(branch, sessionId, request.checkpointId, request.text).entries;
+        entries = planContextRewind(branch, sessionId, request.checkpointId, request.text, ctx.model?.api).entries;
       } else if (!request && applied?.sessionId === sessionId && unchangedSince(branch, applied.leafId)) {
         mark = null;
         entries = applied.entries;
         applied = null;
       } else {
-        const plan = planContextTrim(branch, state.checkpoint?.originId);
+        const plan = planContextTrim(branch, state.checkpoint?.originId, { anchorBoundary: request?.anchorBoundary, readerApi: ctx.model?.api });
+        if (plan.blockedReason)
+          return request ? cancelled(event, plan.blockedReason) : undefined;
         if (request) {
           entries = trimEntries(plan, request.manual ? "manual" : "agent");
         } else {
@@ -18782,41 +19527,54 @@ ${page.text}`);
     }
     return { entries: [...event.entries, ...entries] };
   });
-  const controller = {
-    requestManualTrim(ctx) {
-      const sessionId = resolveSessionId(ctx);
-      if (isUnresolvedSessionId(sessionId)) {
-        return { state: "unavailable", notice: "Context control needs an identifiable session." };
-      }
-      if (options.isPaused?.(ctx)) {
-        return { state: "paused", notice: "A navigation pivot is pending; try again after it finishes." };
-      }
-      if (queued) {
-        return { state: "busy", notice: "Another context change is already queued; it applies at the next turn boundary." };
-      }
-      const branch = ctx.sessionManager.getBranch();
-      const plan = planContextTrim(branch, inspectContext(branch, sessionId).checkpoint?.originId);
-      if (!plan.entries.length) {
-        return { state: "no-eligible", notice: "No eligible archived output to trim." };
-      }
-      mark = null;
-      queued = {
-        action: "trim",
-        callId: "",
-        sessionId,
-        originId: branch.at(-1)?.id ?? "",
-        checkpointId: "",
-        text: "",
-        manual: true
-      };
-      return {
-        state: "queued",
-        notice: "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."
-      };
-    },
+  const requestTrim = (ctx, anchor) => {
+    const sessionId = resolveSessionId(ctx);
+    if (isUnresolvedSessionId(sessionId)) {
+      return { state: "unavailable", notice: "Context control needs an identifiable session." };
+    }
+    if (options.isPaused?.(ctx)) {
+      return { state: "paused", notice: "A navigation pivot is pending; try again after it finishes." };
+    }
+    if (queued) {
+      return { state: "busy", notice: "Another context change is already queued; it applies at the next turn boundary." };
+    }
+    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)) {
+      return { state: "unavailable", notice: "Cleanup not requested: no context pressure or agent changes are disabled." };
+    }
+    const branch = ctx.sessionManager.getBranch();
+    const origin = anchor ? branch.findIndex((entry) => entry.id === anchor.originId) : -1;
+    if (anchor && origin < 0)
+      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") {
+      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;
+    queued = {
+      action: "trim",
+      callId: anchor?.callId ?? "",
+      sessionId,
+      originId: anchor?.originId ?? branch.at(-1)?.id ?? "",
+      checkpointId: "",
+      text: "",
+      manual: !anchor?.callId,
+      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."
+    };
+  };
+  return {
+    requestManualTrim: (ctx) => requestTrim(ctx),
+    requestAnchorTrim: (ctx, originId, callId, signal) => requestTrim(ctx, { originId, callId, signal }),
     deferredTrim: deferred
   };
-  return controller;
 }
 function cancelled(event, reason) {
   return {
@@ -18828,6 +19586,48 @@ function cancelled(event, reason) {
     }]
   };
 }
+function renderSmartContextRow(result, expanded, theme, context) {
+  if (context.isError) {
+    const head = theme.fg("error", "smart_context failed:");
+    return expanded ? expandedRow(theme, result, [head]) : new Text6(head + " " + summarizeLine(firstTextContent(result.content), 140), 0, 0);
+  }
+  const display = result.details?.display;
+  if (!display)
+    return rawFallbackRow(theme, result, expanded);
+  const lines = [];
+  if (display.state === "queued") {
+    lines.push(statusLabel(theme, "queued") + " " + theme.fg("muted", String(display.action ?? "change") + " queued \u2014 applies at the turn boundary, not yet applied"));
+    if (typeof display.label === "string" && display.label) {
+      lines.push(theme.fg("dim", summarizeLine(display.label, 120)));
+    }
+    return new Text6(lines.join(`
+`), 0, 0);
+  }
+  if (display.kind === "status") {
+    const percent = display.pressurePercent;
+    lines.push(theme.fg("muted", "context " + (percent == null ? "unknown" : percent + "%")) + " " + statusLabel(theme, display.cleanupBatchReady ? "pending" : "info") + " " + theme.fg("dim", display.cleanupBatchReady ? "cleanup batch ready" : display.cleanupBatchReason ? "cleanup: " + String(display.cleanupBatchReason) : "no cleanup batch"));
+    lines.push(metaLine(theme, "archived outputs", String(display.archivedOutputs ?? 0)));
+    if (display.checkpoint)
+      lines.push(metaLine(theme, "checkpoint", String(display.checkpoint)));
+    if (display.pending)
+      lines.push(metaLine(theme, "pending", String(display.pending)));
+    if (display.cleanupBlockedReason)
+      lines.push(theme.fg("dim", summarizeLine(String(display.cleanupBlockedReason), 120)));
+    return expanded ? expandedRow(theme, result, lines) : new Text6(lines.join(`
+`), 0, 0);
+  }
+  if (display.kind === "plan") {
+    const percent = display.pressurePercent;
+    lines.push(theme.fg("muted", "context " + (percent == null ? "unknown" : percent + "%")) + " " + theme.fg("dim", "trim plan: " + (Number(display.outputs) || 0) + " output(s) \u2248" + (Number(display.savedChars) || 0).toLocaleString() + " chars"));
+    if (display.batchReady)
+      lines.push(metaLine(theme, "batch", "ready"));
+    else if (display.batchReason)
+      lines.push(metaLine(theme, "batch", String(display.batchReason)));
+    return expanded ? expandedRow(theme, result, lines) : new Text6(lines.join(`
+`), 0, 0);
+  }
+  return rawFallbackRow(theme, result, expanded);
+}
 
 // src/app/model-feasibility.ts
 async function createModelFeasibilityResolver(ctx, config, requestedMode = config.mode, steering = {}) {
@@ -19241,7 +20041,7 @@ import {
   getKeybindings as getKeybindings2,
   Key as Key4,
   matchesKey as matchesKey4,
-  Text as Text5,
+  Text as Text9,
   wrapTextWithAnsi as wrapTextWithAnsi3
 } from "@earendil-works/pi-tui";
 
@@ -19250,7 +20050,7 @@ import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import {
   getKeybindings,
   SettingsList,
-  truncateToWidth as truncateToWidth3,
+  truncateToWidth as truncateToWidth4,
   visibleWidth as visibleWidth2,
   wrapTextWithAnsi as wrapTextWithAnsi2
 } from "@earendil-works/pi-tui";
@@ -19296,8 +20096,8 @@ class SmartSettingsList extends SettingsList {
       internals.items.forEach((item, index) => {
         const original = saved[index];
         const shown = (this.inactive.has(item.id) ? INACTIVE_PREFIX : "") + original.currentValue;
-        item.label = truncateToWidth3(original.label, labelWidth, "\u2026");
-        item.currentValue = truncateToWidth3(shown, valueWidth, "\u2026");
+        item.label = truncateToWidth4(original.label, labelWidth, "\u2026");
+        item.currentValue = truncateToWidth4(shown, valueWidth, "\u2026");
         if (index === internals.selectedIndex) {
           item.description = [
             item.label !== original.label ? original.label : "",
@@ -19338,7 +20138,7 @@ class SmartSettingsList extends SettingsList {
 // src/ui/settings-overlay.ts
 import {
   Container as Container4,
-  Text as Text4
+  Text as Text8
 } from "@earendil-works/pi-tui";
 
 // src/ui/settings-complex.ts
@@ -19349,7 +20149,7 @@ import {
   Key as Key3,
   matchesKey as matchesKey3,
   SelectList as SelectList3,
-  Text as Text3
+  Text as Text7
 } from "@earendil-works/pi-tui";
 var MODEL_SETTINGS = [
   {
@@ -19397,7 +20197,7 @@ var MIN_CONTEXT_SETTING = {
 var MAX_CONTEXT_SETTING = {
   id: "maxContextTokens",
   label: "Context cap for start % (tokens)",
-  description: "Automatic compaction measures Start at context % against this many tokens instead of the full model window, when smaller. Model requests and safety headroom still use the real window. 0 = off.",
+  description: "Cleanup, agent tools and automatic compaction measure pressure against this cap when smaller than the model window. Model requests and safety headroom still use the real window. 0 = off.",
   placeholder: "0 or 16384\u20132000000; blank = off",
   parse: numberParser(CONFIG_NUMERIC_LIMITS.maxContextTokens),
   format: (value) => value === undefined || value === 0 ? "off" : String(value)
@@ -19405,8 +20205,8 @@ var MAX_CONTEXT_SETTING = {
 var parsePreparePercent = numberParser(CONFIG_NUMERIC_LIMITS.prepareContextPercent);
 var PREPARE_CONTEXT_SETTING = {
   id: "prepareContextPercent",
-  label: "Prepare at context %",
-  description: "Prepare in background only: starts the summary at this %; it is applied at Start at context %, so this must be lower. Auto starts 8k\u201332k tokens earlier.",
+  label: "Cleanup / prepare at context %",
+  description: "Early pressure gate for cleanup and optional background preparation. Compaction starts at Start at context %, so this must be lower. Auto starts 8k\u201332k tokens earlier.",
   placeholder: "0\u2013100 below Start at; auto or blank = Auto",
   parse: (input) => input.trim().toLowerCase() === "auto" ? undefined : parsePreparePercent(input),
   format: (value) => value === undefined || value === null ? "Auto" : String(value)
@@ -19615,7 +20415,7 @@ class InputSettingEditor extends Container3 {
   save;
   done;
   input = new Input;
-  status = new Text3("", 0, 0);
+  status = new Text7("", 0, 0);
   saving = false;
   pending = Promise.resolve();
   get focused() {
@@ -19629,10 +20429,10 @@ class InputSettingEditor extends Container3 {
     this.requestRender = requestRender;
     this.save = save;
     this.done = done;
-    this.addChild(new Text3(setting.label, 0, 0));
-    this.addChild(new Text3(setting.description, 0, 0));
-    this.addChild(new Text3(`Allowed: ${setting.placeholder}`, 0, 0));
-    this.addChild(new Text3("", 0, 0));
+    this.addChild(new Text7(setting.label, 0, 0));
+    this.addChild(new Text7(setting.description, 0, 0));
+    this.addChild(new Text7(`Allowed: ${setting.placeholder}`, 0, 0));
+    this.addChild(new Text7("", 0, 0));
     this.input.setValue(initial);
     this.input.handleInput("\x1B[F");
     this.input.onSubmit = (value) => {
@@ -19660,9 +20460,9 @@ class InputSettingEditor extends Container3 {
         this.done();
     };
     this.addChild(this.input);
-    this.addChild(new Text3("", 0, 0));
+    this.addChild(new Text7("", 0, 0));
     this.addChild(this.status);
-    this.addChild(new Text3("Enter save \xB7 Esc cancel", 0, 0));
+    this.addChild(new Text7("Enter save \xB7 Esc cancel", 0, 0));
   }
   handleInput(data) {
     this.input.handleInput(data);
@@ -19677,7 +20477,7 @@ class ModelSettingEditor extends Container3 {
   requestRender;
   search = new Input;
   list;
-  status = new Text3("", 0, 0);
+  status = new Text7("", 0, 0);
   saving = false;
   pending = Promise.resolve();
   get focused() {
@@ -19689,9 +20489,9 @@ class ModelSettingEditor extends Container3 {
   constructor(models, selectedValue, requestRender, save, done) {
     super();
     this.requestRender = requestRender;
-    this.addChild(new Text3("Type to search models", 0, 0));
+    this.addChild(new Text7("Type to search models", 0, 0));
     this.addChild(this.search);
-    this.addChild(new Text3("", 0, 0));
+    this.addChild(new Text7("", 0, 0));
     this.list = new SelectList3(models, 10, {
       selectedPrefix: (text) => text,
       selectedText: (text) => text,
@@ -19726,7 +20526,7 @@ class ModelSettingEditor extends Container3 {
     };
     this.addChild(this.list);
     this.addChild(this.status);
-    this.addChild(new Text3("Type to filter \xB7 Enter select \xB7 Esc cancel", 0, 0));
+    this.addChild(new Text7("Type to filter \xB7 Enter select \xB7 Esc cancel", 0, 0));
   }
   handleInput(data) {
     if (matchesKey3(data, Key3.up) || matchesKey3(data, Key3.down) || matchesKey3(data, Key3.enter) || matchesKey3(data, Key3.escape)) {
@@ -19965,7 +20765,6 @@ var THINKING_VALUES = [
   "max"
 ];
 var needsAutoTrigger = (config) => config.autoTrigger ? undefined : "turn on Automatic compaction first";
-var needsBackgroundTiming = (config) => config.autoTrigger && config.autoTriggerStrategy === "background" ? undefined : "used only when Start when = Prepare in background";
 var needsMnemopi = (config) => config.memoryBackend === "mnemopi" ? undefined : "used only when Memory store = Mnemopi";
 var needsHindsight = (config) => config.memoryBackend === "hindsight" ? undefined : "used only when Memory store = Hindsight server";
 var needsBackups = (config) => config.backupEnabled ? undefined : "turn on Backups first";
@@ -19996,9 +20795,9 @@ var CATEGORIES = [
           labels: { "native-hook": "Before Pi's compaction", settled: "When idle", background: "Prepare in background" }
         }
       },
-      { kind: "input", setting: MIN_CONTEXT_SETTING, inactive: needsAutoTrigger },
-      { kind: "input", setting: MAX_CONTEXT_SETTING, inactive: needsAutoTrigger },
-      { kind: "input", setting: PREPARE_CONTEXT_SETTING, inactive: needsBackgroundTiming },
+      { kind: "input", setting: MIN_CONTEXT_SETTING },
+      { kind: "input", setting: MAX_CONTEXT_SETTING },
+      { kind: "input", setting: PREPARE_CONTEXT_SETTING },
       {
         kind: "choice",
         setting: {
@@ -20113,7 +20912,7 @@ var CATEGORIES = [
         setting: {
           id: "toolLoading",
           label: "Agent tools",
-          description: "On demand: the agent sees a small loader and opens tools when needed. Always available: every permitted tool is active. Off: no context tools can run. Pi may retain previously loaded declarations in cached history. Permissions such as Agent can compact still apply.",
+          description: "Always available (default): permitted tools stay visible with a stable prompt prefix. On demand saves initial schema tokens but later loading can rebuild the cache. Off disables agent context tools, not human commands. Host permissions still apply.",
           values: ["lazy", "eager", "off"],
           labels: { lazy: "On demand", eager: "Always available", off: "Off" }
         }
@@ -20182,17 +20981,27 @@ var CATEGORIES = [
   {
     id: "hygiene",
     label: "Tool output cleanup",
-    description: "Keeps the context small between compactions; local, no model calls",
+    description: "Recoverable, batched cleanup; no model call, but history edits can rebuild the prompt cache",
     rows: [
       {
         kind: "choice",
         setting: {
           id: "contextHygieneEnabled",
           label: "Automatic cleanup",
-          description: "Moves old tool output to local archives when it pays off, when the prompt cache is cold, or when context gets tight; recent turns and instructions stay.",
+          description: "Archives safe old output in batches under context pressure; preserves recent turns, instructions and signed thinking dependencies. Cleanup and compaction use the same pressure window.",
           values: BOOLEAN_VALUES
         }
       },
+      {
+        kind: "choice",
+        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.",
+          values: BOOLEAN_VALUES,
+          labels: { true: "Pressure only", false: "Economic (opt-in)" }
+        }
+      },
       {
         kind: "choice",
         setting: {
@@ -20722,16 +21531,16 @@ async function showSmartCompactSettings(ctx, policy, coordinator = new GlobalSet
   await ctx.ui.custom((tui, theme, _keybindings, done) => {
     const root = createSettingsRoot(policy, ctx, done, () => tui.requestRender(), coordinator, onApplied, writeConfig);
     const container = new Container4;
-    container.addChild(new Text4(theme.fg("accent", theme.bold("Smart Compact Settings")), 0, 0));
-    container.addChild(new Text4(theme.fg("dim", "Changes are saved for all projects; This branch only changes just this branch."), 0, 0));
-    container.addChild(new Text4(theme.fg("dim", "/smart-compact always works. \u2022 = changed from default."), 0, 0));
+    container.addChild(new Text8(theme.fg("accent", theme.bold("Smart Compact Settings")), 0, 0));
+    container.addChild(new Text8(theme.fg("dim", "Changes are saved for all projects; This branch only changes just this branch."), 0, 0));
+    container.addChild(new Text8(theme.fg("dim", "/smart-compact always works. \u2022 = changed from default."), 0, 0));
     const invalid = invalidSettingsLine();
     if (invalid)
-      container.addChild(new Text4(theme.fg("warning", invalid), 0, 0));
-    container.addChild(new Text4("", 0, 0));
+      container.addChild(new Text8(theme.fg("warning", invalid), 0, 0));
+    container.addChild(new Text8("", 0, 0));
     container.addChild(root);
-    container.addChild(new Text4("", 0, 0));
-    container.addChild(new Text4(theme.fg("dim", "\u2191\u2193 move \xB7 Enter change/open \xB7 r reset \xB7 Esc back"), 0, 0));
+    container.addChild(new Text8("", 0, 0));
+    container.addChild(new Text8(theme.fg("dim", "\u2191\u2193 move \xB7 Enter change/open \xB7 r reset \xB7 Esc back"), 0, 0));
     return createSettingsController(root, container, () => tui.requestRender());
   });
 }
@@ -20757,7 +21566,7 @@ var BEHAVIOR_PROFILES = [
   {
     id: "cleanup",
     label: "Cleanup only",
-    summary: "Moves old tool output out of the context when it pays off, when the prompt cache is cold, or when context gets full. Local, no model calls; never compacts by itself.",
+    summary: "Archives safe old output using Cleanup timing (pressure-only by default). No model call, but history edits can rebuild the cache; never compacts by itself.",
     patch: { autoTrigger: false, contextHygieneEnabled: true, agentToolAccess: "disabled" }
   },
   {
@@ -20778,11 +21587,11 @@ var AGENT_WORDS = {
   disabled: "not allowed"
 };
 function deriveBehaviorProfile(config) {
-  if (config.autoTrigger === DEFAULT_CONFIG.autoTrigger && config.autoTriggerStrategy === DEFAULT_CONFIG.autoTriggerStrategy && config.contextHygieneEnabled === DEFAULT_CONFIG.contextHygieneEnabled && config.agentToolAccess === DEFAULT_CONFIG.agentToolAccess) {
+  if (config.autoTrigger === DEFAULT_CONFIG.autoTrigger && config.autoTriggerStrategy === DEFAULT_CONFIG.autoTriggerStrategy && config.contextHygieneEnabled === DEFAULT_CONFIG.contextHygieneEnabled && config.contextPressureOnly === DEFAULT_CONFIG.contextPressureOnly && config.agentToolAccess === DEFAULT_CONFIG.agentToolAccess) {
     return {
       id: "custom",
-      label: "With Pi (default)",
-      detail: "Replaces Pi's summary when Pi's own auto-compaction fires; agent access follows Pi."
+      label: "Pressure-first (default)",
+      detail: "Batched cleanup under early pressure, then idle compaction at the apply gate; agent access follows Pi."
     };
   }
   const found = derive(BEHAVIOR_PROFILES, ({ patch }) => Object.entries(patch).every(([key, value]) => config[key] === value), "Custom");
@@ -20987,7 +21796,7 @@ function createHomeList(options, finish, requestRender) {
     id: "trim",
     label: "Clean up tool output",
     currentValue: "no model call",
-    description: "Queue cleanup for the next completed turn. Older output stays retrievable; the next model request is still sent untrimmed."
+    description: "Queue cleanup for the next completed turn. Older output stays retrievable; the next model request is still sent untrimmed. No summarizer call, but a history rewrite can incur cache cost."
   };
   const setup = {
     id: "setup",
@@ -21228,7 +22037,7 @@ async function showSmartCompactHome(options) {
   return options.ctx.ui.custom((tui, theme, _keybindings, done) => {
     const list = createHomeList(options, done, () => tui.requestRender());
     const container = new Container5;
-    container.addChild(new Text5(theme.fg("accent", theme.bold("Smart Compact")), 0, 0));
+    container.addChild(new Text9(theme.fg("accent", theme.bold("Smart Compact")), 0, 0));
     container.addChild({
       render(width) {
         const config = loadConfig();
@@ -21244,15 +22053,15 @@ async function showSmartCompactHome(options) {
     });
     const invalid = invalidSettingsLine();
     if (invalid)
-      container.addChild(new Text5(theme.fg("warning", invalid), 0, 0));
-    container.addChild(new Text5("", 0, 0));
+      container.addChild(new Text9(theme.fg("warning", invalid), 0, 0));
+    container.addChild(new Text9("", 0, 0));
     container.addChild(list);
     return createSettingsController(list, container, () => tui.requestRender());
   });
 }
 
 // src/ui/metrics-dashboard-overlay.ts
-import { Key as Key5, matchesKey as matchesKey5, truncateToWidth as truncateToWidth4 } from "@earendil-works/pi-tui";
+import { Key as Key5, matchesKey as matchesKey5, truncateToWidth as truncateToWidth5 } from "@earendil-works/pi-tui";
 async function showMetricsDashboardUI(ctx, opts) {
   const entries = opts.entries;
   const latest = entries.at(-1);
@@ -21347,23 +22156,23 @@ async function showMetricsDashboardUI(ctx, opts) {
       return theme.fg(insights.quality.targetMet ? "success" : "warning", " \u2022 Quality " + insights.quality.healthScore + "/100");
     };
     const renderHeader = (width) => [
-      truncateToWidth4(theme.fg("accent", theme.bold("  \uD83D\uDCCA Smart Compact Dashboard")) + theme.fg("dim", "  " + entries.length + " recorded run(s)"), width),
-      truncateToWidth4(theme.fg("dim", "  session: " + (opts.currentSessionId ?? "unknown")) + theme.fg("dim", latest && Number.isFinite(latest.verificationScore) ? " \u2022 latest score " + metricScore(latest) : "") + theme.fg(insights.confidence.targetMet ? "success" : "warning", " \u2022 Data Confidence " + insights.confidence.score + "/100") + qualityStatus(), width),
-      truncateToWidth4(theme.fg("borderMuted", "\u2500".repeat(Math.max(0, width))), width)
+      truncateToWidth5(theme.fg("accent", theme.bold("  \uD83D\uDCCA Smart Compact Dashboard")) + theme.fg("dim", "  " + entries.length + " recorded run(s)"), width),
+      truncateToWidth5(theme.fg("dim", "  session: " + (opts.currentSessionId ?? "unknown")) + theme.fg("dim", latest && Number.isFinite(latest.verificationScore) ? " \u2022 latest score " + metricScore(latest) : "") + theme.fg(insights.confidence.targetMet ? "success" : "warning", " \u2022 Data Confidence " + insights.confidence.score + "/100") + qualityStatus(), width),
+      truncateToWidth5(theme.fg("borderMuted", "\u2500".repeat(Math.max(0, width))), width)
     ];
     return {
       render(width) {
         const lines = renderHeader(width);
         if (view === "menu") {
-          lines.push(truncateToWidth4(theme.fg("text", "  Choose what to inspect:"), width), "");
+          lines.push(truncateToWidth5(theme.fg("text", "  Choose what to inspect:"), width), "");
           for (let index = 0;index < menuItems.length; index++) {
             const item = menuItems[index];
             const active = index === selected;
             const label = active ? theme.fg("accent", theme.bold(item.label)) : theme.fg("text", item.label);
-            lines.push(truncateToWidth4((active ? "  \u203A " : "    ") + label, width));
-            lines.push(truncateToWidth4("      " + theme.fg(active ? "muted" : "dim", item.desc), width));
+            lines.push(truncateToWidth5((active ? "  \u203A " : "    ") + label, width));
+            lines.push(truncateToWidth5("      " + theme.fg(active ? "muted" : "dim", item.desc), width));
           }
-          lines.push("", truncateToWidth4(theme.fg("dim", "  \u2191\u2193 navigate \u2022 enter open \u2022 esc/q close"), width));
+          lines.push("", truncateToWidth5(theme.fg("dim", "  \u2191\u2193 navigate \u2022 enter open \u2022 esc/q close"), width));
           return lines;
         }
         const content = pageLines();
@@ -21376,12 +22185,12 @@ async function showMetricsDashboardUI(ctx, opts) {
             styled = theme.fg("accent", theme.bold(line));
           else if (line.startsWith("-"))
             styled = theme.fg("dim", line);
-          lines.push(truncateToWidth4("  " + styled, width));
+          lines.push(truncateToWidth5("  " + styled, width));
         }
         if (content.length > pageSize) {
-          lines.push(truncateToWidth4(theme.fg("dim", "  showing " + (scroll + 1) + "-" + Math.min(content.length, scroll + pageSize) + " of " + content.length), width));
+          lines.push(truncateToWidth5(theme.fg("dim", "  showing " + (scroll + 1) + "-" + Math.min(content.length, scroll + pageSize) + " of " + content.length), width));
         }
-        lines.push("", truncateToWidth4(theme.fg("dim", "  \u2191\u2193 scroll \u2022 pgup/pgdn page \u2022 home/end jump \u2022 b back \u2022 esc/q close"), width));
+        lines.push("", truncateToWidth5(theme.fg("dim", "  \u2191\u2193 scroll \u2022 pgup/pgdn page \u2022 home/end jump \u2022 b back \u2022 esc/q close"), width));
         return lines;
       },
       invalidate() {},
@@ -21443,7 +22252,7 @@ import {
 import {
   Container as Container6,
   Input as Input2,
-  Text as Text6,
+  Text as Text10,
   wrapTextWithAnsi as wrapTextWithAnsi4
 } from "@earendil-works/pi-tui";
 var PAGE_SIZE = 8;
@@ -21552,7 +22361,7 @@ class Framed {
 
 class Prompt extends Container6 {
   input;
-  status = new Text6("", 0, 0);
+  status = new Text10("", 0, 0);
   busy = false;
   get focused() {
     return this.input.focused;
@@ -21564,8 +22373,8 @@ class Prompt extends Container6 {
     super();
     this.input = new Input2;
     for (const line of lines)
-      this.addChild(new Text6(line, 0, 0));
-    this.addChild(new Text6("", 0, 0));
+      this.addChild(new Text10(line, 0, 0));
+    this.addChild(new Text10("", 0, 0));
     this.input.setValue(initial);
     this.input.handleInput("\x1B[F");
     this.input.onSubmit = (value) => {
@@ -21577,9 +22386,9 @@ class Prompt extends Container6 {
         cancel();
     };
     this.addChild(this.input);
-    this.addChild(new Text6("", 0, 0));
+    this.addChild(new Text10("", 0, 0));
     this.addChild(this.status);
-    this.addChild(new Text6(hint, 0, 0));
+    this.addChild(new Text10(hint, 0, 0));
   }
   setStatus(text, busy = false) {
     this.status.setText(text);
@@ -21594,7 +22403,7 @@ class TextArea {
   open;
   submit;
   editor;
-  status = new Text6("", 0, 0);
+  status = new Text10("", 0, 0);
   busy = false;
   active = false;
   constructor(open, submit) {
@@ -22336,11 +23145,13 @@ async function describeEffectiveState(ctx, config, policy, runtime) {
   lines.push("Agent tool: " + (policy.agentToolEnabled ? "exposed" : "not exposed") + " (policy " + policy.agentToolAccess + ")");
   if (ctx.model && !ctx.model.promptCache)
     lines.push("Reader prompt-cache lifetime: not declared; host cache warming cannot schedule from this metadata. No cache savings are assumed.");
-  const window = ctx.model?.contextWindow;
-  const gateWindow = effectiveContextWindow(ctx.model, config);
-  const tokens = ctx.getContextUsage()?.tokens;
-  if (typeof window === "number" && Number.isFinite(window) && window > 0 && typeof gateWindow === "number") {
-    const gates = preparationWindow(config, gateWindow);
+  const pressure = contextPressure(ctx, config);
+  const window = pressure.modelWindow;
+  const gateWindow = pressure.policyWindow;
+  const tokens = pressure.tokens;
+  if (typeof window === "number" && Number.isFinite(window) && window > 0 && gateWindow !== null) {
+    const gates = { startTokens: pressure.cleanupTokens, applyTokens: pressure.compactionTokens };
+    lines.push("Cleanup gate: \u2265" + gates.startTokens.toLocaleString("en-US") + " tokens; policy usage " + (pressure.percent === null ? "unknown" : pressure.percent.toFixed(1) + "%"));
     const apply = Math.ceil(Math.max(MIN_TOKEN_THRESHOLD, gates.applyTokens)).toLocaleString("en-US");
     const gate = " (" + config.minContextPercent + "% of " + (gateWindow < window ? "maxContextTokens " : "window ") + gateWindow.toLocaleString("en-US") + ", floor " + MIN_TOKEN_THRESHOLD.toLocaleString("en-US") + ")";
     lines.push("Context: " + (typeof tokens === "number" && Number.isFinite(tokens) ? Math.ceil(tokens).toLocaleString("en-US") : "unknown") + "/" + window.toLocaleString("en-US") + " tokens; " + (!policy.autoTrigger ? "automatic compaction off" : hostDriven ? "Pi decides when; PSC replaces Pi's threshold summary only \u2265" + apply + gate + ", overflow skips the % gate" : "PSC starts \u2265" + apply + gate));
@@ -22352,9 +23163,9 @@ async function describeEffectiveState(ctx, config, policy, runtime) {
   lines.push("Runtime: " + (runtime ? (runtime.running ? "running" : "idle") + "; preparation " + runtime.preparation : "not attached") + "; candidate reuse is revalidated at apply");
   if (runtime?.cacheLedger?.length)
     lines.push(...runtime.cacheLedger);
-  lines.push("Auto limits: " + Math.min(config.autoTriggerTimeoutMs, AUTO_TRIGGER_TIMEOUT_CAP_MS) / 1000 + " s timeout; " + SETTLED_TRIGGER_COOLDOWN_MS / 60000 + " min cooldown; " + FIVE_MINUTES_MS / 60000 + " min preparation TTL");
+  lines.push("Auto limits: " + Math.min(config.autoTriggerTimeoutMs, AUTO_TRIGGER_TIMEOUT_CAP_MS) / 1000 + " s timeout; " + SETTLED_TRIGGER_COOLDOWN_MS / 60000 + " min cooldown; " + config.pendingTtlMs / 60000 + " min preparation TTL");
   const backgroundHygiene = policy.autoTrigger && config.autoTriggerStrategy === "background";
-  lines.push("Context hygiene: " + (config.contextHygieneEnabled ? "on (explicit: commits under pressure, at cache break-even, or on a cold cache)" : backgroundHygiene ? "on (enabled by effective background strategy, pressure-gated)" : "off") + ((config.contextHygieneEnabled || backgroundHygiene) && config.toolLoading === "off" ? " \u2014 automatic trims inactive: agent tools are off, so archived output could not be read back" : ""));
+  lines.push("Context hygiene: " + (config.contextHygieneEnabled ? config.contextPressureOnly ? "on (pressure only; roomy cached history stays unchanged)" : "on (economic opt-in: pressure, cache break-even, or cold cache)" : backgroundHygiene ? "on (enabled by effective background strategy, pressure-gated)" : "off") + ((config.contextHygieneEnabled || backgroundHygiene) && config.toolLoading === "off" ? " \u2014 automatic trims inactive: agent tools are off, so archived output could not be read back" : ""));
   const memory = await describeMemoryBackendReadiness(config);
   lines.push("Memory selected: " + config.memoryBackend + (projectId ? " (project-bound)" : " \u2014 unavailable: no project scope"));
   lines.push("Memory readiness: " + memory.reason);
@@ -22596,7 +23407,8 @@ async function showStorage(ctx) {
 function compactNowState(ctx, dependencies) {
   const config = loadConfig();
   const tokens = ctx.getContextUsage()?.tokens;
-  const value = tokens == null ? "not measured yet" : Math.round(tokens / 1000) + "k tokens \xB7 " + Math.round(safeContextPercent(tokens, ctx.model?.contextWindow)) + "%";
+  const window = effectiveContextWindow(ctx.model, config);
+  const value = tokens == null ? "not measured yet" : Math.round(tokens / 1000) + "k tokens \xB7 " + Math.round(safeContextPercent(tokens, window)) + "%" + (window !== ctx.model?.contextWindow ? " of " + window?.toLocaleString("en-US") + " policy window" : "");
   const runtime = dependencies.getRuntimeState?.(ctx);
   if (runtime?.running)
     return { value, blocked: "Compaction is already running. Wait for it to finish." };
@@ -23008,6 +23820,7 @@ function createSmartCompactPolicy(pi, syncTools) {
 
 // src/app/lazy-tools.ts
 import { StringEnum as StringEnum3 } from "@earendil-works/pi-ai";
+import { Text as Text11 } from "@earendil-works/pi-tui";
 import { Type as Type5 } from "typebox";
 
 // src/app/context-guide.ts
@@ -23176,33 +23989,127 @@ function registerContextToolLoader(pi, exposure) {
       if (loadConfig().toolLoading === "off" || !pi.getActiveTools().includes(LOADER))
         throw new Error("Context tools are disabled in Pi settings or /tools.");
       let text;
+      let details = undefined;
       if (params.action === "guide")
         text = await readContextGuide();
-      else if (params.action === "status")
-        text = JSON.stringify(exposure.status());
-      else {
+      else if (params.action === "status") {
+        const status = exposure.status();
+        text = JSON.stringify(status);
+        details = { display: { kind: "tool-groups" }, status };
+      } else {
         if (!params.group)
           throw new Error(`${params.action} requires a group.`);
-        if (params.action === "load")
-          text = `Loaded: ${exposure.load(params.group).join(", ")}. Available on the next model turn; no feature instructions were injected.`;
-        else {
+        if (params.action === "load") {
+          const names = exposure.load(params.group);
+          text = `Loaded: ${names.join(", ")}. Available on the next model turn; no feature instructions were injected.`;
+          details = { display: { state: "loaded", group: params.group, tools: names } };
+        } else {
           if (loadConfig().toolLoading === "eager")
             throw new Error("Eager mode keeps tools loaded. Select On demand or Off in /smart-compact settings before unloading a group.");
           exposure.unload(params.group);
           text = `Unloaded ${params.group}. No files or session history changed.`;
+          details = { display: { state: "unloaded", group: params.group } };
         }
       }
-      return { content: [{ type: "text", text }], details: undefined };
+      return { content: [{ type: "text", text }], details };
+    },
+    renderCall(args, theme) {
+      const label = theme.fg("toolTitle", "smart_tools ");
+      const action = safeArg(args.action, 20);
+      const group = safeArg(args.group, 40);
+      return new Text11(label + theme.fg("accent", action) + (group ? " " + theme.fg("dim", group) : ""), 0, 0);
+    },
+    renderResult(result, options, theme, context) {
+      return tryRow(theme, () => renderToolsRow(result, theme, context, options.expanded), result, options.expanded);
     }
   });
 }
+function renderToolsRow(result, theme, context, expanded) {
+  if (context.isError) {
+    const head = theme.fg("error", "smart_tools failed:");
+    return expanded ? expandedRow(theme, result, [head]) : new Text11(head + " " + summarizeLine(firstTextContent(result.content), 140), 0, 0);
+  }
+  const details = result.details;
+  if (!details)
+    return rawFallbackRow(theme, result, expanded);
+  const lines = [];
+  if (details.display?.state === "loaded") {
+    lines.push(statusLabel(theme, "done") + " " + theme.fg("muted", "loaded " + String(details.display.group)));
+    if (details.display.tools?.length) {
+      lines.push(theme.fg("dim", details.display.tools.join(", ")));
+    }
+    return new Text11(lines.join(`
+`), 0, 0);
+  }
+  if (details.display?.state === "unloaded") {
+    lines.push(statusLabel(theme, "info") + " " + theme.fg("muted", "unloaded " + String(details.display.group)));
+    return new Text11(lines.join(`
+`), 0, 0);
+  }
+  if (details.display?.kind === "tool-groups" && details.status) {
+    lines.push(theme.fg("muted", "mode: ") + theme.fg("accent", String(details.status.mode ?? "")));
+    for (const group of details.status.groups ?? []) {
+      const marker = group.active.length ? theme.fg("success", "\u25CF") : group.available ? theme.fg("dim", "\u25CB") : theme.fg("error", "\u2715");
+      const state = group.active.length ? group.active.length + " active" : group.available ? "available" : "disabled";
+      lines.push(marker + " " + group.group + " " + theme.fg("dim", state));
+    }
+    return expanded ? expandedRow(theme, result, lines) : new Text11(lines.join(`
+`), 0, 0);
+  }
+  return rawFallbackRow(theme, result, expanded);
+}
 
 // src/app/register-navigation.ts
 import { randomUUID as randomUUID5 } from "crypto";
 import path26 from "path";
 import { StringEnum as StringEnum4 } from "@earendil-works/pi-ai";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
+import { Text as Text12 } from "@earendil-works/pi-tui";
 import { Type as Type6 } from "typebox";
+function renderNavigationRow(result, expanded, theme, context) {
+  if (context.isError) {
+    const head = theme.fg("error", "navigation failed:");
+    return expanded ? expandedRow(theme, result, [head]) : new Text12(head + " " + summarizeLine(firstTextContent(result.content), 140), 0, 0);
+  }
+  const details = result.details;
+  if (!details)
+    return rawFallbackRow(theme, result, expanded);
+  const display = details.display;
+  const lines = [];
+  if (display?.state === "queued" && display.action === "pivot") {
+    lines.push(statusLabel(theme, "queued") + " " + theme.fg("muted", "pivot queued \u2014 not applied; takes effect after the turn settles"));
+    if (display.target)
+      lines.push(metaLine(theme, "target", String(display.target)));
+    return new Text12(lines.join(`
+`), 0, 0);
+  }
+  if (details.anchor) {
+    const anchor = details.anchor;
+    lines.push(statusLabel(theme, "done") + " " + theme.fg("muted", "anchor recorded"));
+    lines.push(metaLine(theme, "name", anchor.name ?? ""));
+    if (anchor.targetId)
+      lines.push(metaLine(theme, "target", anchor.targetId));
+    return expanded ? expandedRow(theme, result, lines) : new Text12(lines.join(`
+`), 0, 0);
+  }
+  if (display?.kind === "anchors" || display?.kind === "anchor-recall") {
+    const count = Number(display.count) || 0;
+    lines.push(statusLabel(theme, count ? "done" : "skipped") + " " + theme.fg("muted", count + " anchor(s) " + (display.kind === "anchor-recall" ? "recalled" : "listed")));
+    if (expanded)
+      return expandedRow(theme, result, lines);
+    lines.push(expandHint(theme));
+    return new Text12(lines.join(`
+`), 0, 0);
+  }
+  if (display?.kind === "anchor-detail") {
+    lines.push(statusLabel(theme, "done") + " " + theme.fg("muted", "anchor detail"));
+    if (display.name)
+      lines.push(metaLine(theme, "name", String(display.name)));
+    return expanded ? expandedRow(theme, result, lines) : new Text12(lines.join(`
+`), 0, 0);
+  }
+  return rawFallbackRow(theme, result, expanded);
+}
 var STATUS = "smart-context-navigation";
 var APPLY_PREFIX = "context --apply=";
 function registerNavigation(pi, options = {}) {
@@ -23214,7 +24121,7 @@ function registerNavigation(pi, options = {}) {
     const settings = config();
     return new SecretScrubber(settings.scrubSecrets, settings.scrubPii).scrubText(text).value;
   };
-  const reply = (text) => ({ content: [{ type: "text", text: scrub(text) }], details: undefined });
+  const reply = (text, details = undefined) => ({ content: [{ type: "text", text: scrub(text) }], details });
   const enabled = () => {
     if (!config().contextNavigationEnabled)
       throw new Error("Context navigation is disabled in Pi Continuity settings.");
@@ -23237,10 +24144,10 @@ function registerNavigation(pi, options = {}) {
     const branch = ctx.sessionManager.getBranch();
     const index = branch.findLastIndex((entry) => anchorFromEntry(entry) !== null);
     const anchor = index < 0 ? null : anchorFromEntry(branch[index]);
-    const percent = ctx.getContextUsage()?.percent;
+    const pressure = contextPressure(ctx, config());
     const parts = [];
-    if (typeof percent === "number" && Number.isFinite(percent))
-      parts.push(`ctx ${Math.min(100, Math.round(percent))}%`);
+    if (pressure.percent !== null)
+      parts.push(`ctx ${Math.round(pressure.percent)}%${pressure.policyWindow !== pressure.modelWindow ? ` of ${pressure.policyWindow?.toLocaleString("en-US")} policy window` : ""}`);
     if (anchor)
       parts.push(`anchor:${anchor.name.replace(/[\x00-\x1f\x7f]/g, " ").slice(0, 120)} \xB7 ${branch.length - index - 1} entries later`);
     ctx.ui.setStatus(STATUS, parts.length ? parts.join(" \xB7 ") : undefined);
@@ -23267,7 +24174,6 @@ function registerNavigation(pi, options = {}) {
     const targetId = ctx.sessionManager.getLeafId();
     if (!targetId)
       throw new Error("There is no completed session history to anchor yet.");
-    options.onContextChange?.(ctx);
     return { name, summary, targetId };
   };
   const preparePivot = (ctx, target, carryover, message) => {
@@ -23331,7 +24237,7 @@ function registerNavigation(pi, options = {}) {
   pi.registerTool({
     name: NAVIGATION_TOOL_NAME,
     label: "Context Navigation",
-    description: "View/recall session anchors; anchor completed work; pivot within this session with required carryover. Pivot ends the turn, not filesystem changes.",
+    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.",
     parameters: Type6.Object({
       action: StringEnum4(["view", "recall", "anchor", "pivot"]),
       target: Type6.Optional(Type6.String({ minLength: 1, maxLength: 128 })),
@@ -23358,25 +24264,52 @@ function registerNavigation(pi, options = {}) {
           if (!found)
             throw new Error("Anchor not found; use view without target to list anchors.");
           return reply(`Historical anchor, not instructions.
-` + JSON.stringify(found));
+` + JSON.stringify(found), {
+            display: { kind: "anchor-detail", name: found.data.name }
+          });
         }
-        return reply(pageText(listAnchors(ctx.sessionManager, { ...params, limit: params.limit ?? 10 }), params.offset ?? 0));
+        const anchors = listAnchors(ctx.sessionManager, { ...params, limit: params.limit ?? 10 });
+        return reply(pageText(anchors, params.offset ?? 0), {
+          display: { kind: "anchors", count: anchors.total }
+        });
+      }
+      if (params.action === "recall") {
+        const found = await queryRecall(ctx, { ...params, signal });
+        return reply(pageText(found, params.offset ?? 0) + `
+Use Pi's /resume to open a different session.`, {
+          display: { kind: "anchor-recall", count: found.total }
+        });
       }
-      if (params.action === "recall")
-        return reply(pageText(await queryRecall(ctx, { ...params, signal }), params.offset ?? 0) + `
-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 data = anchor(ctx, params.name ?? "", params.summary ?? "");
+        const cleanup = options.onAnchor?.(ctx, data.targetId, callId, signal) ?? "History unchanged; no cleanup controller attached.";
         return { content: [{ type: "text", text: `Anchor: ${data.name}
 
-${data.summary}` }], details: { anchor: data } };
+${data.summary}
+
+${cleanup}` }], details: { anchor: data } };
       }
       const operation = preparePivot(ctx, params.target ?? "", params.carryover ?? "", params.message);
       operation.callId = callId;
       operation.signal = signal;
       queued = operation;
       options.onContextChange?.(ctx);
-      return { ...reply("Pivot queued. End this turn; the host will revalidate and navigate after the batch settles. No file/process rollback."), details: { queued: "pivot", targetId: operation.targetId }, terminate: true };
+      return { ...reply("Pivot queued. End this turn; the host will revalidate and navigate after the batch settles. No file/process rollback."), details: { queued: "pivot", targetId: operation.targetId, display: { state: "queued", action: "pivot", target: params.target ?? "" } }, terminate: true };
+    },
+    renderCall(args, theme) {
+      const label = theme.fg("toolTitle", "smart_navigation ");
+      const action = safeArg(args.action, 20);
+      const target = safeArg(args.target, 80);
+      const name = safeArg(args.name, 80);
+      const keyword = safeArg(args.keyword, 60);
+      const detail = target ? " " + theme.fg("dim", target) : name ? " " + theme.fg("muted", name) : keyword ? " " + theme.fg("dim", '"' + keyword + '"') : "";
+      return new Text12(label + theme.fg("accent", action) + detail, 0, 0);
+    },
+    renderResult(result, { expanded }, theme, context) {
+      return tryRow(theme, () => renderNavigationRow(result, expanded, theme, context), result, expanded);
     }
   });
   pi.on("turn_end", (event, ctx) => {
@@ -23484,7 +24417,8 @@ ${operation.carryover}` } };
 ${data.summary}`, display: true, details: { anchor: data } }, { triggerTurn: false });
           pi.setLabel(ctx.sessionManager.getLeafId(), data.name);
           footer(ctx);
-          return { ok: true, message: `Anchor ${data.name} saved; history was not compacted.` };
+          const cleanup = options.onAnchor?.(ctx, data.targetId) ?? "History unchanged; no cleanup controller attached.";
+          return { ok: true, message: `Anchor ${data.name} saved; history was not compacted. ${cleanup}` };
         },
         async pivot(target, carryover, message) {
           return applyPivot(preparePivot(ctx, target, carryover, message), ctx);
@@ -23780,8 +24714,7 @@ function unwrapConsumed(result, ctx) {
   }
 }
 function smartCompactExtension(pi) {
-  const PENDING_TTL_MS = FIVE_MINUTES_MS;
-  const pendingRef = createPendingSlot({ ttlMs: PENDING_TTL_MS });
+  const pendingRef = createPendingSlot({ ttlMs: () => loadConfig().pendingTtlMs });
   const isRunning = createSessionRunLock();
   let navigation;
   const pivotQueued = (ctx) => navigation?.isPending(ctx) ?? false;
@@ -23799,14 +24732,19 @@ function smartCompactExtension(pi) {
       showStatus: policy.branchOverrides().showStatus ?? config.showStatus
     };
   };
+  const activeToolDefinitions = () => {
+    const active = new Set(pi.getActiveTools());
+    return pi.getAllTools().filter((tool) => active.has(tool.name)).map((tool) => ({ name: tool.name, description: tool.description, parameters: tool.parameters }));
+  };
   const background = createBackgroundPreparation({
+    toolSignature: () => JSON.stringify(activeToolDefinitions()),
     async prepare(ctx, config, signal) {
       if (signal.aborted || isRunning.isSessionActive(resolveSessionId(ctx)))
         return null;
       const { sumModel, segModel, verifyModel } = resolveModels(ctx, undefined, config);
       if (!sumModel || !segModel || !verifyModel)
         return null;
-      const localPending = createPendingSlot({ ttlMs: FIVE_MINUTES_MS });
+      const localPending = createPendingSlot({ ttlMs: config.pendingTtlMs });
       const outcome = await runSmartCompact({
         ctx,
         config,
@@ -23846,10 +24784,7 @@ function smartCompactExtension(pi) {
     }
   };
   const nativeContinuity = createNativeContinuityBridge();
-  setNativeToolSource(() => {
-    const active = new Set(pi.getActiveTools());
-    return pi.getAllTools().filter((tool) => active.has(tool.name)).map((tool) => ({ name: tool.name, description: tool.description, parameters: tool.parameters }));
-  });
+  setNativeToolSource(activeToolDefinitions);
   registerAnchorCache(pi, { config: loadConfig });
   const nativeReplay = createNativeReplayHook();
   pi.on("before_provider_request", (event, ctx) => nativeReplay.handle(event.payload, ctx));
@@ -23873,7 +24808,7 @@ function smartCompactExtension(pi) {
     return write;
   };
   const commitCandidates = createCompactionCommitStore({
-    ttlMs: loadConfig().pendingTtlMs,
+    ttlMs: () => loadConfig().pendingTtlMs,
     onDiscard: (pending, reason) => {
       recordApplyFailure(pending, reason);
     }
@@ -23888,7 +24823,7 @@ function smartCompactExtension(pi) {
       const calls = displaced.reduce((sum, pending) => sum + (pending.metricsSnapshot?.totalCalls ?? 0), 0);
       reportIssue({
         key: "compact.foreign-displaced",
-        message: actor + " was applied instead of Continuity's prepared summary; that summary (" + calls + " model call" + (calls === 1 ? "" : "s") + ") was discarded and its continuity state was not saved. If another compaction extension is installed, keep only one."
+        message: actor + " was applied instead of Continuity's prepared summary; that summary (" + calls + " model call" + (calls === 1 ? "" : "s") + ") was discarded and its continuity state was not saved."
       }, ctx);
       await Promise.all(displaced.flatMap((pending) => applyFailureWrites.get(pending.runId) ?? []));
       return;
@@ -23896,7 +24831,7 @@ function smartCompactExtension(pi) {
     if (source === "extension") {
       reportIssue({
         key: "compact.foreign-extension",
-        message: actor + " was applied; Continuity did not summarize it and recorded no continuity state or metrics for it. If that is unintended, keep only one compaction extension."
+        message: actor + " was applied; Continuity did not summarize it and recorded no continuity state or metrics for it."
       }, ctx);
     } else if (automaticConfig().autoTrigger) {
       reportIssue({
@@ -23959,6 +24894,7 @@ 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,
     onContextChange: (ctx) => invalidatePreparation(ctx, "branch"),
     onContextEdit: (_ctx, kind) => hostCache.noteContextEdit(kind)
   });
@@ -24007,17 +24943,6 @@ function smartCompactExtension(pi) {
   pi.on("session_start", (_event, ctx) => {
     nativeReplay.refresh(ctx);
     flushIssues(ctx);
-    try {
-      const conflicts = detectExtensionConflicts({ commands: typeof pi.getCommands === "function" ? pi.getCommands() : [], tools: pi.getAllTools() });
-      if (conflicts.length > 0)
-        reportIssue({ key: "interop.conflicts", message: conflictNotice(conflicts) }, ctx);
-    } catch (error) {
-      reportIssue({
-        key: "interop.detect",
-        message: "Could not check loaded extensions for conflicts (" + errorDetail(error) + "). Other compaction extensions are not detected at startup. Please report this if it repeats.",
-        error
-      }, ctx);
-    }
     invalidatePreparation(ctx);
     hostCache.reset(resolveSessionId(ctx));
     toolExposure.atBoundary();
@@ -24283,10 +25208,10 @@ function smartCompactExtension(pi) {
     if (!hostCache.observe(event.message)?.warn)
       return;
     const { foreign } = hostCache.summary().rebuilds;
-    reportIssue({
+    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."
-    }, ctx);
+    });
   });
   pi.on("message_end", async (event, ctx) => {
     try {
@@ -24328,7 +25253,6 @@ function smartCompactExtension(pi) {
   });
   pi.on("session_compact", (_event, ctx) => {
     nativeReplay.refresh(ctx);
-    toolExposure.atBoundary();
     policy.restore(ctx);
     navigation.refresh(ctx);
   });