@oh-my-pi/pi-coding-agent 3.20.1 → 3.21.0

package/src/core/tools/read.ts

@@ -1,17 +1,29 @@
 import { existsSync } from "node:fs";
 import path from "node:path";
+import type { ImageContent, TextContent } from "@mariozechner/pi-ai";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
+import type { Component } from "@oh-my-pi/pi-tui";
+import { Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { globSync } from "glob";
+import { getLanguageFromPath, highlightCode, type Theme } from "../../modes/interactive/theme/theme";
 import readDescription from "../../prompts/tools/read.md" with { type: "text" };
 import { formatDimensionNote, resizeImage } from "../../utils/image-resize";
 import { detectSupportedImageMimeTypeFromFile } from "../../utils/mime";
 import { ensureTool } from "../../utils/tools-manager";
+import type { RenderResultOptions } from "../custom-tools/types";
 import { untilAborted } from "../utils";
 import { createLsTool } from "./ls";
 import { resolveReadPath, resolveToCwd } from "./path-utils";
-import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize, type TruncationResult, truncateHead } from "./truncate";
+import { replaceTabs, shortenPath, wrapBrackets } from "./render-utils";
+import {
+	DEFAULT_MAX_BYTES,
+	DEFAULT_MAX_LINES,
+	formatSize,
+	type TruncationResult,
+	truncateHead,
+	truncateStringToBytesFromStart,
+} from "./truncate";
 
 // Document types convertible via markitdown
 const CONVERTIBLE_EXTENSIONS = new Set([".pdf", ".doc", ".docx", ".ppt", ".pptx", ".xls", ".xlsx", ".rtf", ".epub"]);
@@ -450,9 +462,9 @@ export function createReadTool(cwd: string, options?: ReadToolOptions): AgentToo
 						let outputText = truncation.content;
 
 						if (truncation.truncated) {
-							outputText += `\n\n[Document converted via markitdown. Output truncated to $formatSize(
+							outputText += `\n\n[Document converted via markitdown. Output truncated to ${formatSize(
 								DEFAULT_MAX_BYTES,
-							)]`;
+							)}]`;
 							details = { truncation };
 						}
 
@@ -498,11 +510,21 @@ export function createReadTool(cwd: string, options?: ReadToolOptions): AgentToo
 					let outputText: string;
 
 					if (truncation.firstLineExceedsLimit) {
-						// First line at offset exceeds 30KB - tell model to use bash
-						const firstLineSize = formatSize(Buffer.byteLength(allLines[startLine], "utf-8"));
-						outputText = `[Line ${startLineDisplay} is ${firstLineSize}, exceeds ${formatSize(
-							DEFAULT_MAX_BYTES,
-						)} limit. Use bash: sed -n '${startLineDisplay}p' ${readPath} | head -c ${DEFAULT_MAX_BYTES}]`;
+						const firstLine = allLines[startLine] ?? "";
+						const firstLineBytes = Buffer.byteLength(firstLine, "utf-8");
+						const snippet = truncateStringToBytesFromStart(firstLine, DEFAULT_MAX_BYTES);
+						const shownSize = formatSize(snippet.bytes);
+
+						outputText = snippet.text;
+						if (outputText.length > 0) {
+							outputText += `\n\n[Line ${startLineDisplay} is ${formatSize(
+								firstLineBytes,
+							)}, exceeds ${formatSize(DEFAULT_MAX_BYTES)} limit. Showing first ${shownSize} of the line.]`;
+						} else {
+							outputText = `[Line ${startLineDisplay} is ${formatSize(
+								firstLineBytes,
+							)}, exceeds ${formatSize(DEFAULT_MAX_BYTES)} limit. Unable to display a valid UTF-8 snippet.]`;
+						}
 						details = { truncation };
 					} else if (truncation.truncated) {
 						// Truncation occurred - build actionable notice
@@ -542,3 +564,94 @@ export function createReadTool(cwd: string, options?: ReadToolOptions): AgentToo
 
 /** Default read tool using process.cwd() - for backwards compatibility */
 export const readTool = createReadTool(process.cwd());
+
+// =============================================================================
+// TUI Renderer
+// =============================================================================
+
+interface ReadRenderArgs {
+	path?: string;
+	file_path?: string;
+	offset?: number;
+	limit?: number;
+}
+
+const IMAGE_EXTENSIONS = new Set(["png", "jpg", "jpeg", "gif", "webp", "svg", "ico", "bmp", "tiff"]);
+const BINARY_EXTENSIONS = new Set(["pdf", "zip", "tar", "gz", "exe", "dll", "so", "dylib", "wasm"]);
+
+function getFileType(filePath: string): "image" | "binary" | "text" {
+	const ext = filePath.split(".").pop()?.toLowerCase();
+	if (!ext) return "text";
+	if (IMAGE_EXTENSIONS.has(ext)) return "image";
+	if (BINARY_EXTENSIONS.has(ext)) return "binary";
+	return "text";
+}
+
+export const readToolRenderer = {
+	renderCall(args: ReadRenderArgs, uiTheme: Theme): Component {
+		const rawPath = args.file_path || args.path || "";
+		const filePath = shortenPath(rawPath);
+		const offset = args.offset;
+		const limit = args.limit;
+
+		let pathDisplay = filePath ? uiTheme.fg("accent", filePath) : uiTheme.fg("toolOutput", uiTheme.format.ellipsis);
+		if (offset !== undefined || limit !== undefined) {
+			const startLine = offset ?? 1;
+			const endLine = limit !== undefined ? startLine + limit - 1 : "";
+			pathDisplay += uiTheme.fg("warning", `:${startLine}${endLine ? `-${endLine}` : ""}`);
+		}
+
+		const text = `${uiTheme.fg("toolTitle", uiTheme.bold("Read"))} ${pathDisplay}`;
+		return new Text(text, 0, 0);
+	},
+
+	renderResult(
+		result: { content: Array<{ type: string; text?: string }>; details?: ReadToolDetails },
+		{ expanded }: RenderResultOptions,
+		uiTheme: Theme,
+		args?: ReadRenderArgs,
+	): Component {
+		const rawPath = args?.file_path || args?.path || "";
+		const fileType = getFileType(rawPath);
+		const details = result.details;
+		const lines: string[] = [];
+
+		const output = result.content?.find((c) => c.type === "text")?.text ?? "";
+
+		if (fileType === "image") {
+			lines.push(uiTheme.fg("muted", "Image rendered below"));
+		} else if (fileType === "binary") {
+			// Binary files just show the header from renderCall
+		} else {
+			// Text file
+			const lang = getLanguageFromPath(rawPath);
+			const contentLines = lang ? highlightCode(replaceTabs(output), lang) : output.split("\n");
+
+			if (expanded) {
+				lines.push(
+					...contentLines.map((line: string) =>
+						lang ? replaceTabs(line) : uiTheme.fg("toolOutput", replaceTabs(line)),
+					),
+				);
+			} else {
+				lines.push(uiTheme.fg("dim", `${uiTheme.nav.expand} Ctrl+O to show content`));
+			}
+
+			// Truncation warning
+			const truncation = details?.truncation;
+			if (truncation?.truncated) {
+				let warning: string;
+				if (truncation.firstLineExceedsLimit) {
+					warning = `First line exceeds ${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`;
+				} else if (truncation.truncatedBy === "lines") {
+					warning = `Truncated: ${truncation.outputLines} of ${truncation.totalLines} lines (${truncation.maxLines ?? DEFAULT_MAX_LINES} line limit)`;
+				} else {
+					warning = `Truncated: ${truncation.outputLines} lines (${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit)`;
+				}
+				lines.push(uiTheme.fg("warning", wrapBrackets(warning, uiTheme)));
+			}
+		}
+
+		return new Text(lines.join("\n"), 0, 0);
+	},
+};

package/src/core/tools/render-utils.ts

@@ -204,6 +204,247 @@ export function formatMoreItems(remaining: number, itemType: string, theme: Them
 	return `${theme.format.ellipsis} ${safeRemaining} more ${pluralize(itemType, safeRemaining)}`;
 }
 
+export function formatMeta(meta: string[], theme: Theme): string {
+	return meta.length > 0 ? ` ${theme.fg("muted", meta.join(theme.sep.dot))}` : "";
+}
+
+export function formatScope(scopePath: string | undefined, theme: Theme): string {
+	return scopePath ? ` ${theme.fg("muted", `in ${scopePath}`)}` : "";
+}
+
+export function formatTruncationSuffix(truncated: boolean, theme: Theme): string {
+	return truncated ? theme.fg("warning", " (truncated)") : "";
+}
+
+export function formatErrorMessage(message: string | undefined, theme: Theme): string {
+	const clean = (message ?? "").replace(/^Error:\s*/, "").trim();
+	return `${theme.styledSymbol("status.error", "error")} ${theme.fg("error", `Error: ${clean || "Unknown error"}`)}`;
+}
+
+export function formatEmptyMessage(message: string, theme: Theme): string {
+	return `${theme.styledSymbol("status.warning", "warning")} ${theme.fg("muted", message)}`;
+}
+
+// =============================================================================
+// Diagnostic Formatting
+// =============================================================================
+
+interface ParsedDiagnostic {
+	filePath: string;
+	line: number;
+	col: number;
+	severity: "error" | "warning" | "info" | "hint";
+	source?: string;
+	message: string;
+	code?: string;
+}
+
+function parseDiagnosticMessage(msg: string): ParsedDiagnostic | null {
+	const match = msg.match(/^(.+?):(\d+):(\d+)\s+\[(\w+)\]\s+(?:\[([^\]]+)\]\s+)?(.+?)(?:\s+\(([^)]+)\))?$/);
+	if (!match) return null;
+	return {
+		filePath: match[1],
+		line: parseInt(match[2], 10),
+		col: parseInt(match[3], 10),
+		severity: match[4] as ParsedDiagnostic["severity"],
+		source: match[5],
+		message: match[6],
+		code: match[7],
+	};
+}
+
+export function formatDiagnostics(
+	diag: { errored: boolean; summary: string; messages: string[] },
+	expanded: boolean,
+	theme: Theme,
+	getLangIcon: (filePath: string) => string,
+): string {
+	if (diag.messages.length === 0) return "";
+
+	const byFile = new Map<string, ParsedDiagnostic[]>();
+	const unparsed: string[] = [];
+
+	for (const msg of diag.messages) {
+		const parsed = parseDiagnosticMessage(msg);
+		if (parsed) {
+			const existing = byFile.get(parsed.filePath) ?? [];
+			existing.push(parsed);
+			byFile.set(parsed.filePath, existing);
+		} else {
+			unparsed.push(msg);
+		}
+	}
+
+	const headerIcon = diag.errored
+		? theme.styledSymbol("status.error", "error")
+		: theme.styledSymbol("status.warning", "warning");
+	let output = `\n\n${headerIcon} ${theme.fg("toolTitle", "Diagnostics")} ${theme.fg("dim", `(${diag.summary})`)}`;
+
+	const maxDiags = expanded ? diag.messages.length : 5;
+	let shown = 0;
+
+	const files = Array.from(byFile.entries());
+	for (let fi = 0; fi < files.length && shown < maxDiags; fi++) {
+		const [filePath, diagnostics] = files[fi];
+		const isLastFile = fi === files.length - 1 && unparsed.length === 0;
+		const fileBranch = isLastFile ? theme.tree.last : theme.tree.branch;
+
+		const fileIcon = theme.fg("muted", getLangIcon(filePath));
+		output += `\n ${theme.fg("dim", fileBranch)} ${fileIcon} ${theme.fg("accent", filePath)}`;
+		shown++;
+
+		for (let di = 0; di < diagnostics.length && shown < maxDiags; di++) {
+			const d = diagnostics[di];
+			const isLastDiag = di === diagnostics.length - 1;
+			const diagBranch = isLastFile
+				? isLastDiag
+					? `   ${theme.tree.last}`
+					: `   ${theme.tree.branch}`
+				: isLastDiag
+					? ` ${theme.tree.vertical} ${theme.tree.last}`
+					: ` ${theme.tree.vertical} ${theme.tree.branch}`;
+
+			const sevIcon =
+				d.severity === "error"
+					? theme.styledSymbol("status.error", "error")
+					: d.severity === "warning"
+						? theme.styledSymbol("status.warning", "warning")
+						: theme.styledSymbol("status.info", "muted");
+			const location = theme.fg("dim", `:${d.line}:${d.col}`);
+			const codeTag = d.code ? theme.fg("dim", ` (${d.code})`) : "";
+			const msgColor = d.severity === "error" ? "error" : d.severity === "warning" ? "warning" : "toolOutput";
+
+			output += `\n ${theme.fg("dim", diagBranch)} ${sevIcon}${location} ${theme.fg(msgColor, d.message)}${codeTag}`;
+			shown++;
+		}
+	}
+
+	for (const msg of unparsed) {
+		if (shown >= maxDiags) break;
+		const color = msg.includes("[error]") ? "error" : msg.includes("[warning]") ? "warning" : "dim";
+		output += `\n ${theme.fg("dim", theme.tree.branch)} ${theme.fg(color, msg)}`;
+		shown++;
+	}
+
+	if (diag.messages.length > shown) {
+		const remaining = diag.messages.length - shown;
+		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", `${theme.format.ellipsis} ${remaining} more`)} ${theme.fg("dim", "(Ctrl+O to expand)")}`;
+	}
+
+	return output;
+}
+
+// =============================================================================
+// Diff Utilities
+// =============================================================================
+
+export interface DiffStats {
+	added: number;
+	removed: number;
+	hunks: number;
+	lines: number;
+}
+
+export function getDiffStats(diffText: string): DiffStats {
+	const lines = diffText ? diffText.split("\n") : [];
+	let added = 0;
+	let removed = 0;
+	let hunks = 0;
+	let inHunk = false;
+
+	for (const line of lines) {
+		const isAdded = line.startsWith("+");
+		const isRemoved = line.startsWith("-");
+		const isChange = isAdded || isRemoved;
+
+		if (isAdded) added++;
+		if (isRemoved) removed++;
+
+		if (isChange && !inHunk) {
+			hunks++;
+			inHunk = true;
+		} else if (!isChange) {
+			inHunk = false;
+		}
+	}
+
+	return { added, removed, hunks, lines: lines.length };
+}
+
+export function formatDiffStats(added: number, removed: number, hunks: number, theme: Theme): string {
+	const parts: string[] = [];
+	if (added > 0) parts.push(theme.fg("success", `+${added}`));
+	if (removed > 0) parts.push(theme.fg("error", `-${removed}`));
+	if (hunks > 0) parts.push(theme.fg("dim", `${hunks} hunk${hunks !== 1 ? "s" : ""}`));
+	return parts.join(theme.fg("dim", " / "));
+}
+
+export function truncateDiffByHunk(
+	diffText: string,
+	maxHunks: number,
+	maxLines: number,
+): { text: string; hiddenHunks: number; hiddenLines: number } {
+	const lines = diffText ? diffText.split("\n") : [];
+	const totalStats = getDiffStats(diffText);
+	const kept: string[] = [];
+	let inHunk = false;
+	let currentHunks = 0;
+	let reachedLimit = false;
+
+	for (const line of lines) {
+		const isChange = line.startsWith("+") || line.startsWith("-");
+		if (isChange && !inHunk) {
+			currentHunks++;
+			inHunk = true;
+		}
+		if (!isChange) {
+			inHunk = false;
+		}
+
+		if (currentHunks > maxHunks) {
+			reachedLimit = true;
+			break;
+		}
+
+		kept.push(line);
+		if (kept.length >= maxLines) {
+			reachedLimit = true;
+			break;
+		}
+	}
+
+	if (!reachedLimit) {
+		return { text: diffText, hiddenHunks: 0, hiddenLines: 0 };
+	}
+
+	const keptStats = getDiffStats(kept.join("\n"));
+	return {
+		text: kept.join("\n"),
+		hiddenHunks: Math.max(0, totalStats.hunks - keptStats.hunks),
+		hiddenLines: Math.max(0, totalStats.lines - kept.length),
+	};
+}
+
+// =============================================================================
+// Path Utilities
+// =============================================================================
+
+export function shortenPath(filePath: string, homeDir?: string): string {
+	const home = homeDir ?? process.env.HOME ?? process.env.USERPROFILE;
+	if (home && filePath.startsWith(home)) {
+		return `~${filePath.slice(home.length)}`;
+	}
+	return filePath;
+}
+
+export function wrapBrackets(text: string, theme: Theme): string {
+	return `${theme.format.bracketLeft}${text}${theme.format.bracketRight}`;
+}
+
+export function replaceTabs(text: string): string {
+	return text.replace(/\t/g, "   ");
+}
+
 function pluralize(label: string, count: number): string {
 	if (count === 1) return label;
 	if (/(?:ch|sh|s|x|z)$/i.test(label)) return `${label}es`;