pi-jev-lens 0.3.0 → 0.4.0

package/README.md

@@ -164,17 +164,20 @@ For example, `0/3 new · 5 restored` means no new compressions among three candi
 New-result counts and recall counts start at zero after loading. `/jev-lens stats` shows new and restored savings separately.
 
 In the transcript, a compressed result shows a header like `⌁ jev-lens outline · 179 of 1524 tokens (−88 %)`. When
-you expand it with ctrl+e, you see exactly what the model saw. These commands are available:
-
-Type `/jev-lens ` and press Tab to complete subcommands. After `diff `, completion offers available result numbers.
+you press ctrl+o to expand, you see full output on the left and compressed output on the right.
+Retained lines align with their originals. A `−` marks each omitted line in the full output.
+Long lines wrap. On narrow terminals, the two versions appear one below the other.
+The collapsed result ends with a hint such as `… (48 lines pruned, 50 original, ctrl+o for diff)`.
+The compressed version includes omission markers but excludes the recall footer. Press ctrl+o again to collapse.
+This uses pi's tool expansion keybinding, including any custom binding.
+
+Type `/jev-lens ` and press Tab to complete subcommands.
 Use `/reload` after installing the package in a running pi session.
 
 - `/jev-lens` or `/jev-lens stats` shows the statistics, active configuration, and key source.
 - `/jev-lens help` shows command usage.
 - `/jev-lens decisions` shows post-send pruning decisions. Post-send pruning is off by default.
 - `/jev-lens list` lists the latest 200 compressed results with the tokens before and after.
-- `/jev-lens diff [n]` opens an overlay for the n-th latest result. It shows the original with the lines that the
-  model did not get marked with `−`. Press `t` to see what was sent, and `Esc` to close.
 - `/jev-lens key` stores the API key.
 
 If compression fails, jev-lens keeps the full output and shows a warning. A failed post-send classification leaves that result unchanged.

package/index.ts

@@ -13,11 +13,11 @@ import { appendFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import type { ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
 import type { AgentMessage } from "./src/pi-types.ts";
-import { CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent";
+import { CONFIG_DIR_NAME, keyText } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { createBashToolDefinition, createFindToolDefinition, createGrepToolDefinition, createLsToolDefinition, createReadToolDefinition } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
-import { DiffOverlay, listLines, savingsLine, type CompressedRecord } from "./src/ui.ts";
+import { ComparisonResult, comparisonHint, listLines, savingsLine, type CompressedRecord } from "./src/ui.ts";
 import { TypeSafeClient } from "@typesafe-ai/sdk";
 import { buildItemState, JevClassifier, MockClassifier, type Classifier } from "./src/classifier.ts";
 import { buildPresendState, decideView, DEFAULT_PROMPTS, expandRelevantBlocks, JevPresend, MockPresend, type PresendClassifier, type PromptVariant } from "./src/presend.ts";
@@ -459,13 +459,23 @@ export default function (pi: ExtensionAPI) {
 			pi.registerTool({
 				...original,
 				renderResult(result, options, theme, context) {
-					const rec = recordById.get(context.toolCallId);
+					let rec = recordById.get(context.toolCallId);
+					// Older rows can leave the recent-results index, but retain their comparison.
+					const d = result.details?.jevLens;
+					if (!rec && typeof d?.full === "string") {
+						const sent = contentText(result.content).replace(/\n\n\[jev-lens:[\s\S]*$/, "");
+						rec = { id: context.toolCallId, toolName: original.name, args: d.args,
+							kind: d.kind ?? "?", view: d.view ?? "?", full: d.full, sent,
+							tokensBefore: estimateTokensOfText(d.full), tokensAfter: estimateTokensOfText(sent),
+							included: d.included ?? [], recalls: 0, at: 0 };
+					}
 					if (!rec || options.isPartial || context.isError) {
 						return original.renderResult!(result, options, theme, context);
 					}
+					if (options.expanded) return new ComparisonResult(rec, theme, `${keyText("app.tools.expand")} to collapse`);
 					let out = savingsLine(rec, theme);
-					if (options.expanded) out += "\n" + rec.sent;
-					else out += "\n" + theme.fg("dim", rec.sent.split("\n").slice(0, 3).join("\n"));
+					out += "\n" + theme.fg("dim", rec.sent.split("\n").slice(0, 3).join("\n"));
+					out += "\n" + theme.fg("dim", comparisonHint(rec, keyText("app.tools.expand")));
 					return new Text(out, 0, 0);
 				},
 			});
@@ -475,8 +485,8 @@ export default function (pi: ExtensionAPI) {
 	// ---- commands ----------------------------------------------------------------------
 
 	pi.registerCommand("jev-lens", {
-		description: "Inspect compression and setup: stats | list | diff [n] | decisions | key | help",
-		getArgumentCompletions: (prefix) => commandCompletions(prefix, records),
+		description: "Inspect compression and setup: stats | list | decisions | key | help",
+		getArgumentCompletions: (prefix) => commandCompletions(prefix),
 		handler: async (args, ctx) => {
 			const sub = (args ?? "").trim();
 			if (sub === "help" || sub === "--help" || sub === "-h") {
@@ -503,24 +513,6 @@ export default function (pi: ExtensionAPI) {
 				status(ctx);
 				return;
 			}
-			if (/^diff(?:\s|$)/.test(sub)) {
-				const arg = sub.slice(4).trim();
-				const n = Number(arg || "1");
-				if ((arg && !/^\d+$/.test(arg)) || !Number.isSafeInteger(n) || n < 1) {
-					ctx.ui.notify("Usage: /jev-lens diff [n]. Use a positive whole number. 1 is the newest result.", "warning");
-					return;
-				}
-				if (!records.length) { ctx.ui.notify("No compressed results yet. Use /jev-lens stats to inspect compression settings.", "info"); return; }
-				const rec = records[records.length - n];
-				if (!rec) { ctx.ui.notify(`Result ${n} is not available. Choose 1-${records.length} from /jev-lens list.`, "warning"); return; }
-				if (!ctx.hasUI || ctx.mode !== "tui") { ctx.ui.notify(listLines([rec], { fg: (_c, t) => t, bold: (t) => t }).join("\n"), "info"); return; }
-				await ctx.ui.custom<void>((tui, theme, _kb, done) => {
-					const height = Math.max(12, Math.floor(((tui as { terminalHeight?: number }).terminalHeight ?? process.stdout.rows ?? 40) * 0.85));
-					const overlay = new DiffOverlay(rec, theme, height, () => done(), () => tui.requestRender());
-					return { render: (w) => overlay.render(w), handleInput: (d) => overlay.handleInput(d), invalidate: () => overlay.invalidate() };
-				}, { overlay: true, overlayOptions: { width: "92%", maxHeight: "90%", anchor: "center" } });
-				return;
-			}
 			if (sub === "list") {
 				ctx.ui.notify(listLines(records, { fg: (_c, t) => t, bold: (t) => t }).join("\n"), "info");
 				return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-jev-lens",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "pi extension that compresses large tool results before they reach the model: jev picks the view (outline, relevant blocks, sections, signals, testlog), full text stays recallable",
   "author": "Didrik Rognstad",
   "license": "MIT",

package/src/commands.ts

@@ -1,10 +1,8 @@
 import type { AutocompleteItem } from "@earendil-works/pi-tui";
-import type { CompressedRecord } from "./ui.ts";
 
 const commands = [
 	{ value: "stats", label: "stats", description: "Show statistics and active configuration" },
 	{ value: "list", label: "list", description: "List recent compressed results" },
-	{ value: "diff", label: "diff", description: "Compare original and sent output: diff [n], newest = 1" },
 	{ value: "decisions", label: "decisions", description: "Show post-send pruning decisions" },
 	{ value: "key", label: "key", description: "Store a TypeSafe API key" },
 	{ value: "help", label: "help", description: "Show commands and usage" },
@@ -12,24 +10,12 @@ const commands = [
 
 export const commandHelp = [
 	"/jev-lens [stats] — Show statistics and active configuration.",
-	...commands.slice(1).map((c) => `/jev-lens ${c.value === "diff" ? "diff [n]" : c.value} — ${c.description}.`),
-	"For diff, 1 is the newest result. Use /jev-lens list to find a number.",
+	...commands.slice(1).map((c) => `/jev-lens ${c.value} — ${c.description}.`),
+	"ctrl+o to expand tool output and compare full and compressed output (default keybinding).",
 	"Press Tab after /jev-lens to complete a subcommand.",
 ].join("\n");
 
-/** Pi replaces the entire argument prefix, so diff values include the subcommand. */
-export function commandCompletions(prefix: string, records: CompressedRecord[]): AutocompleteItem[] | null {
-	const input = prefix.trimStart();
-	const diff = /^diff\s+(\d*)$/.exec(input);
-	let items: AutocompleteItem[];
-	if (diff) {
-		items = [...records].reverse().map((r, i) => ({
-			value: `diff ${i + 1}`,
-			label: `diff ${i + 1}`,
-			description: `${r.toolName} · ${r.view} · ${r.tokensBefore} → ${r.tokensAfter} tokens`,
-		})).filter((_, i) => String(i + 1).startsWith(diff[1]));
-	} else {
-		items = commands.filter((c) => c.value.startsWith(input));
-	}
+export function commandCompletions(prefix: string): AutocompleteItem[] | null {
+	const items = commands.filter((c) => c.value.startsWith(prefix.trimStart()));
 	return items.length ? items : null;
 }

package/src/ui.ts

@@ -2,11 +2,9 @@
  * TUI integration: what the model got versus what the tool really returned.
  *
  * - Built-in tools (read, bash, grep, find, ls) are re-registered with renderers that show, for
- *   a compressed result, a one-line savings header and (expanded) the exact text the model saw.
- * - `/jev-lens diff [n]` opens an overlay with the original output, omitted lines marked, and
- *   `t` toggles to the sent view.
+ *   a compressed result, a savings header and an inline comparison when expanded.
  */
-import { matchesKey, truncateToWidth } from "@earendil-works/pi-tui";
+import { truncateToWidth, visibleWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 
 /** Everything needed to show one compressed result. Stored per session and in the tool result details. */
 export interface CompressedRecord {
@@ -39,11 +37,16 @@ export function savingsLine(r: CompressedRecord, theme: ThemeLike): string {
 		theme.fg("accent", "⌁ jev-lens ") +
 		theme.fg("toolTitle", theme.bold(r.view)) +
 		theme.fg("muted", ` · ${r.tokensAfter} of ${r.tokensBefore} tokens (−${pct} %)`) +
-		(r.recalls ? theme.fg("warning", ` · recalled ${r.recalls}×`) : "") +
-		theme.fg("dim", " · /jev-lens diff")
+		(r.recalls ? theme.fg("warning", ` · recalled ${r.recalls}×`) : "")
 	);
 }
 
+export function comparisonHint(r: CompressedRecord, key: string): string {
+	const original = r.full.split("\n").length;
+	const pruned = original - new Set(r.included).size;
+	return `… (${pruned} ${pruned === 1 ? "line" : "lines"} pruned, ${original} original, ${key} for diff)`;
+}
+
 function describeArgs(toolName: string, args: unknown): string {
 	const a = (args ?? {}) as Record<string, unknown>;
 	if (typeof a.path === "string") return a.path;
@@ -52,83 +55,59 @@ function describeArgs(toolName: string, args: unknown): string {
 	return JSON.stringify(a).slice(0, 80);
 }
 
-/**
- * Overlay showing the original output with omitted lines marked (mode "annotated"), or exactly
- * what was sent (mode "sent"). Keys: ↑/↓ scroll, PgUp/PgDn, Home/End, t toggle, Esc/q close.
- */
-export class DiffOverlay {
-	private offset = 0;
-	private mode: "annotated" | "sent" = "annotated";
+/** Inline comparison. Pi owns expansion and transcript scrolling; no extra key handler. */
+export class ComparisonResult {
 	private cache?: { width: number; lines: string[] };
-	constructor(
-		private record: CompressedRecord,
-		private theme: ThemeLike,
-		private height: number,
-		private onClose: () => void,
-		private onChange?: () => void,
-	) {}
+	constructor(private record: CompressedRecord, private theme: ThemeLike, private hint: string) {}
 
-	private bodyLines(width: number): string[] {
+	render(width: number): string[] {
+		if (width < 1) return [];
+		if (this.cache?.width === width) return this.cache.lines;
 		const r = this.record;
-		const out: string[] = [];
-		if (this.mode === "sent") {
-			for (const l of r.sent.split("\n")) out.push(truncateToWidth(l, width));
-			return out;
-		}
-		const inc = new Set(r.included);
-		const lines = r.full.split("\n");
-		const w = String(lines.length).length;
-		for (let i = 0; i < lines.length; i++) {
-			const n = String(i + 1).padStart(w);
-			if (inc.has(i + 1)) out.push(truncateToWidth(this.theme.fg("dim", `${n} `) + this.theme.fg("text", "│ ") + lines[i], width));
-			else out.push(truncateToWidth(this.theme.fg("toolDiffRemoved", `${n} − ${lines[i]}`), width));
+		const full = r.full.split("\n");
+		const included = new Set(r.included);
+		const digits = String(full.length).length;
+		const original = (i: number) => this.theme.fg(included.has(i + 1) ? "text" : "toolDiffRemoved",
+			`${String(i + 1).padStart(digits)} ${included.has(i + 1) ? "│" : "−"} ${full[i]}`);
+		const wrap = (text: string, columns: number) => wrapTextWithAnsi(text.replace(/\t/g, "    "), columns)
+			.map((line) => truncateToWidth(line, columns));
+		const out = wrap(savingsLine(r, this.theme), width);
+		out.push(...wrap(this.theme.fg("dim", this.hint), width));
+		out.push(...wrap(this.theme.fg("dim", "− omitted from model input · compressed view excludes the recall footer"), width));
+		if (width < 100) {
+			out.push(...wrap(this.theme.bold("Full output"), width));
+			for (let i = 0; i < full.length; i++) out.push(...wrap(original(i), width));
+			out.push("", ...wrap(this.theme.bold("Compressed output"), width));
+			for (const line of r.sent.split("\n")) out.push(...wrap(line, width));
+		} else {
+			const leftWidth = Math.floor((width - 3) / 2);
+			const rightWidth = width - leftWidth - 3;
+			const row = (left: string, right: string) => {
+				const a = wrap(left, leftWidth), b = wrap(right, rightWidth);
+				for (let i = 0; i < Math.max(a.length, b.length); i++) {
+					const l = a[i] ?? "";
+					out.push(l + " ".repeat(Math.max(0, leftWidth - visibleWidth(l))) + this.theme.fg("dim", " │ ") + (b[i] ?? ""));
+				}
+			};
+			row(this.theme.bold("Full output"), this.theme.bold("Compressed output"));
+			let cursor = 0;
+			// Align numbered view lines with their originals. Keep markers and any other
+			// generated view text verbatim on separate rows, rather than reconstructing it.
+			for (const line of r.sent.split("\n")) {
+				const match = /^\s*(\d+)│ /.exec(line);
+				const n = match ? Number(match[1]) : 0;
+				if (n > cursor && n <= full.length && included.has(n)) {
+					while (cursor < n - 1) row(original(cursor++), "");
+					row(original(cursor++), line);
+				} else row("", line);
+			}
+			while (cursor < full.length) row(original(cursor++), "");
 		}
+		this.cache = { width, lines: out };
 		return out;
 	}
 
-	header(width: number): string[] {
-		const r = this.record;
-		const pct = r.tokensBefore ? Math.round((100 * (r.tokensBefore - r.tokensAfter)) / r.tokensBefore) : 0;
-		const omitted = r.full.split("\n").length - r.included.length;
-		return [
-			truncateToWidth(this.theme.fg("accent", this.theme.bold(`jev-lens · ${r.toolName} ${describeArgs(r.toolName, r.args)}`)), width),
-			truncateToWidth(this.theme.fg("muted", `${r.kind} → ${r.view} · ${r.tokensAfter} of ${r.tokensBefore} tokens (−${pct} %) · ${omitted} of ${r.full.split("\n").length} lines omitted` + (r.needsFull !== undefined ? ` · P(needs full)=${r.needsFull.toFixed(2)} P(full)=${(r.pFull ?? 0).toFixed(2)}` : "") + (r.recalls ? ` · recalled ${r.recalls}×` : "")), width),
-			truncateToWidth(this.theme.fg("dim", this.mode === "annotated" ? "original output; − marks lines the model did not get · t: show what was sent · ↑↓ PgUp PgDn · Esc" : "exactly what the model got · t: show original with omissions · ↑↓ PgUp PgDn · Esc"), width),
-			"",
-		];
-	}
-
-	render(width: number): string[] {
-		if (this.cache && this.cache.width === width) return this.cache.lines;
-		const head = this.header(width);
-		const body = this.bodyLines(width);
-		const room = Math.max(3, this.height - head.length - 1);
-		const maxOffset = Math.max(0, body.length - room);
-		if (this.offset > maxOffset) this.offset = maxOffset;
-		const slice = body.slice(this.offset, this.offset + room);
-		const footer = truncateToWidth(this.theme.fg("dim", `lines ${body.length ? this.offset + 1 : 0}-${Math.min(body.length, this.offset + room)} of ${body.length}`), width);
-		this.cache = { width, lines: [...head, ...slice, footer] };
-		return this.cache.lines;
-	}
-
-	handleInput(data: string): void {
-		const page = Math.max(1, this.height - 6);
-		if (matchesKey(data, "escape") || data === "q") { this.onClose(); return; }
-		else if (matchesKey(data, "up")) this.offset = Math.max(0, this.offset - 1);
-		else if (matchesKey(data, "down")) this.offset += 1;
-		else if (matchesKey(data, "pageUp")) this.offset = Math.max(0, this.offset - page);
-		else if (matchesKey(data, "pageDown")) this.offset += page;
-		else if (matchesKey(data, "home")) this.offset = 0;
-		else if (matchesKey(data, "end")) this.offset = Number.MAX_SAFE_INTEGER;
-		else if (data === "t") { this.mode = this.mode === "annotated" ? "sent" : "annotated"; this.offset = 0; }
-		else return;
-		this.invalidate();
-		this.onChange?.();
-	}
-
-	invalidate(): void {
-		this.cache = undefined;
-	}
+	invalidate(): void { this.cache = undefined; }
 }
 
 /** One row per compressed result, newest last. */