billion-context-omp 0.1.4 → 0.1.6

package/dist/compress-tool.d.ts

@@ -3,7 +3,6 @@ import type { AcpRuntime } from "./runtime.js";
 /** Label shown for a block when the model did not pass a topic: first
  *  sentence-ish slice of the summary (≤30 chars). Decorative only — never
  *  blocks compression. */
-export declare function topicFallback(summary: string): string;
 declare const CompressParams: import("@oh-my-pi/omptype").FluentType<{
     content: {
         endId: string;

package/dist/index.js

@@ -126,9 +126,11 @@ function prune(messages, state, options = {}) {
   const indexById = /* @__PURE__ */ new Map();
   messages.forEach((message, index) => indexById.set(message.id, index));
   const anchors = inject ? collectSummaryAnchors(state, indexById) : [];
-  return stripOrphanedToolResults(
-    stripOrphanedToolCalls(
-      rebuildMessages(messages, covered, firstUserIndex, anchors)
+  return stripOrphanedReasoning(
+    stripOrphanedToolResults(
+      stripOrphanedToolCalls(
+        rebuildMessages(messages, covered, firstUserIndex, anchors)
+      )
     )
   );
 }
@@ -205,6 +207,24 @@ function stripOrphanedToolCalls(messages) {
     (m) => m.contentType !== "tool-call" || !m.toolCallId || m.toolName === "compress" || knownResultIds.has(m.toolCallId)
   );
 }
+function stripOrphanedReasoning(messages) {
+  const drop = /* @__PURE__ */ new Set();
+  for (let i = 0; i < messages.length; i++) {
+    if (drop.has(i)) continue;
+    if (messages[i].contentType !== "reasoning") continue;
+    let j = i;
+    while (j + 1 < messages.length && messages[j + 1].contentType === "reasoning") {
+      j++;
+    }
+    const companion = messages[j + 1];
+    const hasCompanion = companion !== void 0 && companion.role === "assistant" && (companion.contentType === "text" || companion.contentType === "tool-call");
+    if (!hasCompanion) {
+      for (let k = i; k <= j; k++) drop.add(k);
+    }
+  }
+  if (drop.size === 0) return messages;
+  return messages.filter((_, i) => !drop.has(i));
+}
 function syncBlocks(messages, state) {
   const presentIds = new Set(messages.map((message) => message.id));
   const deactivated = [];
@@ -814,6 +834,38 @@ function adjustBoundariesForToolPairs(startIndex, endIndex, messages, maxScan =
   }
   return { startIndex: newStartIndex, endIndex: newEndIndex };
 }
+function adjustBoundariesForReasoningPairs(startIndex, endIndex, messages) {
+  if (startIndex > endIndex) {
+    return { startIndex, endIndex };
+  }
+  let newStartIndex = startIndex;
+  let newEndIndex = endIndex;
+  for (let i = startIndex; i <= endIndex && i < messages.length; i++) {
+    const msg = messages[i];
+    if (!msg) continue;
+    if (msg.contentType === "reasoning") {
+      let j = i;
+      while (j + 1 < messages.length && messages[j + 1].contentType === "reasoning") {
+        j++;
+      }
+      const companion = messages[j + 1];
+      if (companion !== void 0 && companion.role === "assistant" && (companion.contentType === "text" || companion.contentType === "tool-call") && j + 1 > newEndIndex) {
+        newEndIndex = j + 1;
+      }
+    }
+    if (msg.role === "assistant" && (msg.contentType === "text" || msg.contentType === "tool-call")) {
+      let k = i - 1;
+      while (k >= 0 && messages[k].contentType === "reasoning") {
+        k--;
+      }
+      const runStart = k + 1;
+      if (runStart < i && runStart >= 0 && messages[runStart].contentType === "reasoning" && runStart < newStartIndex) {
+        newStartIndex = runStart;
+      }
+    }
+  }
+  return { startIndex: newStartIndex, endIndex: newEndIndex };
+}
 function refNum(ref) {
   const n = parseInt(ref.slice(1), 10);
   return Number.isNaN(n) ? -1 : n;
@@ -1309,7 +1361,7 @@ function applySingleRange(input) {
     messages: input.messages,
     state: input.state
   });
-  const rangeMessageIds = applyToolPairAdjustment(
+  const rangeMessageIds = applyPairBoundaryAdjustments(
     resolved,
     input.messages
   );
@@ -1423,20 +1475,33 @@ function applySingleRange(input) {
   }
   return { tokens: compressedTokens, warnings };
 }
-function applyToolPairAdjustment(resolved, messages) {
+function applyPairBoundaryAdjustments(resolved, messages) {
   if (resolved.boundaryKind === "block") {
     return resolved.messageIds;
   }
-  const adjusted = adjustBoundariesForToolPairs(
-    resolved.startIndex,
-    resolved.endIndex,
-    messages
-  );
-  if (adjusted.startIndex === resolved.startIndex && adjusted.endIndex === resolved.endIndex) {
+  let startIndex = resolved.startIndex;
+  let endIndex = resolved.endIndex;
+  for (let pass = 0; pass < 2; pass++) {
+    const reasoningAdjusted = adjustBoundariesForReasoningPairs(
+      startIndex,
+      endIndex,
+      messages
+    );
+    const toolAdjusted = adjustBoundariesForToolPairs(
+      reasoningAdjusted.startIndex,
+      reasoningAdjusted.endIndex,
+      messages
+    );
+    const changed = toolAdjusted.startIndex !== startIndex || toolAdjusted.endIndex !== endIndex;
+    startIndex = toolAdjusted.startIndex;
+    endIndex = toolAdjusted.endIndex;
+    if (!changed) break;
+  }
+  if (startIndex === resolved.startIndex && endIndex === resolved.endIndex) {
     return resolved.messageIds;
   }
   const ids = [];
-  for (let i = adjusted.startIndex; i <= adjusted.endIndex; i++) {
+  for (let i = startIndex; i <= endIndex; i++) {
     const msg = messages[i];
     if (msg) ids.push(msg.id);
   }
@@ -3003,10 +3068,6 @@ function boundaryRaw(ref, byRef, blocks, pick) {
   const pos = (id) => rawPos(byRef[id] ?? id);
   return pick === "min" ? ids.reduce((a, b) => pos(a) <= pos(b) ? a : b) : ids.reduce((a, b) => pos(a) >= pos(b) ? a : b);
 }
-var VIABLE_RANGE_MIN_TOKENS = 200;
-function viableRanges(ranges) {
-  return ranges.filter((r) => r.tokens >= VIABLE_RANGE_MIN_TOKENS);
-}
 function rangeFingerprints(ranges, coreMessages, byRef, blocks) {
   return ranges.map((r) => {
     const start = boundaryRaw(r.startRef, byRef, blocks, "min");
@@ -3240,11 +3301,6 @@ var RangeSpec = type({
   summary: type("string").describe("Complete technical summary replacing all content in range. Keep only essential details (conclusions, file paths, decisions, exact values, etc.)."),
   "topic?": type("string").describe("Short label (3-5 words) for THIS range, e.g. 'Auth System Exploration'. Recommended for every range; omit to use top-level topic.")
 });
-function topicFallback(summary) {
-  const first = summary.split(/[.\n]/)[0] ?? "";
-  const t = first.trim().replace(/^["'`]+/, "").trim();
-  return t.length <= 30 ? t : `${t.slice(0, 30).trimEnd()}\u2026`;
-}
 var CompressParams = type({
   "topic?": type("string").describe("Fallback topic for entries without their own. Omit when each content entry specifies its own topic."),
   content: RangeSpec.array().describe("One or more ranges to compress, each with start/end boundaries and a summary. When compressing multiple unrelated ranges in one call, give each its own topic."),
@@ -3623,6 +3679,112 @@ function truncate(s, n) {
 
 // src/status-tool.ts
 import { type as type4 } from "@oh-my-pi/omptype";
+
+// node_modules/billion-context-kit/dist/index.js
+var VIABLE_RANGE_MIN_TOKENS = 200;
+function viableRanges(ranges) {
+  return ranges.filter((r) => r.tokens >= VIABLE_RANGE_MIN_TOKENS);
+}
+function topicFallback(summary) {
+  const first = summary.split(/[.\n]/)[0] ?? "";
+  const t = first.trim().replace(/^["'`]+/, "").trim();
+  return t.length <= 30 ? t : `${t.slice(0, 30).trimEnd()}\u2026`;
+}
+function formatCompactTokens(count) {
+  if (count < 1e3) return count.toString();
+  if (count < 1e4) return `${(count / 1e3).toFixed(1)}k`;
+  if (count < 1e6) return `${Math.round(count / 1e3)}k`;
+  if (count < 1e7) return `${(count / 1e6).toFixed(1)}M`;
+  return `${Math.round(count / 1e6)}M`;
+}
+function bar(value, total, width = 20) {
+  if (total === 0) return "";
+  const filled = Math.max(0, Math.min(width, Math.round(value / total * width)));
+  return "\u2588".repeat(filled) + "\u2591".repeat(width - filled);
+}
+function buildStatusPanel(input) {
+  const { tokenCount, state, nudge, modelContextLimit } = input;
+  const fmt2 = input.fmtTokens ?? formatCompactTokens;
+  const bd = nudge?.contextBreakdown;
+  const limit = modelContextLimit;
+  const classified = bd ? bd.system + bd.tool + bd.summaries + bd.code + bd.text : 0;
+  const systemPromptTokens = input.systemPromptTokens;
+  const sentTotal = classified + systemPromptTokens;
+  const sessionOnly = Math.max(0, tokenCount - sentTotal);
+  const displayTotal = tokenCount;
+  const displayPct = limit > 0 ? Math.round(displayTotal / limit * 100) : 0;
+  const activeBlocksList = state.blocks.filter((b) => b.active);
+  const totalBlocksList = state.blocks;
+  const lines = [];
+  lines.push("\u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E");
+  lines.push("\u2502           ACP Context Analysis              \u2502");
+  lines.push("\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F");
+  if (input.version) lines.push(input.version);
+  lines.push("");
+  lines.push(`Context (session accounting): ${displayPct}% (${fmt2(displayTotal)} / ${fmt2(limit)})`);
+  if (nudge && bd) {
+    const growth = bd.growth;
+    if (growth > 0 && displayTotal > 0) {
+      lines.push(`Growth: +${fmt2(growth)} since last nudge`);
+    }
+    lines.push("");
+    lines.push(`Sent to LLM (after compression): ${fmt2(sentTotal)}`);
+    if (sessionOnly > 0) {
+      lines.push(`Session-only (compressed originals + host overhead): ${fmt2(sessionOnly)} \u2014 pruned from every request; the footer counts it`);
+    }
+    lines.push("");
+    lines.push("Token Breakdown (sent view):");
+    const categories = [
+      { label: "Tool", value: bd.tool },
+      { label: "SysPrompt", value: systemPromptTokens },
+      { label: "Text", value: bd.text },
+      { label: "Code", value: bd.code },
+      { label: "Summaries", value: bd.summaries }
+    ];
+    for (const cat of categories) {
+      if (cat.value <= 0) continue;
+      const pct2 = sentTotal > 0 ? Math.round(cat.value / sentTotal * 100) : 0;
+      const b = bar(cat.value, sentTotal);
+      lines.push(`  ${cat.label.padEnd(10)} ${b} ${String(pct2).padStart(3)}%  ${fmt2(cat.value)}`);
+    }
+  }
+  lines.push("");
+  if (nudge) {
+    if (nudge.shouldInject) {
+      const tierInfo = nudge.tier ? ` [T${nudge.tier} distillation]` : "";
+      lines.push(`Nudge: ACTIVE${tierInfo} \u2014 ${nudge.reason}`);
+    } else {
+      lines.push(`Nudge: idle \u2014 ${nudge.reason}`);
+    }
+  }
+  const ranges = viableRanges(nudge?.compressibleRanges ?? []);
+  const protectedRanges = nudge?.protectedRanges ?? [];
+  if (ranges.length > 0 || protectedRanges.length > 0) {
+    lines.push("");
+    lines.push(formatRanges(ranges, protectedRanges));
+  }
+  if (activeBlocksList.length > 0) {
+    lines.push("");
+    lines.push(`Blocks: ${activeBlocksList.length} active / ${totalBlocksList.length} total (${fmt2(state.stats.tokensCompressed)} tokens compressed)`);
+    for (const b of activeBlocksList) {
+      const topic = b.topic ? `: ${b.topic}` : `: ${topicFallback(b.summary || "")}`;
+      const summaryTok = defaultCountTokens(b.summary || "");
+      const origTok = b.compressedTokens > 0 ? b.compressedTokens : summaryTok;
+      lines.push(`  [${b.blockId}] T${b.tier} ${fmt2(origTok)}\u2192${fmt2(summaryTok)}${topic}`);
+    }
+  } else if (totalBlocksList.length > 0) {
+    lines.push("");
+    lines.push(`Blocks: 0 active / ${totalBlocksList.length} total (${fmt2(state.stats.tokensCompressed)} tokens compressed)`);
+  } else {
+    lines.push("");
+    lines.push("Blocks: none (nothing compressed yet)");
+  }
+  lines.push("");
+  lines.push("Tag visibility: tags injected to LLM only (deep copy), not persisted in session, not shown in terminal.");
+  return lines.join("\n");
+}
+
+// src/status-tool.ts
 var StatusParams = type4({
   "scope?": type4('"compressed" | "uncompressed"').describe('"compressed" = drill into blocks; "uncompressed" = show visible messages/ranges. Default: overview.'),
   "view?": type4('"ranges" | "messages"').describe('For uncompressed scope: "ranges" (default) or "messages" (per-message listing).'),
@@ -3703,15 +3865,6 @@ function getSystemPromptText(ctx) {
   return normalizeSystemPrompt(result);
 }
 
-// src/footer-status.ts
-function formatCompactTokens(count) {
-  if (count < 1e3) return count.toString();
-  if (count < 1e4) return `${(count / 1e3).toFixed(1)}k`;
-  if (count < 1e6) return `${Math.round(count / 1e3)}k`;
-  if (count < 1e7) return `${(count / 1e6).toFixed(1)}M`;
-  return `${Math.round(count / 1e6)}M`;
-}
-
 // src/commands.ts
 function safeHandler(handler) {
   return async (args, ctx) => {
@@ -3789,97 +3942,22 @@ ${text}`);
     }
   ];
 }
-function fmtTokens(n) {
-  return formatCompactTokens(n);
-}
-function bar(value, total, width = 20) {
-  if (total === 0) return "";
-  const filled = Math.max(0, Math.min(width, Math.round(value / total * width)));
-  return "\u2588".repeat(filled) + "\u2591".repeat(width - filled);
-}
 async function statusReport(runtime, ctx) {
   const { state, coreMessages } = await runtime.stateFor(ctx);
   const config = runtime.configFor(ctx);
   const realUsage = ctx.getContextUsage?.();
   const tokenCount = realUsage?.tokens && realUsage.tokens > 0 ? realUsage.tokens : defaultCountTokens(coreMessages.map((m) => m.text ?? "").join("\n"));
   const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount });
-  const nudge = turn.nudge;
-  const bd = nudge?.contextBreakdown;
-  const limit = config.modelContextLimit;
-  const classified = bd ? bd.system + bd.tool + bd.summaries + bd.code + bd.text : 0;
   const systemPromptText = getSystemPromptText(ctx);
-  const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
-  const framework = bd ? Math.max(0, tokenCount - classified - systemPromptTokens) : 0;
-  const displayTotal = tokenCount;
-  const displayPct = limit > 0 ? Math.round(displayTotal / limit * 100) : 0;
-  const activeBlocksList = state.blocks.filter((b) => b.active);
-  const totalBlocksList = state.blocks;
-  const lines = [];
-  const versionStr = "0.1.4" ? `billion-context-omp@${"0.1.4"}` : "";
-  lines.push("\u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E");
-  lines.push("\u2502           ACP Context Analysis              \u2502");
-  lines.push("\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F");
-  if (versionStr) lines.push(versionStr);
-  lines.push("");
-  lines.push(`Context: ${displayPct}% (${fmtTokens(displayTotal)} / ${fmtTokens(limit)})`);
-  if (nudge && bd) {
-    const growth = bd.growth;
-    if (growth > 0 && displayTotal > 0) {
-      lines.push(`Growth: +${fmtTokens(growth)} since last nudge`);
-    }
-    if (displayTotal > 0) {
-      lines.push("");
-      lines.push("Token Breakdown:");
-      const categories = [
-        { label: "Tool", value: bd.tool },
-        { label: "SysPrompt", value: systemPromptTokens },
-        { label: "Framework", value: framework },
-        { label: "Text", value: bd.text },
-        { label: "Code", value: bd.code },
-        { label: "Summaries", value: bd.summaries }
-      ];
-      for (const cat of categories) {
-        if (cat.value <= 0) continue;
-        const pct2 = displayTotal > 0 ? Math.round(cat.value / displayTotal * 100) : 0;
-        const b = bar(cat.value, displayTotal);
-        lines.push(`  ${cat.label.padEnd(10)} ${b} ${String(pct2).padStart(3)}%  ${fmtTokens(cat.value)}`);
-      }
-    }
-  }
-  lines.push("");
-  if (nudge) {
-    if (nudge.shouldInject) {
-      const tierInfo = nudge.tier ? ` [T${nudge.tier} distillation]` : "";
-      lines.push(`Nudge: ACTIVE${tierInfo} \u2014 ${nudge.reason}`);
-    } else {
-      lines.push(`Nudge: idle \u2014 ${nudge.reason}`);
-    }
-  }
-  const ranges = nudge?.compressibleRanges ?? [];
-  const protectedRanges = nudge?.protectedRanges ?? [];
-  if (ranges.length > 0 || protectedRanges.length > 0) {
-    lines.push("");
-    lines.push(formatRanges(ranges, protectedRanges));
-  }
-  if (activeBlocksList.length > 0) {
-    lines.push("");
-    lines.push(`Blocks: ${activeBlocksList.length} active / ${totalBlocksList.length} total (${fmtTokens(state.stats.tokensCompressed)} tokens compressed)`);
-    for (const b of activeBlocksList) {
-      const topic = b.topic ? `: ${b.topic}` : `: ${topicFallback(b.summary || "")}`;
-      const summaryTok = defaultCountTokens(b.summary || "");
-      const origTok = b.compressedTokens > 0 ? b.compressedTokens : summaryTok;
-      lines.push(`  [${b.blockId}] T${b.tier} ${fmtTokens(origTok)}\u2192${fmtTokens(summaryTok)}${topic}`);
-    }
-  } else if (totalBlocksList.length > 0) {
-    lines.push("");
-    lines.push(`Blocks: 0 active / ${totalBlocksList.length} total (${fmtTokens(state.stats.tokensCompressed)} tokens compressed)`);
-  } else {
-    lines.push("");
-    lines.push("Blocks: none (nothing compressed yet)");
-  }
-  lines.push("");
-  lines.push("Tag visibility: tags injected to LLM only (deep copy), not persisted in session, not shown in terminal.");
-  return lines.join("\n");
+  const versionStr = "0.1.6" ? `billion-context-omp@${"0.1.6"}` : void 0;
+  return buildStatusPanel({
+    version: versionStr,
+    tokenCount,
+    systemPromptTokens: systemPromptText ? defaultCountTokens(systemPromptText) : 0,
+    state: turn.state,
+    nudge: turn.nudge,
+    modelContextLimit: config.modelContextLimit
+  });
 }
 
 // src/auto-compress.ts
@@ -4310,7 +4388,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.4";
+    const current = runtimeVersion ?? "0.1.6";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -4598,7 +4676,7 @@ function wireCompactionDisable(pi, runtime) {
 function wireSessionLifecycle(pi, runtime) {
   pi.on("session_start", async (_event, ctx) => {
     const sid = ctx.sessionManager.getSessionId();
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.4" : null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.6" : null });
     try {
       const user = await loadUserConfig(ctx.cwd);
       runtime.setAdapter(applyUserConfig(runtime.adapter, user));