@xynogen/pix-pretty 1.18.0 → 1.18.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-pretty",
-	"version": "1.18.0",
+	"version": "1.18.1",
 	"description": "Enhanced tool output rendering with syntax highlighting, file icons, tree views, diff rendering, and FFF search",
 	"type": "module",
 	"main": "src/index.ts",

package/src/diff-render.ts

@@ -49,8 +49,6 @@ const ANSI_CAPTURE_RE = new RegExp(`${ESC_RE}\\[([^m]*)m`, "g");
 // Terminal bounds + thresholds
 // ---------------------------------------------------------------------------
 
-const MAX_TERM_WIDTH = 210;
-
 const MAX_PREVIEW_LINES = envInt("PRETTY_MAX_PREVIEW_LINES", 80);
 
 const SPLIT_MIN_WIDTH = envInt("DIFF_SPLIT_MIN_WIDTH", dc.splitMinWidth || 150);
@@ -158,8 +156,8 @@ function tabs(s: string): string {
 function termW(): number {
 	// Single source of truth: utils.termW caches, falls back to tty ioctl, and
 	// invalidates on resize. Diff layout needs a hard floor of 80 cols for the
-	// split-view column math, so clamp the shared value here.
-	return Math.max(80, Math.min(utilsTermW(), MAX_TERM_WIDTH));
+	// split-view column math (no ceiling — fill the true width on ultrawide).
+	return Math.max(80, utilsTermW());
 }
 
 /** Pad/truncate `s` to exactly `w` visible chars. ANSI-aware. */
@@ -557,8 +555,7 @@ export async function renderUnified(
 		if (l.type === "sep") {
 			const gap = l.newNum;
 			const label = gap && gap > 0 ? ` ${gap} unmodified lines ` : "···";
-			const totalW = Math.min(tw, 72);
-			const pad = Math.max(0, totalW - label.length - 2);
+			const pad = Math.max(0, tw - label.length - 2);
 			const half1 = Math.floor(pad / 2);
 			const half2 = pad - half1;
 			out.push(`${BG_BASE}${FG_DIM}${"─".repeat(half1)}${label}${"─".repeat(half2)}${RST}`);

package/src/utils.test.ts

@@ -15,6 +15,7 @@ import {
 	ruleFrame,
 	sectionRule,
 	setResultDetails,
+	termW,
 	viewportText,
 } from "./utils.js";
 
@@ -160,6 +161,35 @@ function plain(text: string): string {
 	return text.replace(ANSI, "");
 }
 
+describe("termW", () => {
+	// termW() caches and invalidates on a stdout 'resize' event. Set columns then
+	// emit resize so the next call re-reads.
+	function setCols(cols: number): void {
+		(process.stdout as { columns?: number }).columns = cols;
+		process.stdout.emit("resize");
+	}
+
+	it("returns the true terminal width with no upper clamp (ultrawide)", () => {
+		const orig = process.stdout.columns;
+		try {
+			setCols(384); // wider than the old 210 cap
+			expect(termW()).toBe(384);
+		} finally {
+			setCols(orig ?? 80);
+		}
+	});
+
+	it("floors width at 1 for a degenerate column count", () => {
+		const orig = process.stdout.columns;
+		try {
+			setCols(0); // falsy — falls through resolution chain, never < 1
+			expect(termW()).toBeGreaterThanOrEqual(1);
+		} finally {
+			setCols(orig ?? 80);
+		}
+	});
+});
+
 describe("ruleFrame", () => {
 	it("wraps body with a rule top and bottom, then footer below the close", () => {
 		const out = ruleFrame(["a", "b"], ["… +3 more"], 10);
@@ -469,10 +499,9 @@ describe("sectionRule", () => {
 		expect(sectionRule("\x1b[31m=== x ===\x1b[0m", tag, 20)).toBeNull();
 	});
 
-	it("caps the divider width on an ultra-wide terminal", () => {
-		// Ask for 400 columns — the visible width must stay capped (<= 72).
+	it("fills the full requested width so it aligns with the tool frame", () => {
 		const out = sectionRule("=== x ===", tag, 400) ?? "";
 		const visible = out.replace(/<\/?[a-z]+>/g, "");
-		expect([...visible].length).toBeLessThanOrEqual(72);
+		expect([...visible].length).toBe(400);
 	});
 });

package/src/utils.ts

@@ -52,6 +52,9 @@ export function fillToolBackground(text: string, bg = BG_BASE, width?: number):
 }
 
 export function viewportTextConstructor(TextComponent: TextComponentCtor): TextComponentCtor {
+	// SAFETY: a `new`-able ctor and a plain factory returning the same instance
+	// shape are interchangeable to callers here; TS can't see the returned
+	// ViewportText satisfies TextComponentCtor's construct signature.
 	return function ViewportTextComponent(text = "") {
 		const component = viewportText(TextComponent);
 		component.setText(text);
@@ -451,7 +454,9 @@ export function termW(): number {
 		Number.parseInt(process.env.COLUMNS ?? "", 10) ||
 		_readTtyColumns() ||
 		120;
-	_cachedTermW = Math.max(1, Math.min(raw, 210));
+	// No upper clamp: frames must fill the true terminal width so our rules align
+	// with Pi's native full-width UI on ultrawide displays.
+	_cachedTermW = Math.max(1, raw);
 
 	return _cachedTermW;
 }
@@ -500,26 +505,21 @@ export function rule(w: number, paint?: RulePaint): string {
 /** Matches an `=== label ===` separator line (a common shell/echo idiom). */
 const SECTION_RE = /^\s*={2,}\s*(.+?)\s*={2,}\s*$/;
 
-/** Max width of a section divider — a full-width rule on an ultra-wide
- *  terminal reads as noise, so cap it regardless of available columns. */
-const SECTION_RULE_MAX = 72;
-
 /** Fixed dash count before a left-aligned section label. */
 const SECTION_RULE_LEAD = 4;
 
 /**
  * If `line` is an `=== label ===` separator, render it as a left-aligned
  * section divider (`──── label ───────────`); otherwise return null. Callers
- * fall back to their normal per-line rendering on null. Sized to `width` but
- * capped at SECTION_RULE_MAX so it stays readable on wide terminals. Label and
- * rule both use the muted role — theme-driven, ANSI-safe.
+ * fall back to their normal per-line rendering on null. Fills the full `width`
+ * so the divider aligns with the surrounding tool frame. Label and rule both
+ * use the muted role — theme-driven, ANSI-safe.
  */
 export function sectionRule(line: string, theme: FgTheme, width: number): string | null {
 	const m = SECTION_RE.exec(line);
 	if (!m || hasAnsi(line)) return null;
 	const label = ` ${m[1]} `;
-	const w = Math.min(width, SECTION_RULE_MAX);
-	const trail = w - SECTION_RULE_LEAD - visibleWidth(label);
+	const trail = width - SECTION_RULE_LEAD - visibleWidth(label);
 	// Label fits → lead rule + trailing fill. Too long to fill → don't force a
 	// full-width rule; wrap it snugly with 2 dashes each side (`── long text ──`).
 	const [lead, tail] = trail >= 2 ? [SECTION_RULE_LEAD, trail] : [2, 2];