pi-midcompact 0.4.0 → 0.5.0

package/src/projection.ts

@@ -1,4 +1,10 @@
-import type { CompressionBlock, CompressionState, MessageLike } from "./types.js";
+// Projection: replaces an exact persisted messageKeys subsequence with a
+// midcompact summary message and fails open when a sequence cannot be resolved.
+// Owns factual replacement-size calculation based on the actual summary message
+// wrapper text, not a fixed token heuristic.
+
+import type { CompressionBlock, CompressionState, ContentMetrics, MessageLike } from "./types.js";
+import { aggregateMetrics, measureMessage } from "./content-metrics.js";
 import { approxTokens, messageKey } from "./messages.js";
 
 export function summaryMessage(block: CompressionBlock, timestamp = Date.now()): MessageLike {
@@ -56,6 +62,42 @@ function findSubsequence(haystack: string[], needle: string[]): { start: number;
   return undefined;
 }
 
+/**
+ * Measure the actual replacement message produced for a block, so callers can
+ * report factual replacement content chars (midcompact wrapper + summary).
+ */
+export function replacementMetrics(block: CompressionBlock): ContentMetrics {
+  return measureMessage(summaryMessage(block));
+}
+
+/**
+ * Factual replacement content chars for a range, given its topic and summary.
+ * Computed from the actual summary message wrapper text that projection emits.
+ */
+export function replacementContentChars(summary: string, topic?: string): number {
+  const block: CompressionBlock = {
+    id: "draft",
+    summary,
+    topic,
+    entryIds: [],
+    messageKeys: [],
+    createdAt: new Date().toISOString(),
+    originalContentChars: 0,
+    originalImageCount: 0,
+    originalImagePayloadBytes: 0,
+    replacementContentChars: 0,
+    originalApproxTokens: 0,
+    compressedApproxTokens: 0,
+  };
+  return replacementMetrics(block).contentChars;
+}
+
+/** @deprecated legacy heuristic; kept only for old approximate-token field compat. */
 export function estimateCompressedTokens(summary: string, topic?: string): number {
   return approxTokens(`${topic ?? ""}\n${summary}`) + 40;
 }
+
+/** Factual metrics for a set of atoms that a range/block would replace. */
+export function rangeMetricsForAtoms(atoms: readonly { metrics: ContentMetrics }[]): ContentMetrics {
+  return aggregateMetrics(atoms.map((atom) => atom.metrics));
+}

package/src/renderers.ts

@@ -14,28 +14,27 @@ export function registerStateRenderer(pi: ExtensionAPI): void {
       return box;
     }
     const commit = state.lastCommit;
-    const saved = state.blocks.reduce(
-      (sum, block) => sum + Math.max(0, block.originalApproxTokens - block.compressedApproxTokens),
-      0,
-    );
+    const originalChars = state.blocks.reduce((sum, block) => sum + (block.originalContentChars ?? 0), 0);
+    const replacementChars = state.blocks.reduce((sum, block) => sum + (block.replacementContentChars ?? 0), 0);
+    const imageCount = state.blocks.reduce((sum, block) => sum + (block.originalImageCount ?? 0), 0);
     const added = commit?.addedRangeCount ?? 0;
     const headline = [
       theme.fg("success", "✓ MIDCOMPACT"),
       added ? `+${added} range${added === 1 ? "" : "s"}` : `${state.blocks.length} active block${state.blocks.length === 1 ? "" : "s"}`,
       `${state.blocks.length} active`,
-      `~${formatTokenCount(saved)} saved`,
-    ].join(" · ");
+      `${originalChars} → ${replacementChars} content chars`,
+      imageCount ? `${imageCount} images` : "",
+    ].filter(Boolean).join(" · ");
     box.addChild(new Text(headline, 0, 0));
 
-    if (commit?.anchorUsage?.contextWindow && commit.projectedTokens !== null) {
+    if (commit?.anchorUsage?.contextWindow) {
+      // Pi-reported awareness only; no local projected token percentage claim.
       box.addChild(new Text(
         theme.fg(
           "dim",
-          `anchor ${formatPercent(commit.anchorUsage.percent)} → projected ${formatPercent(commit.projectedPercent, true)} ` +
-            `(~${formatTokenCount(commit.projectedTokens)}/${formatTokenCount(commit.anchorUsage.contextWindow)})`,
+          `anchor ${formatPercent(commit.anchorUsage.percent)} [Pi reported] · ${commit.selectedOriginalContentChars} → ${commit.selectedReplacementContentChars} chars · ${commit.selectedImageCount} images`,
         ),
-        0,
-        0,
+        0, 0,
       ));
     }
 
@@ -43,7 +42,7 @@ export function registerStateRenderer(pi: ExtensionAPI): void {
       const addedSet = new Set(commit?.addedBlockIds ?? []);
       const blocks = addedSet.size ? state.blocks.filter((block) => addedSet.has(block.id)) : state.blocks;
       for (const block of blocks) {
-        const title = `${block.id}${block.topic ? ` · ${block.topic}` : ""} · ~${formatTokenCount(block.originalApproxTokens)} → ~${formatTokenCount(block.compressedApproxTokens)}`;
+        const title = `${block.id}${block.topic ? ` · ${block.topic}` : ""} · ${block.originalContentChars ?? 0} → ${block.replacementContentChars ?? 0} chars${block.originalImageCount ? ` · ${block.originalImageCount} images` : ""}`;
         box.addChild(new Text(theme.fg("accent", title), 0, 0));
         box.addChild(new Text(theme.fg("dim", block.summary), 1, 0));
       }
@@ -56,12 +55,10 @@ export function registerStateRenderer(pi: ExtensionAPI): void {
 export function stateTreeLabel(state: CompressionState): string {
   const commit = state.lastCommit;
   const added = commit?.addedRangeCount ?? 0;
-  const saved = commit?.estimatedSavedTokens ?? state.blocks.reduce(
-    (sum, block) => sum + Math.max(0, block.originalApproxTokens - block.compressedApproxTokens),
-    0,
-  );
-  const projection = commit?.projectedPercent === null || commit?.projectedPercent === undefined
+  const replacementChars = state.blocks.reduce((sum, block) => sum + (block.replacementContentChars ?? 0), 0);
+  const originalChars = state.blocks.reduce((sum, block) => sum + (block.originalContentChars ?? 0), 0);
+  const anchor = commit?.anchorUsage?.percent === null || commit?.anchorUsage?.percent === undefined
     ? ""
-    : ` · →~${formatPercent(commit.projectedPercent, false)}`;
-  return `midcompact${added ? ` +${added}` : ""} · ~${formatTokenCount(saved)} saved${projection}`;
+    : ` · anchor ${formatPercent(commit.anchorUsage.percent)} [Pi]`;
+  return `midcompact${added ? ` +${added}` : ""} · ${originalChars} → ${replacementChars} chars${anchor}`;
 }

package/src/review-ui.ts

@@ -1,7 +1,6 @@
 import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, truncateToWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 
-import { formatPercent, formatTokenCount } from "./telemetry.js";
 import type { Atom, DraftPlan, DraftRange, DraftTelemetry, ReviewAction } from "./types.js";
 
 /**
@@ -63,22 +62,22 @@ export async function showReviewUi(
             if (head) {
               rangeLineStarts.set(head.id, body.length);
               const isSel = Boolean(range && range.id === head.id);
-              const save = Math.max(0, head.originalApproxTokens - head.compressedApproxTokens);
+              const savedChars = Math.max(0, head.originalContentChars - head.replacementContentChars);
               const atomCount = head.endIndex - head.startIndex + 1;
               const caret = isSel ? (expandSelected ? "▾" : "▸") : "▸";
               const caretCol = isSel ? accent(caret) : dim(caret);
               const idCol = isSel ? theme.bold(warning(head.id)) : warning(head.id);
               const span = dim(`${head.startRef}→${head.endRef} · ${atomCount} atoms`);
-              const tok = dim(`~${formatTokenCount(head.originalApproxTokens)}→~${formatTokenCount(head.compressedApproxTokens)}`);
-              const saveCol = success(`save ~${formatTokenCount(save)}`);
+              const chars = dim(`${formatCount(head.originalContentChars)}→${formatCount(head.replacementContentChars)} chars`);
+              const saved = success(`−${formatCount(savedChars)}`);
               const topicCol = head.topic ? `${accent(head.topic)} ` : "";
               const sumCol = dim(firstLine(head.summary, 48));
-              const headText = `${caretCol} ${idCol} ${span} ${tok} ${saveCol} ${topicCol}${sumCol}`;
+              const headText = `${caretCol} ${idCol} ${span} ${chars} ${saved} ${topicCol}${sumCol}`;
               body.push(framed(isSel ? accent(headText) : headText));
 
               if (isSel) {
                 body.push(framed(dim(`  topic: ${head.topic ?? "—"}`)));
-                body.push(framed(dim(`  tokens: ~${formatTokenCount(head.originalApproxTokens)} → ~${formatTokenCount(head.compressedApproxTokens)} (save ~${formatTokenCount(save)})`)));
+                body.push(framed(dim(`  chars: ${formatCount(head.originalContentChars)} → ${formatCount(head.replacementContentChars)} (−${formatCount(savedChars)}) · ${head.originalImageCount} images`)));
                 const wrapWidth = Math.max(10, inner - 6);
                 for (const line of wrapTextWithAnsi(`${accent("summary:")} ${head.summary}`, wrapWidth)) {
                   body.push(framed(`  ${line}`));
@@ -99,9 +98,9 @@ export async function showReviewUi(
                   : "│"
               : " ";
             const policy = owner ? warning(owner.id) : success("KEEP");
-            const tok = dim(`~${formatTokenCount(atom.approxTokens)}`);
+            const facts = dim(`${formatCount(atom.metrics.contentChars)} chars${atom.metrics.imageCount ? ` · ${atom.metrics.imageCount} img` : ""}`);
             const oneLine = dim(firstLine(atom.preview, 80));
-            body.push(framed(`${mark} ${policy} ${atom.ref} [${atom.kind}] ${tok}  ${oneLine}`));
+            body.push(framed(`${mark} ${policy} ${atom.ref} [${atom.kind}] ${facts}  ${oneLine}`));
           }
           if (!body.length) body.push(framed(dim("(No atoms in anchor snapshot.)")));
 
@@ -203,7 +202,7 @@ export function buildReviewText(atoms: Atom[], draft: DraftPlan, telemetry: Draf
   ];
   for (const atom of atoms) {
     const owner = owningRange(atom.index, draft.ranges);
-    lines.push(`${owner ? owner.id : "KEEP"} ${atom.ref} [${atom.kind}] ~${formatTokenCount(atom.approxTokens)} ${firstLine(atom.preview, 120)}`);
+    lines.push(`${owner ? owner.id : "KEEP"} ${atom.ref} [${atom.kind}] ${formatCount(atom.metrics.contentChars)} chars${atom.metrics.imageCount ? ` · ${atom.metrics.imageCount} images` : ""} ${firstLine(atom.preview, 120)}`);
   }
   if (draft.ranges.length) {
     lines.push("", "Proposed summaries:");
@@ -227,13 +226,15 @@ function hint(text: string, theme: ExtensionCommandContext["ui"]["theme"]): stri
 }
 
 function plainUsageLine(telemetry: DraftTelemetry): string {
-  const anchor = telemetry.contextWindow === null
-    ? "anchor usage unavailable"
-    : `${formatTokenCount(telemetry.anchorTokens)}/${formatTokenCount(telemetry.contextWindow)} (${formatPercent(telemetry.anchorPercent)})`;
-  const projected = telemetry.projectedTokens === null || telemetry.contextWindow === null
-    ? "projected unavailable"
-    : `~${formatTokenCount(telemetry.projectedTokens)}/${formatTokenCount(telemetry.contextWindow)} (${formatPercent(telemetry.projectedPercent, true)})`;
-  return `Anchor ${anchor} · Draft selected ~${formatTokenCount(telemetry.selectedOriginalApproxTokens)}→~${formatTokenCount(telemetry.selectedCompressedApproxTokens)} · Projected ${projected}`;
+  const usage = telemetry.anchorUsage;
+  const anchor = usage
+    ? `${usage.tokens === null ? "unavailable" : formatCount(usage.tokens)}/${formatCount(usage.contextWindow)} tokens (${usage.percent === null ? "unavailable" : `${usage.percent}%`}, Pi reported)`
+    : "Pi reported anchor usage unavailable";
+  return `Anchor ${anchor} · Draft ${telemetry.rangeCount} ranges · ${formatCount(telemetry.selectedOriginalContentChars)}→${formatCount(telemetry.selectedReplacementContentChars)} chars · ${telemetry.selectedImageCount} images · ${telemetry.pendingSummaryCount} pending`;
+}
+
+function formatCount(value: number): string {
+  return value.toLocaleString("en-US");
 }
 
 function usageLine(telemetry: DraftTelemetry, theme: ExtensionCommandContext["ui"]["theme"]): string {