acp-kernel 0.0.7 → 0.0.8

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,CAyM7D;AA0kBD,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,CAgN7D;AA8lBD,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/index.js

@@ -269,9 +269,9 @@ import { createRequire } from "module";
 var require2 = createRequire(import.meta.url);
 function defaultCountTokens(text) {
   if (!text) return 0;
-  const ascii = text.match(/[a-zA-Z][a-zA-Z0-9_'-]*/g);
   const cjk = text.match(/[\u4e00-\u9fff\u3040-\u30ff\uac00-\ud7af]/g);
-  return (ascii?.length ?? 0) + (cjk?.length ?? 0);
+  const cjkCount = cjk?.length ?? 0;
+  return cjkCount + Math.ceil((text.length - cjkCount) / 4);
 }
 function estimateTokensFast(text) {
   if (!text) return 0;
@@ -704,6 +704,7 @@ var renderRefsNode = {
 };
 
 // src/protected.ts
+var ALWAYS_PROTECTED_TOOLS = ["compress"];
 function matchToolPattern(toolName, pattern) {
   if (pattern.endsWith("*")) {
     return toolName.startsWith(pattern.slice(0, -1));
@@ -711,13 +712,34 @@ function matchToolPattern(toolName, pattern) {
   return toolName === pattern;
 }
 function isMessageProtected(msg, config) {
-  if (msg.contentType !== "tool-call" || !msg.toolName) return false;
+  if (msg.contentType !== "tool-call" && msg.contentType !== "tool-result" || !msg.toolName) {
+    return false;
+  }
+  if (ALWAYS_PROTECTED_TOOLS.includes(msg.toolName)) {
+    return true;
+  }
   for (const pattern of config.protectedTools) {
     if (matchToolPattern(msg.toolName, pattern)) return true;
   }
   if (config.isToolProtected?.(msg.toolName, msg.text)) return true;
   return false;
 }
+function collectProtectedToolCallIds(messages, config) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const m of messages) {
+    if (m.contentType === "tool-call" && m.toolCallId && isMessageProtected(m, config)) {
+      ids.add(m.toolCallId);
+    }
+  }
+  return ids;
+}
+function isMessageProtectedWithPairing(msg, config, protectedCallIds) {
+  if (isMessageProtected(msg, config)) return true;
+  if (msg.contentType === "tool-result" && msg.toolCallId && protectedCallIds.has(msg.toolCallId)) {
+    return true;
+  }
+  return false;
+}
 
 // src/tool-pairs.ts
 function adjustBoundariesForToolPairs(startIndex, endIndex, messages, maxScan = 20) {
@@ -795,24 +817,27 @@ function computeProtectedRefs(messages, state, config) {
       tokenAccum += visible[i].tokens;
     }
   }
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const msg = messages[i];
-    if (msg.role !== "user" || isSyntheticOrPruned(msg, state)) continue;
-    const ref = state.messageRefs.byRaw[msg.id];
-    if (ref && ref !== "BLOCKED") result.add(ref);
-    break;
+  if (preserveN > 0) {
+    for (let i = messages.length - 1; i >= 0; i--) {
+      const msg = messages[i];
+      if (msg.role !== "user" || isSyntheticOrPruned(msg, state)) continue;
+      const ref = state.messageRefs.byRaw[msg.id];
+      if (ref && ref !== "BLOCKED") result.add(ref);
+      break;
+    }
   }
   return result;
 }
 function buildCompressibleRanges(messages, state, config, protectedZoneRefs) {
   const compressibleMsgs = [];
   const protectedMsgs = [];
+  const protectedCallIds = collectProtectedToolCallIds(messages, config);
   for (const msg of messages) {
     if (isSyntheticOrPruned(msg, state)) continue;
     const ref = state.messageRefs.byRaw[msg.id];
     if (!ref || ref === "BLOCKED") continue;
     const rn = refNum(ref);
-    if (isMessageProtected(msg, config)) {
+    if (isMessageProtectedWithPairing(msg, config, protectedCallIds)) {
       protectedMsgs.push({
         ref,
         refNum: rn,
@@ -828,7 +853,8 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs) {
       ref,
       refNum: rn,
       tokens: estimateMessageTokens(msg),
-      isTool: isToolMessage(msg)
+      isTool: isToolMessage(msg),
+      isUser: msg.role === "user"
     });
   }
   const compressible = [];
@@ -836,7 +862,7 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs) {
   let prevRefNum = -2;
   for (const info of compressibleMsgs) {
     const hasGap = info.refNum > prevRefNum + 1;
-    if (cur && hasGap) {
+    if (cur && (info.isUser && cur.count >= 3 || hasGap)) {
       compressible.push(cur);
       cur = null;
     }
@@ -919,6 +945,7 @@ function createCore(ports = {}) {
     let blocksCreated = 0;
     let tokensCompressed = 0;
     const errors = [];
+    const protectedMessageIds = input.protectedMessageIds ?? computeProtectedRefs(input.messages, input.state, input.config);
     const preExistingCoverage = collectCoverage(state);
     const rangeIndexSets = [];
     for (const spec of input.ranges) {
@@ -1006,7 +1033,7 @@ function createCore(ports = {}) {
           state,
           runId,
           config: input.config,
-          protectedMessageIds: input.protectedMessageIds,
+          protectedMessageIds,
           countTokens,
           preExistingCoverage
         });
@@ -1248,11 +1275,25 @@ function applySingleRange(input) {
   const directMessageIds = [...effectiveMessageIds].filter(
     (id) => !input.preExistingCoverage.has(id)
   );
-  const { filteredIds, appendedProtectedText } = filterProtectedToolMessages(
+  const filteredIds = filterProtectedToolMessages(
     directMessageIds,
     input.messages,
     input.config
   );
+  const protectedRefs = input.protectedMessageIds;
+  const hitProtectedRaw = protectedRefs ? filteredIds.filter((id) => {
+    const ref = input.state.messageRefs.byRaw[id];
+    return ref !== void 0 && protectedRefs.has(ref);
+  }) : [];
+  if (hitProtectedRaw.length > 0) {
+    const recentN = input.config.preserveRecentMessages;
+    const hitRefs = hitProtectedRaw.map((id) => input.state.messageRefs.byRaw[id]).filter(Boolean);
+    throw new Error(
+      `Range includes protected messages (the last ${recentN} messages and/or the most recent user message) which must not be compressed: ${hitRefs.join(
+        ", "
+      )}. Adjust startId/endId to exclude them.`
+    );
+  }
   validateCompressionRange(input, filteredIds, consumedBlockIds.length);
   let compressedTokens = 0;
   for (const id of filteredIds) {
@@ -1266,22 +1307,12 @@ function applySingleRange(input) {
     }
   }
   const blockId = allocateBlockId(input.state);
-  const finalSummary = appendedProtectedText.length > 0 ? `${input.spec.summary}
-
-The following protected tool calls were used in this conversation as well:
-${appendedProtectedText.join("")}` : input.spec.summary;
-  const maxLen = input.spec.summaryMaxChars ?? input.config.compress.maxSummaryLength;
-  if (maxLen > 0 && finalSummary.length > maxLen) {
-    throw new Error(
-      `Summary too long after appending protected content (${finalSummary.length} chars, max ${maxLen}). Reduce the summary or remove protected tools from the range.`
-    );
-  }
   const block = {
     blockId,
     runId: input.runId,
     tier: outputTier,
     topic: input.spec.topic,
-    summary: finalSummary,
+    summary: input.spec.summary,
     directMessageIds: filteredIds,
     effectiveMessageIds: [...effectiveMessageIds],
     directBlockIds: [...consumedBlockIds],
@@ -1344,41 +1375,30 @@ function validateCompressionRange(input, directMessageIds, consumedBlockCount) {
   }
 }
 function filterProtectedToolMessages(directMessageIds, messages, config) {
-  const removedToolCallIds = /* @__PURE__ */ new Set();
-  const allProtectedCallIds = /* @__PURE__ */ new Set();
+  const protectedCallIds = /* @__PURE__ */ new Set();
   const removedIds = /* @__PURE__ */ new Set();
-  const appendedProtectedText = [];
   for (const msg of messages) {
     if (isMessageProtected(msg, config) && msg.toolCallId) {
-      allProtectedCallIds.add(msg.toolCallId);
+      protectedCallIds.add(msg.toolCallId);
     }
   }
   for (const id of directMessageIds) {
     const msg = messages.find((m) => m.id === id);
     if (!msg) continue;
-    if (!isMessageProtected(msg, config)) continue;
-    removedIds.add(id);
-    if (msg.toolCallId) removedToolCallIds.add(msg.toolCallId);
-    if (msg.text) {
-      appendedProtectedText.push(
-        `
-### Protected: ${msg.toolName ?? "tool"}
-${msg.text}`
-      );
+    if (isMessageProtected(msg, config)) {
+      removedIds.add(id);
+      if (msg.toolCallId) protectedCallIds.add(msg.toolCallId);
     }
   }
   for (const id of directMessageIds) {
     if (removedIds.has(id)) continue;
     const msg = messages.find((m) => m.id === id);
     if (!msg) continue;
-    if (msg.contentType === "tool-result" && msg.toolCallId && (removedToolCallIds.has(msg.toolCallId) || allProtectedCallIds.has(msg.toolCallId))) {
+    if (msg.contentType === "tool-result" && msg.toolCallId && protectedCallIds.has(msg.toolCallId)) {
       removedIds.add(id);
     }
   }
-  return {
-    filteredIds: directMessageIds.filter((id) => !removedIds.has(id)),
-    appendedProtectedText
-  };
+  return directMessageIds.filter((id) => !removedIds.has(id));
 }
 function resolveTargetTier(state, nestedBlockIds, isBlockBoundary) {
   if (!isBlockBoundary) return 1;
@@ -1429,23 +1449,30 @@ function decideNudge(input) {
     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;
-    else if (activeT1.length >= config.tiers.tier2Trigger) 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 nothingToCompress = rec ? rec.contextRanges.compressible.length === 0 : false;
-  const shouldInject = shouldContextNudge || tier !== null;
+  const shouldInject = shouldContextNudge;
   let reason;
   if (!shouldInject) {
-    reason = `growth ${growthSinceReference} < threshold ${effectiveThreshold}${hasPendingNudge ? " (halved)" : ""} (floor ${growthFloor})`;
+    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) {
     reason = `EMERGENCY: usage ${Math.round(usage * 100)}% >= ${Math.round(config.nudge.emergencyThresholdPct * 100)}%`;
   } else if (tier !== null) {
-    reason = `tier-${tier} distillation trigger`;
+    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 {
@@ -1457,6 +1484,7 @@ function decideNudge(input) {
     reason,
     compressibleRanges: rec?.recommendedRanges ?? [],
     protectedRanges: rec?.contextRanges.protected ?? [],
+    tierTargetBlocks,
     contextUsage: usage,
     tier,
     breakdown: {
@@ -1733,6 +1761,18 @@ function mergeRanges(compressible, protected_) {
   }
   return merged;
 }
+function formatTierTargetBlocks(blocks) {
+  if (blocks.length === 0) {
+    return "Target blocks: (none \u2014 no tier blocks found)";
+  }
+  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 formatRanges(compressible, protected_) {
   const merged = mergeRanges(compressible, protected_);
   if (merged.length === 0) {
@@ -1756,6 +1796,10 @@ function renderNudgeText(decision) {
   const rangesStr = formatRanges(decision.compressibleRanges, decision.protectedRanges ?? []);
   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";
     return {
       voice: "gentle",
       text: [
@@ -1764,8 +1808,9 @@ function renderNudgeText(decision) {
         breakdownStr,
         "",
         `[TIER ${decision.tier} ${isT2 ? "DISTILLATION" : "CONDENSATION"} TRIGGER]`,
-        isT2 ? "Your tier-1 compression summaries have accumulated. Distill them into a single denser tier-2 summary. Use block IDs as boundaries." : "Your tier-2 compression summaries have accumulated. Condense them further into a tier-3 ultra-condensed summary. Use block IDs as boundaries.",
-        `Example: compress({ content: [{ startId: "b1", endId: "b5", summary: "..." }] })`,
+        isT2 ? `Your tier-1 compression summaries have accumulated. Distill them into a single denser tier-2 summary. Use block IDs as boundaries.` : `Your tier-2 compression summaries have accumulated. Condense them further into a tier-3 ultra-condensed summary. Use block IDs as boundaries.`,
+        blockList,
+        `Example: compress({ content: [{ startId: "${startId}", endId: "${endId}", summary: "..." }] })`,
         "",
         HOW_TO_COMPRESS_RULES,
         "",