billion-context-pi 0.1.30 → 0.1.32

package/dist/index.js

@@ -463,14 +463,49 @@ function truncateLargeToolOutputs(messages, tokenCount, config, countTokens, opt
   return { messages: updated, truncatedCount, savedTokens };
 }
 var KEEP_LAST_ORPHANED = 0;
+function rangeKey(startRef, endRef) {
+  return `${startRef}::${endRef}`;
+}
+function rewriteCompressText(text, liveKeys) {
+  let parsed;
+  try {
+    parsed = JSON.parse(text ?? "");
+  } catch {
+    return null;
+  }
+  if (!parsed || typeof parsed !== "object") return null;
+  const obj = parsed;
+  const content = obj.content;
+  if (!Array.isArray(content) || content.length === 0) return null;
+  const kept = content.filter((entry) => {
+    if (!entry || typeof entry !== "object") return false;
+    const s = typeof entry.startId === "string" ? entry.startId : typeof entry.messageId === "string" ? entry.messageId : "";
+    const e = typeof entry.endId === "string" ? entry.endId : typeof entry.messageId === "string" ? entry.messageId : "";
+    return liveKeys.has(rangeKey(s, e));
+  });
+  if (kept.length === content.length || kept.length === 0) return null;
+  return JSON.stringify({ ...obj, content: kept });
+}
 function hideConsumedCompressCalls(state, messages) {
-  const activeCallIds = /* @__PURE__ */ new Set();
   const allBlockCallIds = /* @__PURE__ */ new Set();
+  const activeCallIds = /* @__PURE__ */ new Set();
+  const liveRangeKeysByCallId = /* @__PURE__ */ new Map();
+  const legacyLiveByCallId = /* @__PURE__ */ new Set();
   for (const block of state.blocks) {
-    if (block.compressCallId) {
-      allBlockCallIds.add(block.compressCallId);
-      if (block.active) activeCallIds.add(block.compressCallId);
+    if (!block.compressCallId) continue;
+    allBlockCallIds.add(block.compressCallId);
+    if (!block.active) continue;
+    activeCallIds.add(block.compressCallId);
+    if (block.startRef === void 0 || block.endRef === void 0) {
+      legacyLiveByCallId.add(block.compressCallId);
+      continue;
+    }
+    let keys = liveRangeKeysByCallId.get(block.compressCallId);
+    if (!keys) {
+      keys = /* @__PURE__ */ new Set();
+      liveRangeKeysByCallId.set(block.compressCallId, keys);
     }
+    keys.add(rangeKey(block.startRef, block.endRef));
   }
   const lastOrphanedCallIds = [];
   for (let i = messages.length - 1; i >= 0 && lastOrphanedCallIds.length < KEEP_LAST_ORPHANED; i--) {
@@ -499,6 +534,16 @@ function hideConsumedCompressCalls(state, messages) {
       hidden++;
       continue;
     }
+    if (message.toolName === "compress" && message.contentType === "tool-call" && message.toolCallId && keepCallIds.has(message.toolCallId)) {
+      const liveKeys = liveRangeKeysByCallId.get(message.toolCallId);
+      if (liveKeys && liveKeys.size > 0 && !legacyLiveByCallId.has(message.toolCallId)) {
+        const rewritten = rewriteCompressText(message.text, liveKeys);
+        if (rewritten !== null) {
+          result.push({ ...message, text: rewritten });
+          continue;
+        }
+      }
+    }
     result.push(message);
   }
   return { messages: result, hidden };
@@ -732,8 +777,8 @@ function refNum(ref) {
   const n = parseInt(ref.slice(1), 10);
   return Number.isNaN(n) ? -1 : n;
 }
-function estimateMessageTokens(message) {
-  return Math.ceil((message.text ?? "").length / 4);
+function estimateTextTokens(text) {
+  return Math.ceil(text.length / 4);
 }
 function isToolMessage(message) {
   return message.contentType === "tool-call" || message.contentType === "tool-result";
@@ -745,7 +790,7 @@ function isSyntheticOrPruned(message, state) {
   }
   return false;
 }
-function computeProtectedRefs(messages, state, config) {
+function computeProtectedRefs(messages, state, config, countTokens = estimateTextTokens) {
   const preserveN = config.preserveRecentMessages;
   const preserveTokens = config.preserveRecentTokens;
   const result = /* @__PURE__ */ new Set();
@@ -755,7 +800,7 @@ function computeProtectedRefs(messages, state, config) {
     if (isNeverPreserveRecent(msg)) continue;
     const ref = state.messageRefs.byRaw[msg.id];
     if (!ref || ref === "BLOCKED") continue;
-    visible.push({ ref, tokens: estimateMessageTokens(msg) });
+    visible.push({ ref, tokens: countTokens(msg.text ?? "") });
   }
   if (preserveN > 0) {
     for (const m of visible.slice(-preserveN)) {
@@ -780,7 +825,7 @@ function computeProtectedRefs(messages, state, config) {
   }
   return result;
 }
-function buildCompressibleRanges(messages, state, config, protectedZoneRefs) {
+function buildCompressibleRanges(messages, state, config, protectedZoneRefs, countTokens = estimateTextTokens) {
   const compressibleMsgs = [];
   const protectedMsgs = [];
   const protectedCallIds = collectProtectedToolCallIds(messages, config);
@@ -793,7 +838,7 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs) {
       protectedMsgs.push({
         ref,
         refNum: rn,
-        tokens: estimateMessageTokens(msg),
+        tokens: countTokens(msg.text ?? ""),
         tools: msg.toolName ? [msg.toolName] : []
       });
       continue;
@@ -804,7 +849,7 @@ function buildCompressibleRanges(messages, state, config, protectedZoneRefs) {
     compressibleMsgs.push({
       ref,
       refNum: rn,
-      tokens: estimateMessageTokens(msg),
+      tokens: countTokens(msg.text ?? ""),
       isTool: isToolMessage(msg),
       isUser: msg.role === "user"
     });
@@ -891,7 +936,7 @@ function createCore(ports = {}) {
     let tokensCompressed = 0;
     const errors = [];
     const warnings = [];
-    const protectedMessageIds = input.protectedMessageIds ?? computeProtectedRefs(input.messages, input.state, input.config);
+    const protectedMessageIds = input.protectedMessageIds ?? computeProtectedRefs(input.messages, input.state, input.config, countTokens);
     const preExistingCoverage = collectCoverage(state);
     const rangeIndexSets = [];
     for (const spec of input.ranges) {
@@ -916,29 +961,25 @@ function createCore(ports = {}) {
       const bMin = b.indices.length > 0 ? Math.min(...b.indices) : Infinity;
       return aMin - bMin;
     });
-    for (let i = 1; i < sortedRanges.length; i++) {
-      const prev = sortedRanges[i - 1];
-      const curr = sortedRanges[i];
-      const prevMax = prev.indices.length > 0 ? Math.max(...prev.indices) : -1;
-      const currMin = curr.indices.length > 0 ? Math.min(...curr.indices) : -1;
-      if (prevMax >= currMin && prevMax >= 0) {
-        return {
-          state: input.state,
-          result: {
-            blocksCreated: 0,
-            tokensCompressed: 0,
-            errors: [
-              `content: range (${prev.spec.startRef}..${prev.spec.endRef}) overlaps (${curr.spec.startRef}..${curr.spec.endRef}). Overlapping ranges cannot be compressed in the same batch.`
-            ],
-            warnings: []
-          }
-        };
+    const skipSpecs = /* @__PURE__ */ new Set();
+    let acceptedMaxIndex = -1;
+    for (const entry of sortedRanges) {
+      const entryMax = entry.indices.length > 0 ? Math.max(...entry.indices) : -1;
+      const entryMin = entry.indices.length > 0 ? Math.min(...entry.indices) : -1;
+      if (entryMin >= 0 && entryMin <= acceptedMaxIndex) {
+        skipSpecs.add(entry.spec);
+        warnings.push(
+          `Skipped range (${entry.spec.startRef}..${entry.spec.endRef}) \u2014 overlaps an earlier range in the batch; the earlier range takes precedence. Keep ranges disjoint.`
+        );
+        continue;
       }
+      if (entryMax > acceptedMaxIndex) acceptedMaxIndex = entryMax;
     }
     if (input.config.compress.minCompressRange > 0 && input.ranges.length > 0) {
       let totalRangeChars = 0;
       let hasBlockBoundaryRange = false;
       for (const spec of input.ranges) {
+        if (skipSpecs.has(spec)) continue;
         let resolved;
         try {
           resolved = resolveBoundaries({
@@ -974,6 +1015,7 @@ function createCore(ports = {}) {
       }
     }
     for (const spec of input.ranges) {
+      if (skipSpecs.has(spec)) continue;
       try {
         const outcome = applySingleRange({
           spec,
@@ -1114,13 +1156,15 @@ var recommendNode = {
     const protectedRefs = computeProtectedRefs(
       io.messages,
       io.state,
-      ctx.config
+      ctx.config,
+      ctx.countTokens
     );
     const contextRanges = buildCompressibleRanges(
       io.messages,
       io.state,
       ctx.config,
-      protectedRefs
+      protectedRefs,
+      ctx.countTokens
     );
     const nothingToCompress = contextRanges.compressible.length === 0;
     const recommendation = {
@@ -1298,7 +1342,9 @@ function applySingleRange(input) {
     survivedCount: 0,
     generation: "young",
     active: true,
-    compressCallId: input.spec.compressCallId
+    compressCallId: input.spec.compressCallId,
+    startRef: input.spec.startRef,
+    endRef: input.spec.endRef
   };
   input.state.blocks.push(block);
   for (const consumedId of consumedBlockIds) {
@@ -1789,7 +1835,7 @@ 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.`,
+        isT2 ? `Your tier-1 compression summaries have accumulated. Distill them into a single denser tier-2 summary. Use block IDs as boundaries (startId and endId as bN). Any raw (uncompressed) messages sitting between the boundary blocks are absorbed into the tier-2 block as well \u2014 apply HOW TO COMPRESS to those raw messages and the TIER 2 distillation rules to the existing summaries, so the whole span is covered and nothing is lost.` : `Your tier-2 compression summaries have accumulated. Condense them further into a tier-3 ultra-condensed summary. Use block IDs as boundaries (startId and endId as bN). Any raw (uncompressed) messages sitting between the boundary blocks are absorbed into the tier-3 block as well \u2014 apply HOW TO COMPRESS to those raw messages and the TIER 3 condensation rules to the existing summaries, so the whole span is covered and nothing is lost.`,
         blockList,
         `Example: compress({ content: [{ startId: "${startId}", endId: "${endId}", summary: "..." }] })`,
         "",
@@ -2537,6 +2583,15 @@ function patchRefTag(original, core) {
   if (!tag) return original;
   const base = original;
   if (base.role === "assistant") return original;
+  const tagCore = tag.replace(/\s+$/, "");
+  let bodyStart = tagCore.length;
+  if (core.text && core.text.charAt(bodyStart) === "\n") bodyStart += 1;
+  const coreBody = core.text ? core.text.slice(bodyStart) : "";
+  const originalBody = extractText(base.content);
+  const trimEnd = (s) => s.replace(/\s+$/, "");
+  if (coreBody && trimEnd(coreBody) !== trimEnd(originalBody)) {
+    return rebuildBodyFromCore(original, coreBody, tag);
+  }
   const rawBlocks = Array.isArray(base.content) ? base.content : typeof base.content === "string" ? [{ type: "text", text: base.content }] : [];
   const peeled = peelRefTagBlocks(rawBlocks);
   const newBlocks = [...peeled];
@@ -2560,6 +2615,23 @@ ${tag}` : tag };
     content: [...peeled, { type: "text", text: tag }]
   };
 }
+function rebuildBodyFromCore(original, coreBody, tag) {
+  const base = original;
+  const text = `${coreBody.replace(/\s+$/, "")}
+
+${tag}`;
+  if (typeof base.content === "string") {
+    return { ...original, content: text };
+  }
+  if (Array.isArray(base.content)) {
+    const nonText = base.content.filter((b) => b.type !== "text");
+    return {
+      ...original,
+      content: [...nonText, { type: "text", text }]
+    };
+  }
+  return { ...original, content: [{ type: "text", text }] };
+}
 function peelRefTagBlocks(blocks) {
   const out = [];
   for (const block of blocks) {
@@ -8718,7 +8790,7 @@ async function statusReport(runtime, ctx) {
   const activeBlocksList = state.blocks.filter((b) => b.active);
   const totalBlocksList = state.blocks;
   const lines = [];
-  const versionStr = "0.1.30" ? `billion-context-pi@${"0.1.30"}` : "";
+  const versionStr = "0.1.32" ? `billion-context-pi@${"0.1.32"}` : "";
   lines.push("\u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E");
   lines.push("\u2502           ACP Context Analysis              \u2502");
   lines.push("\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F");
@@ -9084,7 +9156,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.30";
+    const current = runtimeVersion ?? "0.1.32";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -9323,7 +9395,7 @@ function wireSessionLifecycle(pi, runtime) {
     runtime.store.invalidate();
     runtime.clearNudgeTracking();
     const sid = ctx.sessionManager.getSessionId();
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.30" : null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.32" : null });
     try {
       const user = await loadUserConfig(ctx.cwd);
       runtime.setAdapter(applyUserConfig(runtime.adapter, user));