billion-context-pi 0.1.38 → 0.1.40

package/dist/index.js

@@ -76,6 +76,7 @@ function createInitialState() {
   return {
     blocks: [],
     messageRefs: { byRaw: {}, byRef: {} },
+    tokenSnapshot: {},
     nudge: {
       lastPerMessageNudgeTokens: 0,
       lastNudgeShownTokens: 0,
@@ -245,11 +246,23 @@ function syncBlocks(messages, state) {
       byRaw: { ...state.messageRefs.byRaw },
       byRef: { ...state.messageRefs.byRef }
     },
+    // Snapshot is keyed by ref with primitive values — shallow copy suffices.
+    tokenSnapshot: { ...state.tokenSnapshot ?? {} },
     nudge: { ...state.nudge, anchors: { ...state.nudge.anchors } },
     stats: { ...state.stats },
     nextBlockId: state.nextBlockId,
     nextRunId: state.nextRunId
   };
+  const liveRefs = new Set(
+    messages.map((m) => result.messageRefs.byRaw[m.id]).filter((r) => typeof r === "string")
+  );
+  if (Object.keys(result.tokenSnapshot).length !== liveRefs.size) {
+    const pruned = {};
+    for (const [ref, n] of Object.entries(result.tokenSnapshot)) {
+      if (liveRefs.has(ref)) pruned[ref] = n;
+    }
+    result.tokenSnapshot = pruned;
+  }
   const consumedBlockIds = /* @__PURE__ */ new Set();
   for (const block of result.blocks) {
     for (const consumedId of block.directBlockIds) {
@@ -724,7 +737,7 @@ var TAG_CLOSE = LT + "/acp" + GT;
 function acpTag(ref, tokens, type) {
   return TAG_OPEN + 'tokens="' + formatTokens(tokens) + '" type="' + type + '"' + GT + ref + TAG_CLOSE;
 }
-function renderMessage(message, map, countTokens, strategy) {
+function renderMessage(message, map, countTokens, strategy, snapshot = null) {
   const ref = refForRaw(map, message.id);
   if (!ref || ref === BLOCKED_REF) return message;
   if (strategy === "none") return message;
@@ -735,26 +748,33 @@ function renderMessage(message, map, countTokens, strategy) {
     "^" + escapeRegex(TAG_OPEN) + "[^>]*" + GT + escapeRegex(ref) + escapeRegex(TAG_CLOSE) + "\\n?"
   );
   const cleanText = (message.text || "").replace(ownTagRe, "");
-  const tokens = countTokens(cleanText);
+  const tokens = snapshot ? snapshot[ref] ?? (snapshot[ref] = countTokens(cleanText)) : countTokens(cleanText);
   const type = classifyType(message);
   const prefix = acpTag(ref, tokens, type) + "\n";
   if (!cleanText) return { ...message, text: prefix };
   return { ...message, text: prefix + cleanText };
 }
-function renderVisibleRefs(messages, state, countTokens = (text) => Math.ceil(text.length / 4), strategy = "all") {
+function renderWithSnapshot(messages, state, countTokens = (text) => Math.ceil(text.length / 4), strategy = "all") {
   const map = state.messageRefs;
-  return messages.map(
-    (message) => renderMessage(message, map, countTokens, strategy)
+  const snapshot = { ...state.tokenSnapshot ?? {} };
+  const rendered = messages.map(
+    (message) => renderMessage(message, map, countTokens, strategy, snapshot)
   );
+  return { messages: rendered, tokenSnapshot: snapshot };
 }
 function createRenderRefsNode(strategy) {
   return {
     name: "render-refs",
     run(io, ctx) {
-      return {
-        ...io,
-        messages: renderVisibleRefs(io.messages, io.state, ctx.countTokens, strategy)
-      };
+      const { messages, tokenSnapshot } = renderWithSnapshot(
+        io.messages,
+        io.state,
+        ctx.countTokens,
+        strategy
+      );
+      const prev = io.state.tokenSnapshot;
+      const changed = !prev || Object.keys(tokenSnapshot).length !== Object.keys(prev).length;
+      return changed ? { ...io, messages, state: { ...io.state, tokenSnapshot } } : { ...io, messages };
     }
   };
 }
@@ -950,6 +970,7 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs, cou
       ref,
       refNum: rn,
       tokens: countTokens(msg.text ?? ""),
+      chars: (msg.text ?? "").length,
       isTool: isToolMessage(msg),
       isUser: msg.role === "user"
     });
@@ -970,6 +991,7 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs, cou
         endRef: info.ref,
         count: 1,
         tokens: info.tokens,
+        chars: info.chars,
         toolPct: info.isTool ? 100 : 0,
         textPct: info.isTool ? 0 : 100
       };
@@ -977,6 +999,7 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs, cou
       cur.endRef = info.ref;
       cur.count++;
       cur.tokens += info.tokens;
+      cur.chars = (cur.chars ?? 0) + info.chars;
       if (info.isTool) {
         cur.toolPct = Math.round((cur.toolPct * (cur.count - 1) + 100) / cur.count);
       } else {
@@ -1024,6 +1047,7 @@ function mergeBatch(batch) {
   const last = batch[batch.length - 1];
   const count = batch.reduce((s, r) => s + r.count, 0);
   const tokens = batch.reduce((s, r) => s + r.tokens, 0);
+  const chars = batch.reduce((s, r) => s + rangeChars(r), 0);
   const toolPct = Math.round(
     batch.reduce((s, r) => s + r.toolPct * r.count, 0) / count
   );
@@ -1032,6 +1056,7 @@ function mergeBatch(batch) {
     endRef: last.endRef,
     count,
     tokens,
+    chars,
     toolPct,
     textPct: 100 - toolPct
   };
@@ -1040,16 +1065,21 @@ function mergeBatch(batch) {
   }
   return merged;
 }
+function rangeChars(r) {
+  return r.chars ?? r.tokens * 4;
+}
 function mergeRangesToThreshold(ranges, minChars) {
   if (minChars <= 0 || ranges.length === 0) return ranges;
   const result = [];
   let batch = [];
+  let batchChars = 0;
   for (const r of ranges) {
     batch.push(r);
-    const batchTokens = batch.reduce((s, x) => s + x.tokens, 0);
-    if (batchTokens * 4 >= minChars) {
+    batchChars += rangeChars(r);
+    if (batchChars >= minChars) {
       result.push(mergeBatch(batch));
       batch = [];
+      batchChars = 0;
     }
   }
   if (batch.length > 0) {
@@ -1637,7 +1667,7 @@ function resolveAdaptiveGrowth(modelContextLimit, nudge) {
 function pendingByTier(state, recommendation, countTokens, minCompressRange) {
   const out = {};
   const merged = recommendation?.recommendedRanges ?? [];
-  const effective = minCompressRange > 0 ? merged.filter((r) => r.tokens * 4 >= minCompressRange) : merged;
+  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: [] };
   const active = activeBlocks(state);
   const t1 = active.filter((b) => b.tier === 1);
@@ -1799,6 +1829,7 @@ function cloneState(state) {
       byRaw: { ...state.messageRefs.byRaw },
       byRef: { ...state.messageRefs.byRef }
     },
+    tokenSnapshot: { ...state.tokenSnapshot ?? {} },
     nudge: { ...state.nudge, anchors: { ...state.nudge.anchors } },
     stats: { ...state.stats },
     nextBlockId: state.nextBlockId,
@@ -2464,9 +2495,9 @@ function charBigrams(text) {
   }
   return grams;
 }
-function tfMap(text, stem22) {
+function tfMap(text, stem2) {
   const m = /* @__PURE__ */ new Map();
-  for (const t of tokenize(text, { stem: stem22 })) m.set(t, (m.get(t) ?? 0) + 1);
+  for (const t of tokenize(text, { stem: stem2 })) m.set(t, (m.get(t) ?? 0) + 1);
   return m;
 }
 var bm25Algorithm = {
@@ -2671,7 +2702,20 @@ function resolveDelegate(adapter) {
     displayUsage: adapter.displayUsage ?? "separate"
   };
 }
-function resolveConfig(adapter, liveContextLimit) {
+function mergeCompress(global, provider, model) {
+  return {
+    maxContextLimit: model?.maxContextLimit ?? provider?.maxContextLimit ?? global?.maxContextLimit,
+    emergencyThresholdPercent: model?.emergencyThresholdPercent ?? provider?.emergencyThresholdPercent ?? global?.emergencyThresholdPercent,
+    nudgeGrowthTokens: model?.nudgeGrowthTokens ?? provider?.nudgeGrowthTokens ?? global?.nudgeGrowthTokens
+  };
+}
+function resolveCompress(compress, provider, modelId) {
+  if (!compress) return {};
+  const prov = provider ? compress.providers?.[provider] : void 0;
+  const model = prov && modelId ? prov.models?.[modelId] : void 0;
+  return mergeCompress(compress, prov, model);
+}
+function resolveConfig(adapter, liveContextLimit, provider, modelId) {
   const envLimit = process.env.ACP_MODEL_CONTEXT_LIMIT;
   const envLimitNum = envLimit ? Number(envLimit) : NaN;
   const FALLBACK_LIMIT = 15e4;
@@ -2681,14 +2725,14 @@ function resolveConfig(adapter, liveContextLimit) {
     preserveRecentMessages: adapter.preserveRecentMessages ?? 5,
     ...adapter.coreOverrides
   });
-  const c = adapter.compress;
-  if (c?.maxContextLimit !== void 0) config.nudge.maxContextLimitPct = parsePercent(c.maxContextLimit);
-  if (c?.emergencyThresholdPercent !== void 0) {
+  const c = resolveCompress(adapter.compress, provider, modelId);
+  if (c.maxContextLimit !== void 0) config.nudge.maxContextLimitPct = parsePercent(c.maxContextLimit);
+  if (c.emergencyThresholdPercent !== void 0) {
     const pct2 = parsePercent(c.emergencyThresholdPercent);
     config.nudge.emergencyThresholdPct = pct2;
     config.truncate.threshold = pct2;
   }
-  if (c?.nudgeGrowthTokens !== void 0) {
+  if (c.nudgeGrowthTokens !== void 0) {
     config.nudge.growthFloor = c.nudgeGrowthTokens;
     config.nudge.growthCap = c.nudgeGrowthTokens;
   }
@@ -2701,6 +2745,89 @@ function parsePercent(v) {
   return Number(s);
 }
 
+// src/density.ts
+var DENSITY_MIN = 0.5;
+var DENSITY_MAX = 2.5;
+var MIN_DELTA_EST = 50;
+var CONFIRM_RATIO = 0.2;
+var INITIAL_DENSITY = 1;
+var DensityEstimator = class {
+  models = /* @__PURE__ */ new Map();
+  /** 重置指定模型（模型切换/会话开始时调用）。 */
+  resetModel(modelId) {
+    this.models.delete(modelId);
+  }
+  /** 返回当前密度系数（未知模型返回初始 1）。 */
+  densityFor(modelId) {
+    return this.models.get(modelId)?.density ?? INITIAL_DENSITY;
+  }
+  /**
+   * 每轮 context 事件调用。realTotal 为 provider 真实 usage（可空），
+   * estTotal 为本地估算总 token。postCompression 为压缩刚发生标志。
+   */
+  update(modelId, realTotal, estTotal, postCompression = false) {
+    if (realTotal === null) return;
+    let est = this.models.get(modelId);
+    if (!est) {
+      est = {
+        density: INITIAL_DENSITY,
+        anchorReal: null,
+        anchorEst: null,
+        pendingDensity: null,
+        confirmCount: 0,
+        postCompressionSkip: false
+      };
+      this.models.set(modelId, est);
+    }
+    if (postCompression) {
+      est.postCompressionSkip = true;
+      return;
+    }
+    if (est.postCompressionSkip) {
+      est.postCompressionSkip = false;
+      est.anchorReal = realTotal;
+      est.anchorEst = estTotal;
+      est.pendingDensity = null;
+      est.confirmCount = 0;
+      return;
+    }
+    if (est.anchorReal === null || est.anchorEst === null) {
+      est.anchorReal = realTotal;
+      est.anchorEst = estTotal;
+      return;
+    }
+    const dReal = realTotal - est.anchorReal;
+    const dEst = estTotal - est.anchorEst;
+    if (dEst < MIN_DELTA_EST) return;
+    est.anchorReal = realTotal;
+    est.anchorEst = estTotal;
+    const instant = clamp(dReal / dEst, DENSITY_MIN, DENSITY_MAX);
+    if (est.pendingDensity === null) {
+      est.pendingDensity = instant;
+      est.confirmCount = 1;
+    } else if (Math.abs(instant - est.pendingDensity) / est.pendingDensity <= CONFIRM_RATIO) {
+      est.confirmCount += 1;
+    } else {
+      est.pendingDensity = instant;
+      est.confirmCount = 1;
+    }
+    if (est.confirmCount >= 2) {
+      est.density = est.pendingDensity;
+      est.confirmCount = 0;
+      est.pendingDensity = null;
+    }
+  }
+  /** 注入器：估算文本 token = defaultCountTokens × density。 */
+  estimateWithDensity(modelId, text) {
+    const d = this.densityFor(modelId);
+    if (d === 1) return defaultCountTokens(text);
+    return Math.round(defaultCountTokens(text) * d);
+  }
+};
+function clamp(v, lo, hi) {
+  return v < lo ? lo : v > hi ? hi : v;
+}
+
 // src/messages.ts
 var REF_TAG_SOURCE = "(?:<acp\\s[^>]*>m\\d{5}</acp>|\\[m\\d{1,5}\\])";
 var REF_TAG = new RegExp(`^${REF_TAG_SOURCE}\\s?\\n?`);
@@ -3206,6 +3333,7 @@ function mergeInitialState(parsed) {
   return {
     blocks: parsed.blocks ?? fresh.blocks,
     messageRefs: parsed.messageRefs ?? fresh.messageRefs,
+    tokenSnapshot: parsed.tokenSnapshot ?? fresh.tokenSnapshot,
     nudge: { ...fresh.nudge, ...parsed.nudge ?? {} },
     stats: { ...fresh.stats, ...parsed.stats ?? {} },
     nextBlockId: parsed.nextBlockId ?? fresh.nextBlockId,
@@ -3213,6 +3341,64 @@ function mergeInitialState(parsed) {
   };
 }
 
+// src/user-config.ts
+import { promises as fs2 } from "fs";
+import * as path3 from "path";
+import { homedir as homedir2 } from "os";
+import { CONFIG_DIR_NAME as CONFIG_DIR_NAME2 } from "@earendil-works/pi-coding-agent";
+async function loadUserConfig(cwd) {
+  const home = homedir2();
+  const merged = {};
+  for (const base of [join4(home, CONFIG_DIR_NAME2), join4(cwd, CONFIG_DIR_NAME2)]) {
+    const file = join4(base, "acp.json");
+    try {
+      const raw = await fs2.readFile(file, "utf8");
+      const parsed = JSON.parse(raw);
+      if (parsed && typeof parsed === "object") {
+        Object.assign(merged, pickKnown(parsed));
+        debug.event("config-loaded", { file });
+      }
+    } catch (e) {
+      const code = e.code;
+      if (code !== "ENOENT") {
+        logWarn("config", { event: "load-failed", file, error: e instanceof Error ? e.message : String(e) });
+      }
+    }
+  }
+  return merged;
+}
+function join4(...parts) {
+  return path3.join(...parts);
+}
+var KNOWN = /* @__PURE__ */ new Set([
+  "debug",
+  "autoUpdate",
+  "modelContextLimit",
+  "toolBashDefaultTimeout",
+  "toolOutputMaxBytes",
+  "delegate",
+  "compress",
+  "displayUsage",
+  "prompts",
+  "acknowledgePromptsRisk"
+]);
+function pickKnown(parsed) {
+  const out = {};
+  for (const [k, v] of Object.entries(parsed)) {
+    if (KNOWN.has(k)) out[k] = v;
+  }
+  return out;
+}
+function applyUserConfig(adapter, user) {
+  return {
+    ...adapter,
+    ...user,
+    coreOverrides: adapter.coreOverrides,
+    protectedTools: adapter.protectedTools,
+    preserveRecentMessages: adapter.preserveRecentMessages
+  };
+}
+
 // src/sequence-match.ts
 function findUniqueLongestRun(candidates, live) {
   if (candidates.length === 0 || live.length === 0) return void 0;
@@ -3428,10 +3614,18 @@ function pruneOrphanRefs(state, messages) {
   }
 }
 function createRuntime(adapter) {
-  const core = createCore({ countTokens: defaultCountTokens });
+  const density = new DensityEstimator();
+  let countModelId = "default";
+  const core = createCore({
+    // 密度校准版 countTokens（Phase 2）：默认回落 defaultCountTokens（density=1）
+    countTokens: (text) => density.estimateWithDensity(countModelId, text)
+  });
   const store = new SessionStateStore();
+  const lastActiveBlockIds = /* @__PURE__ */ new Map();
   const locks = /* @__PURE__ */ new Map();
+  const factoryAdapter = adapter;
   let adapterRef = adapter;
+  let lastUserConfigKey;
   let promptsRef = defaultPrompts;
   const nudgeShownTurns = /* @__PURE__ */ new Set();
   async function acquireLock(sid) {
@@ -3454,7 +3648,27 @@ function createRuntime(adapter) {
     return m?.contextWindow ?? 0;
   }
   function configFor(ctx) {
-    return resolveConfig(adapterRef, liveContextLimit(ctx));
+    const m = ctx.model;
+    return resolveConfig(adapterRef, liveContextLimit(ctx), m?.provider, m?.id);
+  }
+  async function reloadConfig(cwd) {
+    let user;
+    try {
+      user = await loadUserConfig(cwd);
+    } catch (e) {
+      logWarn("runtime", { event: "config-reload-failed", error: e instanceof Error ? e.message : String(e) });
+      return;
+    }
+    try {
+      const key = JSON.stringify(user);
+      if (key === lastUserConfigKey) return;
+      lastUserConfigKey = key;
+      adapterRef = applyUserConfig(factoryAdapter, user);
+      if (adapterRef.debug !== void 0) setDebugEnabled(adapterRef.debug);
+      logInfo("runtime", { event: "config-reloaded", limit: adapterRef.modelContextLimit ?? null });
+    } catch (e) {
+      logWarn("runtime", { event: "config-reload-failed", error: e instanceof Error ? e.message : String(e) });
+    }
   }
   async function stateFor(ctx, liveMessages) {
     const sm = ctx.sessionManager;
@@ -3477,10 +3691,20 @@ function createRuntime(adapter) {
     const sm = ctx.sessionManager;
     await store.save(state, sm.getSessionFile() ?? void 0, sm.getSessionId());
   }
-  return { core, store, get adapter() {
+  function noteActiveBlocks(sid, activeBlockIds) {
+    const current = new Set(activeBlockIds);
+    const prev = lastActiveBlockIds.get(sid);
+    const isNew = prev !== void 0 && activeBlockIds.some((id) => !prev.has(id));
+    lastActiveBlockIds.set(sid, current);
+    return isNew;
+  }
+  function clearSessionTracking(sid) {
+    lastActiveBlockIds.delete(sid);
+  }
+  return { core, store, density, setCountModel: (m) => {
+    countModelId = m;
+  }, noteActiveBlocks, clearSessionTracking, get adapter() {
     return adapterRef;
-  }, setAdapter: (a) => {
-    adapterRef = a;
   }, get prompts() {
     return promptsRef;
   }, setPrompts: (p) => {
@@ -3489,7 +3713,7 @@ function createRuntime(adapter) {
     nudgeShownTurns.add(k);
   }, nudgeShownFor: (k) => nudgeShownTurns.has(k), clearNudgeTracking: () => {
     nudgeShownTurns.clear();
-  }, liveContextLimit, configFor, stateFor, save, acquireLock };
+  }, liveContextLimit, configFor, reloadConfig, stateFor, save, acquireLock };
 }
 
 // node_modules/typebox/build/system/memory/memory.mjs
@@ -7904,6 +8128,9 @@ function estimateTokens(messages, coveredIds) {
   }
   return tokens;
 }
+function calibrateTokens(estimate, density) {
+  return density === 1 ? estimate : Math.round(estimate * density);
+}
 function lastUserMessageId(entries) {
   for (let i = entries.length - 1; i >= 0; i--) {
     const e = entries[i];
@@ -7974,6 +8201,7 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
   if (ranges.length === 0) return "No ranges provided.";
   const { state: initialState, coreMessages } = await runtime.stateFor(ctx);
   const config = runtime.configFor(ctx);
+  const modelId = ctx.model?.id ?? "default";
   const systemPromptText = getSystemPromptText(ctx);
   const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
   const sentTokens = estimateTokens(coreMessages, collectCoveredMessageIds(initialState)) + systemPromptTokens;
@@ -7981,15 +8209,18 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
     messages: coreMessages,
     state: initialState,
     config,
-    tokenCount: sentTokens
+    tokenCount: calibrateTokens(sentTokens, runtime.density.densityFor(modelId))
   });
   const state = turn.state;
   const messages = turn.messages;
-  const beforeTokens = estimateTokens(messages, collectCoveredMessageIds(state));
+  const density = runtime.density.densityFor(modelId);
+  const beforeTokens = calibrateTokens(estimateTokens(messages, collectCoveredMessageIds(state)), density);
   const summaryMaxChars = args.summaryMaxChars;
   const topLevelTopic = args.topic;
   debug.event("compress-in", {
     sid: ctx.sessionManager.getSessionId(),
+    modelId,
+    density,
     ranges: ranges.length,
     spans: ranges.map((r) => ({ span: `${r.startId}..${r.endId}`, summaryLen: r.summary.length, summary: r.summary, topic: r.topic ?? topLevelTopic ?? null })),
     blocksBefore: state.blocks.length,
@@ -8005,7 +8236,14 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
   });
   await runtime.save(applied.state, ctx);
   const { blocksCreated, tokensCompressed, errors, warnings } = applied.result;
-  const afterTokens = Math.max(0, beforeTokens - tokensCompressed);
+  const afterTurn = runtime.core.processTurn({
+    messages: coreMessages,
+    state: applied.state,
+    config,
+    tokenCount: calibrateTokens(sentTokens, density)
+  });
+  const afterTokens = calibrateTokens(estimateTokens(afterTurn.messages, collectCoveredMessageIds(applied.state)), density);
+  const reclaimed = Math.max(0, beforeTokens - afterTokens);
   const newBlocks = applied.state.blocks.slice(-blocksCreated);
   debug.event("compress-out", {
     sid: ctx.sessionManager.getSessionId(),
@@ -8036,9 +8274,9 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
     logError("compress", { sid: ctx.sessionManager.getSessionId(), event: "errors", count: errors.length, errors: errors.slice(0, 5) });
   }
   if (warnings.length > 0) {
-    logError("compress", { sid: ctx.sessionManager.getSessionId(), event: "warnings", count: warnings.length, warnings: warnings.slice(0, 5) });
+    logWarn("compress", { sid: ctx.sessionManager.getSessionId(), event: "warnings", count: warnings.length, warnings: warnings.slice(0, 5) });
   }
-  const lines = [`\u25A3 ACP | ${formatK2(beforeTokens)} \u2192 ${formatK2(afterTokens)} tokens (~${formatK2(tokensCompressed)} reclaimed, ${blocksCreated} block${blocksCreated > 1 ? "s" : ""})`];
+  const lines = [`\u25A3 ACP | ${formatK2(beforeTokens)} \u2192 ${formatK2(afterTokens)} tokens (~${formatK2(reclaimed)} reclaimed, ${blocksCreated} block${blocksCreated > 1 ? "s" : ""})`];
   if (warnings.length > 0) lines.push("\u26A0\uFE0F " + warnings.join("; "));
   if (errors.length > 0) lines.push("Errors: " + errors.join("; "));
   return lines.join("\n");
@@ -8046,9 +8284,10 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
 
 // src/decompress-tool.ts
 import { writeFile, mkdir } from "fs/promises";
-import { resolve, relative, isAbsolute, join as join3 } from "path";
-import { tmpdir, homedir as homedir2 } from "os";
-var AUTO_DIR = join3(homedir2() || tmpdir(), ".cache", "pi", "acp-decompress");
+import { existsSync as existsSync2, lstatSync, readlinkSync, realpathSync } from "fs";
+import { resolve, relative, isAbsolute, join as join5, basename as basename2, dirname as dirname3 } from "path";
+import { tmpdir, homedir as homedir3 } from "os";
+var AUTO_DIR = join5(homedir3() || tmpdir(), ".cache", "pi", "acp-decompress");
 var PREVIEW_CHARS = 600;
 var MESSAGE_INLINE_THRESHOLD = 2e3;
 var DecompressParams = typebox_exports.Object({
@@ -8084,23 +8323,48 @@ function makeDecompressTool(runtime) {
 }
 var ALLOWED_DIRS = [
   tmpdir(),
-  join3(homedir2(), ".cache", "opencode"),
-  join3(homedir2(), ".cache", "pi")
+  join5(homedir3(), ".cache", "opencode"),
+  join5(homedir3(), ".cache", "pi")
 ];
 function resolveToFilePath(targetPath) {
-  const expanded = targetPath.startsWith("~/") ? join3(homedir2(), targetPath.slice(2)) : targetPath;
+  const expanded = targetPath.startsWith("~/") ? join5(homedir3(), targetPath.slice(2)) : targetPath;
   const resolved = resolve(expanded);
-  const isAllowed = ALLOWED_DIRS.some((dir) => {
-    const rel = relative(dir, resolved);
+  let probe = resolved;
+  const suffix = [];
+  while (!existsSync2(probe) && probe !== dirname3(probe)) {
+    suffix.unshift(basename2(probe));
+    probe = dirname3(probe);
+  }
+  const real = existsSync2(probe) ? realpathSync(probe) : probe;
+  let checked = real;
+  for (const part of suffix) {
+    checked = join5(checked, part);
+    try {
+      if (lstatSync(checked).isSymbolicLink()) {
+        const target = readlinkSync(checked);
+        checked = isAbsolute(target) ? resolve(target) : resolve(dirname3(checked), target);
+      }
+    } catch {
+    }
+  }
+  const allowed = ALLOWED_DIRS.map((d) => {
+    try {
+      return realpathSync(d);
+    } catch {
+      return d;
+    }
+  });
+  const isAllowed = allowed.some((dir) => {
+    const rel = relative(dir, checked);
     return rel === "" || !rel.startsWith("..") && !isAbsolute(rel);
   });
   if (!isAllowed) {
     return { error: `Error: toFile path must be under ${tmpdir()}, ~/.cache/opencode, or ~/.cache/pi. Got: ${targetPath}` };
   }
-  return resolved;
+  return checked;
 }
 function autoFilePath(blockId) {
-  return join3(AUTO_DIR, `${blockId}-${Date.now()}.txt`);
+  return join5(AUTO_DIR, `${blockId}-${Date.now()}.txt`);
 }
 function headPreview(text) {
   if (text.length <= PREVIEW_CHARS) return text;
@@ -8163,7 +8427,7 @@ ${text}`;
 }
 async function handleDecompress(args, runtime, ctx) {
   const { state, coreMessages } = await runtime.stateFor(ctx);
-  const arg = args.blockId.trim();
+  const arg = (args.blockId ?? "").trim();
   const owner = state.blocks.find((b) => b.effectiveMessageIds.includes(arg));
   if (owner) {
     return handleMessageRef(arg, owner.blockId, args, ctx);
@@ -8335,420 +8599,6 @@ function formatSize(tokens) {
   return `${(tokens / 1e6).toFixed(1)}M`;
 }
 
-// node_modules/billion-context-kit/node_modules/acp-kernel/dist/index.js
-import { createRequire as createRequire2 } from "module";
-var BLOCKED_REF2 = "BLOCKED";
-function refForRaw2(map, rawId) {
-  return map.byRaw[rawId] ?? null;
-}
-var require22 = createRequire2(import.meta.url);
-function defaultCountTokens2(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 formatTokens3(tokens) {
-  if (tokens < 1e3) return String(tokens);
-  if (tokens < 1e4) return (tokens / 1e3).toFixed(1) + "K";
-  return Math.round(tokens / 1e3) + "K";
-}
-function classifyType2(message) {
-  if (message.contentType === "tool-call" || message.contentType === "tool-result") {
-    return message.toolName || "tool";
-  }
-  return message.contentType;
-}
-function escapeRegex2(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-var LT2 = "<";
-var GT2 = ">";
-var TAG_OPEN2 = LT2 + "acp ";
-var TAG_CLOSE2 = LT2 + "/acp" + GT2;
-function acpTag2(ref, tokens, type) {
-  return TAG_OPEN2 + 'tokens="' + formatTokens3(tokens) + '" type="' + type + '"' + GT2 + ref + TAG_CLOSE2;
-}
-function renderMessage2(message, map, countTokens, strategy) {
-  const ref = refForRaw2(map, message.id);
-  if (!ref || ref === BLOCKED_REF2) return message;
-  if (strategy === "none") return message;
-  if (strategy === "text-only" && message.contentType !== "text") {
-    return message;
-  }
-  const ownTagRe = new RegExp(
-    "^" + escapeRegex2(TAG_OPEN2) + "[^>]*" + GT2 + escapeRegex2(ref) + escapeRegex2(TAG_CLOSE2) + "\\n?"
-  );
-  const cleanText = (message.text || "").replace(ownTagRe, "");
-  const tokens = countTokens(cleanText);
-  const type = classifyType2(message);
-  const prefix = acpTag2(ref, tokens, type) + "\n";
-  if (!cleanText) return { ...message, text: prefix };
-  return { ...message, text: prefix + cleanText };
-}
-function renderVisibleRefs2(messages, state, countTokens = (text) => Math.ceil(text.length / 4), strategy = "all") {
-  const map = state.messageRefs;
-  return messages.map(
-    (message) => renderMessage2(message, map, countTokens, strategy)
-  );
-}
-function createRenderRefsNode2(strategy) {
-  return {
-    name: "render-refs",
-    run(io, ctx) {
-      return {
-        ...io,
-        messages: renderVisibleRefs2(io.messages, io.state, ctx.countTokens, strategy)
-      };
-    }
-  };
-}
-var renderRefsNode2 = createRenderRefsNode2("all");
-var COMPRESS_PHILOSOPHY2 = `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_RULES2 = `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_RULES2 = `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_RULES2 = `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 defaultPrompts2 = Object.freeze({
-  compressPhilosophy: COMPRESS_PHILOSOPHY2,
-  howToCompressRules: HOW_TO_COMPRESS_RULES2,
-  tier2DistillRules: TIER2_DISTILL_RULES2,
-  tier3CondenseRules: TIER3_CONDENSE_RULES2
-});
-function formatK3(n) {
-  if (n >= 1e3) return `${(n / 1e3).toFixed(1)}K`;
-  return `${n}`;
-}
-function formatRanges2(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 });
-    }
-  }
-  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  ${formatK3(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  ${formatK3(e.tokens)} [${formatK3(e.compressibleTokens)} compressible | ${formatK3(e.protectedTokens)} protected: ${e.protectedTools.join(", ")}]${suffix}`;
-    }
-    return `  ${e.startRef}\u2013${e.endRef}  ${e.count} msgs  ${formatK3(e.tokens)} [tool ${e.toolPct}% | text ${e.textPct}%]${suffix}`;
-  });
-  return `Compressible ranges (${merged.length}, oldest first):
-${lines.join("\n")}`;
-}
-var substringAlgorithm2 = {
-  name: "substring",
-  description: "Exact substring counting (original baseline). Predictable, no normalization.",
-  score(docs, query) {
-    const terms = query.toLowerCase().trim().split(/\s+/).filter((t) => t.length > 0);
-    if (terms.length === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
-    return docs.map((d) => {
-      const haystack = d.text.toLowerCase();
-      let score = 0;
-      for (const term of terms) score += countOccurrences22(haystack, term);
-      return { ref: d.ref, score };
-    });
-  }
-};
-function countOccurrences22(haystack, needle) {
-  if (!needle) return 0;
-  return haystack.split(needle).length - 1;
-}
-function stem2(word) {
-  let w = word;
-  if (w.length <= 3) return w;
-  if (w.endsWith("ies")) w = w.slice(0, -3) + "y";
-  else if (w.endsWith("ses") || w.endsWith("xes") || w.endsWith("zes")) w = w.slice(0, -2);
-  else if (w.endsWith("ches") || w.endsWith("shes")) w = w.slice(0, -2);
-  else if (w.endsWith("s") && !w.endsWith("ss")) w = w.slice(0, -1);
-  if (w.endsWith("ing") && w.length > 5) w = w.slice(0, -3);
-  if (w.endsWith("ed") && w.length > 4) w = w.slice(0, -2);
-  if (w.endsWith("ation") && w.length > 6) w = w.slice(0, -3);
-  else if (w.endsWith("tion") && w.length > 5) w = w.slice(0, -4) + "t";
-  else if (w.endsWith("ion") && w.length > 4) w = w.slice(0, -3);
-  if (w.endsWith("ment") && w.length > 6) w = w.slice(0, -4);
-  if (w.endsWith("ness") && w.length > 6) w = w.slice(0, -4);
-  if (w.endsWith("ly") && w.length > 4) w = w.slice(0, -2);
-  return w;
-}
-var CJK2 = /[\u3400-\u9fff\uf900-\ufaff\u3040-\u30ff\uac00-\ud7af]/;
-var CJK_RUN2 = new RegExp(`${CJK2.source}+`, "g");
-var LATIN_WORD2 = /[a-z][a-z0-9_]*[a-z0-9]|[a-z0-9]/g;
-function tokenize2(text, opts = {}) {
-  const lower = text.toLowerCase();
-  const tokens = [];
-  const latin = lower.match(LATIN_WORD2) ?? [];
-  for (let w of latin) {
-    if (w.length >= 2) {
-      if (opts.stem) w = stem2(w);
-      tokens.push(w);
-    }
-  }
-  const cjkRuns = lower.match(CJK_RUN2) ?? [];
-  for (const run of cjkRuns) {
-    if (run.length === 1) {
-      tokens.push(run);
-    } else {
-      for (let i = 0; i < run.length - 1; i++) tokens.push(run.slice(i, i + 2));
-      for (const ch of run) tokens.push(ch);
-    }
-  }
-  return tokens;
-}
-function charBigrams2(text) {
-  const grams = [];
-  for (let i = 0; i < text.length - 1; i++) {
-    const pair = text.slice(i, i + 2);
-    if (pair.trim().length === pair.length) grams.push(pair);
-  }
-  return grams;
-}
-function tfMap2(text, stem22) {
-  const m = /* @__PURE__ */ new Map();
-  for (const t of tokenize2(text, { stem: stem22 })) m.set(t, (m.get(t) ?? 0) + 1);
-  return m;
-}
-var bm25Algorithm2 = {
-  name: "bm25",
-  description: "BM25 with stemming + CJK bigram tokenization. IR-standard relevance ranking.",
-  score(docs, query) {
-    const N = docs.length;
-    const k1 = 1.2;
-    const b = 0.75;
-    const parsed = docs.map((d) => {
-      const text = d.text;
-      const tf = tfMap2(text, true);
-      let len = 0;
-      for (const v of tf.values()) len += v;
-      return { id: d.ref, tf, len };
-    });
-    const avgdl = parsed.reduce((s, d) => s + d.len, 0) / (N || 1);
-    const qTerms = tokenize2(query, { stem: true });
-    if (qTerms.length === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
-    const idf = /* @__PURE__ */ new Map();
-    for (const t of new Set(qTerms)) {
-      let df = 0;
-      for (const d of parsed) if (d.tf.has(t)) df++;
-      idf.set(t, Math.log(1 + (N - df + 0.5) / (df + 0.5)));
-    }
-    return parsed.map((d) => {
-      let score = 0;
-      for (const t of qTerms) {
-        const f = d.tf.get(t) ?? 0;
-        if (f === 0) continue;
-        const idfT = idf.get(t) ?? 0;
-        score += idfT * (f * (k1 + 1)) / (f + k1 * (1 - b + b * d.len / (avgdl || 1)));
-      }
-      return { ref: d.id, score };
-    });
-  }
-};
-var fuzzyAlgorithm2 = {
-  name: "fuzzy",
-  description: "Character bigram overlap. Typo-tolerant, script-agnostic, high recall.",
-  score(docs, query) {
-    const qTokens = query.toLowerCase().split(/[\s,]+/).filter((t) => t.length >= 4);
-    if (qTokens.length === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
-    const qGrams = /* @__PURE__ */ new Set();
-    for (const t of qTokens) for (const g of charBigrams2(t)) qGrams.add(g);
-    if (qGrams.size === 0) return docs.map((d) => ({ ref: d.ref, score: 0 }));
-    return docs.map((d) => {
-      const haystack = d.text.toLowerCase();
-      const docGrams = new Set(charBigrams2(haystack));
-      let hits = 0;
-      for (const g of qGrams) if (docGrams.has(g)) hits++;
-      return { ref: d.ref, score: hits / qGrams.size };
-    });
-  }
-};
-var W_BM252 = 0.7;
-var W_FUZZY2 = 0.3;
-var hybridAlgorithm2 = {
-  name: "hybrid",
-  description: "Weighted BM25(stem) + fuzzy n-gram. Default \u2014 best precision + recall.",
-  score(docs, query) {
-    const bm = bm25Algorithm2.score(docs, query);
-    const fz = fuzzyAlgorithm2.score(docs, query);
-    const maxBm = Math.max(...bm.map((r) => r.score), 1e-9);
-    const maxFz = Math.max(...fz.map((r) => r.score), 1e-9);
-    const bmMap = new Map(bm.map((r) => [r.ref, r.score / maxBm]));
-    const fzMap = new Map(fz.map((r) => [r.ref, r.score / maxFz]));
-    return docs.map((d) => ({
-      ref: d.ref,
-      score: W_BM252 * (bmMap.get(d.ref) ?? 0) + W_FUZZY2 * (fzMap.get(d.ref) ?? 0)
-    }));
-  }
-};
-var registry22 = /* @__PURE__ */ new Map();
-function registerSearchAlgorithm2(algo) {
-  registry22.set(algo.name, algo);
-}
-registerSearchAlgorithm2(substringAlgorithm2);
-registerSearchAlgorithm2(bm25Algorithm2);
-registerSearchAlgorithm2(fuzzyAlgorithm2);
-registerSearchAlgorithm2(hybridAlgorithm2);
-
 // node_modules/billion-context-kit/dist/index.js
 var VIABLE_RANGE_MIN_TOKENS = 200;
 function viableRanges(ranges) {
@@ -8831,14 +8681,14 @@ function buildStatusPanel(input) {
   const protectedRanges = nudge?.protectedRanges ?? [];
   if (ranges.length > 0 || protectedRanges.length > 0) {
     lines.push("");
-    lines.push(formatRanges2(ranges, protectedRanges));
+    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 = defaultCountTokens2(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}`);
     }
@@ -8858,10 +8708,10 @@ function buildStatusPanel(input) {
 import {
   spawn
 } from "child_process";
-import { createWriteStream, existsSync as existsSync2 } from "fs";
+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 dirname3, join as join4, resolve as resolvePath } from "path";
+import { dirname as dirname4, join as join6, resolve as resolvePath } from "path";
 
 // src/footer-status.ts
 var FOOTER_STATUS_KEY = "billion-context-pi";
@@ -9265,7 +9115,7 @@ var IDLE_GRACE_MS = 5 * 6e4;
 var ASYNC_TIMEOUT_MS = 30 * 6e4;
 var KILL_GRACE_MS = 1e4;
 var RESULT_SUMMARY_CHARS = 500;
-var OUT_DIR = join4(tmpdir2(), "acp-delegate");
+var OUT_DIR = join6(tmpdir2(), "acp-delegate");
 function delegateSpawnOptions(cwd, env) {
   return {
     cwd,
@@ -9275,13 +9125,13 @@ function delegateSpawnOptions(cwd, env) {
   };
 }
 var PI_CLI_ENTRY_RE = /[\\/]pi-coding-agent[\\/]dist[\\/]cli\.js$/;
-var PI_PACKAGE_REL = join4("@earendil-works", "pi-coding-agent", "dist", "cli.js");
+var PI_PACKAGE_REL = join6("@earendil-works", "pi-coding-agent", "dist", "cli.js");
 function probeUpFromArgv(argv1) {
-  let dir = resolvePath(dirname3(argv1) || process.cwd());
+  let dir = resolvePath(dirname4(argv1) || process.cwd());
   for (; ; ) {
-    const candidate = join4(dir, "node_modules", PI_PACKAGE_REL);
-    if (existsSync2(candidate)) return candidate;
-    const parent = dirname3(dir);
+    const candidate = join6(dir, "node_modules", PI_PACKAGE_REL);
+    if (existsSync3(candidate)) return candidate;
+    const parent = dirname4(dir);
     if (parent === dir) return null;
     dir = parent;
   }
@@ -9289,12 +9139,12 @@ function probeUpFromArgv(argv1) {
 function piCliGlobalCandidates(env) {
   const candidates = [];
   if (process.platform === "win32") {
-    if (env.APPDATA) candidates.push(join4(env.APPDATA, "npm", "node_modules", PI_PACKAGE_REL));
+    if (env.APPDATA) candidates.push(join6(env.APPDATA, "npm", "node_modules", PI_PACKAGE_REL));
   } else {
     const home = env.HOME ?? env.USERPROFILE;
-    if (home) candidates.push(join4(home, ".local", "lib", "node_modules", PI_PACKAGE_REL));
-    candidates.push(join4("/usr/local", "lib", "node_modules", PI_PACKAGE_REL));
-    candidates.push(join4("/usr", "lib", "node_modules", PI_PACKAGE_REL));
+    if (home) candidates.push(join6(home, ".local", "lib", "node_modules", PI_PACKAGE_REL));
+    candidates.push(join6("/usr/local", "lib", "node_modules", PI_PACKAGE_REL));
+    candidates.push(join6("/usr", "lib", "node_modules", PI_PACKAGE_REL));
   }
   return candidates;
 }
@@ -9306,7 +9156,7 @@ function resolvePiCliEntry(argv1, env = process.env, piHost = true) {
     const probed = probeUpFromArgv(argv1);
     if (probed) return probed;
     for (const candidate of piCliGlobalCandidates(env)) {
-      if (existsSync2(candidate)) return candidate;
+      if (existsSync3(candidate)) return candidate;
     }
     logWarn("delegate", { event: "cli-entry-unresolved", argv1, fallback: "argv[1]" });
   }
@@ -9446,6 +9296,11 @@ function makeEventApplier(opts, writers) {
 }
 var WAIT_TIMEOUT_MS_DEFAULT = 1e4;
 var WAIT_TIMEOUT_MS_MAX = 3e5;
+function resolveWaitTimeoutMs(raw) {
+  if (raw === void 0) return WAIT_TIMEOUT_MS_DEFAULT;
+  const ms = raw < 1e3 ? raw * 1e3 : raw;
+  return Math.min(Math.max(ms, 1e3), WAIT_TIMEOUT_MS_MAX);
+}
 var DelegateParams = typebox_exports.Object({
   agent: typebox_exports.String({
     description: `Role of the delegate. One of: ${AGENT_NAMES.join(", ")}. See tool description for what each does.`
@@ -9477,7 +9332,7 @@ var WaitParams = typebox_exports.Object({
   runId: typebox_exports.String({ description: "The runId returned by acp_delegate to wait for." }),
   timeout: typebox_exports.Optional(
     typebox_exports.Integer({
-      description: `Maximum milliseconds to block waiting for the result. Default ${WAIT_TIMEOUT_MS_DEFAULT} (10s); max ${WAIT_TIMEOUT_MS_MAX} (300s). If the delegate does not finish in time, returns "failed (not ready)" \u2014 do NOT keep waiting or retry; go do other work, and a completion notification will still be injected when it completes.`
+      description: `Maximum time to block waiting for the result, in milliseconds. Default ${WAIT_TIMEOUT_MS_DEFAULT} (10s); max ${WAIT_TIMEOUT_MS_MAX} (300s). Values below 1000 are treated as seconds (so 180 means 180s, not 180ms). If the delegate does not finish in time, returns "failed (not ready)" \u2014 do NOT keep waiting or retry; go do other work, and a completion notification will still be injected when it completes.`
     })
   )
 });
@@ -9636,10 +9491,7 @@ function makeDelegateWaitTool(_pi) {
         }
         return buildWaitResult(run, formatRunResult(run), displayMode);
       }
-      const timeoutMs = Math.min(
-        Math.max(args.timeout ?? WAIT_TIMEOUT_MS_DEFAULT, 1e3),
-        WAIT_TIMEOUT_MS_MAX
-      );
+      const timeoutMs = resolveWaitTimeoutMs(args.timeout);
       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.` }] };
       }
@@ -9760,8 +9612,8 @@ async function runDelegate(pi, args, ctx, signal) {
       },
       { eofGraceMs: EOF_GRACE_MS, idleMs: IDLE_GRACE_MS, timeoutMs: ASYNC_TIMEOUT_MS, killGraceMs: KILL_GRACE_MS }
     );
-    const replyFile = join4(OUT_DIR, `${runId}.out`);
-    const activityFile = join4(OUT_DIR, `${runId}.activity`);
+    const replyFile = join6(OUT_DIR, `${runId}.out`);
+    const activityFile = join6(OUT_DIR, `${runId}.activity`);
     await mkdir2(OUT_DIR, { recursive: true });
     const replyStream = createWriteStream(replyFile, { flags: "a" });
     const activityStream = useJsonStream ? createWriteStream(activityFile, { flags: "a" }) : null;
@@ -9911,8 +9763,8 @@ async function runDelegate(pi, args, ctx, signal) {
   return formatSyncResult(args.agent, runId, args.task, result, file);
 }
 async function buildChildArgs(args, rolePrompt, ctx) {
-  const tmpDir = await mkdtemp(join4(tmpdir2(), "acp-delegate-"));
-  const promptFile = join4(tmpDir, "role.md");
+  const tmpDir = await mkdtemp(join6(tmpdir2(), "acp-delegate-"));
+  const promptFile = join6(tmpDir, "role.md");
   await writeFile2(promptFile, `${rolePrompt}
 
 ---
@@ -10049,7 +9901,7 @@ async function persistResult(runId, body) {
     await mkdir2(OUT_DIR, { recursive: true });
   } catch {
   }
-  const file = join4(OUT_DIR, `${runId}.out`);
+  const file = join6(OUT_DIR, `${runId}.out`);
   try {
     await writeFile2(file, body, "utf8");
     return file;
@@ -10107,6 +9959,7 @@ 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;
@@ -10114,7 +9967,7 @@ async function handleStatus(args, runtime, ctx) {
     messages: coreMessages,
     state,
     config,
-    tokenCount: sentTokens
+    tokenCount: calibrateTokens(sentTokens, runtime.density.densityFor(modelId))
   });
   const processed = turn.messages;
   const base = buildStatusReport(turn.state, processed, defaultCountTokens, {
@@ -10232,9 +10085,10 @@ async function statusReport(runtime, ctx) {
   const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
   const sessionTokens = realUsage?.tokens && realUsage.tokens > 0 ? realUsage.tokens : defaultCountTokens(coreMessages.map((m) => m.text ?? "").join("\n"));
   const coveredIds = collectCoveredMessageIds(state);
+  const modelId = ctx.model?.id ?? "default";
   const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
-  const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: sentTokens });
-  const versionStr = "0.1.38" ? `billion-context-pi@${"0.1.38"}` : void 0;
+  const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: calibrateTokens(sentTokens, runtime.density.densityFor(modelId)) });
+  const versionStr = "0.1.40" ? `billion-context-pi@${"0.1.40"}` : void 0;
   let text = buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -10447,16 +10301,16 @@ function wireToolGuardrails(pi, runtime) {
 
 // src/update.ts
 import { readFile, writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
-import { join as join5, dirname as dirname4 } from "path";
+import { join as join7, dirname as dirname5 } from "path";
 import { fileURLToPath } from "url";
 import { execFile } from "child_process";
-import { homedir as homedir3 } from "os";
-import { CONFIG_DIR_NAME as CONFIG_DIR_NAME2 } from "@earendil-works/pi-coding-agent";
+import { homedir as homedir4 } from "os";
+import { CONFIG_DIR_NAME as CONFIG_DIR_NAME3 } 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 = join5(homedir3(), CONFIG_DIR_NAME2, "agent", ".billion-context-pi-update-check");
+var THROTTLE_FILE = join7(homedir4(), CONFIG_DIR_NAME3, "agent", ".billion-context-pi-update-check");
 var updateInFlight = false;
 function parseVersion(v) {
   return v.replace(/^v/, "").split(".").map((n) => parseInt(n, 10) || 0);
@@ -10480,7 +10334,7 @@ async function readLastCheck() {
 }
 async function writeLastCheck(timestamp) {
   try {
-    await mkdir3(dirname4(THROTTLE_FILE), { recursive: true });
+    await mkdir3(dirname5(THROTTLE_FILE), { recursive: true });
     await writeFile3(THROTTLE_FILE, String(timestamp), "utf-8");
   } catch {
   }
@@ -10494,20 +10348,20 @@ async function readPackageJson(path4) {
   }
 }
 function findNpmRoot(extDir) {
-  let dir = dirname4(extDir);
+  let dir = dirname5(extDir);
   for (; ; ) {
-    if (dir.endsWith("node_modules")) return dirname4(dir);
-    const parent = dirname4(dir);
+    if (dir.endsWith("node_modules")) return dirname5(dir);
+    const parent = dirname5(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
 }
 async function findExtensionDir() {
-  let dir = dirname4(fileURLToPath(import.meta.url));
+  let dir = dirname5(fileURLToPath(import.meta.url));
   for (; ; ) {
-    const pkg = await readPackageJson(join5(dir, "package.json"));
+    const pkg = await readPackageJson(join7(dir, "package.json"));
     if (pkg?.name === PACKAGE_NAME) return dir;
-    const parent = dirname4(dir);
+    const parent = dirname5(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
@@ -10556,7 +10410,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.38";
+    const current = runtimeVersion ?? "0.1.40";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -10586,16 +10440,16 @@ async function checkForUpdate(autoUpdate, notify) {
 async function getRuntimeVersion() {
   const extDir = await findExtensionDir();
   if (!extDir) return void 0;
-  const pkg = await readPackageJson(join5(extDir, "package.json"));
+  const pkg = await readPackageJson(join7(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 existsSync3 } from "fs";
-import { homedir as homedir4 } from "os";
-import { join as join6 } from "path";
-import { CONFIG_DIR_NAME as CONFIG_DIR_NAME3 } from "@earendil-works/pi-coding-agent";
+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"],
@@ -10610,9 +10464,9 @@ var BUILTIN_DEFAULT_TOOLS = {
 };
 function resolveAgentDir() {
   const configured = process.env.PI_CODING_AGENT_DIR;
-  if (configured === "~") return homedir4();
-  if (configured?.startsWith("~/")) return join6(homedir4(), configured.slice(2));
-  return configured || join6(homedir4(), CONFIG_DIR_NAME3, "agent");
+  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] ?? []];
@@ -10622,7 +10476,7 @@ function desiredTools(existing, name) {
   return { tools: base, changed: true };
 }
 async function ensureSubagentAcpTools(settingsPath) {
-  const path4 = settingsPath ?? join6(resolveAgentDir(), "settings.json");
+  const path4 = settingsPath ?? join8(resolveAgentDir(), "settings.json");
   let raw;
   let mtimeMs;
   try {
@@ -10657,7 +10511,7 @@ async function ensureSubagentAcpTools(settingsPath) {
     return { path: path4, action: "skipped", reason: "all builtin agents already have ACP tools" };
   }
   const backupPath = `${path4}.acp-bak`;
-  if (!existsSync3(backupPath)) {
+  if (!existsSync4(backupPath)) {
     try {
       await copyFile(path4, backupPath);
     } catch {
@@ -10720,64 +10574,6 @@ async function runSetupAndNotify(notify) {
   }
 }
 
-// src/user-config.ts
-import { promises as fs2 } from "fs";
-import * as path3 from "path";
-import { homedir as homedir5 } from "os";
-import { CONFIG_DIR_NAME as CONFIG_DIR_NAME4 } from "@earendil-works/pi-coding-agent";
-async function loadUserConfig(cwd) {
-  const home = homedir5();
-  const merged = {};
-  for (const base of [join8(home, CONFIG_DIR_NAME4), join8(cwd, CONFIG_DIR_NAME4)]) {
-    const file = join8(base, "acp.json");
-    try {
-      const raw = await fs2.readFile(file, "utf8");
-      const parsed = JSON.parse(raw);
-      if (parsed && typeof parsed === "object") {
-        Object.assign(merged, pickKnown(parsed));
-        debug.event("config-loaded", { file });
-      }
-    } catch (e) {
-      const code = e.code;
-      if (code !== "ENOENT") {
-        logWarn("config", { event: "load-failed", file, error: e instanceof Error ? e.message : String(e) });
-      }
-    }
-  }
-  return merged;
-}
-function join8(...parts) {
-  return path3.join(...parts);
-}
-var KNOWN = /* @__PURE__ */ new Set([
-  "debug",
-  "autoUpdate",
-  "modelContextLimit",
-  "toolBashDefaultTimeout",
-  "toolOutputMaxBytes",
-  "delegate",
-  "compress",
-  "displayUsage",
-  "prompts",
-  "acknowledgePromptsRisk"
-]);
-function pickKnown(parsed) {
-  const out = {};
-  for (const [k, v] of Object.entries(parsed)) {
-    if (KNOWN.has(k)) out[k] = v;
-  }
-  return out;
-}
-function applyUserConfig(adapter, user) {
-  return {
-    ...adapter,
-    ...user,
-    coreOverrides: adapter.coreOverrides,
-    protectedTools: adapter.protectedTools,
-    preserveRecentMessages: adapter.preserveRecentMessages
-  };
-}
-
 // src/index.ts
 function createAcpExtension(adapter = {}) {
   return (pi) => {
@@ -10804,15 +10600,17 @@ function wireSessionLifecycle(pi, runtime) {
   pi.on("session_start", async (_event, ctx) => {
     runtime.store.invalidate();
     runtime.clearNudgeTracking();
+    const modelId = ctx.model?.id ?? "default";
+    runtime.density.resetModel(modelId);
     resetDelegateUsage();
     setDelegateDisplayUsage("separate");
     const sid = ctx.sessionManager.getSessionId();
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.38" : null });
+    runtime.clearSessionTracking(sid);
+    const modelInfo = ctx.model;
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.40" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
     try {
-      const user = await loadUserConfig(ctx.cwd);
-      runtime.setAdapter(applyUserConfig(runtime.adapter, user));
+      await runtime.reloadConfig(ctx.cwd);
       setDelegateDisplayUsage(resolveDelegate(runtime.adapter).displayUsage);
-      if (runtime.adapter.debug !== void 0) setDebugEnabled(runtime.adapter.debug);
     } catch (e) {
       logThrow("config", e, { sid, phase: "session_start" });
     }
@@ -10843,6 +10641,9 @@ function wireContextTransform(pi, runtime) {
     const sid = ctx.sessionManager.getSessionId();
     const release = await runtime.acquireLock(sid);
     try {
+      await runtime.reloadConfig(ctx.cwd);
+      const modelId = ctx.model?.id ?? "default";
+      runtime.setCountModel(modelId);
       const { state, coreMessages, entries } = await runtime.stateFor(ctx, event.messages);
       const config = runtime.configFor(ctx);
       const coveredIds = collectCoveredMessageIds(state);
@@ -10850,9 +10651,15 @@ function wireContextTransform(pi, runtime) {
       const systemPromptText = getSystemPromptText(ctx);
       const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
       const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
-      const tokenCount = sentTokens;
+      const tokenCount = calibrateTokens(sentTokens, runtime.density.densityFor(modelId));
+      const postCompression = runtime.noteActiveBlocks(
+        sid,
+        state.blocks.filter((b) => b.active).map((b) => b.blockId)
+      );
       debug.event("context-in", {
         sid,
+        modelId,
+        density: runtime.density.densityFor(modelId),
         eventMsgs: event.messages?.length ?? 0,
         entries: entries.length,
         coreMsgs: coreMessages.length,
@@ -10864,8 +10671,10 @@ function wireContextTransform(pi, runtime) {
       });
       const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount });
       await runtime.save(turn.state, ctx);
+      runtime.density.update(modelId, realUsage?.tokens ?? null, sentTokens, postCompression);
       logInfo("turn", {
         sid,
+        model: ctx.model?.id ?? null,
         inMsgs: coreMessages.length,
         outMsgs: turn.messages.length,
         tokens: tokenCount,
@@ -10877,6 +10686,8 @@ function wireContextTransform(pi, runtime) {
         activeBlocks: turn.state.blocks.filter((b) => b.active).length
       });
       debug.event("processTurn", {
+        modelId,
+        density: runtime.density.densityFor(modelId),
         outMsgs: turn.messages.length,
         summaryMsgs: turn.messages.filter((m) => m.id.startsWith("acp_summary")).length,
         prunedMsgs: coreMessages.length - turn.messages.length + turn.messages.filter((m) => m.id.startsWith("acp_summary")).length,