@pi-archimedes/diff 2.7.3 → 2.9.0

package/README.md

@@ -43,13 +43,14 @@ The renderer displays `edit` and `write` tool changes in the tool UI, including
 
 ## Appearance
 
-Standalone, the renderer runs on fixed defaults — the `github-dark` theme, a 150-column minimum for split view, and 60 code columns per side — and it does **not** read settings, because standalone has no config reader. In the [suite](https://github.com/danielcherubini/pi-archimedes), its `archimedes.diff` namespace supplies the same three values (`diffTheme`, `diffSplitMinWidth`, `diffSplitMinCodeWidth`) through the suite's config reader:
+Standalone, the renderer runs on fixed defaults — the `github-dark` theme, a 150-column minimum for split view, 60 code columns per side, and line-wrap safety checks enabled — and it does **not** read settings, because standalone has no config reader. In the [suite](https://github.com/danielcherubini/pi-archimedes), its `archimedes.diff` namespace supplies the settings through the suite's config reader:
 
 | Setting | Type | Default | Description |
 |---------|------|---------|-------------|
 | `diffTheme` | string | `github-dark` | Shiki syntax-highlighting theme |
 | `diffSplitMinWidth` | number | `150` | Minimum terminal columns for split view (≥ 100) |
 | `diffSplitMinCodeWidth` | number | `60` | Minimum code columns per side in split view (≥ 30) |
+| `diffSplitWrapCheck` | boolean | `true` | Fall back to unified view when lines wrap (>20% or ≥8 lines) |
 
 The palette is derived from the chosen Shiki theme; it does **not** automatically pick up Pi's active theme colours. If you want a different look, pick a closer theme rather than expecting a live match.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-archimedes/diff",
-  "version": "2.7.3",
+  "version": "2.9.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/danielcherubini/pi-archimedes.git"
@@ -28,8 +28,8 @@
     "@earendil-works/pi-tui": ">=0.1.0"
   },
   "devDependencies": {
-    "@earendil-works/pi-coding-agent": "^0.85.1",
-    "@earendil-works/pi-tui": "^0.85.1",
+    "@earendil-works/pi-coding-agent": "^0.87.0",
+    "@earendil-works/pi-tui": "^0.87.0",
     "@types/diff": "^7.0.2",
     "typescript": "^6.0.0"
   },

package/src/index.ts

@@ -29,12 +29,14 @@ export interface DiffConfig {
 	diffTheme: string;
 	diffSplitMinWidth: number;
 	diffSplitMinCodeWidth: number;
+	diffSplitWrapCheck?: boolean;
 }
 
 const DEFAULT_DIFF_CONFIG: DiffConfig = {
 	diffTheme: "github-dark",
 	diffSplitMinWidth: 150,
 	diffSplitMinCodeWidth: 60,
+	diffSplitWrapCheck: true,
 };
 
 let _readConfig: () => DiffConfig = () => DEFAULT_DIFF_CONFIG;
@@ -44,8 +46,8 @@ function getConfig(): DiffConfig { return _readConfig(); }
 // Settings
 // ---------------------------------------------------------------------------
 
-export function getDiffSettingsItems(): SettingItem[] {
-	const config = getConfig();
+export function getDiffSettingsItems(overrideConfig?: DiffConfig): SettingItem[] {
+	const config = overrideConfig ?? getConfig();
 	return [
 		{
 			id: "diffTheme",
@@ -65,6 +67,13 @@ export function getDiffSettingsItems(): SettingItem[] {
 			description: "Minimum code column width for split diff view",
 			currentValue: String(config.diffSplitMinCodeWidth),
 		},
+		{
+			id: "diffSplitWrapCheck",
+			label: "Split Wrap Check",
+			description: "Fall back to unified diff if lines wrap",
+			currentValue: (config.diffSplitWrapCheck ?? true) ? "On" : "Off",
+			values: ["On", "Off"],
+		},
 	];
 }
 

package/src/render/shared.test.ts

@@ -0,0 +1,110 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import { parseDiff } from "../core/diff.js";
+import {
+	shouldUseSplit,
+	setConfigGetter,
+	getConfig,
+	adaptiveWrapRows,
+	wrapAnsi,
+} from "./shared.js";
+
+describe("adaptiveWrapRows", () => {
+	it("returns correct row limits at width boundaries", () => {
+		expect(adaptiveWrapRows(44)).toBe(2);
+		expect(adaptiveWrapRows(45)).toBe(4);
+		expect(adaptiveWrapRows(79)).toBe(4);
+		expect(adaptiveWrapRows(80)).toBe(5);
+	});
+});
+
+describe("wrapAnsi", () => {
+	it("wraps lines without exceeding max rows", () => {
+		const str = "a".repeat(100);
+		// w=44 -> adaptiveWrapRows=2
+		const rows = wrapAnsi(str, 44);
+		expect(rows).toHaveLength(2);
+	});
+
+	it("wraps up to the adaptive row limits and emits › when truncated on maxRows", () => {
+		// w=80 -> maxRows=5; input requires > 5 rows
+		const longStr = "x".repeat(80 * 6);
+		const rows = wrapAnsi(longStr, 80);
+		expect(rows).toHaveLength(5);
+		expect(rows[4]).toContain("›");
+
+		// w=44 -> maxRows=2; input requires > 2 rows
+		const narrowLongStr = "y".repeat(44 * 3);
+		const narrowRows = wrapAnsi(narrowLongStr, 44);
+		expect(narrowRows).toHaveLength(2);
+		expect(narrowRows[1]).toContain("›");
+	});
+
+	it("does not emit › when content fits within maxRows", () => {
+		const str = "z".repeat(80 * 3);
+		const rows = wrapAnsi(str, 80);
+		expect(rows).toHaveLength(3);
+		expect(rows[2]).not.toContain("›");
+	});
+});
+
+describe("render shared / shouldUseSplit", () => {
+	beforeEach(() => {
+		setConfigGetter(() => ({
+			diffSplitMinWidth: 150,
+			diffSplitMinCodeWidth: 60,
+			diffSplitWrapCheck: true,
+		}));
+	});
+
+	it("returns false for empty diff", () => {
+		const diff = parseDiff("", "");
+		expect(shouldUseSplit(diff, 200)).toBe(false);
+	});
+
+	it("returns false if terminal width < diffSplitMinWidth", () => {
+		const old = "const x = 1;\n";
+		const updated = "const x = 2;\n";
+		const diff = parseDiff(old, updated);
+		expect(shouldUseSplit(diff, 140)).toBe(false);
+	});
+
+	it("returns false if available code column width < diffSplitMinCodeWidth", () => {
+		setConfigGetter(() => ({
+			diffSplitMinWidth: 100,
+			diffSplitMinCodeWidth: 60,
+			diffSplitWrapCheck: true,
+		}));
+		const old = "const x = 1;\n";
+		const updated = "const x = 2;\n";
+		const diff = parseDiff(old, updated);
+		// With tw=110, half=54, nw=2, gw=7, cw=47 < 60 -> false
+		expect(shouldUseSplit(diff, 110)).toBe(false);
+	});
+
+	it("returns true for normal short lines when terminal width and code width fit", () => {
+		const old = "const x = 1;\n";
+		const updated = "const x = 2;\n";
+		const diff = parseDiff(old, updated);
+		expect(shouldUseSplit(diff, 200)).toBe(true);
+	});
+
+	it("falls back to false when lines wrap and diffSplitWrapCheck is true", () => {
+		const longLineOld = "const longLine = '" + "a".repeat(150) + "';\n";
+		const longLineNew = "const longLine = '" + "b".repeat(150) + "';\n";
+		const diff = parseDiff(longLineOld, longLineNew);
+		// In a 200 col terminal, cw ~ 92, line length > 150, all lines wrap (ratio = 1.0 >= 0.2)
+		expect(shouldUseSplit(diff, 200)).toBe(false);
+	});
+
+	it("returns true when lines wrap but diffSplitWrapCheck is false", () => {
+		setConfigGetter(() => ({
+			diffSplitMinWidth: 150,
+			diffSplitMinCodeWidth: 60,
+			diffSplitWrapCheck: false,
+		}));
+		const longLineOld = "const longLine = '" + "a".repeat(150) + "';\n";
+		const longLineNew = "const longLine = '" + "b".repeat(150) + "';\n";
+		const diff = parseDiff(longLineOld, longLineNew);
+		expect(shouldUseSplit(diff, 200)).toBe(true);
+	});
+});

package/src/render/shared.ts

@@ -14,22 +14,32 @@ export const MAX_HL_CHARS = 80_000;
 export const WORD_DIFF_MIN_SIM = 0.15;
 const SPLIT_MAX_WRAP_RATIO = 0.2;
 const SPLIT_MAX_WRAP_LINES = 8;
-const MAX_WRAP_ROWS_WIDE = 3;
-const MAX_WRAP_ROWS_MED = 2;
-const MAX_WRAP_ROWS_NARROW = 1;
+const MAX_WRAP_ROWS_WIDE = 5;
+const MAX_WRAP_ROWS_MED = 4;
+const MAX_WRAP_ROWS_NARROW = 2;
 export const DEFAULT_TERM_WIDTH = 200;
 
 // ---------------------------------------------------------------------------
 // Config
 // ---------------------------------------------------------------------------
 
-export function getConfig(): { diffSplitMinWidth: number; diffSplitMinCodeWidth: number } {
+export interface DiffRenderConfig {
+	diffSplitMinWidth: number;
+	diffSplitMinCodeWidth: number;
+	diffSplitWrapCheck?: boolean;
+}
+
+export function getConfig(): DiffRenderConfig {
 	return typeof _getConfig === "function" ? _getConfig() : DEFAULT_CONFIG;
 }
 
-const DEFAULT_CONFIG = { diffSplitMinWidth: 150, diffSplitMinCodeWidth: 60 };
-let _getConfig: (() => { diffSplitMinWidth: number; diffSplitMinCodeWidth: number }) | undefined;
-export function setConfigGetter(fn: () => { diffSplitMinWidth: number; diffSplitMinCodeWidth: number }): void {
+const DEFAULT_CONFIG: DiffRenderConfig = {
+	diffSplitMinWidth: 150,
+	diffSplitMinCodeWidth: 60,
+	diffSplitWrapCheck: true,
+};
+let _getConfig: (() => DiffRenderConfig) | undefined;
+export function setConfigGetter(fn: () => DiffRenderConfig): void {
 	_getConfig = fn;
 }
 
@@ -38,8 +48,8 @@ export function setConfigGetter(fn: () => { diffSplitMinWidth: number; diffSplit
 // ---------------------------------------------------------------------------
 
 export function adaptiveWrapRows(w: number): number {
-	if (w >= 180) return MAX_WRAP_ROWS_WIDE;
-	if (w >= 120) return MAX_WRAP_ROWS_MED;
+	if (w >= 80) return MAX_WRAP_ROWS_WIDE;
+	if (w >= 45) return MAX_WRAP_ROWS_MED;
 	return MAX_WRAP_ROWS_NARROW;
 }
 
@@ -112,6 +122,8 @@ export function shouldUseSplit(diff: ParsedDiff, tw: number, maxRows = MAX_PREVI
 	const cw = Math.max(1, half - gw);
 	if (cw < cfg.diffSplitMinCodeWidth) return false;
 
+	if (cfg.diffSplitWrapCheck === false) return true;
+
 	const vis = diff.lines.slice(0, maxRows);
 	let contentLines = 0, wrapCandidates = 0;
 	for (const l of vis) {