billion-context-pi 0.1.43 → 0.1.46

package/dist/index.js

@@ -4,204 +4,555 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// node_modules/acp-kernel/dist/index.js
+// node_modules/acp-kernel/dist/chunk-MWXUJVMN.js
 import { createRequire } from "module";
-var REF_WIDTH = 5;
-var MIN_INDEX = 1;
-var MAX_INDEX = 99999;
-var REF_PATTERN = /^m0*(\d{1,5})$/;
-var BLOCKED_REF = "BLOCKED";
-function indexToRef(index) {
-  if (!Number.isInteger(index) || index < MIN_INDEX || index > MAX_INDEX) {
-    throw new RangeError(
-      `ref index out of bounds: ${index} (allowed ${MIN_INDEX}-${MAX_INDEX})`
-    );
-  }
-  return `m${String(index).padStart(REF_WIDTH, "0")}`;
-}
-function refToIndex(ref) {
-  const match = REF_PATTERN.exec(ref.trim().toLowerCase());
-  if (!match) return null;
-  const index = Number(match[1]);
-  if (index < MIN_INDEX || index > MAX_INDEX) return null;
-  return index;
-}
-function refForRaw(map, rawId) {
-  return map.byRaw[rawId] ?? null;
-}
-function assignRefs(messages, options) {
-  const map = {
-    byRaw: { ...options.existing.byRaw },
-    byRef: { ...options.existing.byRef }
-  };
-  let cursor = Number.isInteger(options.nextIndex) && options.nextIndex >= MIN_INDEX ? options.nextIndex : MIN_INDEX;
-  let newlyAssigned = 0;
-  for (const message of messages) {
-    if (!message.id || options.shouldSkip?.(message)) continue;
-    if (map.byRaw[message.id]) continue;
-    if (options.isProtected?.(message)) {
-      map.byRaw[message.id] = BLOCKED_REF;
-      continue;
-    }
-    const ref = allocateFreeRef(map, cursor);
-    cursor = ref.index + 1;
-    map.byRaw[message.id] = ref.text;
-    map.byRef[ref.text] = message.id;
-    newlyAssigned++;
-  }
-  return { map, nextIndex: cursor, newlyAssigned };
+var require2 = createRequire(import.meta.url);
+function defaultCountTokens(text) {
+  if (!text) return 0;
+  const cjk = text.match(/[\u4e00-\u9fff\u3040-\u30ff\uac00-\ud7af]/g);
+  const cjkCount = cjk?.length ?? 0;
+  return cjkCount + Math.ceil((text.length - cjkCount) / 4);
 }
-function allocateFreeRef(map, start) {
-  let candidate = Math.max(start, MIN_INDEX);
-  while (candidate <= MAX_INDEX) {
-    const text = indexToRef(candidate);
-    if (!map.byRef[text]) {
-      return { text, index: candidate };
+var COMPRESS_PHILOSOPHY = `Compression Philosophy:
+- All compression serves the primary task, but be frugal.
+- Context capacity is precious. Save context by compressing consumed outputs, not by avoiding tools.
+- Compress by need, not by percentage.
+- Work from summaries, not raw tool outputs. All listed ranges (user prompts, tool outputs, code, logs, exploration, intermediate steps) should be compressed to summary format \u2014 the ONLY exceptions are protected content, content the current step is actively using, or critical content you cannot reconstruct.`;
+var HOW_TO_COMPRESS_RULES = `HOW TO COMPRESS
+
+When you call \`compress\`, the summary you write becomes the only record of the replaced conversation. Make it self-contained and complete: every user request, experiment purpose, and work task in the range must be accurately captured. A later reader (or you, after decompressing) should be able to continue the task WITHOUT needing the original.
+
+KEEP VERBATIM \u2014 never paraphrase or abbreviate these:
+- Full file paths with line numbers, directory prefix on every mention (\`lib/hooks.ts:347\`, \`src/index.ts:12-18\`, \`gatenet_v3/model.py:45\`). Never abbreviate to a bare filename (\`hooks.ts\`, \`model.py\`) \u2014 they are ambiguous and cannot be grepped or decompressed-to later.
+- Function, class, and type signatures (exact names, params, return types) AND critical code lines that encode logic \u2014 the line that IS the finding, not just the function name (e.g. \`kv_keys += define_gate * a_key[i](emb)\` is more useful than "see model_kvnet.py").
+- Error messages and stack traces (exact text \u2014 you need the literal string to grep for it later).
+- Key details from reports and analyses \u2014 not just the conclusion. Keep the comparison numbers and the mechanism, not "X is worse" alone (write "1.76\xD7 PPL gap because KV store is static", not "KVNet underperforms").
+- Decisions and their rationale ("chose X over Y because Z" \u2014 the "because" is load-bearing; without it the decision looks arbitrary).
+- Constraints discovered ("must support Node 22", "no new dependencies", "AGENTS.md forbids \`as any\`").
+- Exact values: versions, config keys, thresholds, magic numbers.
+- User intent \u2014 quote short user messages verbatim. When the message is too long to quote, preserve intent with extra care: do not change scope, constraints, priorities, acceptance criteria, or requested outcomes. Mark them clearly as past quotes (e.g., "User said: ..."), not as current directives. Losing these changes the task itself.
+- The user's overall goal and any changes to it \u2014 the big-picture objective plus how it evolved during the compressed range. Each summary must reflect the goal as it stood at the end of the range, including pivots (e.g., "initially: fix bug X \u2192 pivoted to: refactor module Y after discovering root cause"). Losing the goal or its evolution makes all subsequent work appear unmotivated.
+- Purpose behind each significant action \u2014 preserve not just what was done but why: the hypothesis behind each experiment, the question behind each exploration, the task goal behind each work action. Without purpose, the summary reads as disconnected technical steps with no through-line.
+- Open questions and unresolved TODOs \u2014 losing these changes what work appears to remain.
+- Message refs of key anchors (\`m00420\`, \`m00510\u2013m00520\`) \u2014 they let you or a later reader jump back via decompress to the exact original.
+
+DROP \u2014 extract the signal, discard the vessel:
+- Verbose logs (build/test/\`npm\` output) once you have captured the error line or the result.
+- Duplicate file reads once the needed content is recorded.
+- Consumed exploration \u2014 search hits, agent return values, successful tool outputs \u2014 once you have extracted the facts you need (same rule as dead-ends, but nothing went wrong; the content is simply spent).
+- Dead-end exploration \u2014 but PRESERVE the lesson in one line: "tried X, failed because Y".
+- Back-and-forth discussion and self-corrections once the final position is captured (keep the outcome, drop the journey to it).
+- Repeated status checks (\`git status\`, \`ls\`) once state is known.
+
+For each significant item you DROP (scripts, reports, large analyses, long tool outputs), add a one-line CONTENT description of what it covers \u2014 not where it lives. Bad: "probe script at /path/probe_kvnet.py". Good: "probe_kvnet.py: tests n-gram baseline, generation quality, long-range dependency, position sensitivity, op pipeline, QUERY attention." This lets a later decompress target the right block by relevance, not by guessing locations.
+
+PRIORITY \u2014 when the summary must be compact, preserve in this order:
+1. User's overall goal, goal evolution, intent, and hard constraints (losing these changes the task).
+2. Decisions and rationale.
+3. Exact technical artifacts: paths, signatures, errors, values.
+4. Conclusions and key findings.
+5. Lessons learned: what failed and why.
+
+Write dense, scannable bullets \u2014 not narrative prose. If the range spans distinct concerns (request \u2192 findings \u2192 decision), group bullets under short thematic headers so a reader can scan to the part they need. Every line must earn its place. Do not mimic the style of existing summaries in context; follow these rules.`;
+var TIER2_DISTILL_RULES = `TIER 2 COMPRESSION \u2014 DISTILLATION
+
+You are compressing historical summaries (not raw conversation). These summaries have already captured the details. Your job is to DISTILL them: extract only what matters for future work, discard the process.
+
+KEEP \u2014 these are the only things that survive distillation:
+- Decisions and their rationale ("chose X over Y because Z" \u2014 the "because" is load-bearing).
+- Final outcomes: version numbers shipped, PR numbers merged/closed, bugs fixed or deferred.
+- Key lessons: what failed and why ("tried X, failed because Y"). These prevent repeating mistakes.
+- Critical constraints discovered ("must support Node 22", "AGENTS.md forbids as any").
+- Design decisions with architectural impact ("chose compress-as-anchor over synthetic messages because prefix cache").
+- Whether content is OBSOLETE or SUPERSEDED \u2014 mark with one line: "[SUPERSEDED by PR #NNN]" or "[OBSOLETE: deleted in vX.Y.Z]". Do NOT keep the obsolete content's details \u2014 just the marker and reason.
+- Function/class/type names and module paths that are the SUBJECT of the work \u2014 e.g., "fixed filterCompressedRanges in prune.ts", "added SessionStateRegistry in state.ts". Not exact line numbers or full signatures \u2014 just enough to LOCATE the code without searching.
+- Exploration findings: if a block was exploratory with no decision, keep the CONCLUSION in one line ("explored X, not viable because Y"). Do not keep the exploration process.
+
+DROP \u2014 these were useful during the work but are no longer needed:
+- Exact line numbers, diffs, verbose function signatures, full code listings.
+- Build/deploy process details, test execution steps.
+- Review process details (who reviewed, what rounds, test counts).
+- Verbose logs, command output, intermediate debugging steps.
+
+FORMAT:
+- Start each distilled block with a source header line:
+  \`Source: bN+bM+... (XK\u2192YK tok, Zx). [original topic]\`
+  Example: \`Source: b5+b7 (56K+44K\u2192268 tok, 375x). [Tool-result recap + publish]\`
+- 3-5 bullet points per source block, each a self-contained fact.
+- Dense, scannable \u2014 no narrative prose.
+- Start with the outcome, not the process: "v1.13.0 shipped (7 PRs bundled)" not "implemented 7 PRs then reviewed then merged".
+- Cross-block synthesis: if multiple source blocks cover the same topic (same PR, same feature, same bug), MERGE them into a single group of bullets. Do not repeat the same fact from different blocks \u2014 keep it once under the most relevant source header.
+
+SIZE TARGET: 50-150 tokens per source block (excluding the header). If you can't fit it in 150 tokens, you're keeping too much process. If a block has nothing worth keeping (pure noise), output just the header followed by "[no actionable content]."`;
+var TIER3_CONDENSE_RULES = `TIER 3 COMPRESSION \u2014 ULTRA-CONDENSATION
+
+You are compressing distilled summaries (Tier 2) into ultra-condensed facts (Tier 3). The distilled summaries already contain only decisions and outcomes. Your job is to reduce them to bare factual references.
+
+PRIORITY \u2014 when a source block has more facts than the size target allows, keep in this order:
+1. Shipped outcomes (versions released, PRs merged) \u2014 these are permanent record.
+2. Open work (PRs/issues still pending) \u2014 these may need follow-up.
+3. Key decisions with architectural impact ("chose X over Y because Z").
+4. Critical constraints ("must support Node 22").
+Drop everything else. Tier 3 is a lookup index, not a knowledge base.
+
+FORMAT:
+- Start with a source header line:
+  \`Source: bN+bM+... (XK\u2192YK tok, Zx). [original topic]\`
+- Output 1-3 facts per source block. Each fact is a single line: subject + outcome.
+- No explanations, no rationale, no process \u2014 just the fact.
+- Format: "[PR/Issue/Version] \u2014 [outcome in \u22648 words]"
+- Merge related facts from different source blocks if they concern the same topic.
+
+EXAMPLES:
+- "v1.13.0 shipped \u2014 quality gate + GC fix (7 PRs)"
+- "PR #196 merged \u2014 preserve-first-user (supersedes #169)"
+- "Bug 1214 fixed \u2014 compress consumed all user messages"
+- "Chose compress-as-anchor \u2014 prefix cache benefit over synthetic injection"
+- "Constraint: AGENTS.md forbids as any \u2014 never suppress types"
+
+DROP:
+- Multi-sentence context. If a fact needs >1 sentence, it's too detailed for Tier 3.
+- Lessons learned ("tried X, failed because Y") \u2014 drop UNLESS the failure is likely to recur and the block is <30 days old.
+- Design rationale details \u2014 keep the decision, drop the "because" unless it's a critical constraint.
+- Anything marked [OBSOLETE] or [SUPERSEDED] \u2014 drop entirely, note "[N blocks obsolete]" in the summary.
+
+SIZE TARGET: 30-60 tokens per source block (including header). For a batch of N source blocks, total output \u2248 N \xD7 40 tokens. If a source block has only one trivial fact, output just the header + one line.`;
+var defaultPrompts = Object.freeze({
+  compressPhilosophy: COMPRESS_PHILOSOPHY,
+  howToCompressRules: HOW_TO_COMPRESS_RULES,
+  tier2DistillRules: TIER2_DISTILL_RULES,
+  tier3CondenseRules: TIER3_CONDENSE_RULES
+});
+function resolvePrompts(overrides, options = {}) {
+  const clean = {};
+  if (overrides) {
+    for (const [key, value] of Object.entries(overrides)) {
+      if (typeof value === "string") {
+        clean[key] = value;
+      }
     }
-    candidate++;
   }
-  throw new Error(
-    `ref capacity exhausted: cannot allocate beyond ${indexToRef(MAX_INDEX)}`
-  );
-}
-function highestUsedIndex(map) {
-  let highest = 0;
-  for (const ref of Object.values(map.byRaw)) {
-    const index = ref === BLOCKED_REF ? null : refToIndex(ref);
-    if (index !== null && index > highest) highest = index;
+  const keys = Object.keys(clean);
+  if (keys.length > 0 && !options.acknowledgeRisk) {
+    throw new Error(
+      `resolvePrompts: overriding compression rules requires { acknowledgeRisk: true }. Overridden keys: ${keys.join(", ")}. These rules are quality-critical (tuned over months of production use); changing them can degrade summary quality and break retrieval (summaries may lose paths, signatures, decisions).`
+    );
   }
-  return highest;
-}
-function createInitialState() {
-  return {
-    blocks: [],
-    messageRefs: { byRaw: {}, byRef: {} },
-    tokenSnapshot: {},
-    nudge: {
-      lastPerMessageNudgeTokens: 0,
-      lastNudgeShownTokens: 0,
-      baselineTokens: 0,
-      anchors: {},
-      lastShownByTier: {}
-    },
-    stats: { tokensCompressed: 0, compressionCount: 0 },
-    nextBlockId: 1,
-    nextRunId: 1
-  };
+  return { ...defaultPrompts, ...clean };
 }
-function allocateBlockId(state) {
-  const id = state.nextBlockId;
-  state.nextBlockId = Math.max(1, id) + 1;
-  return `b${id}`;
+function efficiencyNote(prompts) {
+  return `This is an efficiency nudge to compress early and keep context lean \u2014 not an overflow warning. A separate, stronger alert will appear if the context is actually full.
+
+${prompts.compressPhilosophy}`;
 }
-function allocateRunId(state) {
-  const id = state.nextRunId;
-  state.nextRunId = Math.max(1, id) + 1;
-  return `r${id}`;
+function emergencyHeader(prompts) {
+  return `\u26A0\uFE0F Context limit reached \u2014 compress now. Prioritize consumed tool outputs.
+
+${prompts.compressPhilosophy}`;
 }
-function blockById(state, blockId) {
-  return state.blocks.find((block) => block.blockId === blockId);
+function formatK(n) {
+  if (n >= 1e3) return `${(n / 1e3).toFixed(1)}K`;
+  return `${n}`;
 }
-function activeBlocks(state) {
-  return state.blocks.filter((block) => block.active);
+function formatBreakdown(bd) {
+  if (!bd) return "";
+  const parts = [];
+  if (bd.system > 0) parts.push(`${formatK(bd.system)} system`);
+  if (bd.tool > 0) parts.push(`${formatK(bd.tool)} tool`);
+  if (bd.summaries > 0) parts.push(`${formatK(bd.summaries)} summaries`);
+  if (bd.code > 0) parts.push(`${formatK(bd.code)} code`);
+  if (bd.text > 0) parts.push(`${formatK(bd.text)} text`);
+  const growth = bd.growth > 0 ? `
++${formatK(bd.growth)} since last nudge` : "";
+  return `Context breakdown: ${parts.join(" | ")}${growth}`;
 }
-function coveredMessageIds(state) {
-  const covered = /* @__PURE__ */ new Set();
-  for (const block of state.blocks) {
-    if (!block.active) continue;
-    for (const id of block.effectiveMessageIds) covered.add(id);
+function formatTierTargetBlocks(blocks) {
+  if (blocks.length === 0) {
+    return "Target blocks: (none \u2014 no tier blocks found)";
   }
-  return covered;
-}
-function advanceSurvival(state, promotionThreshold) {
-  for (const block of state.blocks) {
-    if (!block.active) continue;
-    block.survivedCount += 1;
-    if (block.survivedCount >= promotionThreshold) {
-      block.generation = "old";
-    }
-  }
-}
-var SUMMARY_HEADER = "[Compressed conversation section]";
-function prune(messages, state, options = {}) {
-  const covered = coveredMessageIds(state);
-  if (covered.size === 0) return [...messages];
-  const inject = options.injectSummaries ?? true;
-  const firstUserIndex = messages.findIndex(
-    (message) => message.role === "user"
-  );
-  const indexById = /* @__PURE__ */ new Map();
-  messages.forEach((message, index) => indexById.set(message.id, index));
-  const anchors = inject ? collectSummaryAnchors(state, indexById) : [];
-  return stripOrphanedReasoning(
-    stripOrphanedToolResults(
-      stripOrphanedToolCalls(
-        rebuildMessages(messages, covered, firstUserIndex, anchors)
-      )
-    )
-  );
+  const lines = blocks.map((b) => {
+    const summaryTokens = Math.ceil((b.summary ?? "").length / 4);
+    const topic = b.topic ? `  "${b.topic}"` : "";
+    return `  ${b.blockId}  ${b.effectiveMessageIds.length} msgs  ${formatK(b.compressedTokens)}\u2192${formatK(summaryTokens)}${topic}`;
+  });
+  return `Target ${blocks[0].tier === 1 ? "tier-1" : "tier-2"} blocks to distill (${blocks.length}):
+${lines.join("\n")}`;
 }
-function collectSummaryAnchors(state, indexById) {
-  const anchors = [];
-  for (const block of activeBlocks(state)) {
-    let earliest = null;
-    for (const id of block.effectiveMessageIds) {
-      const index = indexById.get(id);
-      if (index !== void 0 && (earliest === null || index < earliest)) {
-        earliest = index;
+function formatRanges(compressible, protectedRanges) {
+  if (compressible.length === 0 && protectedRanges.length === 0) {
+    return "[No specific ranges detected \u2014 compress any consumed content.]";
+  }
+  const refNum2 = (ref) => {
+    const m = ref.match(/\d+/);
+    return m ? parseInt(m[0], 10) : 0;
+  };
+  const entries = [];
+  for (const r of compressible) {
+    entries.push({
+      startRef: r.startRef,
+      endRef: r.endRef,
+      startNum: refNum2(r.startRef),
+      endNum: refNum2(r.endRef),
+      count: r.count,
+      tokens: r.tokens,
+      toolPct: r.toolPct,
+      textPct: r.textPct,
+      compressibleTokens: r.tokens,
+      compressibleCount: r.count,
+      protectedTokens: 0,
+      protectedCount: 0,
+      protectedTools: [],
+      dangerous: r.dangerous ?? false
+    });
+  }
+  for (const r of protectedRanges) {
+    entries.push({
+      startRef: r.startRef,
+      endRef: r.endRef,
+      startNum: refNum2(r.startRef),
+      endNum: refNum2(r.endRef),
+      count: r.count,
+      tokens: r.tokens,
+      toolPct: 0,
+      textPct: 0,
+      compressibleTokens: 0,
+      compressibleCount: 0,
+      protectedTokens: r.tokens,
+      protectedCount: r.count,
+      protectedTools: [...r.tools],
+      dangerous: false
+    });
+  }
+  entries.sort((a, b) => a.startNum - b.startNum);
+  const merged = [];
+  for (const e of entries) {
+    const last = merged[merged.length - 1];
+    if (last && e.startNum <= last.endNum + 1) {
+      last.endRef = e.endRef;
+      last.endNum = Math.max(last.endNum, e.endNum);
+      last.count += e.count;
+      last.tokens += e.tokens;
+      last.compressibleTokens += e.compressibleTokens;
+      last.compressibleCount += e.compressibleCount;
+      last.protectedTokens += e.protectedTokens;
+      last.protectedCount += e.protectedCount;
+      if (e.dangerous) last.dangerous = true;
+      for (const t of e.protectedTools) {
+        if (!last.protectedTools.includes(t)) last.protectedTools.push(t);
       }
+    } else {
+      merged.push({ ...e });
     }
-    anchors.push({
-      blockId: block.blockId,
-      summary: block.summary,
-      topic: block.topic,
-      insertAt: earliest ?? 0
-    });
   }
-  anchors.sort((left, right) => left.insertAt - right.insertAt);
-  return anchors;
-}
-function rebuildMessages(messages, covered, firstUserIndex, anchors) {
-  const result = [];
-  const pending = [...anchors];
-  for (let index = 0; index < messages.length; index++) {
-    while (pending.length > 0 && pending[0].insertAt === index) {
-      result.push(renderSummary(pending.shift()));
+  const lines = merged.map((e) => {
+    const suffix = e.dangerous && e.compressibleTokens > 0 ? "  \u26A0\uFE0F NOT recommended unless you are certain." : "";
+    if (e.protectedTokens > 0 && e.compressibleTokens === 0) {
+      return `  ${e.startRef}\u2013${e.endRef}  ${e.count} msgs  ${formatK(e.tokens)} [PROTECTED: ${e.protectedTools.join(", ")} \u2014 not compressible]${suffix}`;
     }
-    if (index === firstUserIndex && firstUserIndex >= 0) {
-      result.push(messages[index]);
-      continue;
+    if (e.protectedTokens > 0 && e.compressibleTokens > 0) {
+      return `  ${e.startRef}\u2013${e.endRef}  ${e.count} msgs  ${formatK(e.tokens)} [${formatK(e.compressibleTokens)} compressible | ${formatK(e.protectedTokens)} protected: ${e.protectedTools.join(", ")}]${suffix}`;
     }
-    if (covered.has(messages[index].id)) continue;
-    result.push(messages[index]);
+    return `  ${e.startRef}\u2013${e.endRef}  ${e.count} msgs  ${formatK(e.tokens)} [tool ${e.toolPct}% | text ${e.textPct}%]${suffix}`;
+  });
+  return `Compressible ranges (${merged.length}, oldest first):
+${lines.join("\n")}`;
+}
+function renderNudgeText(decision, prompts = defaultPrompts) {
+  const breakdownStr = formatBreakdown(decision.contextBreakdown);
+  const rangesStr = formatRanges(decision.compressibleRanges, decision.protectedRanges ?? []);
+  const isEmergency = !!decision.breakdown?.emergencyOverride || !!decision.breakdown?.overLimit;
+  if (decision.tier !== null && decision.tier >= 2) {
+    const isT2 = decision.tier === 2;
+    const targets = decision.tierTargetBlocks ?? [];
+    const blockList = formatTierTargetBlocks(targets);
+    const startId = targets[0]?.blockId ?? "b1";
+    const endId = targets[targets.length - 1]?.blockId ?? "b5";
+    const voice = isEmergency ? "emergency" : "gentle";
+    const triggerLine = isEmergency ? `[EMERGENCY \u2014 TIER ${decision.tier} ${isT2 ? "DISTILLATION" : "CONDENSATION"}] Context limit reached \u2014 distill NOW into a denser summary to reclaim tokens.` : `[TIER ${decision.tier} ${isT2 ? "DISTILLATION" : "CONDENSATION"} TRIGGER]`;
+    return {
+      voice,
+      text: [
+        efficiencyNote(prompts),
+        "",
+        breakdownStr,
+        "",
+        triggerLine,
+        isT2 ? `Your tier-1 compression summaries have accumulated. Distill them into a single denser tier-2 summary. Use block IDs as boundaries (startId and endId as bN). Any raw (uncompressed) messages sitting between the boundary blocks are absorbed into the tier-2 block as well \u2014 apply HOW TO COMPRESS to those raw messages and the TIER 2 distillation rules to the existing summaries, so the whole span is covered and nothing is lost.` : `Your tier-2 compression summaries have accumulated. Condense them further into a tier-3 ultra-condensed summary. Use block IDs as boundaries (startId and endId as bN). Any raw (uncompressed) messages sitting between the boundary blocks are absorbed into the tier-3 block as well \u2014 apply HOW TO COMPRESS to those raw messages and the TIER 3 condensation rules to the existing summaries, so the whole span is covered and nothing is lost.`,
+        blockList,
+        `Example: compress({ content: [{ startId: "${startId}", endId: "${endId}", summary: "..." }] })`,
+        "",
+        prompts.howToCompressRules,
+        "",
+        isT2 ? prompts.tier2DistillRules : prompts.tier3CondenseRules
+      ].join("\n")
+    };
   }
-  while (pending.length > 0) {
-    result.push(renderSummary(pending.shift()));
+  if (isEmergency) {
+    return {
+      voice: "emergency",
+      text: [
+        emergencyHeader(prompts),
+        "",
+        breakdownStr,
+        "",
+        prompts.howToCompressRules,
+        "",
+        `{ "topic": "...", "content": [{ "startId": "<ID>", "endId": "<ID>", "summary": "..." }] }`,
+        "Only use IDs from visible messages above. Compress older work first.",
+        "",
+        rangesStr
+      ].join("\n")
+    };
   }
-  return result;
+  return {
+    voice: "gentle",
+    text: [
+      efficiencyNote(prompts),
+      "",
+      breakdownStr,
+      "",
+      prompts.howToCompressRules,
+      "",
+      rangesStr,
+      "",
+      `\u{1F4A1} Compress all ranges in one call (pass multiple content entries: \`content: [{...}, {...}]\`).`
+    ].join("\n")
+  };
 }
-function renderSummary(anchor) {
-  const body = anchor.summary.trim();
-  const topicLine = anchor.topic ? `${SUMMARY_HEADER} \u2014 ${anchor.topic}` : SUMMARY_HEADER;
-  const text = body.length === 0 ? topicLine : `${topicLine}
-${body}`;
+var VIABLE_RANGE_MIN_TOKENS = 200;
+function viableRanges(ranges) {
+  return ranges.filter((r) => r.tokens >= VIABLE_RANGE_MIN_TOKENS);
+}
+
+// node_modules/acp-kernel/dist/chunk-DPH62BGM.js
+function createInitialState() {
   return {
-    id: `acp_summary_${anchor.blockId}`,
-    role: "system",
-    contentType: "text",
-    text
+    blocks: [],
+    messageRefs: { byRaw: {}, byRef: {} },
+    tokenSnapshot: {},
+    nudge: {
+      lastPerMessageNudgeTokens: 0,
+      lastNudgeShownTokens: 0,
+      baselineTokens: 0,
+      anchors: {},
+      lastShownByTier: {}
+    },
+    stats: { tokensCompressed: 0, compressionCount: 0 },
+    nextBlockId: 1,
+    nextRunId: 1
   };
 }
-function stripOrphanedToolResults(messages) {
-  const knownCallIds = /* @__PURE__ */ new Set();
-  for (const m of messages) {
-    if (m.contentType === "tool-call" && m.toolCallId) {
-      knownCallIds.add(m.toolCallId);
+function allocateBlockId(state) {
+  const id = state.nextBlockId;
+  state.nextBlockId = Math.max(1, id) + 1;
+  return `b${id}`;
+}
+function allocateRunId(state) {
+  const id = state.nextRunId;
+  state.nextRunId = Math.max(1, id) + 1;
+  return `r${id}`;
+}
+function blockById(state, blockId) {
+  return state.blocks.find((block) => block.blockId === blockId);
+}
+function activeBlocks(state) {
+  return state.blocks.filter((block) => block.active);
+}
+function coveredMessageIds(state) {
+  const covered = /* @__PURE__ */ new Set();
+  for (const block of state.blocks) {
+    if (!block.active) continue;
+    for (const id of block.effectiveMessageIds) covered.add(id);
+  }
+  return covered;
+}
+function advanceSurvival(state, promotionThreshold) {
+  for (const block of state.blocks) {
+    if (!block.active) continue;
+    block.survivedCount += 1;
+    if (block.survivedCount >= promotionThreshold) {
+      block.generation = "old";
     }
   }
-  return messages.filter(
-    (m) => m.contentType !== "tool-result" || !m.toolCallId || knownCallIds.has(m.toolCallId)
-  );
+}
+
+// node_modules/acp-kernel/dist/index.js
+var REF_WIDTH = 5;
+var MIN_INDEX = 1;
+var MAX_INDEX = 99999;
+var REF_PATTERN = /^m0*(\d{1,5})$/;
+var BLOCKED_REF = "BLOCKED";
+function indexToRef(index) {
+  if (!Number.isInteger(index) || index < MIN_INDEX || index > MAX_INDEX) {
+    throw new RangeError(
+      `ref index out of bounds: ${index} (allowed ${MIN_INDEX}-${MAX_INDEX})`
+    );
+  }
+  return `m${String(index).padStart(REF_WIDTH, "0")}`;
+}
+function refToIndex(ref) {
+  const match = REF_PATTERN.exec(ref.trim().toLowerCase());
+  if (!match) return null;
+  const index = Number(match[1]);
+  if (index < MIN_INDEX || index > MAX_INDEX) return null;
+  return index;
+}
+function refForRaw(map, rawId) {
+  return map.byRaw[rawId] ?? null;
+}
+function assignRefs(messages, options) {
+  const map = {
+    byRaw: { ...options.existing.byRaw },
+    byRef: { ...options.existing.byRef }
+  };
+  let cursor = Number.isInteger(options.nextIndex) && options.nextIndex >= MIN_INDEX ? options.nextIndex : MIN_INDEX;
+  let newlyAssigned = 0;
+  for (const message of messages) {
+    if (!message.id || options.shouldSkip?.(message)) continue;
+    if (map.byRaw[message.id]) continue;
+    if (options.isProtected?.(message)) {
+      map.byRaw[message.id] = BLOCKED_REF;
+      continue;
+    }
+    const ref = allocateFreeRef(map, cursor);
+    cursor = ref.index + 1;
+    map.byRaw[message.id] = ref.text;
+    map.byRef[ref.text] = message.id;
+    newlyAssigned++;
+  }
+  return { map, nextIndex: cursor, newlyAssigned };
+}
+function allocateFreeRef(map, start) {
+  let candidate = Math.max(start, MIN_INDEX);
+  while (candidate <= MAX_INDEX) {
+    const text = indexToRef(candidate);
+    if (!map.byRef[text]) {
+      return { text, index: candidate };
+    }
+    candidate++;
+  }
+  throw new Error(
+    `ref capacity exhausted: cannot allocate beyond ${indexToRef(MAX_INDEX)}`
+  );
+}
+function highestUsedIndex(map) {
+  let highest = 0;
+  for (const ref of Object.values(map.byRaw)) {
+    const index = ref === BLOCKED_REF ? null : refToIndex(ref);
+    if (index !== null && index > highest) highest = index;
+  }
+  return highest;
+}
+var SUMMARY_HEADER = "[Compressed conversation section]";
+var SUMMARY_ID_PREFIX = "acp_summary_";
+function summaryMessageId(blockId) {
+  return `${SUMMARY_ID_PREFIX}${blockId}`;
+}
+function isSummaryMessageId(id) {
+  return id.startsWith(SUMMARY_ID_PREFIX);
+}
+function isRenderedSummaryMessage(message) {
+  return isSummaryMessageId(message.id) && message.role === "system" && message.contentType === "text";
+}
+function prune(messages, state, options = {}) {
+  const covered = coveredMessageIds(state);
+  if (covered.size === 0) return [...messages];
+  const inject = options.injectSummaries ?? true;
+  const firstUserIndex = messages.findIndex(
+    (message) => message.role === "user"
+  );
+  const indexById = /* @__PURE__ */ new Map();
+  const summaryIndexById = /* @__PURE__ */ new Map();
+  messages.forEach((message, index) => {
+    indexById.set(message.id, index);
+    if (isRenderedSummaryMessage(message))
+      summaryIndexById.set(message.id, index);
+  });
+  const anchors = inject ? collectSummaryAnchors(state, indexById, summaryIndexById) : [];
+  return stripOrphanedReasoning(
+    stripOrphanedToolResults(
+      stripOrphanedToolCalls(
+        rebuildMessages(messages, covered, firstUserIndex, anchors)
+      )
+    )
+  );
+}
+function collectSummaryAnchors(state, indexById, summaryIndexById) {
+  const anchors = [];
+  for (const block of activeBlocks(state)) {
+    const existingIndex = summaryIndexById.get(summaryMessageId(block.blockId));
+    if (existingIndex !== void 0) {
+      anchors.push({
+        blockId: block.blockId,
+        summary: block.summary,
+        topic: block.topic,
+        insertAt: existingIndex
+      });
+      continue;
+    }
+    let earliest = null;
+    for (const id of block.effectiveMessageIds) {
+      const index = indexById.get(id);
+      if (index !== void 0 && (earliest === null || index < earliest)) {
+        earliest = index;
+      }
+    }
+    anchors.push({
+      blockId: block.blockId,
+      summary: block.summary,
+      topic: block.topic,
+      insertAt: earliest ?? 0
+    });
+  }
+  anchors.sort((left, right) => left.insertAt - right.insertAt);
+  return anchors;
+}
+function rebuildMessages(messages, covered, firstUserIndex, anchors) {
+  const result = [];
+  const pending = [...anchors];
+  const anchoredSummaryIds = new Set(
+    anchors.map((anchor) => summaryMessageId(anchor.blockId))
+  );
+  for (let index = 0; index < messages.length; index++) {
+    while (pending.length > 0 && pending[0].insertAt === index) {
+      result.push(renderSummary(pending.shift()));
+    }
+    if (index === firstUserIndex && firstUserIndex >= 0) {
+      result.push(messages[index]);
+      continue;
+    }
+    if (covered.has(messages[index].id)) continue;
+    if (isRenderedSummaryMessage(messages[index]) && anchoredSummaryIds.has(messages[index].id))
+      continue;
+    result.push(messages[index]);
+  }
+  while (pending.length > 0) {
+    result.push(renderSummary(pending.shift()));
+  }
+  return result;
+}
+function renderSummary(anchor) {
+  const body = anchor.summary.trim();
+  const topicLine = anchor.topic ? `${SUMMARY_HEADER} \u2014 ${anchor.topic}` : SUMMARY_HEADER;
+  const text = body.length === 0 ? topicLine : `${topicLine}
+${body}`;
+  return {
+    id: summaryMessageId(anchor.blockId),
+    role: "system",
+    contentType: "text",
+    text
+  };
+}
+function stripOrphanedToolResults(messages) {
+  const knownCallIds = /* @__PURE__ */ new Set();
+  for (const m of messages) {
+    if (m.contentType === "tool-call" && m.toolCallId) {
+      knownCallIds.add(m.toolCallId);
+    }
+  }
+  return messages.filter(
+    (m) => m.contentType !== "tool-result" || !m.toolCallId || knownCallIds.has(m.toolCallId)
+  );
 }
 function stripOrphanedToolCalls(messages) {
   const knownResultIds = /* @__PURE__ */ new Set();
@@ -275,9 +626,7 @@ function syncBlocks(messages, state) {
       continue;
     }
     block.active = true;
-    const stillPresent = block.effectiveMessageIds.some(
-      (id) => presentIds.has(id)
-    );
+    const stillPresent = block.effectiveMessageIds.some((id) => presentIds.has(id)) || presentIds.has(summaryMessageId(block.blockId));
     if (!stillPresent) {
       block.active = false;
       deactivated.push(block.blockId);
@@ -285,13 +634,6 @@ function syncBlocks(messages, state) {
   }
   return { state: result, deactivated };
 }
-var require2 = createRequire(import.meta.url);
-function defaultCountTokens(text) {
-  if (!text) return 0;
-  const cjk = text.match(/[\u4e00-\u9fff\u3040-\u30ff\uac00-\ud7af]/g);
-  const cjkCount = cjk?.length ?? 0;
-  return cjkCount + Math.ceil((text.length - cjkCount) / 4);
-}
 function defaultConfig(modelContextLimit, overrides = {}) {
   const base = {
     tiers: { enabled: true, tier2Trigger: 5, tier3Trigger: 10 },
@@ -397,14 +739,24 @@ function resolveBoundaries(input) {
       `Invalid boundary ref(s): startId="${input.startRef}", endId="${input.endRef}". Use mNNNNN or bN.`
     );
   }
-  const indexByRawId = /* @__PURE__ */ new Map();
+  const indexByMessageId = /* @__PURE__ */ new Map();
   input.messages.forEach(
-    (message, index) => indexByRawId.set(message.id, index)
+    (message, index) => indexByMessageId.set(message.id, index)
   );
   let snappedBoundaries = [];
-  const startAnchor = resolveAnchorIndex(start, input.state, indexByRawId, "start");
+  const startAnchor = resolveAnchorIndex(
+    start,
+    input.state,
+    indexByMessageId,
+    "start"
+  );
   if (startAnchor.snapped) snappedBoundaries.push(startAnchor.snapped);
-  const endAnchor = resolveAnchorIndex(end, input.state, indexByRawId, "end");
+  const endAnchor = resolveAnchorIndex(
+    end,
+    input.state,
+    indexByMessageId,
+    "end"
+  );
   if (endAnchor.snapped) snappedBoundaries.push(endAnchor.snapped);
   let startIndex = startAnchor.index;
   let endIndex = endAnchor.index;
@@ -414,14 +766,14 @@ function resolveBoundaries(input) {
   const messageIds = [];
   for (let index = startIndex; index <= endIndex; index++) {
     const message = input.messages[index];
-    if (message) messageIds.push(message.id);
+    if (message && !isRenderedSummaryMessage(message))
+      messageIds.push(message.id);
   }
   const boundaryKind = start.kind === "block" || end.kind === "block" ? "block" : "message";
   const nestedBlockIds = [];
   const nestedSeen = /* @__PURE__ */ new Set();
   for (const block of activeBlocks(input.state)) {
-    const anchor = earliestIndexOfIds(block.effectiveMessageIds, indexByRawId);
-    if (anchor !== null && anchor >= startIndex && anchor <= endIndex) {
+    if (blockVisibleInRange(block, indexByMessageId, startIndex, endIndex)) {
       if (!nestedSeen.has(block.blockId)) {
         nestedSeen.add(block.blockId);
         nestedBlockIds.push(block.blockId);
@@ -439,7 +791,7 @@ function resolveBoundaries(input) {
     snappedBoundaries
   };
 }
-function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
+function resolveAnchorIndex(boundary, state, indexByMessageId, endpoint) {
   const label = endpoint === "start" ? "startId" : "endId";
   if (boundary.kind === "message") {
     const rawId = state.messageRefs.byRef[boundary.raw] ?? state.messageRefs.byRef[formatPaddedRef(boundary.numericId)];
@@ -450,15 +802,15 @@ function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
         `${label}="${boundary.raw}" does not exist in this session (typo or wrong session) \u2014 run acp_status for current refs.`
       );
     }
-    const index = indexByRawId.get(rawId);
+    const index = indexByMessageId.get(rawId);
     if (index !== void 0) {
       return { index, snapped: null };
     }
-    const owner2 = activeOwnerAnchor(state, [rawId], indexByRawId);
+    const owner2 = activeOwnerAnchor(state, [rawId], indexByMessageId);
     if (owner2 !== null) {
       return {
         index: owner2,
-        snapped: `${label}="${boundary.raw}" refers to a message already compressed into an active block \u2014 anchored to that block's summary instead.`
+        snapped: `${label}="${boundary.raw}" refers to a message already compressed into an active block \u2014 anchored to the active block covering it instead.`
       };
     }
     throw new BoundaryNotFoundError(
@@ -476,12 +828,16 @@ function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
     );
   }
   if (block.active) {
-    const anchor = earliestIndexOfIds(block.effectiveMessageIds, indexByRawId);
+    const anchor = visibleBlockAnchor(block, indexByMessageId);
     if (anchor !== null) {
       return { index: anchor, snapped: null };
     }
   }
-  const owner = activeOwnerAnchor(state, block.effectiveMessageIds, indexByRawId);
+  const owner = activeOwnerAnchor(
+    state,
+    block.effectiveMessageIds,
+    indexByMessageId
+  );
   if (owner !== null) {
     return {
       index: owner,
@@ -498,31 +854,64 @@ function resolveAnchorIndex(boundary, state, indexByRawId, endpoint) {
   throw new BoundaryNotFoundError(
     "consumed",
     endpoint,
-    `${label}="b${boundary.numericId}" not found in visible context (block messages consumed by a higher-tier block).`
+    `${label}="b${boundary.numericId}" is an active block but none of its content (raw messages or rendered summary) is visible in the current context \u2014 run acp_status to verify.`
   );
 }
-function activeOwnerAnchor(state, ownedIds, indexByRawId) {
+function activeOwnerAnchor(state, ownedIds, indexByMessageId) {
   if (ownedIds.length === 0) return null;
   const owned = new Set(ownedIds);
   let best = null;
   for (const block of state.blocks) {
     if (!block.active) continue;
-    const anchor = earliestIndexOfIds(block.effectiveMessageIds, indexByRawId);
+    const inherited = inheritedContentIds(state, block);
+    let ownsInherited = false;
+    for (const id of owned) {
+      if (inherited.has(id)) {
+        ownsInherited = true;
+        break;
+      }
+    }
+    if (!ownsInherited) continue;
+    const anchor = visibleBlockAnchor(block, indexByMessageId);
     if (anchor === null) continue;
-    const ownsContent = block.effectiveMessageIds.some((id) => owned.has(id));
-    if (ownsContent && (best === null || anchor < best)) {
+    if (best === null || anchor < best) {
       best = anchor;
     }
   }
   return best;
 }
+function inheritedContentIds(state, block) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const childId of block.directBlockIds) {
+    const child = blockById(state, childId);
+    if (!child) continue;
+    for (const id of child.effectiveMessageIds) ids.add(id);
+  }
+  return ids;
+}
 function formatPaddedRef(index) {
   return `m${String(index).padStart(5, "0")}`;
 }
-function earliestIndexOfIds(ids, indexByRawId) {
+function visibleBlockAnchor(block, indexByMessageId) {
+  const summaryIndex = indexByMessageId.get(summaryMessageId(block.blockId));
+  if (summaryIndex !== void 0) return summaryIndex;
+  return earliestIndexOfIds(block.effectiveMessageIds, indexByMessageId);
+}
+function blockVisibleInRange(block, indexByMessageId, startIndex, endIndex) {
+  const summaryIndex = indexByMessageId.get(summaryMessageId(block.blockId));
+  if (summaryIndex !== void 0 && summaryIndex >= startIndex && summaryIndex <= endIndex) {
+    return true;
+  }
+  const rawIndex = earliestIndexOfIds(
+    block.effectiveMessageIds,
+    indexByMessageId
+  );
+  return rawIndex !== null && rawIndex >= startIndex && rawIndex <= endIndex;
+}
+function earliestIndexOfIds(ids, indexByMessageId) {
   let earliest = null;
   for (const id of ids) {
-    const index = indexByRawId.get(id);
+    const index = indexByMessageId.get(id);
     if (index !== void 0 && (earliest === null || index < earliest)) {
       earliest = index;
     }
@@ -580,7 +969,7 @@ function truncateLargeToolOutputs(messages, tokenCount, config, countTokens, opt
   );
   return { messages: updated, truncatedCount, savedTokens };
 }
-var KEEP_LAST_ORPHANED = 0;
+var KEEP_LAST_ORPHANED = 2;
 function rangeKey(startRef, endRef) {
   return `${startRef}::${endRef}`;
 }
@@ -1148,7 +1537,12 @@ function createCore(ports = {}) {
     let tokensCompressed = 0;
     const errors = [];
     const warnings = [];
-    const protectedMessageIds = input.protectedMessageIds ?? computeProtectedRefs(input.messages, input.state, input.config, countTokens);
+    const protectedMessageIds = input.protectedMessageIds ?? computeProtectedRefs(
+      input.messages,
+      input.state,
+      input.config,
+      countTokens
+    );
     const preExistingCoverage = collectCoverage(state);
     const classifications = /* @__PURE__ */ new Map();
     const classificationErrors = [];
@@ -1179,7 +1573,10 @@ function createCore(ports = {}) {
             error: error instanceof Error ? error : new Error(String(error))
           });
           classificationErrors.push(
-            rangeError(spec, error instanceof Error ? error.message : String(error))
+            rangeError(
+              spec,
+              error instanceof Error ? error.message : String(error)
+            )
           );
         }
       }
@@ -1190,32 +1587,27 @@ function createCore(ports = {}) {
       if (resolution.status === "ok") resolvableCount++;
       else if (resolution.status === "unknown") unknownCount++;
     }
-    const rangeIndexSets = [];
+    const rangeSpans = [];
     for (const [spec, resolution] of classifications) {
       if (resolution.status !== "ok") continue;
-      const indices = resolution.resolved.messageIds.map(
-        (id) => input.messages.findIndex((m) => m.id === id)
-      ).filter((i) => i >= 0);
-      rangeIndexSets.push({ spec, indices });
-    }
-    const sortedRanges = [...rangeIndexSets].sort((a, b) => {
-      const aMin = a.indices.length > 0 ? Math.min(...a.indices) : Infinity;
-      const bMin = b.indices.length > 0 ? Math.min(...b.indices) : Infinity;
-      return aMin - bMin;
-    });
+      rangeSpans.push({
+        spec,
+        start: resolution.resolved.startIndex,
+        end: resolution.resolved.endIndex
+      });
+    }
+    const sortedRanges = [...rangeSpans].sort((a, b) => a.start - b.start);
     const skipSpecs = /* @__PURE__ */ new Set();
     let acceptedMaxIndex = -1;
     for (const entry of sortedRanges) {
-      const entryMax = entry.indices.length > 0 ? Math.max(...entry.indices) : -1;
-      const entryMin = entry.indices.length > 0 ? Math.min(...entry.indices) : -1;
-      if (entryMin >= 0 && entryMin <= acceptedMaxIndex) {
+      if (entry.start <= acceptedMaxIndex) {
         skipSpecs.add(entry.spec);
         warnings.push(
           `Skipped range (${entry.spec.startRef}..${entry.spec.endRef}) \u2014 overlaps an earlier range in the batch; the earlier range takes precedence. Keep ranges disjoint.`
         );
         continue;
       }
-      if (entryMax > acceptedMaxIndex) acceptedMaxIndex = entryMax;
+      if (entry.end > acceptedMaxIndex) acceptedMaxIndex = entry.end;
     }
     if (input.config.compress.minCompressRange > 0 && input.ranges.length > 0) {
       let totalRangeChars = 0;
@@ -1278,7 +1670,12 @@ function createCore(ports = {}) {
         tokensCompressed += outcome.tokens;
         warnings.push(...outcome.warnings);
       } catch (error) {
-        errors.push(rangeError(spec, error instanceof Error ? error.message : String(error)));
+        errors.push(
+          rangeError(
+            spec,
+            error instanceof Error ? error.message : String(error)
+          )
+        );
       }
     }
     state.stats.compressionCount += blocksCreated;
@@ -1288,12 +1685,17 @@ function createCore(ports = {}) {
       state.nudge.lastNudgeShownTokens = 0;
       state.nudge.lastShownByTier = {};
     }
-    return { state, result: { blocksCreated, tokensCompressed, errors, warnings } };
+    return {
+      state,
+      result: { blocksCreated, tokensCompressed, errors, warnings }
+    };
   }
   function processTurn(input) {
     const configErrors = validateConfig(input.config);
     if (configErrors.length > 0) {
-      console.warn(`[acp-kernel] Config validation warnings: ${configErrors.join("; ")}. Thresholds may not fire correctly.`);
+      console.warn(
+        `[acp-kernel] Config validation warnings: ${configErrors.join("; ")}. Thresholds may not fire correctly.`
+      );
     }
     const ctx = {
       config: input.config,
@@ -1353,7 +1755,14 @@ function createCore(ports = {}) {
     if (strategy === "none") return base;
     return [...base, createRenderRefsNode(strategy)];
   }
-  return { processTurn, applyCompression, defaultNodes, decompress, search, status };
+  return {
+    processTurn,
+    applyCompression,
+    defaultNodes,
+    decompress,
+    search,
+    status
+  };
 }
 var assignRefsNode = {
   name: "assign-refs",
@@ -1453,7 +1862,10 @@ var nudgeNode = {
     if (nudge.shouldInject) {
       stamped.lastNudgeShownTokens = ctx.tokenCount;
       if (nudge.tier !== null) {
-        stamped.lastShownByTier = { ...stamped.lastShownByTier, [nudge.tier]: ctx.tokenCount };
+        stamped.lastShownByTier = {
+          ...stamped.lastShownByTier,
+          [nudge.tier]: ctx.tokenCount
+        };
       }
     }
     return {
@@ -1493,17 +1905,16 @@ function applySingleRange(input) {
   const rangeMessageIds = applyPairBoundaryAdjustments(
     resolved,
     input.messages
-  );
+  ).filter((id) => !isSummaryMessageId(id));
   if (rangeMessageIds.length > resolved.messageIds.length) {
-    const indexByRawId = /* @__PURE__ */ new Map();
-    input.messages.forEach((m, i) => indexByRawId.set(m.id, i));
-    const adjustedStart = indexByRawId.get(rangeMessageIds[0]) ?? resolved.startIndex;
-    const adjustedEnd = indexByRawId.get(rangeMessageIds[rangeMessageIds.length - 1]) ?? resolved.endIndex;
+    const indexByMessageId = /* @__PURE__ */ new Map();
+    input.messages.forEach((m, i) => indexByMessageId.set(m.id, i));
+    const adjustedStart = rangeMessageIds.length > 0 ? indexByMessageId.get(rangeMessageIds[0]) ?? resolved.startIndex : resolved.startIndex;
+    const adjustedEnd = rangeMessageIds.length > 0 ? indexByMessageId.get(rangeMessageIds[rangeMessageIds.length - 1]) ?? resolved.endIndex : resolved.endIndex;
     const nestedSeen = new Set(resolved.nestedBlockIds);
     for (const block2 of activeBlocks(input.state)) {
       if (nestedSeen.has(block2.blockId)) continue;
-      const anchor = earliestIndexOfIds(block2.effectiveMessageIds, indexByRawId);
-      if (anchor !== null && anchor >= adjustedStart && anchor <= adjustedEnd) {
+      if (blockVisibleInRange(block2, indexByMessageId, adjustedStart, adjustedEnd)) {
         nestedSeen.add(block2.blockId);
         resolved.nestedBlockIds.push(block2.blockId);
       }
@@ -1566,6 +1977,15 @@ function applySingleRange(input) {
       )} from compression range (recent/last-user zone).`
     );
   }
+  if (!isBlockBoundary && filteredIds.length === 0 && consumedBlockIds.length > 0) {
+    const first = consumedBlockIds[0];
+    const last = consumedBlockIds[consumedBlockIds.length - 1];
+    throw new Error(
+      `Range ${input.spec.startRef}..${input.spec.endRef} contains no new compressible messages \u2014 every message in it is already covered by active block(s) ${consumedBlockIds.join(
+        ", "
+      )}. Nothing was compressed. To rewrite or merge those blocks, reference them by block ID (${first}..${last}); otherwise run acp_status and compress a range it reports as compressible.`
+    );
+  }
   validateCompressionRange(input, filteredIds, consumedBlockIds.length);
   let compressedTokens = 0;
   for (const id of filteredIds) {
@@ -1718,12 +2138,21 @@ function pendingByTier(state, recommendation, countTokens, minCompressRange) {
   const out = {};
   const merged = recommendation?.recommendedRanges ?? [];
   const effective = minCompressRange > 0 ? merged.filter((r) => (r.chars ?? r.tokens * 4) >= minCompressRange) : merged;
-  out[1] = { pending: effective.reduce((s, r) => s + r.tokens, 0), targetBlocks: [] };
+  out[1] = {
+    pending: effective.reduce((s, r) => s + r.tokens, 0),
+    targetBlocks: []
+  };
   const active = activeBlocks(state);
   const t1 = active.filter((b) => b.tier === 1);
   const t2 = active.filter((b) => b.tier === 2);
-  out[2] = { pending: t1.reduce((s, b) => s + countTokens(b.summary), 0), targetBlocks: t1 };
-  out[3] = { pending: t2.reduce((s, b) => s + countTokens(b.summary), 0), targetBlocks: t2 };
+  out[2] = {
+    pending: t1.reduce((s, b) => s + countTokens(b.summary), 0),
+    targetBlocks: t1
+  };
+  out[3] = {
+    pending: t2.reduce((s, b) => s + countTokens(b.summary), 0),
+    targetBlocks: t2
+  };
   return out;
 }
 function decideNudge(input) {
@@ -1811,18 +2240,35 @@ function decideNudge(input) {
     const eligible = tiersList.filter((t) => config.tiers.enabled || t === 1);
     const ready = eligible.filter((t) => (tiers[t]?.pending ?? 0) >= nudgeGrowthTokens).map((t) => `T${t} ${tiers[t].pending}`);
     const readyHint = ready.length > 0 ? `, ready: ${ready.join(", ")}` : "";
-    const blocked = eligible.filter((t) => (tiers[t]?.pending ?? 0) >= nudgeGrowthTokens && (state.nudge.lastShownByTier[t] ?? 0) > 0 && tokenCount - (state.nudge.lastShownByTier[t] ?? 0) < growthFloor).map((t) => `T${t} (cadence)`);
+    const blocked = eligible.filter(
+      (t) => (tiers[t]?.pending ?? 0) >= nudgeGrowthTokens && (state.nudge.lastShownByTier[t] ?? 0) > 0 && tokenCount - (state.nudge.lastShownByTier[t] ?? 0) < growthFloor
+    ).map((t) => `T${t} (cadence)`);
     const blockedHint = blocked.length > 0 ? `, blocked: ${blocked.join(", ")}` : "";
-    const maxPending = Math.max(0, ...Object.values(tiers).map((t) => t.pending));
+    const maxPending = Math.max(
+      0,
+      ...Object.values(tiers).map((t) => t.pending)
+    );
     const pendingShort = maxPending < nudgeGrowthTokens;
     const growthShort = growthSinceReference < growthFloor;
     const parts = [];
-    if (pendingShort) parts.push(`max compressible ${maxPending} < threshold ${nudgeGrowthTokens}`);
-    if (growthShort) parts.push(`growth ${growthSinceReference} < floor ${growthFloor}`);
-    if (parts.length === 0) parts.push(`max compressible ${maxPending}, growth ${growthSinceReference}`);
+    if (pendingShort)
+      parts.push(
+        `max compressible ${maxPending} < threshold ${nudgeGrowthTokens}`
+      );
+    if (growthShort)
+      parts.push(`growth ${growthSinceReference} < floor ${growthFloor}`);
+    if (parts.length === 0)
+      parts.push(
+        `max compressible ${maxPending}, growth ${growthSinceReference}`
+      );
     reason = `${parts.join("; ")}${readyHint}${blockedHint}`;
   }
-  const ctxBreakdown = computeContextBreakdown(input.messages, tokenCount, growthSinceReference, countTokens);
+  const ctxBreakdown = computeContextBreakdown(
+    input.messages,
+    tokenCount,
+    growthSinceReference,
+    countTokens
+  );
   return {
     shouldInject,
     reason,
@@ -1908,433 +2354,127 @@ function countOccurrences(haystack, needle) {
   }
   return count;
 }
-var COMPRESS_PHILOSOPHY = `Compression Philosophy:
-- All compression serves the primary task, but be frugal.
-- Context capacity is precious. Save context by compressing consumed outputs, not by avoiding tools.
-- Compress by need, not by percentage.
-- Work from summaries, not raw tool outputs. All listed ranges (user prompts, tool outputs, code, logs, exploration, intermediate steps) should be compressed to summary format \u2014 the ONLY exceptions are protected content, content the current step is actively using, or critical content you cannot reconstruct.`;
-var HOW_TO_COMPRESS_RULES = `HOW TO COMPRESS
-
-When you call \`compress\`, the summary you write becomes the only record of the replaced conversation. Make it self-contained and complete: every user request, experiment purpose, and work task in the range must be accurately captured. A later reader (or you, after decompressing) should be able to continue the task WITHOUT needing the original.
-
-KEEP VERBATIM \u2014 never paraphrase or abbreviate these:
-- Full file paths with line numbers, directory prefix on every mention (\`lib/hooks.ts:347\`, \`src/index.ts:12-18\`, \`gatenet_v3/model.py:45\`). Never abbreviate to a bare filename (\`hooks.ts\`, \`model.py\`) \u2014 they are ambiguous and cannot be grepped or decompressed-to later.
-- Function, class, and type signatures (exact names, params, return types) AND critical code lines that encode logic \u2014 the line that IS the finding, not just the function name (e.g. \`kv_keys += define_gate * a_key[i](emb)\` is more useful than "see model_kvnet.py").
-- Error messages and stack traces (exact text \u2014 you need the literal string to grep for it later).
-- Key details from reports and analyses \u2014 not just the conclusion. Keep the comparison numbers and the mechanism, not "X is worse" alone (write "1.76\xD7 PPL gap because KV store is static", not "KVNet underperforms").
-- Decisions and their rationale ("chose X over Y because Z" \u2014 the "because" is load-bearing; without it the decision looks arbitrary).
-- Constraints discovered ("must support Node 22", "no new dependencies", "AGENTS.md forbids \`as any\`").
-- Exact values: versions, config keys, thresholds, magic numbers.
-- User intent \u2014 quote short user messages verbatim. When the message is too long to quote, preserve intent with extra care: do not change scope, constraints, priorities, acceptance criteria, or requested outcomes. Mark them clearly as past quotes (e.g., "User said: ..."), not as current directives. Losing these changes the task itself.
-- The user's overall goal and any changes to it \u2014 the big-picture objective plus how it evolved during the compressed range. Each summary must reflect the goal as it stood at the end of the range, including pivots (e.g., "initially: fix bug X \u2192 pivoted to: refactor module Y after discovering root cause"). Losing the goal or its evolution makes all subsequent work appear unmotivated.
-- Purpose behind each significant action \u2014 preserve not just what was done but why: the hypothesis behind each experiment, the question behind each exploration, the task goal behind each work action. Without purpose, the summary reads as disconnected technical steps with no through-line.
-- Open questions and unresolved TODOs \u2014 losing these changes what work appears to remain.
-- Message refs of key anchors (\`m00420\`, \`m00510\u2013m00520\`) \u2014 they let you or a later reader jump back via decompress to the exact original.
-
-DROP \u2014 extract the signal, discard the vessel:
-- Verbose logs (build/test/\`npm\` output) once you have captured the error line or the result.
-- Duplicate file reads once the needed content is recorded.
-- Consumed exploration \u2014 search hits, agent return values, successful tool outputs \u2014 once you have extracted the facts you need (same rule as dead-ends, but nothing went wrong; the content is simply spent).
-- Dead-end exploration \u2014 but PRESERVE the lesson in one line: "tried X, failed because Y".
-- Back-and-forth discussion and self-corrections once the final position is captured (keep the outcome, drop the journey to it).
-- Repeated status checks (\`git status\`, \`ls\`) once state is known.
-
-For each significant item you DROP (scripts, reports, large analyses, long tool outputs), add a one-line CONTENT description of what it covers \u2014 not where it lives. Bad: "probe script at /path/probe_kvnet.py". Good: "probe_kvnet.py: tests n-gram baseline, generation quality, long-range dependency, position sensitivity, op pipeline, QUERY attention." This lets a later decompress target the right block by relevance, not by guessing locations.
-
-PRIORITY \u2014 when the summary must be compact, preserve in this order:
-1. User's overall goal, goal evolution, intent, and hard constraints (losing these changes the task).
-2. Decisions and rationale.
-3. Exact technical artifacts: paths, signatures, errors, values.
-4. Conclusions and key findings.
-5. Lessons learned: what failed and why.
-
-Write dense, scannable bullets \u2014 not narrative prose. If the range spans distinct concerns (request \u2192 findings \u2192 decision), group bullets under short thematic headers so a reader can scan to the part they need. Every line must earn its place. Do not mimic the style of existing summaries in context; follow these rules.`;
-var TIER2_DISTILL_RULES = `TIER 2 COMPRESSION \u2014 DISTILLATION
-
-You are compressing historical summaries (not raw conversation). These summaries have already captured the details. Your job is to DISTILL them: extract only what matters for future work, discard the process.
-
-KEEP \u2014 these are the only things that survive distillation:
-- Decisions and their rationale ("chose X over Y because Z" \u2014 the "because" is load-bearing).
-- Final outcomes: version numbers shipped, PR numbers merged/closed, bugs fixed or deferred.
-- Key lessons: what failed and why ("tried X, failed because Y"). These prevent repeating mistakes.
-- Critical constraints discovered ("must support Node 22", "AGENTS.md forbids as any").
-- Design decisions with architectural impact ("chose compress-as-anchor over synthetic messages because prefix cache").
-- Whether content is OBSOLETE or SUPERSEDED \u2014 mark with one line: "[SUPERSEDED by PR #NNN]" or "[OBSOLETE: deleted in vX.Y.Z]". Do NOT keep the obsolete content's details \u2014 just the marker and reason.
-- Function/class/type names and module paths that are the SUBJECT of the work \u2014 e.g., "fixed filterCompressedRanges in prune.ts", "added SessionStateRegistry in state.ts". Not exact line numbers or full signatures \u2014 just enough to LOCATE the code without searching.
-- Exploration findings: if a block was exploratory with no decision, keep the CONCLUSION in one line ("explored X, not viable because Y"). Do not keep the exploration process.
-
-DROP \u2014 these were useful during the work but are no longer needed:
-- Exact line numbers, diffs, verbose function signatures, full code listings.
-- Build/deploy process details, test execution steps.
-- Review process details (who reviewed, what rounds, test counts).
-- Verbose logs, command output, intermediate debugging steps.
-
-FORMAT:
-- Start each distilled block with a source header line:
-  \`Source: bN+bM+... (XK\u2192YK tok, Zx). [original topic]\`
-  Example: \`Source: b5+b7 (56K+44K\u2192268 tok, 375x). [Tool-result recap + publish]\`
-- 3-5 bullet points per source block, each a self-contained fact.
-- Dense, scannable \u2014 no narrative prose.
-- Start with the outcome, not the process: "v1.13.0 shipped (7 PRs bundled)" not "implemented 7 PRs then reviewed then merged".
-- Cross-block synthesis: if multiple source blocks cover the same topic (same PR, same feature, same bug), MERGE them into a single group of bullets. Do not repeat the same fact from different blocks \u2014 keep it once under the most relevant source header.
-
-SIZE TARGET: 50-150 tokens per source block (excluding the header). If you can't fit it in 150 tokens, you're keeping too much process. If a block has nothing worth keeping (pure noise), output just the header followed by "[no actionable content]."`;
-var TIER3_CONDENSE_RULES = `TIER 3 COMPRESSION \u2014 ULTRA-CONDENSATION
-
-You are compressing distilled summaries (Tier 2) into ultra-condensed facts (Tier 3). The distilled summaries already contain only decisions and outcomes. Your job is to reduce them to bare factual references.
-
-PRIORITY \u2014 when a source block has more facts than the size target allows, keep in this order:
-1. Shipped outcomes (versions released, PRs merged) \u2014 these are permanent record.
-2. Open work (PRs/issues still pending) \u2014 these may need follow-up.
-3. Key decisions with architectural impact ("chose X over Y because Z").
-4. Critical constraints ("must support Node 22").
-Drop everything else. Tier 3 is a lookup index, not a knowledge base.
-
-FORMAT:
-- Start with a source header line:
-  \`Source: bN+bM+... (XK\u2192YK tok, Zx). [original topic]\`
-- Output 1-3 facts per source block. Each fact is a single line: subject + outcome.
-- No explanations, no rationale, no process \u2014 just the fact.
-- Format: "[PR/Issue/Version] \u2014 [outcome in \u22648 words]"
-- Merge related facts from different source blocks if they concern the same topic.
-
-EXAMPLES:
-- "v1.13.0 shipped \u2014 quality gate + GC fix (7 PRs)"
-- "PR #196 merged \u2014 preserve-first-user (supersedes #169)"
-- "Bug 1214 fixed \u2014 compress consumed all user messages"
-- "Chose compress-as-anchor \u2014 prefix cache benefit over synthetic injection"
-- "Constraint: AGENTS.md forbids as any \u2014 never suppress types"
-
-DROP:
-- Multi-sentence context. If a fact needs >1 sentence, it's too detailed for Tier 3.
-- Lessons learned ("tried X, failed because Y") \u2014 drop UNLESS the failure is likely to recur and the block is <30 days old.
-- Design rationale details \u2014 keep the decision, drop the "because" unless it's a critical constraint.
-- Anything marked [OBSOLETE] or [SUPERSEDED] \u2014 drop entirely, note "[N blocks obsolete]" in the summary.
-
-SIZE TARGET: 30-60 tokens per source block (including header). For a batch of N source blocks, total output \u2248 N \xD7 40 tokens. If a source block has only one trivial fact, output just the header + one line.`;
-var defaultPrompts = Object.freeze({
-  compressPhilosophy: COMPRESS_PHILOSOPHY,
-  howToCompressRules: HOW_TO_COMPRESS_RULES,
-  tier2DistillRules: TIER2_DISTILL_RULES,
-  tier3CondenseRules: TIER3_CONDENSE_RULES
-});
-function resolvePrompts(overrides, options = {}) {
-  const clean = {};
-  if (overrides) {
-    for (const [key, value] of Object.entries(overrides)) {
-      if (typeof value === "string") {
-        clean[key] = value;
-      }
+function parseBlockIdArg(arg) {
+  const normalized = arg.trim().toLowerCase();
+  const refMatch = /^b0*(\d+)$/.exec(normalized);
+  if (refMatch && refMatch[1] !== void 0) return `b${refMatch[1]}`;
+  const numMatch = /^(\d+)$/.exec(normalized);
+  if (numMatch && numMatch[1] !== void 0) return `b${numMatch[1]}`;
+  return null;
+}
+function collectBlockContent(state, block, messages, options = {}) {
+  const full = options.full ?? false;
+  const targetIds = new Set(block.effectiveMessageIds);
+  if (full) {
+    const msgs = messages.filter((m) => targetIds.has(m.id));
+    if (msgs.length === 0) return { text: "", count: 0 };
+    return { text: msgs.map(formatMessage).join("\n\n"), count: msgs.length };
+  }
+  const nestedChildren = [];
+  const nestedCovered = /* @__PURE__ */ new Set();
+  for (const childId of block.directBlockIds) {
+    const child = state.blocks.find((b) => b.blockId === childId);
+    if (!child?.active) continue;
+    nestedChildren.push(child);
+    for (const id of child.effectiveMessageIds) nestedCovered.add(id);
+  }
+  const parts = [];
+  for (const child of nestedChildren) {
+    const label = child.topic ? `${child.blockId}: ${child.topic}` : child.blockId;
+    parts.push(`${SUMMARY_HEADER} \u2014 ${label}
+${child.summary}`);
+  }
+  let directCount = 0;
+  for (const m of messages) {
+    if (targetIds.has(m.id) && !nestedCovered.has(m.id)) {
+      parts.push(formatMessage(m));
+      directCount++;
     }
   }
-  const keys = Object.keys(clean);
-  if (keys.length > 0 && !options.acknowledgeRisk) {
-    throw new Error(
-      `resolvePrompts: overriding compression rules requires { acknowledgeRisk: true }. Overridden keys: ${keys.join(", ")}. These rules are quality-critical (tuned over months of production use); changing them can degrade summary quality and break retrieval (summaries may lose paths, signatures, decisions).`
-    );
+  const count = directCount + nestedChildren.length;
+  if (count === 0) return { text: "", count: 0 };
+  return { text: parts.join("\n\n"), count };
+}
+function formatMessage(message) {
+  const text = message.text ?? "";
+  if (message.toolName && message.contentType !== "text") {
+    return `[${message.role} \u2022 ${message.toolName}]
+${text}`;
   }
-  return { ...defaultPrompts, ...clean };
+  return `[${message.role}]
+${text}`;
 }
-function efficiencyNote(prompts) {
-  return `This is an efficiency nudge to compress early and keep context lean \u2014 not an overflow warning. A separate, stronger alert will appear if the context is actually full.
-
-${prompts.compressPhilosophy}`;
+function formatTokens2(n) {
+  if (!Number.isFinite(n) || n <= 0) return "0";
+  return n >= 1e3 ? `${(n / 1e3).toFixed(1)}K` : String(n);
 }
-function emergencyHeader(prompts) {
-  return `\u26A0\uFE0F Context limit reached \u2014 compress now. Prioritize consumed tool outputs.
-
-${prompts.compressPhilosophy}`;
+function pct(n, total) {
+  if (n <= 0 || total <= 0) return 0;
+  return Math.max(1, Math.round(n / total * 100));
 }
-function formatK(n) {
-  if (n >= 1e3) return `${(n / 1e3).toFixed(1)}K`;
-  return `${n}`;
+function numericPart2(blockId) {
+  const match = /^b(\d+)$/.exec(blockId);
+  return match && match[1] !== void 0 ? Number(match[1]) : 0;
 }
-function formatBreakdown(bd) {
-  if (!bd) return "";
+function summaryTokensOf(block, countTokens) {
+  return countTokens(block.summary);
+}
+function effectiveCompressedTokens(block, _state, _countTokens) {
+  return block.compressedTokens;
+}
+function tierLabel(block) {
+  return `T${block.tier}`;
+}
+function tierBreakdown(blocks, countTokens) {
+  const tierTokens = {};
+  for (const block of blocks) {
+    tierTokens[block.tier] = (tierTokens[block.tier] ?? 0) + summaryTokensOf(block, countTokens);
+  }
+  const tiers = Object.keys(tierTokens).map(Number);
+  if (tiers.length <= 1) return null;
   const parts = [];
-  if (bd.system > 0) parts.push(`${formatK(bd.system)} system`);
-  if (bd.tool > 0) parts.push(`${formatK(bd.tool)} tool`);
-  if (bd.summaries > 0) parts.push(`${formatK(bd.summaries)} summaries`);
-  if (bd.code > 0) parts.push(`${formatK(bd.code)} code`);
-  if (bd.text > 0) parts.push(`${formatK(bd.text)} text`);
-  const growth = bd.growth > 0 ? `
-+${formatK(bd.growth)} since last nudge` : "";
-  return `Context breakdown: ${parts.join(" | ")}${growth}`;
+  for (const tier of [1, 2, 3]) {
+    if (tierTokens[tier]) parts.push(`T${tier}: ${formatTokens2(tierTokens[tier])}`);
+  }
+  return parts.join(" | ");
 }
-function formatTierTargetBlocks(blocks) {
-  if (blocks.length === 0) {
-    return "Target blocks: (none \u2014 no tier blocks found)";
+function collectVisible(messages, state, countTokens) {
+  const coveredIds = /* @__PURE__ */ new Set();
+  for (const block of state.blocks) {
+    if (!block.active) continue;
+    for (const id of block.effectiveMessageIds) coveredIds.add(id);
   }
-  const lines = blocks.map((b) => {
-    const summaryTokens = Math.ceil((b.summary ?? "").length / 4);
-    const topic = b.topic ? `  "${b.topic}"` : "";
-    return `  ${b.blockId}  ${b.effectiveMessageIds.length} msgs  ${formatK(b.compressedTokens)}\u2192${formatK(summaryTokens)}${topic}`;
+  let summaryTokens = 0;
+  for (const block of state.blocks) {
+    if (block.active) summaryTokens += summaryTokensOf(block, countTokens);
+  }
+  const visible = [];
+  messages.forEach((message, index) => {
+    if (coveredIds.has(message.id)) return;
+    const ref = refForRaw(state.messageRefs, message.id);
+    if (!ref) return;
+    const tokens = countTokens(message.text ?? "");
+    const tool = message.toolName ?? "text";
+    if (tokens > 0) visible.push({ ref, tokens, tool, index });
   });
-  return `Target ${blocks[0].tier === 1 ? "tier-1" : "tier-2"} blocks to distill (${blocks.length}):
-${lines.join("\n")}`;
+  return { visible, summaryTokens };
 }
-function formatRanges(compressible, protectedRanges) {
-  if (compressible.length === 0 && protectedRanges.length === 0) {
-    return "[No specific ranges detected \u2014 compress any consumed content.]";
-  }
-  const refNum2 = (ref) => {
-    const m = ref.match(/\d+/);
-    return m ? parseInt(m[0], 10) : 0;
-  };
-  const entries = [];
-  for (const r of compressible) {
-    entries.push({
-      startRef: r.startRef,
-      endRef: r.endRef,
-      startNum: refNum2(r.startRef),
-      endNum: refNum2(r.endRef),
-      count: r.count,
-      tokens: r.tokens,
-      toolPct: r.toolPct,
-      textPct: r.textPct,
-      compressibleTokens: r.tokens,
-      compressibleCount: r.count,
-      protectedTokens: 0,
-      protectedCount: 0,
-      protectedTools: [],
-      dangerous: r.dangerous ?? false
-    });
+function buildStatusReport(state, messages, countTokens, options = {}) {
+  const scope = options.scope;
+  const view = options.view ?? "ranges";
+  const toolFilter = options.tool;
+  const sort = options.sort ?? "size";
+  const limit = options.limit ?? 30;
+  const activeBlocks2 = state.blocks.filter((b) => b.active).sort((a, b) => numericPart2(a.blockId) - numericPart2(b.blockId));
+  if (scope === "compressed") {
+    return renderCompressedDrilldown(activeBlocks2, state, sort, limit, countTokens);
   }
-  for (const r of protectedRanges) {
-    entries.push({
-      startRef: r.startRef,
-      endRef: r.endRef,
-      startNum: refNum2(r.startRef),
-      endNum: refNum2(r.endRef),
-      count: r.count,
-      tokens: r.tokens,
-      toolPct: 0,
-      textPct: 0,
-      compressibleTokens: 0,
-      compressibleCount: 0,
-      protectedTokens: r.tokens,
-      protectedCount: r.count,
-      protectedTools: [...r.tools],
-      dangerous: false
-    });
-  }
-  entries.sort((a, b) => a.startNum - b.startNum);
-  const merged = [];
-  for (const e of entries) {
-    const last = merged[merged.length - 1];
-    if (last && e.startNum <= last.endNum + 1) {
-      last.endRef = e.endRef;
-      last.endNum = Math.max(last.endNum, e.endNum);
-      last.count += e.count;
-      last.tokens += e.tokens;
-      last.compressibleTokens += e.compressibleTokens;
-      last.compressibleCount += e.compressibleCount;
-      last.protectedTokens += e.protectedTokens;
-      last.protectedCount += e.protectedCount;
-      if (e.dangerous) last.dangerous = true;
-      for (const t of e.protectedTools) {
-        if (!last.protectedTools.includes(t)) last.protectedTools.push(t);
-      }
-    } else {
-      merged.push({ ...e });
-    }
-  }
-  const lines = merged.map((e) => {
-    const suffix = e.dangerous && e.compressibleTokens > 0 ? "  \u26A0\uFE0F NOT recommended unless you are certain." : "";
-    if (e.protectedTokens > 0 && e.compressibleTokens === 0) {
-      return `  ${e.startRef}\u2013${e.endRef}  ${e.count} msgs  ${formatK(e.tokens)} [PROTECTED: ${e.protectedTools.join(", ")} \u2014 not compressible]${suffix}`;
-    }
-    if (e.protectedTokens > 0 && e.compressibleTokens > 0) {
-      return `  ${e.startRef}\u2013${e.endRef}  ${e.count} msgs  ${formatK(e.tokens)} [${formatK(e.compressibleTokens)} compressible | ${formatK(e.protectedTokens)} protected: ${e.protectedTools.join(", ")}]${suffix}`;
-    }
-    return `  ${e.startRef}\u2013${e.endRef}  ${e.count} msgs  ${formatK(e.tokens)} [tool ${e.toolPct}% | text ${e.textPct}%]${suffix}`;
-  });
-  return `Compressible ranges (${merged.length}, oldest first):
-${lines.join("\n")}`;
-}
-function renderNudgeText(decision, prompts = defaultPrompts) {
-  const breakdownStr = formatBreakdown(decision.contextBreakdown);
-  const rangesStr = formatRanges(decision.compressibleRanges, decision.protectedRanges ?? []);
-  const isEmergency = !!decision.breakdown?.emergencyOverride || !!decision.breakdown?.overLimit;
-  if (decision.tier !== null && decision.tier >= 2) {
-    const isT2 = decision.tier === 2;
-    const targets = decision.tierTargetBlocks ?? [];
-    const blockList = formatTierTargetBlocks(targets);
-    const startId = targets[0]?.blockId ?? "b1";
-    const endId = targets[targets.length - 1]?.blockId ?? "b5";
-    const voice = isEmergency ? "emergency" : "gentle";
-    const triggerLine = isEmergency ? `[EMERGENCY \u2014 TIER ${decision.tier} ${isT2 ? "DISTILLATION" : "CONDENSATION"}] Context limit reached \u2014 distill NOW into a denser summary to reclaim tokens.` : `[TIER ${decision.tier} ${isT2 ? "DISTILLATION" : "CONDENSATION"} TRIGGER]`;
-    return {
-      voice,
-      text: [
-        efficiencyNote(prompts),
-        "",
-        breakdownStr,
-        "",
-        triggerLine,
-        isT2 ? `Your tier-1 compression summaries have accumulated. Distill them into a single denser tier-2 summary. Use block IDs as boundaries (startId and endId as bN). Any raw (uncompressed) messages sitting between the boundary blocks are absorbed into the tier-2 block as well \u2014 apply HOW TO COMPRESS to those raw messages and the TIER 2 distillation rules to the existing summaries, so the whole span is covered and nothing is lost.` : `Your tier-2 compression summaries have accumulated. Condense them further into a tier-3 ultra-condensed summary. Use block IDs as boundaries (startId and endId as bN). Any raw (uncompressed) messages sitting between the boundary blocks are absorbed into the tier-3 block as well \u2014 apply HOW TO COMPRESS to those raw messages and the TIER 3 condensation rules to the existing summaries, so the whole span is covered and nothing is lost.`,
-        blockList,
-        `Example: compress({ content: [{ startId: "${startId}", endId: "${endId}", summary: "..." }] })`,
-        "",
-        prompts.howToCompressRules,
-        "",
-        isT2 ? prompts.tier2DistillRules : prompts.tier3CondenseRules
-      ].join("\n")
-    };
-  }
-  if (isEmergency) {
-    return {
-      voice: "emergency",
-      text: [
-        emergencyHeader(prompts),
-        "",
-        breakdownStr,
-        "",
-        prompts.howToCompressRules,
-        "",
-        `{ "topic": "...", "content": [{ "startId": "<ID>", "endId": "<ID>", "summary": "..." }] }`,
-        "Only use IDs from visible messages above. Compress older work first.",
-        "",
-        rangesStr
-      ].join("\n")
-    };
-  }
-  return {
-    voice: "gentle",
-    text: [
-      efficiencyNote(prompts),
-      "",
-      breakdownStr,
-      "",
-      prompts.howToCompressRules,
-      "",
-      rangesStr,
-      "",
-      `\u{1F4A1} Compress all ranges in one call (pass multiple content entries: \`content: [{...}, {...}]\`).`
-    ].join("\n")
-  };
-}
-function parseBlockIdArg(arg) {
-  const normalized = arg.trim().toLowerCase();
-  const refMatch = /^b0*(\d+)$/.exec(normalized);
-  if (refMatch && refMatch[1] !== void 0) return `b${refMatch[1]}`;
-  const numMatch = /^(\d+)$/.exec(normalized);
-  if (numMatch && numMatch[1] !== void 0) return `b${numMatch[1]}`;
-  return null;
-}
-function collectBlockContent(state, block, messages, options = {}) {
-  const full = options.full ?? false;
-  const targetIds = new Set(block.effectiveMessageIds);
-  if (full) {
-    const msgs = messages.filter((m) => targetIds.has(m.id));
-    if (msgs.length === 0) return { text: "", count: 0 };
-    return { text: msgs.map(formatMessage).join("\n\n"), count: msgs.length };
-  }
-  const nestedChildren = [];
-  const nestedCovered = /* @__PURE__ */ new Set();
-  for (const childId of block.directBlockIds) {
-    const child = state.blocks.find((b) => b.blockId === childId);
-    if (!child?.active) continue;
-    nestedChildren.push(child);
-    for (const id of child.effectiveMessageIds) nestedCovered.add(id);
-  }
-  const parts = [];
-  for (const child of nestedChildren) {
-    const label = child.topic ? `${child.blockId}: ${child.topic}` : child.blockId;
-    parts.push(`${SUMMARY_HEADER} \u2014 ${label}
-${child.summary}`);
-  }
-  let directCount = 0;
-  for (const m of messages) {
-    if (targetIds.has(m.id) && !nestedCovered.has(m.id)) {
-      parts.push(formatMessage(m));
-      directCount++;
-    }
-  }
-  const count = directCount + nestedChildren.length;
-  if (count === 0) return { text: "", count: 0 };
-  return { text: parts.join("\n\n"), count };
-}
-function formatMessage(message) {
-  const text = message.text ?? "";
-  if (message.toolName && message.contentType !== "text") {
-    return `[${message.role} \u2022 ${message.toolName}]
-${text}`;
-  }
-  return `[${message.role}]
-${text}`;
-}
-function formatTokens2(n) {
-  if (!Number.isFinite(n) || n <= 0) return "0";
-  return n >= 1e3 ? `${(n / 1e3).toFixed(1)}K` : String(n);
-}
-function pct(n, total) {
-  if (n <= 0 || total <= 0) return 0;
-  return Math.max(1, Math.round(n / total * 100));
-}
-function numericPart2(blockId) {
-  const match = /^b(\d+)$/.exec(blockId);
-  return match && match[1] !== void 0 ? Number(match[1]) : 0;
-}
-function summaryTokensOf(block, countTokens) {
-  return countTokens(block.summary);
-}
-function effectiveCompressedTokens(block, _state, _countTokens) {
-  return block.compressedTokens;
-}
-function tierLabel(block) {
-  return `T${block.tier}`;
-}
-function tierBreakdown(blocks, countTokens) {
-  const tierTokens = {};
-  for (const block of blocks) {
-    tierTokens[block.tier] = (tierTokens[block.tier] ?? 0) + summaryTokensOf(block, countTokens);
-  }
-  const tiers = Object.keys(tierTokens).map(Number);
-  if (tiers.length <= 1) return null;
-  const parts = [];
-  for (const tier of [1, 2, 3]) {
-    if (tierTokens[tier]) parts.push(`T${tier}: ${formatTokens2(tierTokens[tier])}`);
-  }
-  return parts.join(" | ");
-}
-function collectVisible(messages, state, countTokens) {
-  const coveredIds = /* @__PURE__ */ new Set();
-  for (const block of state.blocks) {
-    if (!block.active) continue;
-    for (const id of block.effectiveMessageIds) coveredIds.add(id);
-  }
-  let summaryTokens = 0;
-  for (const block of state.blocks) {
-    if (block.active) summaryTokens += summaryTokensOf(block, countTokens);
-  }
-  const visible = [];
-  messages.forEach((message, index) => {
-    if (coveredIds.has(message.id)) return;
-    const ref = refForRaw(state.messageRefs, message.id);
-    if (!ref) return;
-    const tokens = countTokens(message.text ?? "");
-    const tool = message.toolName ?? "text";
-    if (tokens > 0) visible.push({ ref, tokens, tool, index });
-  });
-  return { visible, summaryTokens };
-}
-function buildStatusReport(state, messages, countTokens, options = {}) {
-  const scope = options.scope;
-  const view = options.view ?? "ranges";
-  const toolFilter = options.tool;
-  const sort = options.sort ?? "size";
-  const limit = options.limit ?? 30;
-  const activeBlocks2 = state.blocks.filter((b) => b.active).sort((a, b) => numericPart2(a.blockId) - numericPart2(b.blockId));
-  if (scope === "compressed") {
-    return renderCompressedDrilldown(activeBlocks2, state, sort, limit, countTokens);
-  }
-  const { visible, summaryTokens } = collectVisible(messages, state, countTokens);
-  if (scope === "uncompressed") {
-    if (view === "messages") {
-      return renderMessageDrilldown(visible, toolFilter, sort, limit);
-    }
-    return renderUncompressedRanges(visible);
+  const { visible, summaryTokens } = collectVisible(messages, state, countTokens);
+  if (scope === "uncompressed") {
+    if (view === "messages") {
+      return renderMessageDrilldown(visible, toolFilter, sort, limit);
+    }
+    return renderUncompressedRanges(visible);
   }
   return renderOverview(visible, summaryTokens, activeBlocks2, state, countTokens, limit);
 }
@@ -3604,7 +3744,7 @@ async function abortableSleep(ms, signal) {
     if (signal.aborted) return "aborted";
     const remaining = end - Date.now();
     if (remaining <= 0) return "ok";
-    await new Promise((resolve2) => setTimeout(resolve2, Math.min(250, remaining)));
+    await new Promise((resolve3) => setTimeout(resolve3, Math.min(250, remaining)));
   }
 }
 
@@ -3930,17 +4070,20 @@ function createRuntime(adapter) {
     for (const o of outcomes) {
       if (compressOutcomeSeen.has(o.toolCallId)) continue;
       compressOutcomeSeen.add(o.toolCallId);
-      if (o.isError) {
+      if (o.isError || o.noop === true) {
         compressFailCount += 1;
       } else if (o.success) {
         compressFailCount = 0;
       }
     }
     const latest = outcomes.length > 0 ? outcomes[outcomes.length - 1] : void 0;
-    const retryFor = latest && latest.isError && compressFailCount >= 1 && compressFailCount < MAX_COMPRESS_ATTEMPTS ? latest.toolCallId : null;
+    const retryFor = latest && (latest.isError || latest.noop === true) && compressFailCount >= 1 && compressFailCount < MAX_COMPRESS_ATTEMPTS ? latest.toolCallId : null;
     const cappedNow = compressFailCount >= MAX_COMPRESS_ATTEMPTS && prevCount < MAX_COMPRESS_ATTEMPTS;
     return { count: compressFailCount, retryFor, cappedNow };
   }
+  function compressRetryCappedFor(turnKey) {
+    return compressFailTurnKey === turnKey && compressFailCount >= MAX_COMPRESS_ATTEMPTS;
+  }
   function clearCompressRetryTracking() {
     compressOutcomeSeen.clear();
     compressFailTurnKey = null;
@@ -3949,10 +4092,10 @@ function createRuntime(adapter) {
   async function acquireLock(sid) {
     const prev = locks.get(sid) ?? Promise.resolve();
     let release;
-    const next = new Promise((resolve2) => {
+    const next = new Promise((resolve3) => {
       release = () => {
         locks.delete(sid);
-        resolve2();
+        resolve3();
       };
     });
     locks.set(sid, prev.then(() => next));
@@ -4033,7 +4176,7 @@ function createRuntime(adapter) {
     nudgeShownTurns.add(k);
   }, nudgeShownFor: (k) => nudgeShownTurns.has(k), clearNudgeTracking: () => {
     nudgeShownTurns.clear();
-  }, noteCompressOutcomes, clearCompressRetryTracking, liveContextLimit, configFor, reloadConfig, stateFor, save, acquireLock, overflowFor, overflowDrop, throttleFor, throttleDrop };
+  }, noteCompressOutcomes, compressRetryCappedFor, clearCompressRetryTracking, liveContextLimit, configFor, reloadConfig, stateFor, save, acquireLock, overflowFor, overflowDrop, throttleFor, throttleDrop };
 }
 
 // node_modules/typebox/build/system/memory/memory.mjs
@@ -8545,8 +8688,16 @@ function normalizeRanges(content) {
   }
   return ranges;
 }
+function compressPanelBlocks(text) {
+  if (!text.trimStart().startsWith("\u25A3 ACP |")) return -1;
+  const m = text.match(/, (\d+) blocks?\)/);
+  return m ? Number(m[1]) : -1;
+}
 function isCompressSuccessText(text) {
-  return text.trimStart().startsWith("\u25A3 ACP |");
+  return compressPanelBlocks(text) > 0;
+}
+function isCompressNoopText(text) {
+  return compressPanelBlocks(text) === 0;
 }
 function tier3OnlyRewrite(newBlocks, allBlocks) {
   if (newBlocks.length === 0) return null;
@@ -8978,16 +9129,19 @@ function formatSize(tokens) {
   return `${(tokens / 1e6).toFixed(1)}M`;
 }
 
-// node_modules/billion-context-kit/dist/index.js
-var VIABLE_RANGE_MIN_TOKENS = 200;
-function viableRanges(ranges) {
-  return ranges.filter((r) => r.tokens >= VIABLE_RANGE_MIN_TOKENS);
-}
-function topicFallback(summary) {
-  const first = summary.split(/[.\n]/)[0] ?? "";
-  const t = first.trim().replace(/^["'`]+/, "").trim();
-  return t.length <= 30 ? t : `${t.slice(0, 30).trimEnd()}\u2026`;
-}
+// src/delegate-tool.ts
+import {
+  spawn
+} from "child_process";
+import { createWriteStream, existsSync as existsSync3 } from "fs";
+import { mkdir as mkdir2, mkdtemp, writeFile as writeFile2, rm, appendFile } from "fs/promises";
+import { tmpdir as tmpdir2 } from "os";
+import { dirname as dirname4, join as join6, resolve as resolvePath } from "path";
+
+// src/footer-status.ts
+var FOOTER_STATUS_KEY = "billion-context-pi";
+var ui;
+var lastFooterText = "";
 function formatCompactTokens(count) {
   if (count < 1e3) return count.toString();
   if (count < 1e4) return `${(count / 1e3).toFixed(1)}k`;
@@ -8995,117 +9149,9 @@ function formatCompactTokens(count) {
   if (count < 1e7) return `${(count / 1e6).toFixed(1)}M`;
   return `${Math.round(count / 1e6)}M`;
 }
-function bar(value, total, width = 20) {
-  if (total === 0) return "";
-  const filled = Math.max(0, Math.min(width, Math.round(value / total * width)));
-  return "\u2588".repeat(filled) + "\u2591".repeat(width - filled);
-}
-function buildStatusPanel(input) {
-  const { tokenCount, state, nudge, modelContextLimit } = input;
-  const fmt2 = input.fmtTokens ?? formatCompactTokens;
-  const bd = nudge?.contextBreakdown;
-  const limit = modelContextLimit;
-  const classified = bd ? bd.system + bd.tool + bd.summaries + bd.code + bd.text : 0;
-  const systemPromptTokens = input.systemPromptTokens;
-  const sentTotal = classified + systemPromptTokens;
-  const sessionOnly = input.unprunedTokens !== void 0 ? Math.max(0, input.unprunedTokens - sentTotal) : 0;
-  const displayTotal = tokenCount;
-  const displayPct = limit > 0 ? Math.round(displayTotal / limit * 100) : 0;
-  const sentPct = limit > 0 ? Math.round(sentTotal / limit * 100) : 0;
-  const activeBlocksList = state.blocks.filter((b) => b.active);
-  const totalBlocksList = state.blocks;
-  const lines = [];
-  lines.push("\u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E");
-  lines.push("\u2502           ACP Context Analysis              \u2502");
-  lines.push("\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F");
-  if (input.version) lines.push(input.version);
-  lines.push("");
-  lines.push(`Context (session accounting, host footer scale): ${displayPct}% (${fmt2(displayTotal)} / ${fmt2(limit)}) \u2014 never shrinks; includes compressed originals`);
-  if (nudge && bd) {
-    const growth = bd.growth;
-    if (growth > 0 && displayTotal > 0) {
-      lines.push(`Growth: +${fmt2(growth)} since last nudge`);
-    }
-    lines.push("");
-    lines.push(`Sent to LLM (after compression, est.): ${fmt2(sentTotal)}${limit > 0 ? ` (${sentPct}% of limit)` : ""}`);
-    if (input.unprunedTokens !== void 0 && sessionOnly > 0) {
-      lines.push(`Session-only (compressed originals, est.): ${fmt2(sessionOnly)} \u2014 pruned from every request; the footer/nudge still count them`);
-    }
-    lines.push("");
-    lines.push("Token Breakdown (sent view):");
-    const categories = [
-      { label: "Tool", value: bd.tool },
-      { label: "SysPrompt", value: systemPromptTokens },
-      { label: "Text", value: bd.text },
-      { label: "Code", value: bd.code },
-      { label: "Summaries", value: bd.summaries }
-    ];
-    for (const cat of categories) {
-      if (cat.value <= 0) continue;
-      const pct2 = sentTotal > 0 ? Math.round(cat.value / sentTotal * 100) : 0;
-      const b = bar(cat.value, sentTotal);
-      lines.push(`  ${cat.label.padEnd(10)} ${b} ${String(pct2).padStart(3)}%  ${fmt2(cat.value)}`);
-    }
-  }
-  lines.push("");
-  if (nudge) {
-    if (nudge.shouldInject) {
-      const tierInfo = nudge.tier ? ` [T${nudge.tier} distillation]` : "";
-      lines.push(`Nudge: ACTIVE${tierInfo} \u2014 ${nudge.reason}`);
-    } else {
-      lines.push(`Nudge: idle \u2014 ${nudge.reason}`);
-    }
-  }
-  const ranges = viableRanges(nudge?.compressibleRanges ?? []);
-  const protectedRanges = nudge?.protectedRanges ?? [];
-  if (ranges.length > 0 || protectedRanges.length > 0) {
-    lines.push("");
-    lines.push(formatRanges(ranges, protectedRanges));
-  }
-  if (activeBlocksList.length > 0) {
-    lines.push("");
-    lines.push(`Blocks: ${activeBlocksList.length} active / ${totalBlocksList.length} total (${fmt2(state.stats.tokensCompressed)} tokens compressed)`);
-    for (const b of activeBlocksList) {
-      const topic = b.topic ? `: ${b.topic}` : `: ${topicFallback(b.summary || "")}`;
-      const summaryTok = defaultCountTokens(b.summary || "");
-      const origTok = b.compressedTokens > 0 ? b.compressedTokens : summaryTok;
-      lines.push(`  [${b.blockId}] T${b.tier} ${fmt2(origTok)}\u2192${fmt2(summaryTok)}${topic}`);
-    }
-  } else if (totalBlocksList.length > 0) {
-    lines.push("");
-    lines.push(`Blocks: 0 active / ${totalBlocksList.length} total (${fmt2(state.stats.tokensCompressed)} tokens compressed)`);
-  } else {
-    lines.push("");
-    lines.push("Blocks: none (nothing compressed yet)");
-  }
-  lines.push("");
-  lines.push("Tag visibility: tags injected to LLM only (deep copy), not persisted in session, not shown in terminal.");
-  return lines.join("\n");
-}
-
-// src/delegate-tool.ts
-import {
-  spawn
-} from "child_process";
-import { createWriteStream, existsSync as existsSync3 } from "fs";
-import { mkdir as mkdir2, mkdtemp, writeFile as writeFile2, rm, appendFile } from "fs/promises";
-import { tmpdir as tmpdir2 } from "os";
-import { dirname as dirname4, join as join6, resolve as resolvePath } from "path";
-
-// src/footer-status.ts
-var FOOTER_STATUS_KEY = "billion-context-pi";
-var ui;
-var lastFooterText = "";
-function formatCompactTokens2(count) {
-  if (count < 1e3) return count.toString();
-  if (count < 1e4) return `${(count / 1e3).toFixed(1)}k`;
-  if (count < 1e6) return `${Math.round(count / 1e3)}k`;
-  if (count < 1e7) return `${(count / 1e6).toFixed(1)}M`;
-  return `${Math.round(count / 1e6)}M`;
-}
-function initFooterStatus(ctx) {
-  ui = ctx.ui;
-  lastFooterText = void 0;
+function initFooterStatus(ctx) {
+  ui = ctx.ui;
+  lastFooterText = void 0;
 }
 function updateFooterStatus() {
   if (!ui) return;
@@ -9113,7 +9159,7 @@ function updateFooterStatus() {
   let text;
   if (usage && usage.totalTokens > 0) {
     const costStr = usage.cost.total > 0 ? ` ($${usage.cost.total.toFixed(4)})` : "";
-    text = `sub-agents \u2191${formatCompactTokens2(usage.input)} \u2193${formatCompactTokens2(usage.output)}${costStr}`;
+    text = `sub-agents \u2191${formatCompactTokens(usage.input)} \u2193${formatCompactTokens(usage.output)}${costStr}`;
   }
   if ((text ?? "") === lastFooterText) return;
   lastFooterText = text ?? "";
@@ -9874,7 +9920,7 @@ function makeDelegateWaitTool(_pi) {
       if (run.waiter) {
         return { details: void 0, content: [{ type: "text", text: `Delegate \`${args.runId}\` already has a wait in progress; do not wait on it twice.` }] };
       }
-      return new Promise((resolve2) => {
+      return new Promise((resolve3) => {
         let settled = false;
         let timer2;
         const finish = (result) => {
@@ -9883,7 +9929,7 @@ function makeDelegateWaitTool(_pi) {
           run.waiter = void 0;
           if (timer2) clearTimeout(timer2);
           signal?.removeEventListener("abort", onAbort);
-          resolve2(result);
+          resolve3(result);
         };
         const onAbort = () => {
           finish({ details: void 0, content: [{ type: "text", text: `Aborted; delegate \`${args.runId}\` is still running in the background. A notification will be injected when it finishes.` }] });
@@ -9996,9 +10042,9 @@ async function runDelegate(pi, args, ctx, signal) {
     await mkdir2(OUT_DIR, { recursive: true });
     const replyStream = createWriteStream(replyFile, { flags: "a" });
     const activityStream = useJsonStream ? createWriteStream(activityFile, { flags: "a" }) : null;
-    const endStream = (s) => new Promise((resolve2) => {
-      if (!s || s.destroyed || s.closed) return resolve2();
-      s.end(() => resolve2());
+    const endStream = (s) => new Promise((resolve3) => {
+      if (!s || s.destroyed || s.closed) return resolve3();
+      s.end(() => resolve3());
     });
     let stdoutBuf = "";
     const applier = makeEventApplier(
@@ -10167,7 +10213,7 @@ Complete the task below.`, "utf8");
   return { cliArgs, tmpDir, isAsync, useJsonStream };
 }
 function waitForChild(child, signal) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve3) => {
     const stdoutChunks = [];
     let stderrText = "";
     child.stdout?.on("data", (c) => stdoutChunks.push(c));
@@ -10186,7 +10232,7 @@ function waitForChild(child, signal) {
     function finish(r) {
       clearTimeout(timer2);
       signal?.removeEventListener("abort", onAbort);
-      resolve2(r);
+      resolve3(r);
     }
     child.on("close", (code) => {
       finish({
@@ -10249,144 +10295,438 @@ Tokens: ${totalUsage.input.toLocaleString()} in, ${totalUsage.output.toLocaleStr
         lines.push(`cost=${JSON.stringify(c)}`);
       }
     }
-    if (lines.length) usageNote = ` Usage: ${lines.join(", ")}.`;
+    if (lines.length) usageNote = ` Usage: ${lines.join(", ")}.`;
+  }
+  const header = `[acp_delegate ${status}] **${agent}** (runId \`${runId}\`, exit ${code ?? "?"})${timeoutNote}${remainingLine}${usageNote} This is an automated system notification, NOT a user message. Read the result file if you need the details, then continue your original task; do not treat this as a new user request.`;
+  const text = formatPayload(header, file, task);
+  try {
+    send.call(pi, text, { deliverAs: "followUp" });
+    return true;
+  } catch (err) {
+    debug.event("delegate-inject-error", { runId, error: String(err) });
+    logError("delegate", { event: "inject-error", runId, agent, error: String(err) });
+    return false;
+  }
+}
+function formatPayload(header, file, task, body) {
+  const lines = [header, "", `Task: ${truncate2(task, 160)}`];
+  if (file) {
+    lines.push(``, `Full result: \`${file}\``, "(use the `read` tool to open it if you need the details)");
+  } else {
+    lines.push("", "(result could not be persisted to a file)");
+  }
+  if (body) {
+    lines.push("", "Output:", "~~~", truncate2(body, RESULT_SUMMARY_CHARS), "~~~");
+  }
+  lines.push("");
+  return lines.join("\n");
+}
+async function persistResult(runId, body) {
+  try {
+    await mkdir2(OUT_DIR, { recursive: true });
+  } catch {
+  }
+  const file = join6(OUT_DIR, `${runId}.out`);
+  try {
+    await writeFile2(file, body, "utf8");
+    return file;
+  } catch (err) {
+    debug.event("delegate-persist-error", { runId, file, error: String(err) });
+    logError("delegate", { event: "persist-error", runId, file, error: String(err) });
+    return "";
+  }
+}
+async function cleanupTmp(tmpDir) {
+  if (!tmpDir) return;
+  try {
+    await rm(tmpDir, { recursive: true, force: true });
+  } catch {
+  }
+}
+function truncate2(s, n) {
+  if (s.length <= n) return s;
+  return s.slice(0, n - 1) + "\u2026";
+}
+
+// src/status-tool.ts
+var StatusParams = typebox_exports.Object({
+  scope: typebox_exports.Optional(typebox_exports.Union([typebox_exports.Literal("compressed"), typebox_exports.Literal("uncompressed")], { description: '"compressed" = drill into blocks; "uncompressed" = show visible messages/ranges. Default: overview.' })),
+  view: typebox_exports.Optional(typebox_exports.Union([typebox_exports.Literal("ranges"), typebox_exports.Literal("messages")], { description: 'For uncompressed scope: "ranges" (default) or "messages" (per-message listing).' })),
+  tool: typebox_exports.Optional(typebox_exports.String({ description: 'Filter by tool name (e.g. "bash", "read"). Only for uncompressed+messages.' })),
+  sort: typebox_exports.Optional(typebox_exports.Union([typebox_exports.Literal("size"), typebox_exports.Literal("time"), typebox_exports.Literal("tool"), typebox_exports.Literal("age")], { description: "Sort order. Default: size." })),
+  limit: typebox_exports.Optional(typebox_exports.Number({ description: "Max items to show (default: 30)." }))
+});
+function makeStatusTool(runtime) {
+  return {
+    name: "acp_status",
+    label: "ACP Status",
+    description: "Context status: overview, compressed blocks, or uncompressed ranges/messages. No args = overview + totals + compressible ranges. scope:'uncompressed' + view:'messages' for per-message listing. scope:'compressed' for block drilldown.",
+    promptSnippet: 'acp_status({}) or acp_status({ scope: "uncompressed", view: "messages" })',
+    promptGuidelines: [
+      "Call with no args for a quick overview of context usage.",
+      "Use scope:'uncompressed' to find the largest compressible ranges.",
+      "Use scope:'compressed' to inspect existing compression blocks."
+    ],
+    parameters: StatusParams,
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      let result;
+      try {
+        result = await handleStatus(params, runtime, ctx);
+      } catch (e) {
+        logThrow("status", e, { sid: ctx.sessionManager.getSessionId(), scope: params.scope ?? null });
+        throw e;
+      }
+      return { details: void 0, content: [{ type: "text", text: result }] };
+    }
+  };
+}
+async function handleStatus(args, runtime, ctx) {
+  const { state, coreMessages } = await runtime.stateFor(ctx);
+  const config = runtime.configFor(ctx);
+  const coveredIds = collectCoveredMessageIds(state);
+  const modelId = ctx.model?.id ?? "default";
+  const systemPromptText = getSystemPromptText(ctx);
+  const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
+  const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
+  const turn = runtime.core.processTurn({
+    messages: coreMessages,
+    state,
+    config,
+    tokenCount: calibrateTokens(sentTokens, runtime.density.densityFor(modelId))
+  });
+  const processed = turn.messages;
+  const base = buildStatusReport(turn.state, processed, defaultCountTokens, {
+    scope: args.scope,
+    view: args.view,
+    tool: args.tool,
+    sort: args.sort,
+    limit: args.limit
+  });
+  if (args.scope) return base;
+  const nudge = turn.nudge;
+  const ranges = viableRanges(nudge?.compressibleRanges ?? []);
+  const protectedRanges = nudge?.protectedRanges ?? [];
+  const extra = [];
+  if (nudge) {
+    extra.push("");
+    extra.push(
+      nudge.shouldInject ? `Nudge: ACTIVE \u2014 ${nudge.reason}` : `Nudge: idle \u2014 ${nudge.reason}`
+    );
+  }
+  if (ranges.length > 0 || protectedRanges.length > 0) {
+    extra.push("");
+    extra.push(formatRanges(ranges, protectedRanges));
+  }
+  const delegateUsage = getDelegateUsage();
+  if (delegateUsage && delegateUsage.totalTokens > 0) {
+    extra.push("");
+    const cost = delegateUsage.cost.total;
+    const costStr = cost > 0 ? ` ($${cost.toFixed(4)})` : "";
+    extra.push("\u2500\u2500 Session delegate usage (excluded from main totals) \u2500\u2500");
+    extra.push(`Tokens: ${delegateUsage.input.toLocaleString()} in, ${delegateUsage.output.toLocaleString()} out (${delegateUsage.totalTokens.toLocaleString()} total)${costStr}`);
+  } else if (resolveDelegate(runtime.adapter).displayUsage === "merged") {
+    extra.push("");
+    extra.push("merged mode: delegate usage is included in main session totals.");
+  } else {
+    extra.push("");
+    extra.push("Delegate usage: none this session.");
+  }
+  return extra.length > 0 ? `${base}
+${extra.join("\n")}` : base;
+}
+
+// node_modules/acp-kernel/dist/panel/index.js
+function topicFallback(summary) {
+  const first = summary.split(/[.\n]/)[0] ?? "";
+  const t = first.trim().replace(/^["'`]+/, "").trim();
+  return t.length <= 30 ? t : `${t.slice(0, 30).trimEnd()}\u2026`;
+}
+function formatCompactTokens2(count) {
+  if (count < 1e3) return count.toString();
+  if (count < 1e4) return `${(count / 1e3).toFixed(1)}k`;
+  if (count < 1e6) return `${Math.round(count / 1e3)}k`;
+  if (count < 1e7) return `${(count / 1e6).toFixed(1)}M`;
+  return `${Math.round(count / 1e6)}M`;
+}
+function bar(value, total, width = 20) {
+  if (total === 0) return "";
+  const filled = Math.max(0, Math.min(width, Math.round(value / total * width)));
+  return "\u2588".repeat(filled) + "\u2591".repeat(width - filled);
+}
+function buildStatusPanel(input) {
+  const { tokenCount, state, nudge, modelContextLimit } = input;
+  const fmt2 = input.fmtTokens ?? formatCompactTokens2;
+  const bd = nudge?.contextBreakdown;
+  const limit = modelContextLimit;
+  const classified = bd ? bd.system + bd.tool + bd.summaries + bd.code + bd.text : 0;
+  const systemPromptTokens = input.systemPromptTokens;
+  const sentTotal = classified + systemPromptTokens;
+  const sessionOnly = input.unprunedTokens !== void 0 ? Math.max(0, input.unprunedTokens - sentTotal) : 0;
+  const displayTotal = tokenCount;
+  const displayPct = limit > 0 ? Math.round(displayTotal / limit * 100) : 0;
+  const sentPct = limit > 0 ? Math.round(sentTotal / limit * 100) : 0;
+  const activeBlocksList = state.blocks.filter((b) => b.active);
+  const totalBlocksList = state.blocks;
+  const lines = [];
+  lines.push("\u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E");
+  lines.push("\u2502           ACP Context Analysis              \u2502");
+  lines.push("\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F");
+  if (input.version) lines.push(input.version);
+  lines.push("");
+  lines.push(`Context (session accounting, host footer scale): ${displayPct}% (${fmt2(displayTotal)} / ${fmt2(limit)}) \u2014 never shrinks; includes compressed originals`);
+  if (nudge && bd) {
+    const growth = bd.growth;
+    if (growth > 0 && displayTotal > 0) {
+      lines.push(`Growth: +${fmt2(growth)} since last nudge`);
+    }
+    lines.push("");
+    lines.push(`Sent to LLM (after compression, est.): ${fmt2(sentTotal)}${limit > 0 ? ` (${sentPct}% of limit)` : ""}`);
+    if (input.unprunedTokens !== void 0 && sessionOnly > 0) {
+      lines.push(`Session-only (compressed originals, est.): ${fmt2(sessionOnly)} \u2014 pruned from every request; the footer/nudge still count them`);
+    }
+    lines.push("");
+    lines.push("Token Breakdown (sent view):");
+    const categories = [
+      { label: "Tool", value: bd.tool },
+      { label: "SysPrompt", value: systemPromptTokens },
+      { label: "Text", value: bd.text },
+      { label: "Code", value: bd.code },
+      { label: "Summaries", value: bd.summaries }
+    ];
+    for (const cat of categories) {
+      if (cat.value <= 0) continue;
+      const pct2 = sentTotal > 0 ? Math.round(cat.value / sentTotal * 100) : 0;
+      const b = bar(cat.value, sentTotal);
+      lines.push(`  ${cat.label.padEnd(10)} ${b} ${String(pct2).padStart(3)}%  ${fmt2(cat.value)}`);
+    }
+  }
+  lines.push("");
+  if (nudge) {
+    if (nudge.shouldInject) {
+      const tierInfo = nudge.tier ? ` [T${nudge.tier} distillation]` : "";
+      lines.push(`Nudge: ACTIVE${tierInfo} \u2014 ${nudge.reason}`);
+    } else {
+      lines.push(`Nudge: idle \u2014 ${nudge.reason}`);
+    }
+  }
+  const ranges = viableRanges(nudge?.compressibleRanges ?? []);
+  const protectedRanges = nudge?.protectedRanges ?? [];
+  if (ranges.length > 0 || protectedRanges.length > 0) {
+    lines.push("");
+    lines.push(formatRanges(ranges, protectedRanges));
+  }
+  if (activeBlocksList.length > 0) {
+    lines.push("");
+    lines.push(`Blocks: ${activeBlocksList.length} active / ${totalBlocksList.length} total (${fmt2(state.stats.tokensCompressed)} tokens compressed)`);
+    for (const b of activeBlocksList) {
+      const topic = b.topic ? `: ${b.topic}` : `: ${topicFallback(b.summary || "")}`;
+      const summaryTok = defaultCountTokens(b.summary || "");
+      const origTok = b.compressedTokens > 0 ? b.compressedTokens : summaryTok;
+      lines.push(`  [${b.blockId}] T${b.tier} ${fmt2(origTok)}\u2192${fmt2(summaryTok)}${topic}`);
+    }
+  } else if (totalBlocksList.length > 0) {
+    lines.push("");
+    lines.push(`Blocks: 0 active / ${totalBlocksList.length} total (${fmt2(state.stats.tokensCompressed)} tokens compressed)`);
+  } else {
+    lines.push("");
+    lines.push("Blocks: none (nothing compressed yet)");
+  }
+  lines.push("");
+  lines.push("Tag visibility: tags injected to LLM only (deep copy), not persisted in session, not shown in terminal.");
+  return lines.join("\n");
+}
+
+// src/setup-subagent-tools.ts
+import * as fs3 from "fs";
+import * as os from "os";
+import * as path4 from "path";
+import { CONFIG_DIR_NAME as CONFIG_DIR_NAME3 } from "@earendil-works/pi-coding-agent";
+var ACP_TOOLS2 = ["compress", "decompress", "search_context", "acp_status"];
+function resolveAgentDir() {
+  const envDir = process.env.PI_CODING_AGENT_DIR;
+  if (envDir) {
+    if (envDir === "~") return os.homedir();
+    if (envDir.startsWith("~/")) return path4.join(os.homedir(), envDir.slice(2));
+    return envDir;
+  }
+  return path4.join(os.homedir(), CONFIG_DIR_NAME3, "agent");
+}
+function parseFrontmatterTools(content) {
+  const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
+  if (!match) return null;
+  const body = match[1];
+  if (!body) return null;
+  let name;
+  let tools;
+  for (const rawLine of body.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (line.startsWith("name:")) {
+      name = line.slice(5).trim().replace(/^["']|["']$/g, "");
+    } else if (line.startsWith("tools:")) {
+      const value = line.slice(6).trim();
+      if (value) {
+        tools = value.split(",").map((t) => t.trim().replace(/^["']|["']$/g, "")).filter(Boolean);
+      }
+    }
+  }
+  if (!name) return null;
+  return tools ? { name, tools } : { name };
+}
+function findPiSubagentsInstall(agentDir, cwd) {
+  const candidates = [
+    path4.join(agentDir, "npm", "node_modules", "pi-subagents"),
+    path4.join(cwd, CONFIG_DIR_NAME3, "npm", "node_modules", "pi-subagents")
+  ];
+  const extensionRoots = [
+    path4.join(agentDir, "extensions"),
+    path4.join(cwd, CONFIG_DIR_NAME3, "extensions")
+  ];
+  for (const dir of candidates) {
+    if (fs3.existsSync(path4.join(dir, "package.json"))) return dir;
+  }
+  for (const root of extensionRoots) {
+    let entries;
+    try {
+      entries = fs3.readdirSync(root, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      if (!entry.isDirectory()) continue;
+      const pkgPath = path4.join(root, entry.name, "package.json");
+      try {
+        if (JSON.parse(fs3.readFileSync(pkgPath, "utf-8")).name === "pi-subagents") {
+          return path4.join(root, entry.name);
+        }
+      } catch {
+      }
+    }
   }
-  const header = `[acp_delegate ${status}] **${agent}** (runId \`${runId}\`, exit ${code ?? "?"})${timeoutNote}${remainingLine}${usageNote} This is an automated system notification, NOT a user message. Read the result file if you need the details, then continue your original task; do not treat this as a new user request.`;
-  const text = formatPayload(header, file, task);
+  return null;
+}
+function discoverBuiltinAgents(installDir) {
+  const agentsDir = path4.join(installDir, "agents");
+  let entries;
   try {
-    send.call(pi, text, { deliverAs: "followUp" });
-    return true;
-  } catch (err) {
-    debug.event("delegate-inject-error", { runId, error: String(err) });
-    logError("delegate", { event: "inject-error", runId, agent, error: String(err) });
-    return false;
+    entries = fs3.readdirSync(agentsDir, { withFileTypes: true });
+  } catch {
+    return [];
   }
+  const parsed = [];
+  for (const entry of entries) {
+    if (!entry.isFile() || !entry.name.endsWith(".md")) continue;
+    try {
+      const result = parseFrontmatterTools(fs3.readFileSync(path4.join(agentsDir, entry.name), "utf-8"));
+      if (result) parsed.push(result);
+    } catch {
+    }
+  }
+  return parsed;
 }
-function formatPayload(header, file, task, body) {
-  const lines = [header, "", `Task: ${truncate2(task, 160)}`];
-  if (file) {
-    lines.push(``, `Full result: \`${file}\``, "(use the `read` tool to open it if you need the details)");
+function desiredTools(baseTools) {
+  const tools = baseTools ? [...baseTools] : [];
+  for (const tool of ACP_TOOLS2) {
+    if (!tools.includes(tool)) tools.push(tool);
+  }
+  return tools;
+}
+function ensureSubagentAcpTools(settingsPath, options) {
+  const agentDir = options?.agentDir ?? resolveAgentDir();
+  const cwd = options?.cwd ?? process.cwd();
+  const path_ = settingsPath ?? path4.join(agentDir, "settings.json");
+  let installDir;
+  if (options?.installDir) {
+    installDir = path4.resolve(options.installDir);
+    if (!fs3.existsSync(path4.join(installDir, "package.json"))) {
+      return { path: path_, action: "failed", reason: `not a package: ${installDir}` };
+    }
   } else {
-    lines.push("", "(result could not be persisted to a file)");
+    const detected = findPiSubagentsInstall(agentDir, cwd);
+    if (!detected) {
+      return { path: path_, action: "skipped", reason: "pi-subagents not installed" };
+    }
+    installDir = detected;
   }
-  if (body) {
-    lines.push("", "Output:", "~~~", truncate2(body, RESULT_SUMMARY_CHARS), "~~~");
+  const builtins = discoverBuiltinAgents(installDir);
+  if (builtins.length === 0) {
+    return { path: path_, action: "skipped", reason: "pi-subagents ships no agents/*.md" };
   }
-  lines.push("");
-  return lines.join("\n");
-}
-async function persistResult(runId, body) {
+  let settingsRaw;
   try {
-    await mkdir2(OUT_DIR, { recursive: true });
+    settingsRaw = fs3.readFileSync(path_, "utf-8");
   } catch {
+    return { path: path_, action: "skipped", reason: "not found" };
   }
-  const file = join6(OUT_DIR, `${runId}.out`);
+  let settings2;
   try {
-    await writeFile2(file, body, "utf8");
-    return file;
-  } catch (err) {
-    debug.event("delegate-persist-error", { runId, file, error: String(err) });
-    logError("delegate", { event: "persist-error", runId, file, error: String(err) });
-    return "";
+    settings2 = JSON.parse(settingsRaw);
+    if (typeof settings2 !== "object" || settings2 === null || Array.isArray(settings2)) {
+      return { path: path_, action: "failed", reason: "settings.json root is not an object" };
+    }
+  } catch {
+    return { path: path_, action: "failed", reason: "settings.json is not valid JSON" };
+  }
+  const subagents = typeof settings2.subagents === "object" && settings2.subagents !== null ? settings2.subagents : {};
+  const existingOverrides = typeof subagents.agentOverrides === "object" && subagents.agentOverrides !== null ? subagents.agentOverrides : {};
+  let changed = false;
+  const overrides = {};
+  for (const [name, existing] of Object.entries(existingOverrides)) overrides[name] = existing ?? {};
+  const frontmatterByName = new Map(builtins.map((b) => [b.name, b.tools]));
+  for (const name of builtins.map((b) => b.name)) {
+    const existing = overrides[name];
+    const baseTools = existing?.tools && Array.isArray(existing.tools) && existing.tools.length > 0 ? existing.tools : frontmatterByName.get(name);
+    if (baseTools === void 0) continue;
+    const wanted = desiredTools(baseTools);
+    const current = existing?.tools;
+    if (Array.isArray(current) && current.length > 0 && wanted.every((tool) => current.includes(tool))) {
+      continue;
+    }
+    overrides[name] = { ...existing, tools: wanted };
+    changed = true;
   }
-}
-async function cleanupTmp(tmpDir) {
-  if (!tmpDir) return;
+  if (!changed) {
+    return { path: path_, action: "skipped", reason: "already have ACP tools" };
+  }
+  subagents.agentOverrides = overrides;
+  settings2.subagents = subagents;
+  const backupPath = `${path_}.acp-bak`;
   try {
-    await rm(tmpDir, { recursive: true, force: true });
-  } catch {
+    if (!fs3.existsSync(backupPath)) fs3.copyFileSync(path_, backupPath);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    return { path: path_, action: "failed", reason: `backup failed: ${message}` };
   }
-}
-function truncate2(s, n) {
-  if (s.length <= n) return s;
-  return s.slice(0, n - 1) + "\u2026";
-}
-
-// src/status-tool.ts
-var StatusParams = typebox_exports.Object({
-  scope: typebox_exports.Optional(typebox_exports.Union([typebox_exports.Literal("compressed"), typebox_exports.Literal("uncompressed")], { description: '"compressed" = drill into blocks; "uncompressed" = show visible messages/ranges. Default: overview.' })),
-  view: typebox_exports.Optional(typebox_exports.Union([typebox_exports.Literal("ranges"), typebox_exports.Literal("messages")], { description: 'For uncompressed scope: "ranges" (default) or "messages" (per-message listing).' })),
-  tool: typebox_exports.Optional(typebox_exports.String({ description: 'Filter by tool name (e.g. "bash", "read"). Only for uncompressed+messages.' })),
-  sort: typebox_exports.Optional(typebox_exports.Union([typebox_exports.Literal("size"), typebox_exports.Literal("time"), typebox_exports.Literal("tool"), typebox_exports.Literal("age")], { description: "Sort order. Default: size." })),
-  limit: typebox_exports.Optional(typebox_exports.Number({ description: "Max items to show (default: 30)." }))
-});
-function makeStatusTool(runtime) {
-  return {
-    name: "acp_status",
-    label: "ACP Status",
-    description: "Context status: overview, compressed blocks, or uncompressed ranges/messages. No args = overview + totals + compressible ranges. scope:'uncompressed' + view:'messages' for per-message listing. scope:'compressed' for block drilldown.",
-    promptSnippet: 'acp_status({}) or acp_status({ scope: "uncompressed", view: "messages" })',
-    promptGuidelines: [
-      "Call with no args for a quick overview of context usage.",
-      "Use scope:'uncompressed' to find the largest compressible ranges.",
-      "Use scope:'compressed' to inspect existing compression blocks."
-    ],
-    parameters: StatusParams,
-    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
-      let result;
+  const expectedMtimeMs = fs3.statSync(path_).mtimeMs;
+  const tmpPath = `${path_}.tmp-${process.pid}`;
+  try {
+    fs3.writeFileSync(tmpPath, JSON.stringify(settings2, null, 2) + "\n", "utf-8");
+    if (fs3.statSync(path_).mtimeMs !== expectedMtimeMs) {
+      fs3.unlinkSync(tmpPath);
+      return { path: path_, action: "failed", reason: "settings.json changed during write" };
+    }
+    fs3.renameSync(tmpPath, path_);
+    const written = JSON.parse(fs3.readFileSync(path_, "utf-8"));
+    const writtenSub = written.subagents;
+    const writtenOverrides = writtenSub?.agentOverrides ?? {};
+    for (const b of builtins) {
+      const entry = writtenOverrides[b.name];
+      const tools = entry?.tools ?? [];
+      if (frontmatterByName.get(b.name) !== void 0 && !ACP_TOOLS2.every((t) => tools.includes(t))) {
+        fs3.copyFileSync(backupPath, path_);
+        return { path: path_, action: "failed", reason: "post-write verification failed" };
+      }
+    }
+    return { path: path_, action: "updated" };
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (fs3.existsSync(backupPath)) {
       try {
-        result = await handleStatus(params, runtime, ctx);
-      } catch (e) {
-        logThrow("status", e, { sid: ctx.sessionManager.getSessionId(), scope: params.scope ?? null });
-        throw e;
+        fs3.copyFileSync(backupPath, path_);
+      } catch {
       }
-      return { details: void 0, content: [{ type: "text", text: result }] };
     }
-  };
-}
-async function handleStatus(args, runtime, ctx) {
-  const { state, coreMessages } = await runtime.stateFor(ctx);
-  const config = runtime.configFor(ctx);
-  const coveredIds = collectCoveredMessageIds(state);
-  const modelId = ctx.model?.id ?? "default";
-  const systemPromptText = getSystemPromptText(ctx);
-  const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
-  const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
-  const turn = runtime.core.processTurn({
-    messages: coreMessages,
-    state,
-    config,
-    tokenCount: calibrateTokens(sentTokens, runtime.density.densityFor(modelId))
-  });
-  const processed = turn.messages;
-  const base = buildStatusReport(turn.state, processed, defaultCountTokens, {
-    scope: args.scope,
-    view: args.view,
-    tool: args.tool,
-    sort: args.sort,
-    limit: args.limit
-  });
-  if (args.scope) return base;
-  const nudge = turn.nudge;
-  const ranges = viableRanges(nudge?.compressibleRanges ?? []);
-  const protectedRanges = nudge?.protectedRanges ?? [];
-  const extra = [];
-  if (nudge) {
-    extra.push("");
-    extra.push(
-      nudge.shouldInject ? `Nudge: ACTIVE \u2014 ${nudge.reason}` : `Nudge: idle \u2014 ${nudge.reason}`
-    );
+    return { path: path_, action: "failed", reason: message };
   }
-  if (ranges.length > 0 || protectedRanges.length > 0) {
-    extra.push("");
-    extra.push(formatRanges(ranges, protectedRanges));
-  }
-  const delegateUsage = getDelegateUsage();
-  if (delegateUsage && delegateUsage.totalTokens > 0) {
-    extra.push("");
-    const cost = delegateUsage.cost.total;
-    const costStr = cost > 0 ? ` ($${cost.toFixed(4)})` : "";
-    extra.push("\u2500\u2500 Session delegate usage (excluded from main totals) \u2500\u2500");
-    extra.push(`Tokens: ${delegateUsage.input.toLocaleString()} in, ${delegateUsage.output.toLocaleString()} out (${delegateUsage.totalTokens.toLocaleString()} total)${costStr}`);
-  } else if (resolveDelegate(runtime.adapter).displayUsage === "merged") {
-    extra.push("");
-    extra.push("merged mode: delegate usage is included in main session totals.");
-  } else {
-    extra.push("");
-    extra.push("Delegate usage: none this session.");
-  }
-  return extra.length > 0 ? `${base}
-${extra.join("\n")}` : base;
 }
 
 // src/commands.ts
@@ -10453,6 +10793,25 @@ ${text}`);
           ctx.ui.notify(lines.join("\n"));
         }
       }
+    },
+    {
+      name: "acp-subagents",
+      options: {
+        description: "Add ACP context tools (compress/decompress/search_context/acp_status) to pi-subagents' builtin agents. One-time setup \u2014 re-run after upgrading pi-subagents. Usage: /acp-subagents [installDir]",
+        handler: async (args, ctx) => {
+          const installDir = args.trim();
+          const result = ensureSubagentAcpTools(void 0, installDir ? { installDir } : void 0);
+          if (result.action === "updated") {
+            ctx.ui.notify(`ACP tools enabled for pi-subagents agents in ${result.path}`);
+          } else if (result.action === "skipped") {
+            ctx.ui.notify(
+              `Nothing to do: ${result.reason ?? ""}. Install pi-subagents (pi install npm:pi-subagents) or pass its directory: /acp-subagents <installDir>`
+            );
+          } else {
+            ctx.ui.notify(`Failed to update ${result.path}: ${result.reason ?? "unknown"}`);
+          }
+        }
+      }
     }
   ];
 }
@@ -10467,7 +10826,7 @@ async function statusReport(runtime, ctx) {
   const modelId = ctx.model?.id ?? "default";
   const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
   const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: calibrateTokens(sentTokens, runtime.density.densityFor(modelId)) });
-  const versionStr = "0.1.43" ? `billion-context-pi@${"0.1.43"}` : void 0;
+  const versionStr = "0.1.46" ? `billion-context-pi@${"0.1.46"}` : void 0;
   let text = buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -10685,18 +11044,48 @@ function wireToolGuardrails(pi, runtime) {
 }
 
 // src/update.ts
-import { readFile, writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
-import { join as join7, dirname as dirname5 } from "path";
+import { readFile, writeFile as writeFile3, mkdir as mkdir3, access } from "fs/promises";
+import { join as join8, dirname as dirname5 } from "path";
 import { fileURLToPath } from "url";
 import { execFile } from "child_process";
-import { homedir as homedir4 } from "os";
-import { CONFIG_DIR_NAME as CONFIG_DIR_NAME3 } from "@earendil-works/pi-coding-agent";
+import { homedir as homedir5 } from "os";
+import { CONFIG_DIR_NAME as CONFIG_DIR_NAME4 } from "@earendil-works/pi-coding-agent";
 var PACKAGE_NAME = "billion-context-pi";
 var REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
 var SEMVER_RE = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z-.]+)?$/;
 var CHECK_INTERVAL_MS = 3 * 60 * 1e3;
-var THROTTLE_FILE = join7(homedir4(), CONFIG_DIR_NAME3, "agent", ".billion-context-pi-update-check");
+var throttleFile = () => process.env.ACP_UPDATE_THROTTLE_FILE ?? join8(homedir5(), CONFIG_DIR_NAME4, "agent", ".billion-context-pi-update-check");
 var updateInFlight = false;
+var runNpm = async (args, opts) => {
+  return new Promise((resolve3) => {
+    execFile(
+      "npm",
+      args,
+      { ...opts, shell: process.platform === "win32", maxBuffer: 4 * 1024 * 1024 },
+      (err, stdout, stderr) => resolve3({
+        code: err ? 1 : 0,
+        stdout: String(stdout ?? ""),
+        stderr: String(stderr ?? "")
+      })
+    );
+  });
+};
+var runNpmImpl = runNpm;
+var runNode = (args, opts) => {
+  return new Promise((resolve3) => {
+    execFile(
+      process.execPath,
+      args,
+      { ...opts, maxBuffer: 4 * 1024 * 1024 },
+      (err, stdout, stderr) => resolve3({
+        code: err ? 1 : 0,
+        stdout: String(stdout ?? ""),
+        stderr: String(stderr ?? "")
+      })
+    );
+  });
+};
+var runNodeImpl = runNode;
 function parseVersion(v) {
   return v.replace(/^v/, "").split(".").map((n) => parseInt(n, 10) || 0);
 }
@@ -10711,7 +11100,7 @@ function isNewer(latest, current) {
 }
 async function readLastCheck() {
   try {
-    const data = await readFile(THROTTLE_FILE, "utf-8");
+    const data = await readFile(throttleFile(), "utf-8");
     return parseInt(data.trim(), 10) || 0;
   } catch {
     return 0;
@@ -10719,14 +11108,14 @@ async function readLastCheck() {
 }
 async function writeLastCheck(timestamp) {
   try {
-    await mkdir3(dirname5(THROTTLE_FILE), { recursive: true });
-    await writeFile3(THROTTLE_FILE, String(timestamp), "utf-8");
+    await mkdir3(dirname5(throttleFile()), { recursive: true });
+    await writeFile3(throttleFile(), String(timestamp), "utf-8");
   } catch {
   }
 }
-async function readPackageJson(path4) {
+async function readPackageJson(path5) {
   try {
-    const data = JSON.parse(await readFile(path4, "utf-8"));
+    const data = JSON.parse(await readFile(path5, "utf-8"));
     return data && typeof data === "object" ? data : void 0;
   } catch {
     return void 0;
@@ -10744,31 +11133,118 @@ function findNpmRoot(extDir) {
 async function findExtensionDir() {
   let dir = dirname5(fileURLToPath(import.meta.url));
   for (; ; ) {
-    const pkg = await readPackageJson(join7(dir, "package.json"));
+    const pkg = await readPackageJson(join8(dir, "package.json"));
     if (pkg?.name === PACKAGE_NAME) return dir;
     const parent = dirname5(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
 }
-async function autoInstallLatest(latest) {
-  if (!SEMVER_RE.test(latest)) return false;
-  const extDir = await findExtensionDir();
-  if (!extDir) return false;
+function declaredEntries(pkg) {
+  const dot = pkg.exports?.["."];
+  const exportEntry = typeof dot === "string" ? dot : dot?.import;
+  return [.../* @__PURE__ */ new Set([pkg.pi?.extensions?.[0], exportEntry, pkg.main])].filter((v) => typeof v === "string" && v.length > 0);
+}
+async function verifyInstall(npmDir, latest) {
+  const dir = join8(npmDir, "node_modules", PACKAGE_NAME);
+  const pkg = await readPackageJson(join8(dir, "package.json"));
+  if (!pkg?.version) return { ok: false, reason: "package-json-missing" };
+  if (pkg.version !== latest) return { ok: false, reason: `version-mismatch:${pkg.version}` };
+  const entries = declaredEntries(pkg);
+  if (entries.length === 0) return { ok: false, reason: "no-entry-declared" };
+  for (const rel of entries) {
+    try {
+      await access(join8(dir, rel));
+    } catch {
+      return { ok: false, reason: `entry-missing:${rel}` };
+    }
+  }
+  const smokeEntry = pkg.pi?.extensions?.[0] ?? entries[0];
+  if (!smokeEntry) return { ok: false, reason: "no-entry-declared" };
+  const entry = join8(dir, smokeEntry);
+  const SMOKE = "const{pathToFileURL}=require('node:url');import(pathToFileURL(process.argv[1]).href).then(()=>{},(e)=>{console.error(e&&e.stack||e);process.exit(1)})";
+  const { code, stderr } = await runNodeImpl(["-e", SMOKE, entry], { timeout: 15e3 });
+  if (code !== 0) return { ok: false, reason: `entry-import-failed:${stderr.trim().slice(-500)}` };
+  return { ok: true };
+}
+async function autoInstallLatest(latest, extDirOverride) {
+  if (!SEMVER_RE.test(latest)) return "failed";
+  const extDir = extDirOverride ?? await findExtensionDir();
+  if (!extDir) {
+    logWarn("update", { event: "install-skip", reason: "extension-dir-not-found" });
+    return "failed";
+  }
   const npmDir = findNpmRoot(extDir);
-  if (!npmDir) return false;
+  if (!npmDir) {
+    logWarn("update", { event: "install-skip", reason: "not-under-node-modules", extDir });
+    return "failed";
+  }
   try {
-    const code = await new Promise((resolve2) => {
-      execFile(
-        "npm",
-        ["install", `${PACKAGE_NAME}@${latest}`, "--silent", "--no-audit", "--no-fund"],
-        { cwd: npmDir, timeout: 6e4, shell: process.platform === "win32" },
-        (err) => resolve2(err ? 1 : 0)
-      );
+    const installArgs = (v) => [
+      "install",
+      `${PACKAGE_NAME}@${v}`,
+      "--silent",
+      "--no-audit",
+      "--no-fund",
+      "--no-save"
+    ];
+    const prevVersion = (await readPackageJson(join8(extDir, "package.json")))?.version ?? "0.1.46";
+    const { code, stderr } = await runNpmImpl(installArgs(latest), { cwd: npmDir, timeout: 6e4 });
+    if (code !== 0) {
+      logWarn("update", {
+        event: "auto-install-failed",
+        latest,
+        npmDir,
+        stderr: stderr.trim().slice(-2e3)
+      });
+      return "failed";
+    }
+    const verify = await verifyInstall(npmDir, latest);
+    if (!verify.ok) {
+      const rollbackTo = SEMVER_RE.test(prevVersion) ? prevVersion : "0.1.46";
+      logWarn("update", { event: "auto-install-verify-failed", latest, reason: verify.reason, rollbackTo });
+      const rb = await runNpmImpl(installArgs(rollbackTo), { cwd: npmDir, timeout: 6e4 });
+      logInfo("update", { event: "rollback", from: latest, to: rollbackTo, ok: rb.code === 0 });
+      return "rolled-back";
+    }
+    return "ok";
+  } catch (e) {
+    logWarn("update", {
+      event: "auto-install-error",
+      latest,
+      error: e instanceof Error ? e.message : String(e)
+    });
+    return "failed";
+  }
+}
+async function fetchLatestVersion() {
+  try {
+    const { code, stdout } = await runNpmImpl(["view", PACKAGE_NAME, "version"], {
+      timeout: 2e4
     });
-    return code === 0;
+    if (code === 0) {
+      const v = stdout.trim().split("\n").map((s) => s.trim()).filter(Boolean).pop();
+      if (v && SEMVER_RE.test(v)) return v;
+    }
   } catch {
-    return false;
+  }
+  try {
+    const res = await fetch(REGISTRY_URL, {
+      signal: AbortSignal.timeout(1e4),
+      headers: { Accept: "application/json" }
+    });
+    if (!res.ok) {
+      logWarn("update", { event: "check-http", status: res.status });
+      return void 0;
+    }
+    const data = await res.json();
+    return data.version;
+  } catch (e) {
+    logWarn("update", {
+      event: "check-fetch-error",
+      error: e instanceof Error ? e.message : String(e)
+    });
+    return void 0;
   }
 }
 async function checkForUpdate(autoUpdate, notify) {
@@ -10784,18 +11260,9 @@ async function checkForUpdate(autoUpdate, notify) {
     if (now - lastCheck < CHECK_INTERVAL_MS) return;
     await writeLastCheck(now);
     const runtimeVersion = await getRuntimeVersion();
-    const res = await fetch(REGISTRY_URL, {
-      signal: AbortSignal.timeout(5e3),
-      headers: { Accept: "application/json" }
-    });
-    if (!res.ok) {
-      logWarn("update", { event: "check-http", status: res.status });
-      return;
-    }
-    const data = await res.json();
-    const latest = data.version;
+    const latest = await fetchLatestVersion();
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.43";
+    const current = runtimeVersion ?? "0.1.46";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -10804,13 +11271,17 @@ async function checkForUpdate(autoUpdate, notify) {
     });
     logInfo("update", { event: "check", current, latest, hasUpdate });
     if (hasUpdate) {
-      const installed = await autoInstallLatest(latest);
-      if (installed && notify) {
+      const outcome = await autoInstallLatest(latest);
+      if (outcome === "ok" && notify) {
         notify(
           `\x1B[32m\u2714 ACP auto-updated ${current} \u2192 ${latest}. Restart Pi to finish.\x1B[0m`
         );
         logInfo("update", { event: "auto-installed", from: current, to: latest });
-      } else if (!installed && notify) {
+      } else if (outcome === "rolled-back" && notify) {
+        notify(
+          `\x1B[33mACP ${latest} failed verification and was rolled back. Keeping ${current}. A later release will auto-update.\x1B[0m`
+        );
+      } else if (notify) {
         notify(
           `${PACKAGE_NAME} ${latest} available (you have ${current}). Run: pi update --extension npm:${PACKAGE_NAME}`
         );
@@ -10825,140 +11296,10 @@ async function checkForUpdate(autoUpdate, notify) {
 async function getRuntimeVersion() {
   const extDir = await findExtensionDir();
   if (!extDir) return void 0;
-  const pkg = await readPackageJson(join7(extDir, "package.json"));
+  const pkg = await readPackageJson(join8(extDir, "package.json"));
   return pkg?.version;
 }
 
-// src/setup-subagent-tools.ts
-import { readFile as readFile2, writeFile as writeFile4, stat, copyFile, rename } from "fs/promises";
-import { existsSync as existsSync4 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join8 } from "path";
-import { CONFIG_DIR_NAME as CONFIG_DIR_NAME4 } from "@earendil-works/pi-coding-agent";
-var ACP_TOOLS2 = ["compress", "decompress", "search_context", "acp_status"];
-var BUILTIN_DEFAULT_TOOLS = {
-  advisor: ["read", "grep", "find", "ls", "bash", "intercom"],
-  "context-builder": ["read", "grep", "find", "ls", "bash", "write", "web_search", "intercom"],
-  delegate: ["read", "grep", "find", "ls", "bash", "edit", "write", "contact_supervisor"],
-  oracle: ["read", "grep", "find", "ls", "bash", "intercom"],
-  planner: ["read", "grep", "find", "ls", "intercom"],
-  researcher: ["read", "write", "web_search", "fetch_content", "get_search_content", "intercom"],
-  reviewer: ["read", "grep", "find", "ls", "bash", "edit", "write", "intercom"],
-  scout: ["read", "grep", "find", "ls", "bash", "write", "intercom"],
-  worker: ["read", "grep", "find", "ls", "bash", "edit", "write", "contact_supervisor"]
-};
-function resolveAgentDir() {
-  const configured = process.env.PI_CODING_AGENT_DIR;
-  if (configured === "~") return homedir5();
-  if (configured?.startsWith("~/")) return join8(homedir5(), configured.slice(2));
-  return configured || join8(homedir5(), CONFIG_DIR_NAME4, "agent");
-}
-function desiredTools(existing, name) {
-  const base = Array.isArray(existing?.tools) && existing.tools.length > 0 ? [...existing.tools] : [...BUILTIN_DEFAULT_TOOLS[name] ?? []];
-  const hasAll = ACP_TOOLS2.every((t) => base.includes(t));
-  if (hasAll) return { tools: base, changed: false };
-  for (const t of ACP_TOOLS2) if (!base.includes(t)) base.push(t);
-  return { tools: base, changed: true };
-}
-async function ensureSubagentAcpTools(settingsPath) {
-  const path4 = settingsPath ?? join8(resolveAgentDir(), "settings.json");
-  let raw;
-  let mtimeMs;
-  try {
-    raw = await readFile2(path4, "utf-8");
-    mtimeMs = (await stat(path4)).mtimeMs;
-  } catch {
-    return { path: path4, action: "skipped", reason: "settings.json not found; will retry next session" };
-  }
-  let settings2;
-  try {
-    const parsed = JSON.parse(raw);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      return { path: path4, action: "failed", reason: "settings.json root is not a JSON object" };
-    }
-    settings2 = parsed;
-  } catch (e) {
-    return { path: path4, action: "failed", reason: `settings.json is not valid JSON: ${e.message}` };
-  }
-  const subagents = typeof settings2.subagents === "object" && settings2.subagents !== null && !Array.isArray(settings2.subagents) ? { ...settings2.subagents } : {};
-  const overridesRaw = typeof subagents.agentOverrides === "object" && subagents.agentOverrides !== null && !Array.isArray(subagents.agentOverrides) ? { ...subagents.agentOverrides } : {};
-  const updatedOverrides = { ...overridesRaw };
-  let anyChanged = false;
-  for (const name of Object.keys(BUILTIN_DEFAULT_TOOLS)) {
-    const existing = overridesRaw[name] ?? void 0;
-    const { tools, changed } = desiredTools(existing, name);
-    if (changed) {
-      updatedOverrides[name] = { ...existing ?? {}, tools };
-      anyChanged = true;
-    }
-  }
-  if (!anyChanged) {
-    return { path: path4, action: "skipped", reason: "all builtin agents already have ACP tools" };
-  }
-  const backupPath = `${path4}.acp-bak`;
-  if (!existsSync4(backupPath)) {
-    try {
-      await copyFile(path4, backupPath);
-    } catch {
-    }
-  }
-  try {
-    if ((await stat(path4)).mtimeMs !== mtimeMs) {
-      return { path: path4, action: "skipped", reason: "settings.json changed during setup (concurrent write); will retry next session" };
-    }
-  } catch {
-    return { path: path4, action: "failed", reason: "settings.json disappeared during setup" };
-  }
-  const next = {
-    ...settings2,
-    subagents: { ...subagents, agentOverrides: updatedOverrides }
-  };
-  const tmpPath = `${path4}.tmp-${process.pid}`;
-  try {
-    await writeFile4(tmpPath, `${JSON.stringify(next, null, 2)}
-`, "utf-8");
-    await rename(tmpPath, path4);
-  } catch (e) {
-    return { path: path4, action: "failed", reason: `write failed: ${e.message}` };
-  }
-  try {
-    const verify = JSON.parse(await readFile2(path4, "utf-8"));
-    const sub = verify.subagents;
-    const v = sub?.agentOverrides;
-    if (typeof v !== "object" || v === null) throw new Error("agentOverrides missing after write");
-    for (const name of Object.keys(BUILTIN_DEFAULT_TOOLS)) {
-      const tools = v[name]?.tools;
-      if (!Array.isArray(tools) || !ACP_TOOLS2.every((t) => tools.includes(t))) {
-        throw new Error(`${name} missing ACP tools after write`);
-      }
-    }
-  } catch (e) {
-    try {
-      await copyFile(backupPath, path4);
-    } catch {
-    }
-    return { path: path4, action: "failed", reason: `verification failed; restored backup: ${e.message}` };
-  }
-  return { path: path4, action: "updated" };
-}
-async function runSetupAndNotify(notify) {
-  try {
-    const result = await ensureSubagentAcpTools();
-    debug.event("setup-subagent-tools", { action: result.action, reason: result.reason });
-    if (result.action === "updated" && notify) {
-      notify(`ACP: enabled context tools (compress/decompress/search_context/acp_status) for subagents`);
-    }
-    if (result.action === "failed") {
-      logWarn("setup", { event: "subagent-tools", action: result.action, reason: result.reason });
-    }
-    return result;
-  } catch (e) {
-    debug.event("setup-subagent-tools-error", { msg: String(e) });
-    logError("setup", { event: "subagent-tools-error", error: e instanceof Error ? e.message : String(e), stack: e instanceof Error ? e.stack ?? "" : "" });
-    return { path: "", action: "failed", reason: String(e) };
-  }
-}
-
 // src/index.ts
 function createAcpExtension(adapter = {}) {
   return (pi) => {
@@ -10996,7 +11337,7 @@ function wireSessionLifecycle(pi, runtime) {
     const sid = ctx.sessionManager.getSessionId();
     runtime.clearSessionTracking(sid);
     const modelInfo = ctx.model;
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.43" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.46" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
     try {
       await runtime.reloadConfig(ctx.cwd);
       setDelegateDisplayUsage(resolveDelegate(runtime.adapter).displayUsage);
@@ -11014,10 +11355,10 @@ function wireSessionLifecycle(pi, runtime) {
       pi.registerTool(makeDelegateWaitTool(pi));
       pi.registerTool(makeDelegateCancelTool(pi));
     }
-    void checkForUpdate(runtime.adapter.autoUpdate ?? true, (msg) => {
+    const updateCheck = checkForUpdate(runtime.adapter.autoUpdate ?? true, (msg) => {
       if (ctx.hasUI) ctx.ui.notify(msg);
     });
-    void runSetupAndNotify(ctx.hasUI ? (m) => ctx.ui.notify(m) : void 0);
+    if (!ctx.hasUI) await updateCheck;
     delegateStatusWidget.setContext(ctx, runningRunsSnapshot);
   });
   pi.on("session_shutdown", () => {
@@ -11119,10 +11460,13 @@ function wireContextTransform(pi, runtime) {
       const rebuilt = coreOutToAgentMessages(turn.messages, originalById);
       const debugOn2 = debug.enabled;
       const turnKey = lastUserMessageId(entries) ?? sid;
+      const compressOutcomes = collectCompressOutcomes(entries, turnStartIndex(entries));
+      const outcome = compressOutcomes.length > 0 ? runtime.noteCompressOutcomes(turnKey, compressOutcomes) : null;
       if (turn.nudge?.shouldInject) {
         const emergency = turn.nudge.breakdown?.emergencyOverride === 1;
         turn.nudge.compressibleRanges = viableRanges(turn.nudge.compressibleRanges);
-        const alreadyShown = !emergency && runtime.nudgeShownFor(turnKey);
+        const retryCapped = runtime.compressRetryCappedFor(turnKey);
+        const alreadyShown = retryCapped || !emergency && runtime.nudgeShownFor(turnKey);
         if (!alreadyShown) {
           rebuilt.push(nudgeMessage(turn.nudge, turn.state.blocks.filter((b) => b.active), runtime.prompts));
           const rendered = renderNudgeText(turn.nudge, runtime.prompts);
@@ -11143,9 +11487,7 @@ ${rendered.text}${example}`);
           debug.event("nudge-suppressed", { sid: ctx.sessionManager.getSessionId(), turnKey, reason: turn.nudge.reason });
         }
       }
-      const compressOutcomes = collectCompressOutcomes(entries, turnStartIndex(entries));
-      if (compressOutcomes.length > 0) {
-        const outcome = runtime.noteCompressOutcomes(turnKey, compressOutcomes);
+      if (outcome !== null) {
         const failed = outcome.retryFor !== null ? compressOutcomes.find((o) => o.toolCallId === outcome.retryFor) : void 0;
         if (failed) {
           rebuilt.push(compressRetryMessage(failed.text, outcome.count, MAX_COMPRESS_ATTEMPTS));
@@ -11160,9 +11502,10 @@ ${rendered.text}${example}`);
         }
       }
       debug.event("context-out", { outMsgs: rebuilt.length, injected: turn.nudge?.shouldInject ?? false, emergency: turn.nudge?.breakdown?.emergencyOverride === 1 });
-      void checkForUpdate(runtime.adapter.autoUpdate ?? true, (msg) => {
+      const updateCheck = checkForUpdate(runtime.adapter.autoUpdate ?? true, (msg) => {
         if (ctx.hasUI) ctx.ui.notify(msg);
       });
+      if (!ctx.hasUI) await updateCheck;
       return { messages: rebuilt };
     } catch (e) {
       logThrow("context", e, { sid, phase: "transform" });
@@ -11288,7 +11631,7 @@ function collectCompressOutcomes(entries, startIndex) {
     const m = entry.message;
     if (m.role !== "toolResult" || m.toolName !== "compress" || !m.toolCallId) continue;
     const text = extractText(m.content);
-    out.push({ toolCallId: m.toolCallId, isError: m.isError === true, success: m.isError !== true && isCompressSuccessText(text), text });
+    out.push({ toolCallId: m.toolCallId, isError: m.isError === true, success: m.isError !== true && isCompressSuccessText(text), noop: m.isError !== true && isCompressNoopText(text), text });
   }
   return out;
 }
@@ -11304,7 +11647,8 @@ function compressRetryMessage(errorText, attempt, maxAttempts) {
     "- content must be an ARRAY of { startId, endId, summary } objects (topic optional) \u2014 not a JSON-encoded string.",
     '- Example: compress({ content: [{ startId: "m00005", endId: "m00080", summary: "..." }] })',
     '- startId/endId are the mNNNNN refs from the <acp> tags (or block ids like "b3").',
-    attempt >= maxAttempts - 1 ? "- This is your LAST retry for this turn \u2014 if it fails again, compression pauses until the next user message." : null
+    attempt >= maxAttempts - 1 ? "- This is your LAST retry for this turn \u2014 if it fails again, compression pauses until the next user message." : null,
+    "- If ranges were skipped (already compressed / too small), do NOT retry the same refs \u2014 run acp_status and use its CURRENT compressible ranges."
   ].filter((l) => l !== null).join("\n");
   return { role: "user", content: [{ type: "text", text }], timestamp: Date.now() };
 }