@oh-my-pi/pi-coding-agent 4.3.2 → 4.4.5

package/src/core/tools/lsp/render.ts

@@ -128,7 +128,7 @@ function renderHover(
 	// Collapsed view
 	const firstCodeLine = codeLines[0] || "";
 	const hasMore = codeLines.length > 1 || Boolean(afterCode);
-	const expandHint = formatExpandHint(false, hasMore, theme);
+	const expandHint = formatExpandHint(theme, expanded, hasMore);
 
 	let output = `${icon}${langLabel}${expandHint}`;
 	const h = theme.boxSharp.horizontal;
@@ -237,7 +237,10 @@ function renderDiagnostics(
 			}
 			const severityColor = severityToColor(item.severity);
 			const location = formatDiagnosticLocation(item.file, item.line, item.col, theme);
-			output += `\n ${theme.fg("dim", branch)} ${theme.fg(severityColor, location)} ${theme.fg("dim", `[${item.severity}]`)}`;
+			output += `\n ${theme.fg("dim", branch)} ${theme.fg(severityColor, location)} ${theme.fg(
+				"dim",
+				`[${item.severity}]`,
+			)}`;
 			if (item.message) {
 				output += `\n ${theme.fg("dim", detailPrefix)}${theme.fg(
 					"muted",
@@ -253,7 +256,7 @@ function renderDiagnostics(
 		parsedDiagnostics.length > 0 ? parsedDiagnostics.slice(0, 3) : fallbackDiagnostics.slice(0, 3);
 	const remaining =
 		(parsedDiagnostics.length > 0 ? parsedDiagnostics.length : fallbackDiagnostics.length) - previewItems.length;
-	const expandHint = formatExpandHint(false, remaining > 0, theme);
+	const expandHint = formatExpandHint(theme, expanded, remaining > 0);
 	let output = `${icon} ${theme.fg("dim", meta.join(theme.sep.dot))}${expandHint}`;
 	for (let i = 0; i < previewItems.length; i++) {
 		const item = previewItems[i];
@@ -271,7 +274,10 @@ function renderDiagnostics(
 		output += `\n ${theme.fg("dim", branch)} ${theme.fg(severityColor, location)}${message}`;
 	}
 	if (remaining > 0) {
-		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", `${theme.format.ellipsis} ${remaining} more`)}`;
+		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
+			"muted",
+			`${theme.format.ellipsis} ${remaining} more`,
+		)}`;
 	}
 
 	return new Text(output, 0, 0);
@@ -305,7 +311,7 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 	const files = Array.from(byFile.keys());
 
 	const renderGrouped = (maxFiles: number, maxLocsPerFile: number, showHint: boolean): string => {
-		const expandHint = formatExpandHint(false, showHint, theme);
+		const expandHint = formatExpandHint(theme, undefined, showHint);
 		let output = `${icon} ${theme.fg("dim", `${refCount} found`)}${expandHint}`;
 
 		const filesToShow = files.slice(0, maxFiles);
@@ -326,7 +332,10 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 					const isLastLoc = li === locsToShow.length - 1 && locs.length <= maxLocsPerFile;
 					const locBranch = isLastLoc ? theme.tree.last : theme.tree.branch;
 					const locCont = isLastLoc ? "   " : `${theme.tree.vertical}  `;
-					output += `\n ${theme.fg("dim", fileCont)}${theme.fg("dim", locBranch)} ${theme.fg("muted", `line ${line}, col ${col}`)}`;
+					output += `\n ${theme.fg("dim", fileCont)}${theme.fg("dim", locBranch)} ${theme.fg(
+						"muted",
+						`line ${line}, col ${col}`,
+					)}`;
 					if (expanded) {
 						const context = `at ${file}:${line}:${col}`;
 						output += `\n ${theme.fg("dim", fileCont)}${theme.fg("dim", locCont)}${theme.fg(
@@ -345,7 +354,10 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 		}
 
 		if (files.length > maxFiles) {
-			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", formatMoreItems(files.length - maxFiles, "file", theme))}`;
+			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
+				"muted",
+				formatMoreItems(files.length - maxFiles, "file", theme),
+			)}`;
 		}
 
 		return output;
@@ -439,7 +451,7 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 	// Collapsed: show first 3 top-level symbols
 	const topLevel = symbols.filter((s) => s.indent === 0).slice(0, 3);
 	const hasMoreSymbols = symbols.length > topLevel.length;
-	const expandHint = formatExpandHint(false, hasMoreSymbols, theme);
+	const expandHint = formatExpandHint(theme, expanded, hasMoreSymbols);
 	let output = `${icon} ${theme.fg("dim", `in ${fileName}`)}${expandHint}`;
 	for (let i = 0; i < topLevel.length; i++) {
 		const sym = topLevel[i];
@@ -451,7 +463,10 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 		)}`;
 	}
 	if (topLevelCount > 3) {
-		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", `${theme.format.ellipsis} ${topLevelCount - 3} more`)}`;
+		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
+			"muted",
+			`${theme.format.ellipsis} ${topLevelCount - 3} more`,
+		)}`;
 	}
 
 	return new Text(output, 0, 0);
@@ -486,8 +501,11 @@ function renderGeneric(text: string, lines: string[], expanded: boolean, theme:
 	}
 
 	const firstLine = lines[0] || "No output";
-	const expandHint = formatExpandHint(false, lines.length > 1, theme);
-	let output = `${icon} ${theme.fg("dim", truncate(firstLine, TRUNCATE_LENGTHS.TITLE, theme.format.ellipsis))}${expandHint}`;
+	const expandHint = formatExpandHint(theme, expanded, lines.length > 1);
+	let output = `${icon} ${theme.fg(
+		"dim",
+		truncate(firstLine, TRUNCATE_LENGTHS.TITLE, theme.format.ellipsis),
+	)}${expandHint}`;
 
 	if (lines.length > 1) {
 		const previewLines = lines.slice(1, 4);
@@ -500,7 +518,10 @@ function renderGeneric(text: string, lines: string[], expanded: boolean, theme:
 			)}`;
 		}
 		if (lines.length > 4) {
-			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", formatMoreItems(lines.length - 4, "line", theme))}`;
+			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
+				"muted",
+				formatMoreItems(lines.length - 4, "line", theme),
+			)}`;
 		}
 	}
 

package/src/core/tools/notebook.ts

@@ -278,7 +278,7 @@ export const notebookToolRenderer = {
 		if (totalCells !== undefined) summaryParts.push(`${totalCells} total`);
 		const summaryText = summaryParts.join(uiTheme.sep.dot);
 
-		const expandHint = formatExpandHint(expanded, canExpand, uiTheme);
+		const expandHint = expanded || !canExpand ? "" : formatExpandHint(uiTheme);
 		let text = `${icon} ${uiTheme.fg("dim", summaryText)}${expandHint}`;
 
 		if (cellSource) {

package/src/core/tools/output.ts

@@ -470,7 +470,7 @@ export const outputToolRenderer = {
 		const maxOutputs = expanded ? outputs.length : Math.min(outputs.length, 5);
 		const hasMoreOutputs = outputs.length > maxOutputs;
 		const hasMorePreview = outputs.some((o) => (o.previewLines?.length ?? 0) > previewLimit);
-		const expandHint = formatExpandHint(expanded, hasMoreOutputs || hasMorePreview, uiTheme);
+		const expandHint = formatExpandHint(uiTheme, expanded, hasMoreOutputs || hasMorePreview);
 		let text = `${icon} ${uiTheme.fg("dim", summary)}${expandHint}`;
 
 		for (let i = 0; i < maxOutputs; i++) {

package/src/core/tools/read.ts

@@ -6,7 +6,7 @@ import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
 import { CONFIG_DIR_NAME } from "../../config";
-import { getLanguageFromPath, highlightCode, type Theme } from "../../modes/interactive/theme/theme";
+import 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";
@@ -17,7 +17,7 @@ import type { ToolSession } from "../sdk";
 import { ScopeSignal, untilAborted } from "../utils";
 import { createLsTool } from "./ls";
 import { resolveReadPath, resolveToCwd } from "./path-utils";
-import { replaceTabs, shortenPath, wrapBrackets } from "./render-utils";
+import { shortenPath, wrapBrackets } from "./render-utils";
 import {
 	DEFAULT_MAX_BYTES,
 	DEFAULT_MAX_LINES,
@@ -657,17 +657,6 @@ interface ReadRenderArgs {
 	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 || "";
@@ -688,49 +677,26 @@ export const readToolRenderer = {
 
 	renderResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: ReadToolDetails },
-		{ expanded }: RenderResultOptions,
+		_options: RenderResultOptions,
 		uiTheme: Theme,
-		args?: ReadRenderArgs,
+		_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`));
-			}
+		lines.push(uiTheme.fg("dim", "Content hidden"));
 
-			// 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)));
+		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

@@ -41,7 +41,7 @@ export const TRUNCATE_LENGTHS = {
 } as const;
 
 /** Standard expand hint text */
-export const EXPAND_HINT = "(Ctrl+O to expand)";
+export const EXPAND_HINT = "(Ctrl+O for more)";
 
 // =============================================================================
 // Text Truncation Utilities
@@ -148,7 +148,7 @@ export function formatAge(ageSeconds: number | null | undefined): string {
  * Get the appropriate status icon with color for a given state.
  * Standardizes status icon usage across all renderers.
  */
-export function getStyledStatusIcon(status: ToolUIStatus, theme: Theme, spinnerFrame?: number): string {
+export function formatStatusIcon(status: ToolUIStatus, theme: Theme, spinnerFrame?: number): string {
 	switch (status) {
 		case "success":
 			return theme.styledSymbol("status.success", "success");
@@ -175,8 +175,10 @@ export function getStyledStatusIcon(status: ToolUIStatus, theme: Theme, spinnerF
  * Format the expand hint with proper theming.
  * Returns empty string if already expanded or there is nothing more to show.
  */
-export function formatExpandHint(expanded: boolean, hasMore: boolean, theme: Theme): string {
-	return !expanded && hasMore ? theme.fg("dim", ` ${EXPAND_HINT}`) : "";
+export function formatExpandHint(theme: Theme, expanded?: boolean, hasMore?: boolean): string {
+	if (expanded) return "";
+	if (hasMore === false) return "";
+	return theme.fg("dim", wrapBrackets(EXPAND_HINT, theme));
 }
 
 /**
@@ -267,13 +269,13 @@ export function createToolUIKit(theme: Theme): ToolUIKit {
 		meta: (meta) => formatMeta(meta, theme),
 		count: (label, count) => formatCount(label, count),
 		moreItems: (remaining, itemType) => formatMoreItems(remaining, itemType, theme),
-		expandHint: (expanded, hasMore) => formatExpandHint(expanded, hasMore, theme),
+		expandHint: (expanded, hasMore) => formatExpandHint(theme, expanded, hasMore),
 		scope: (scopePath) => formatScope(scopePath, theme),
 		truncationSuffix: (truncated) => formatTruncationSuffix(truncated, theme),
 		errorMessage: (message) => formatErrorMessage(message, theme),
 		emptyMessage: (message) => formatEmptyMessage(message, theme),
 		badge: (label, color) => formatBadge(label, color, theme),
-		statusIcon: (status, spinnerFrame) => getStyledStatusIcon(status, theme, spinnerFrame),
+		statusIcon: (status, spinnerFrame) => formatStatusIcon(status, theme, spinnerFrame),
 		wrapBrackets: (text) => wrapBrackets(text, theme),
 		truncate: (text, maxLen) => truncate(text, maxLen, theme.format.ellipsis),
 		previewLines: (text, maxLines, maxLineLen) => getPreviewLines(text, maxLines, maxLineLen, theme.format.ellipsis),
@@ -342,26 +344,56 @@ export function formatDiagnostics(
 	let output = `\n\n${headerIcon} ${theme.fg("toolTitle", "Diagnostics")} ${theme.fg("dim", `(${diag.summary})`)}`;
 
 	const maxDiags = expanded ? diag.messages.length : 5;
-	let shown = 0;
+	let diagsShown = 0;
 
 	const files = Array.from(byFile.entries());
-	for (let fi = 0; fi < files.length && shown < maxDiags; fi++) {
+
+	// Count total diagnostics for "... X more" calculation
+	const totalParsedDiags = files.reduce((sum, [, diags]) => sum + diags.length, 0);
+	const totalDiags = totalParsedDiags + unparsed.length;
+
+	// Helper to check if this is the very last item in the tree
+	const isTreeEnd = (fileIdx: number, diagIdx: number | null, unparsedIdx: number | null): boolean => {
+		const willShowMore = totalDiags > diagsShown + 1;
+		if (willShowMore) return false;
+
+		if (unparsedIdx !== null) {
+			return unparsedIdx === unparsed.length - 1;
+		}
+		if (diagIdx !== null) {
+			const isLastDiagInFile = diagIdx === files[fileIdx][1].length - 1;
+			const isLastFile = fileIdx === files.length - 1;
+			return isLastDiagInFile && isLastFile && unparsed.length === 0;
+		}
+		// File node - never the tree end if it has diagnostics
+		return false;
+	};
+
+	for (let fi = 0; fi < files.length && diagsShown < 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;
+		// File is "last" only if no more files AND no unparsed AND we'll show all diags AND no "... X more"
+		const remainingDiagsInFile = diagnostics.length;
+		const remainingDiagsAfter = files.slice(fi + 1).reduce((sum, [, d]) => sum + d.length, 0) + unparsed.length;
+		const willShowAllRemaining = diagsShown + remainingDiagsInFile + remainingDiagsAfter <= maxDiags;
+		const isLastFileNode = fi === files.length - 1 && unparsed.length === 0 && willShowAllRemaining;
+		const fileBranch = isLastFileNode ? 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++) {
+		for (let di = 0; di < diagnostics.length && diagsShown < maxDiags; di++) {
 			const d = diagnostics[di];
-			const isLastDiag = di === diagnostics.length - 1;
-			const diagBranch = isLastFile
-				? isLastDiag
+			const isLastDiagInFile = di === diagnostics.length - 1;
+			// This is the last visible diag in file if it's actually last OR we're about to hit the limit
+			const atDisplayLimit = diagsShown + 1 >= maxDiags;
+			const isLastVisibleInFile = isLastDiagInFile || atDisplayLimit;
+			// Check if this is the last visible item in the entire tree
+			const isVeryLast = isTreeEnd(fi, di, null);
+			const diagBranch = isLastFileNode
+				? isLastVisibleInFile || isVeryLast
 					? `  ${theme.tree.last}`
 					: `  ${theme.tree.branch}`
-				: isLastDiag
+				: isLastVisibleInFile || isVeryLast
 					? `${theme.tree.vertical} ${theme.tree.last}`
 					: `${theme.tree.vertical} ${theme.tree.branch}`;
 
@@ -376,20 +408,25 @@ export function formatDiagnostics(
 			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++;
+			diagsShown++;
 		}
 	}
 
-	for (const msg of unparsed) {
-		if (shown >= maxDiags) break;
+	for (let ui = 0; ui < unparsed.length && diagsShown < maxDiags; ui++) {
+		const msg = unparsed[ui];
+		const isVeryLast = isTreeEnd(-1, null, ui);
+		const branch = isVeryLast ? theme.tree.last : theme.tree.branch;
 		const color = msg.includes("[error]") ? "error" : msg.includes("[warning]") ? "warning" : "dim";
-		output += `\n ${theme.fg("dim", theme.tree.branch)} ${theme.fg(color, msg)}`;
-		shown++;
+		output += `\n ${theme.fg("dim", branch)} ${theme.fg(color, msg)}`;
+		diagsShown++;
 	}
 
-	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)")}`;
+	if (totalDiags > diagsShown) {
+		const remaining = totalDiags - diagsShown;
+		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
+			"muted",
+			`${theme.format.ellipsis} ${remaining} more`,
+		)} ${formatExpandHint(theme)}`;
 	}
 
 	return output;

package/src/core/tools/renderers.ts

@@ -20,6 +20,7 @@ import { outputToolRenderer } from "./output";
 import { readToolRenderer } from "./read";
 import { sshToolRenderer } from "./ssh";
 import { taskToolRenderer } from "./task/render";
+import { todoWriteToolRenderer } from "./todo-write";
 import { webFetchToolRenderer } from "./web-fetch";
 import { webSearchToolRenderer } from "./web-search/render";
 import { writeToolRenderer } from "./write";
@@ -49,6 +50,7 @@ export const toolRenderers: Record<string, ToolRenderer> = {
 	read: readToolRenderer as ToolRenderer,
 	ssh: sshToolRenderer as ToolRenderer,
 	task: taskToolRenderer as ToolRenderer,
+	todo_write: todoWriteToolRenderer as ToolRenderer,
 	web_fetch: webFetchToolRenderer as ToolRenderer,
 	web_search: webSearchToolRenderer as ToolRenderer,
 	write: writeToolRenderer as ToolRenderer,