@xynogen/pix-pretty 1.3.0 → 1.3.1

package/package.json

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

package/src/diff-render.ts

@@ -14,6 +14,7 @@ import { MAX_HL_CHARS, MAX_RENDER_LINES, WORD_DIFF_MIN_SIM } from "./config.js";
 import type { DiffLine, ParsedDiff } from "./diff.js";
 import { hlBlock } from "./highlight.js";
 import type { BundledLanguage } from "./types.js";
+import { termW as utilsTermW } from "./utils.js";
 
 // ---------------------------------------------------------------------------
 // Env-overridable color/threshold helpers (mirror pi-diff)
@@ -73,7 +74,6 @@ const ANSI_CAPTURE_RE = new RegExp(`${ESC_RE}\\[([^m]*)m`, "g");
 // ---------------------------------------------------------------------------
 
 const MAX_TERM_WIDTH = 210;
-const DEFAULT_TERM_WIDTH = 200;
 
 const MAX_PREVIEW_LINES = envInt("PRETTY_MAX_PREVIEW_LINES", 80);
 
@@ -201,36 +201,10 @@ function tabs(s: string): string {
 }
 
 function termW(): number {
-	// Delegate to utils.termW which has tty ioctl fallback + resize invalidation
-	const stderrCols = (process.stderr as { columns?: number }).columns;
-	const raw =
-		process.stdout.columns ||
-		stderrCols ||
-		Number.parseInt(process.env.COLUMNS ?? "", 10) ||
-		_readTtyColsDR() ||
-		DEFAULT_TERM_WIDTH;
-	return Math.max(80, Math.min(raw, MAX_TERM_WIDTH));
-}
-
-function _readTtyColsDR(): number | undefined {
-	try {
-		const { getWindowSize } = require("node:tty") as {
-			getWindowSize?: (fd: number) => [number, number];
-		};
-		if (getWindowSize) {
-			for (const fd of [1, 2, 0]) {
-				try {
-					const [cols] = getWindowSize(fd);
-					if (cols && cols > 0) return cols;
-				} catch {
-					/* not a tty */
-				}
-			}
-		}
-	} catch {
-		/* tty unavailable */
-	}
-	return undefined;
+	// 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));
 }
 
 /** Pad/truncate `s` to exactly `w` visible chars. ANSI-aware. */

package/src/tools/bash.test.ts

@@ -0,0 +1,86 @@
+import { describe, expect, it } from "bun:test";
+import { visibleWidth } from "@earendil-works/pi-tui";
+import { registerBashTool } from "./bash";
+
+class MockTextComponent {
+	private text: string;
+
+	constructor(text = "") {
+		this.text = text;
+	}
+
+	setText(value: string): void {
+		this.text = value;
+	}
+
+	getText(): string {
+		return this.text;
+	}
+}
+
+describe("registerBashTool", () => {
+	it("clamps renderCall to small terminal widths", () => {
+		const registered: { renderCall?: (...args: any[]) => MockTextComponent } =
+			{};
+		const origColumns = process.env.COLUMNS;
+		process.env.COLUMNS = "24";
+		process.stdout.emit("resize");
+		process.stdin.emit("resize");
+
+		try {
+			registerBashTool(
+				{
+					registerTool(tool: unknown) {
+						Object.assign(registered, tool);
+					},
+				} as any,
+				() => ({
+					execute: async () => ({
+						content: [{ type: "text", text: "ok" }],
+						details: undefined,
+					}),
+				}),
+				{
+					cwd: process.cwd(),
+					sp: (p: string) => p,
+					TextComponent: MockTextComponent as any,
+					fffState: {} as any,
+					cursorStore: {} as any,
+					multiGrepRipgrepFallback: async () => ({
+						text: "",
+						matchCount: 0,
+						limitReached: false,
+					}),
+				},
+			);
+
+			const text = registered.renderCall?.(
+				{
+					command: 'printf "very very very long line"\necho second\necho third',
+					timeout: 30,
+				},
+				{
+					fg: (_key: string, value: string) => value,
+					bold: (value: string) => value,
+				} as any,
+				{
+					expanded: false,
+					isError: false,
+					invalidate: () => {},
+					state: {},
+				} as any,
+			);
+
+			expect(text).toBeDefined();
+			const rendered = text?.getText() ?? "";
+			for (const line of rendered.split("\n")) {
+				expect(visibleWidth(line)).toBeLessThanOrEqual(24);
+			}
+		} finally {
+			if (origColumns === undefined) delete process.env.COLUMNS;
+			else process.env.COLUMNS = origColumns;
+			process.stdout.emit("resize");
+			process.stdin.emit("resize");
+		}
+	});
+});

package/src/tools/bash.ts

@@ -4,6 +4,7 @@ import type {
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
 
+import { truncateToWidth } from "@earendil-works/pi-tui";
 import { FG_DIM, RST } from "../ansi.js";
 import { MAX_PREVIEW_LINES } from "../config.js";
 import { renderBashOutput } from "../renderers.js";
@@ -19,6 +20,7 @@ import {
 	fillToolBackground,
 	getTextContent,
 	isTextContent,
+	normalizeLineEndings,
 	renderToolError,
 	rule,
 	setResultDetails,
@@ -37,6 +39,9 @@ export function registerBashTool(
 	pi.registerTool({
 		...origBash,
 		name: "bash",
+		// Full-width framing (rules + bg fill) baked at termW(); the default
+		// Box shell pads x by 1 and re-wraps at width-2, splitting every line.
+		renderShell: "self",
 
 		async execute(
 			tid: string,
@@ -84,17 +89,28 @@ export function registerBashTool(
 			renderCtx: RenderContextLike,
 		) {
 			const cmd = args.command ?? "";
+			const displayCmdRaw = cmd.trim();
 			const text = renderCtx.lastComponent ?? new TextComponent("", 0, 0);
+			const label = theme.fg("toolTitle", theme.bold("bash"));
 			const timeout = args.timeout
 				? ` ${theme.fg("muted", `(${args.timeout}s timeout)`)}`
 				: "";
-			const displayCmd =
-				renderCtx.expanded || cmd.length <= 80 ? cmd : `${cmd.slice(0, 77)}…`;
-			text.setText(
-				fillToolBackground(
-					`${theme.fg("toolTitle", theme.bold("bash"))} ${theme.fg("accent", displayCmd)}${timeout}`,
-				),
+			const cmdLines = displayCmdRaw.split("\n");
+			const firstLine = cmdLines[0] ?? "";
+			const compactCmd =
+				cmdLines.length > 1
+					? `${firstLine} ${theme.fg("muted", `… (+${cmdLines.length - 1} lines)`)}`
+					: firstLine;
+			const baseCmd = renderCtx.expanded ? displayCmdRaw : compactCmd;
+			const availableWidth = Math.max(1, termW() - 1);
+			const prefix = `${label} `;
+			const reserve = Math.max(0, availableWidth - timeout.length);
+			const displayCmd = truncateToWidth(
+				theme.fg("accent", baseCmd),
+				Math.max(1, reserve - prefix.length),
+				"…",
 			);
+			text.setText(fillToolBackground(`${prefix}${displayCmd}${timeout}`));
 			return text;
 		},
 
@@ -113,17 +129,20 @@ export function registerBashTool(
 
 			const d = result.details as Record<string, unknown> | undefined;
 			if (d?._type === "bashResult") {
+				const normalizedText = normalizeLineEndings(d.text as string)
+					.replace(/\n{3,}/g, "\n\n")
+					.replace(/^\n+|\n+$/g, "");
 				const { summary } = renderBashOutput(
-					d.text as string,
+					normalizedText,
 					d.exitCode as number | null,
 				);
-				const lines = (d.text as string).split("\n");
+				const lines = normalizedText ? normalizedText.split("\n") : [];
 				const lineCount = lines.length;
 				const lineInfo =
 					lineCount > 1 ? `  ${FG_DIM}(${lineCount} lines)${RST}` : "";
 				const header = `  ${summary}${lineInfo}`;
 
-				if ((d.text as string).trim()) {
+				if (normalizedText) {
 					const maxShow = renderCtx.expanded ? lineCount : MAX_PREVIEW_LINES;
 					const show = lines.slice(0, maxShow);
 					const tw = termW();

package/src/tools/find.ts

@@ -37,6 +37,7 @@ export function registerFindTool(
 	pi.registerTool({
 		...origFind,
 		name: "find",
+		renderShell: "self",
 
 		async execute(
 			tid: string,

package/src/tools/grep.ts

@@ -42,6 +42,7 @@ export function registerGrepTool(
 	pi.registerTool({
 		...origGrep,
 		name: "grep",
+		renderShell: "self",
 
 		async execute(
 			tid: string,

package/src/tools/ls.ts

@@ -34,6 +34,7 @@ export function registerLsTool(
 	pi.registerTool({
 		...origLs,
 		name: "ls",
+		renderShell: "self",
 
 		async execute(
 			tid: string,

package/src/tools/multi-grep.ts

@@ -51,6 +51,7 @@ export function registerMultiGrepTool(
 	pi.registerTool({
 		name: "multi_grep",
 		label: "multi_grep",
+		renderShell: "self",
 		description: [
 			"Search file contents for lines matching ANY of multiple patterns (OR logic).",
 			"Uses SIMD-accelerated Aho-Corasick multi-pattern matching when FFF is available.",

package/src/tools/read.ts

@@ -39,6 +39,9 @@ export function registerReadTool(
 	pi.registerTool({
 		...origRead,
 		name: "read",
+		// Full-width framing baked at termW(); default Box shell pads x by 1
+		// and re-wraps at width-2, splitting every line into a padding row.
+		renderShell: "self",
 
 		async execute(
 			tid: string,

package/src/tools/write.ts

@@ -47,6 +47,7 @@ export function registerWriteTool(
 	pi.registerTool({
 		...origWrite,
 		name: "write",
+		renderShell: "self",
 
 		async execute(
 			tid: string,

package/src/utils.ts

@@ -49,11 +49,26 @@ export function fillToolBackground(text: string, bg = BG_BASE): string {
 }
 
 let _cachedTermW: number | undefined;
+let _termWResizeBound = false;
+
+function _bindTermWResize(): void {
+	if (_termWResizeBound) return;
+	_termWResizeBound = true;
+	// Persistent listeners: every SIGWINCH invalidates the cache so the next
+	// termW() re-reads. `.once` only caught the first resize, leaving width
+	// stale on subsequent resizes.
+	const invalidate = () => {
+		_cachedTermW = undefined;
+	};
+	process.stdout.on("resize", invalidate);
+	process.stdin.on("resize", invalidate);
+}
 
 /** Read terminal width — checks all available sources in priority order.
  *  Falls back to querying the controlling tty via fd 1/2/stdin ioctl.
  *  Result is cached and invalidated on SIGWINCH / stdout resize. */
 export function termW(): number {
+	_bindTermWResize();
 	if (_cachedTermW !== undefined) return _cachedTermW;
 
 	const stderrWithColumns = process.stderr as NodeJS.WriteStream & {
@@ -67,14 +82,6 @@ export function termW(): number {
 		120;
 	_cachedTermW = Math.max(1, Math.min(raw, 210));
 
-	// Invalidate on resize so next call re-reads
-	process.stdout.once("resize", () => {
-		_cachedTermW = undefined;
-	});
-	process.stdin.once("resize", () => {
-		_cachedTermW = undefined;
-	});
-
 	return _cachedTermW;
 }