acp-kernel 0.0.8 → 0.0.10

package/dist/compress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAcpB,OAAO,EAGL,KAAK,YAAY,EAElB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,MAAM,EAEN,WAAW,EAGX,iBAAiB,EAEjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,KAAK;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACxD,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,YAAY,IAAI,YAAY,EAAE,CAAC;IAC/B,UAAU,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACnE,MAAM,CACJ,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,YAAY,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EAAE,CAAC;IACJ,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC;AAED,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CAgN7D;AA8lBD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,kBAAkB,EACnB,MAAM,YAAY,CAAC;AAcpB,OAAO,EAGL,KAAK,YAAY,EAElB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,gBAAgB,EAEhB,MAAM,EAEN,WAAW,EAGX,iBAAiB,EAEjB,YAAY,EACb,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,KAAK;IACpB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACxC;AAED,MAAM,WAAW,eAAe;IAC9B,WAAW,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACxD,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,sBAAsB,CAAC;IACvE,YAAY,IAAI,YAAY,EAAE,CAAC;IAC/B,UAAU,CACR,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gBAAgB,GACtB,gBAAgB,GAAG,SAAS,CAAC;IAChC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAAC;IACnE,MAAM,CACJ,KAAK,EAAE,gBAAgB,EACvB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GACb,YAAY,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE;QACN,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,EAAE,CAAC;IACJ,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,KAAK,EAAE,gBAAgB,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CACnC;AAED,wBAAgB,UAAU,CAAC,KAAK,GAAE,KAAU,GAAG,eAAe,CAoN7D;AAgpBD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/hide-consumed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hide-consumed.d.ts","sourceRoot":"","sources":["../src/hide-consumed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAIhE,MAAM,WAAW,kBAAkB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAClB;AAGD,wBAAgB,yBAAyB,CACrC,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,WAAW,EAAE,GACxB,kBAAkB,CAwDpB"}
+{"version":3,"file":"hide-consumed.d.ts","sourceRoot":"","sources":["../src/hide-consumed.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAQhE,MAAM,WAAW,kBAAkB;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;CAClB;AAGD,wBAAgB,yBAAyB,CACrC,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,WAAW,EAAE,GACxB,kBAAkB,CAwDpB"}

package/dist/index.js

@@ -81,7 +81,8 @@ function createInitialState() {
       lastPerMessageNudgeTokens: 0,
       lastNudgeShownTokens: 0,
       baselineTokens: 0,
-      anchors: {}
+      anchors: {},
+      lastShownByTier: {}
     },
     stats: { tokensCompressed: 0, compressionCount: 0 },
     nextBlockId: 1,
@@ -504,7 +505,7 @@ function truncateLargeToolOutputs(messages, tokenCount, config, countTokens, opt
 }
 
 // src/hide-consumed.ts
-var KEEP_LAST_ORPHANED = 2;
+var KEEP_LAST_ORPHANED = 0;
 function hideConsumedCompressCalls(state, messages) {
   const activeCallIds = /* @__PURE__ */ new Set();
   const allBlockCallIds = /* @__PURE__ */ new Set();
@@ -1048,6 +1049,7 @@ function createCore(ports = {}) {
     if (blocksCreated > 0) {
       state.nudge.lastPerMessageNudgeTokens = 0;
       state.nudge.lastNudgeShownTokens = 0;
+      state.nudge.lastShownByTier = {};
     }
     return { state, result: { blocksCreated, tokensCompressed, errors } };
   }
@@ -1183,7 +1185,8 @@ var nudgeNode = {
       config: ctx.config,
       state: io.state,
       messages: io.messages,
-      recommendation: io.effects.recommendation
+      recommendation: io.effects.recommendation,
+      countTokens: ctx.countTokens
     });
     const baseline = io.state.nudge.lastPerMessageNudgeTokens;
     const nudgeGrowthTokens = resolveAdaptiveGrowth(
@@ -1200,6 +1203,9 @@ var nudgeNode = {
     }
     if (nudge.shouldInject) {
       stamped.lastNudgeShownTokens = ctx.tokenCount;
+      if (nudge.tier !== null) {
+        stamped.lastShownByTier = { ...stamped.lastShownByTier, [nudge.tier]: ctx.tokenCount };
+      }
     }
     return {
       ...io,
@@ -1427,8 +1433,19 @@ function resolveAdaptiveGrowth(modelContextLimit, nudge) {
     )
   );
 }
+function pendingByTier(state, recommendation, countTokens) {
+  const out = {};
+  const compressible = recommendation?.contextRanges.compressible ?? [];
+  out[1] = { pending: compressible.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 };
+  return out;
+}
 function decideNudge(input) {
-  const { config, state, tokenCount, recommendation } = input;
+  const { config, state, tokenCount, recommendation, countTokens } = input;
   const limit = config.modelContextLimit;
   const usage = limit > 0 ? tokenCount / limit : 0;
   const nudgeGrowthTokens = resolveAdaptiveGrowth(limit, config.nudge);
@@ -1443,40 +1460,45 @@ function decideNudge(input) {
     config.nudge.minGrowthRatio * nudgeGrowthTokens
   );
   const growthSinceReference = tokenCount - growthReference;
-  const growthTriggered = growthSinceReference >= effectiveThreshold;
-  let shouldContextNudge = emergencyOverride || growthTriggered;
-  if (shouldContextNudge && !emergencyOverride) {
-    shouldContextNudge = growthSinceReference >= growthFloor;
-  }
-  let tier = null;
-  let tierTargetBlocks = [];
-  if (config.tiers.enabled) {
-    const active = activeBlocks(state);
-    const activeT1 = active.filter((b) => b.tier === 1);
-    const activeT2 = active.filter((b) => b.tier === 2);
-    if (activeT2.length >= config.tiers.tier3Trigger) {
-      tier = 3;
-      tierTargetBlocks = activeT2;
-    } else if (activeT1.length >= config.tiers.tier2Trigger) {
-      tier = 2;
-      tierTargetBlocks = activeT1;
+  const rec = recommendation;
+  const tiers = pendingByTier(state, rec, countTokens);
+  let injectedTier = null;
+  let injectedReason = "";
+  const growthReady = growthSinceReference >= growthFloor;
+  if (!emergencyOverride && growthReady) {
+    for (const tier of [1, 2, 3]) {
+      if (!config.tiers.enabled && tier > 1) break;
+      const info = tiers[tier];
+      if (!info || info.pending < nudgeGrowthTokens) continue;
+      const lastShown = state.nudge.lastShownByTier[tier] ?? 0;
+      const cadenceMet = lastShown === 0 || tokenCount - lastShown >= growthFloor;
+      if (!cadenceMet) continue;
+      injectedTier = tier;
+      injectedReason = tier === 1 ? `T1 compressible ${info.pending} >= ${nudgeGrowthTokens}, growth ${growthSinceReference}, usage ${Math.round(usage * 100)}%` : `T${tier} distill ready: ${info.targetBlocks.length} tier-${tier - 1} blocks (${info.pending} tokens) >= ${nudgeGrowthTokens}, usage ${Math.round(usage * 100)}%`;
+      break;
     }
   }
-  const rec = recommendation;
-  const nothingToCompress = rec ? rec.contextRanges.compressible.length === 0 : false;
-  const shouldInject = shouldContextNudge;
+  const shouldInject = emergencyOverride || injectedTier !== null;
   let reason;
-  if (!shouldInject) {
-    const tierHint = tier !== null ? `, tier-${tier} ready (distill when growth reaches threshold)` : "";
-    reason = `growth ${growthSinceReference} < threshold ${effectiveThreshold}${hasPendingNudge ? " (halved)" : ""} (floor ${growthFloor})${tierHint}`;
-  } else if (emergencyOverride) {
+  if (emergencyOverride) {
     reason = `EMERGENCY: usage ${Math.round(usage * 100)}% >= ${Math.round(config.nudge.emergencyThresholdPct * 100)}%`;
-  } else if (tier !== null) {
-    reason = `growth ${growthSinceReference} >= ${effectiveThreshold}${hasPendingNudge ? " (halved)" : ""}, usage ${Math.round(usage * 100)}%, tier-${tier} distillation`;
-  } else if (nothingToCompress) {
-    reason = `growth ${growthSinceReference} >= ${effectiveThreshold} but no specific ranges worth compressing`;
+  } else if (injectedTier !== null) {
+    reason = injectedReason;
   } else {
-    reason = `growth ${growthSinceReference} >= ${effectiveThreshold}${hasPendingNudge ? " (halved)" : ""}, usage ${Math.round(usage * 100)}%`;
+    const tiersList = [1, 2, 3];
+    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 blockedHint = blocked.length > 0 ? `, blocked: ${blocked.join(", ")}` : "";
+    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}`);
+    reason = `${parts.join("; ")}${readyHint}${blockedHint}`;
   }
   const ctxBreakdown = computeContextBreakdown(input.messages, tokenCount, growthSinceReference);
   return {
@@ -1484,9 +1506,9 @@ function decideNudge(input) {
     reason,
     compressibleRanges: rec?.recommendedRanges ?? [],
     protectedRanges: rec?.contextRanges.protected ?? [],
-    tierTargetBlocks,
+    tierTargetBlocks: injectedTier ? tiers[injectedTier].targetBlocks : [],
     contextUsage: usage,
-    tier,
+    tier: injectedTier,
     breakdown: {
       usage,
       growth: growthSinceReference,
@@ -1495,7 +1517,10 @@ function decideNudge(input) {
       nudgeGrowthTokens,
       growthFloor,
       hasPendingNudge: hasPendingNudge ? 1 : 0,
-      emergencyOverride: emergencyOverride ? 1 : 0
+      emergencyOverride: emergencyOverride ? 1 : 0,
+      pendingT1: tiers[1].pending,
+      pendingT2: tiers[2].pending,
+      pendingT3: tiers[3].pending
     },
     contextBreakdown: ctxBreakdown
   };
@@ -1691,76 +1716,6 @@ function formatBreakdown(bd) {
 +${formatK(bd.growth)} since last nudge` : "";
   return `Context breakdown: ${parts.join(" | ")}${growth}`;
 }
-function refToNum(ref) {
-  if (!ref) return 0;
-  const m = ref.match(/^m0*(\d+)$/);
-  return m && m[1] ? parseInt(m[1], 10) : 0;
-}
-function mergeRanges(compressible, protected_) {
-  const entries = [];
-  for (const r of compressible) {
-    const sNum = refToNum(r.startRef);
-    const eNum = refToNum(r.endRef);
-    entries.push({
-      startRef: r.startRef,
-      endRef: r.endRef,
-      startNum: sNum,
-      endNum: eNum,
-      count: r.count,
-      tokens: r.tokens,
-      compressibleTokens: r.tokens,
-      compressibleCount: r.count,
-      protectedTokens: 0,
-      protectedCount: 0,
-      protectedTools: [],
-      toolPct: r.toolPct,
-      textPct: r.textPct,
-      dangerous: r.dangerous ?? false
-    });
-  }
-  for (const r of protected_) {
-    const sNum = refToNum(r.startRef);
-    const eNum = refToNum(r.endRef);
-    entries.push({
-      startRef: r.startRef,
-      endRef: r.endRef,
-      startNum: sNum,
-      endNum: eNum,
-      count: r.count,
-      tokens: r.tokens,
-      compressibleTokens: 0,
-      compressibleCount: 0,
-      protectedTokens: r.tokens,
-      protectedCount: r.count,
-      protectedTools: [...r.tools],
-      toolPct: 0,
-      textPct: 0,
-      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 && last.endNum + 1 >= e.startNum) {
-      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 });
-    }
-  }
-  return merged;
-}
 function formatTierTargetBlocks(blocks) {
   if (blocks.length === 0) {
     return "Target blocks: (none \u2014 no tier blocks found)";
@@ -1773,27 +1728,25 @@ function formatTierTargetBlocks(blocks) {
   return `Target ${blocks[0].tier === 1 ? "tier-1" : "tier-2"} blocks to distill (${blocks.length}):
 ${lines.join("\n")}`;
 }
-function formatRanges(compressible, protected_) {
-  const merged = mergeRanges(compressible, protected_);
-  if (merged.length === 0) {
+function formatRanges(compressible) {
+  if (compressible.length === 0) {
     return "[No specific ranges detected \u2014 compress any consumed content.]";
   }
-  const lines = merged.slice(0, 10).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}`;
-    }
+  const refNum2 = (ref) => {
+    const m = ref.match(/\d+/);
+    return m ? parseInt(m[0], 10) : 0;
+  };
+  const sorted = [...compressible].sort((a, b) => refNum2(a.startRef) - refNum2(b.startRef));
+  const lines = sorted.map((e) => {
+    const suffix = e.dangerous ? "  \u26A0\uFE0F NOT recommended unless you are certain." : "";
     return `  ${e.startRef}\u2013${e.endRef}  ${e.count} msgs  ${formatK(e.tokens)} [tool ${e.toolPct}% | text ${e.textPct}%]${suffix}`;
   });
-  return `Compressible ranges (oldest first):
+  return `Compressible ranges (${compressible.length}, oldest first):
 ${lines.join("\n")}`;
 }
 function renderNudgeText(decision) {
   const breakdownStr = formatBreakdown(decision.contextBreakdown);
-  const rangesStr = formatRanges(decision.compressibleRanges, decision.protectedRanges ?? []);
+  const rangesStr = formatRanges(decision.compressibleRanges);
   if (decision.tier !== null && decision.tier >= 2) {
     const isT2 = decision.tier === 2;
     const targets = decision.tierTargetBlocks ?? [];
@@ -2150,11 +2103,31 @@ function renderUncompressedRanges(visible) {
   lines.push("");
   if (visible.length === 0) {
     lines.push("  (no uncompressed messages)");
-  } else {
-    for (const message of visible.slice(0, 30)) {
-      lines.push(`  ${message.ref} (${formatTokens2(message.tokens)}) ${message.tool}`);
+    return lines.join("\n");
+  }
+  const refNum2 = (ref) => {
+    const m = ref.match(/\d+/);
+    return m ? parseInt(m[0], 10) : 0;
+  };
+  const merged = [];
+  for (const m of visible) {
+    const num = refNum2(m.ref);
+    const last = merged[merged.length - 1];
+    if (last && num === last.startNum + last.count) {
+      last.endRef = m.ref;
+      last.count += 1;
+      last.tokens += m.tokens;
+    } else {
+      merged.push({ startRef: m.ref, endRef: m.ref, startNum: num, count: 1, tokens: m.tokens, tool: m.tool });
     }
   }
+  for (const r of merged.slice(0, 30)) {
+    const range = r.count === 1 ? r.startRef : `${r.startRef}\u2013${r.endRef}`;
+    lines.push(`  ${range}  (${r.count} msgs, ${formatTokens2(r.tokens)}${r.count > 1 ? ` (${Math.round(r.tokens / r.count)}/msg)` : ""}) ${r.tool}`);
+  }
+  if (merged.length > 30) {
+    lines.push(`  ... and ${merged.length - 30} more ranges`);
+  }
   return lines.join("\n");
 }
 function renderMessageDrilldown(visible, toolFilter, sort, limit) {