@oh-my-pi/pi-coding-agent 8.0.20 → 8.2.0

package/src/tools/ls.ts

@@ -1,14 +1,14 @@
 import nodePath from "node:path";
 import type { AgentTool, AgentToolResult } from "@oh-my-pi/pi-agent-core";
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { getLanguageFromPath, type Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { OutputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
-import { ToolError, throwIfAborted } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
 import { type Component, Text } from "@oh-my-pi/pi-tui";
 import { untilAborted } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
-import type { ToolSession } from "./index";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import type { Theme } from "../modes/theme/theme";
+import { renderFileList, renderStatusLine } from "../tui";
+import type { ToolSession } from ".";
 import { applyListLimit } from "./list-limit";
+import type { OutputMeta } from "./output-meta";
 import { resolveToCwd } from "./path-utils";
 import {
 	formatAge,
@@ -16,12 +16,9 @@ import {
 	formatCount,
 	formatEmptyMessage,
 	formatErrorMessage,
-	formatExpandHint,
-	formatMeta,
-	formatMoreItems,
-	formatTruncationSuffix,
 	PREVIEW_LIMITS,
 } from "./render-utils";
+import { ToolError, throwIfAborted } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { type TruncationResult, truncateHead } from "./truncate";
 
@@ -214,13 +211,9 @@ const COLLAPSED_LIST_LIMIT = PREVIEW_LIMITS.COLLAPSED_ITEMS;
 export const lsToolRenderer = {
 	inline: true,
 	renderCall(args: LsRenderArgs, uiTheme: Theme): Component {
-		const label = uiTheme.fg("toolTitle", uiTheme.bold("Ls"));
-		let text = `${uiTheme.format.bullet} ${label} ${uiTheme.fg("accent", args.path || ".")}`;
-
 		const meta: string[] = [];
 		if (args.limit !== undefined) meta.push(`limit:${args.limit}`);
-		text += formatMeta(meta, uiTheme);
-
+		const text = renderStatusLine({ icon: "pending", title: "Ls", description: args.path || ".", meta }, uiTheme);
 		return new Text(text, 0, 0);
 	},
 
@@ -228,31 +221,35 @@ export const lsToolRenderer = {
 		result: { content: Array<{ type: string; text?: string }>; details?: LsToolDetails; isError?: boolean },
 		{ expanded }: RenderResultOptions,
 		uiTheme: Theme,
+		args?: LsRenderArgs,
 	): Component {
 		const details = result.details;
-		const textContent = result.content?.find((c) => c.type === "text")?.text ?? "";
+		const textContent = result.content?.find(c => c.type === "text")?.text ?? "";
 
 		if (result.isError) {
-			return new Text(`  ${formatErrorMessage(textContent, uiTheme)}`, 0, 0);
+			const header = renderStatusLine({ icon: "error", title: "Ls", description: args?.path || "." }, uiTheme);
+			return new Text([header, formatErrorMessage(textContent, uiTheme)].join("\n"), 0, 0);
 		}
 
 		if (
 			(!textContent || textContent.trim() === "" || textContent.trim() === "(empty directory)") &&
 			(!details?.entries || details.entries.length === 0)
 		) {
-			return new Text(`  ${formatEmptyMessage("Empty directory", uiTheme)}`, 0, 0);
+			const header = renderStatusLine({ icon: "warning", title: "Ls", description: args?.path || "." }, uiTheme);
+			return new Text([header, formatEmptyMessage("Empty directory", uiTheme)].join("\n"), 0, 0);
 		}
 
 		let entries: string[] = details?.entries ? [...details.entries] : [];
 		let rawEntries: string[] | undefined = details?.rawEntries;
 		if (entries.length === 0) {
 			const rawLines = textContent.split("\n").filter((l: string) => l.trim());
-			entries = rawLines.filter((line) => !/^\[.*\]$/.test(line.trim()));
+			entries = rawLines.filter(line => !/^\[.*\]$/.test(line.trim()));
 			rawEntries = undefined; // Can't reliably extract raw paths from text
 		}
 
 		if (entries.length === 0) {
-			return new Text(`  ${formatEmptyMessage("Empty directory", uiTheme)}`, 0, 0);
+			const header = renderStatusLine({ icon: "warning", title: "Ls", description: args?.path || "." }, uiTheme);
+			return new Text([header, formatEmptyMessage("Empty directory", uiTheme)].join("\n"), 0, 0);
 		}
 
 		let dirCount = details?.dirCount;
@@ -260,8 +257,11 @@ export const lsToolRenderer = {
 		if (dirCount === undefined || fileCount === undefined) {
 			dirCount = 0;
 			fileCount = 0;
-			for (const entry of entries) {
-				if (entry.endsWith("/")) {
+			for (let i = 0; i < entries.length; i++) {
+				const entry = entries[i];
+				const raw = rawEntries?.[i] ?? entry;
+				const name = raw.split(" (")[0];
+				if (name.endsWith("/")) {
 					dirCount += 1;
 				} else {
 					fileCount += 1;
@@ -272,62 +272,36 @@ export const lsToolRenderer = {
 		const truncation = details?.meta?.truncation;
 		const limits = details?.meta?.limits;
 		const truncated = Boolean(details?.entryLimitReached || truncation || limits?.resultLimit || limits?.headLimit);
-		const icon = truncated
-			? uiTheme.styledSymbol("status.warning", "warning")
-			: uiTheme.styledSymbol("status.success", "success");
-
 		const summaryText = [formatCount("dir", dirCount ?? 0), formatCount("file", fileCount ?? 0)].join(
 			uiTheme.sep.dot,
 		);
-		const maxEntries = expanded ? entries.length : Math.min(entries.length, COLLAPSED_LIST_LIMIT);
-		const hasMoreEntries = entries.length > maxEntries;
-		const expandHint = formatExpandHint(uiTheme, expanded, hasMoreEntries);
+		const meta = truncated ? [summaryText, uiTheme.fg("warning", "truncated")] : [summaryText];
+		const header = renderStatusLine(
+			{ icon: truncated ? "warning" : "success", title: "Ls", description: args?.path || ".", meta },
+			uiTheme,
+		);
 
-		let text = `  ${icon} ${uiTheme.fg("dim", summaryText)}${formatTruncationSuffix(truncated, uiTheme)}${expandHint}`;
+		const fileLines = renderFileList(
+			{
+				files: entries.map((entry, index) => ({
+					path: entry,
+					isDirectory: (rawEntries?.[index] ?? entry).endsWith("/"),
+				})),
+				expanded,
+				maxCollapsed: COLLAPSED_LIST_LIMIT,
+			},
+			uiTheme,
+		);
 
 		const truncationReasons: string[] = [];
-		if (limits?.resultLimit) {
-			truncationReasons.push(`entry limit ${limits.resultLimit.reached}`);
-		}
-		if (truncation) {
-			truncationReasons.push(`output cap ${formatBytes(truncation.outputBytes)}`);
-		}
-		if (truncation?.artifactId) {
-			truncationReasons.push(`full output: artifact://${truncation.artifactId}`);
-		}
-
-		const hasTruncation = truncationReasons.length > 0;
-
-		for (let i = 0; i < maxEntries; i++) {
-			const entry = entries[i];
-			const rawEntry = rawEntries?.[i] ?? entry;
-			const isLast = i === maxEntries - 1 && !hasMoreEntries && !hasTruncation;
-			const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-			const isDir = rawEntry.endsWith("/");
-			const entryPath = isDir ? rawEntry.slice(0, -1) : rawEntry;
-			const lang = isDir ? undefined : getLanguageFromPath(entryPath);
-			const entryIcon = isDir
-				? uiTheme.fg("accent", uiTheme.icon.folder)
-				: uiTheme.fg("muted", uiTheme.getLangIcon(lang));
-			const entryColor = isDir ? "accent" : "toolOutput";
-			text += `\n  ${uiTheme.fg("dim", branch)} ${entryIcon} ${uiTheme.fg(entryColor, entry)}`;
-		}
+		if (limits?.resultLimit) truncationReasons.push(`entry limit ${limits.resultLimit.reached}`);
+		if (truncation) truncationReasons.push(`output cap ${formatBytes(truncation.outputBytes)}`);
+		if (truncation?.artifactId) truncationReasons.push(`full output: artifact://${truncation.artifactId}`);
 
-		if (hasMoreEntries) {
-			const moreEntriesBranch = hasTruncation ? uiTheme.tree.branch : uiTheme.tree.last;
-			text += `\n  ${uiTheme.fg("dim", moreEntriesBranch)} ${uiTheme.fg(
-				"muted",
-				formatMoreItems(entries.length - maxEntries, "entry", uiTheme),
-			)}`;
-		}
+		const extraLines =
+			truncationReasons.length > 0 ? [uiTheme.fg("warning", `truncated: ${truncationReasons.join(", ")}`)] : [];
 
-		if (hasTruncation) {
-			text += `\n  ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg(
-				"warning",
-				`truncated: ${truncationReasons.join(", ")}`,
-			)}`;
-		}
-
-		return new Text(text, 0, 0);
+		return new Text([header, ...fileLines, ...extraLines].join("\n"), 0, 0);
 	},
+	mergeCallAndResult: true,
 };

package/src/tools/notebook.ts

@@ -1,21 +1,15 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { ToolSession } from "@oh-my-pi/pi-coding-agent/sdk";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import type { Theme } from "../modes/theme/theme";
+import type { ToolSession } from "../sdk";
+import { renderCodeCell, renderStatusLine } from "../tui";
 import { resolveToCwd } from "./path-utils";
-import {
-	formatCount,
-	formatErrorMessage,
-	formatExpandHint,
-	formatMeta,
-	formatMoreItems,
-	PREVIEW_LIMITS,
-} from "./render-utils";
+import { formatCount, formatErrorMessage, PREVIEW_LIMITS } from "./render-utils";
 
 const notebookSchema = Type.Object({
 	action: StringEnum(["edit", "insert", "delete"], {
@@ -200,57 +194,31 @@ export class NotebookTool implements AgentTool<typeof notebookSchema, NotebookTo
 
 interface NotebookRenderArgs {
 	action: string;
-	notebookPath: string;
+	notebookPath?: string;
+	notebook_path?: string;
 	cellNumber?: number;
+	cell_index?: number;
 	cellType?: string;
+	cell_type?: string;
 	content?: string;
 }
 
 const COLLAPSED_TEXT_LIMIT = PREVIEW_LIMITS.COLLAPSED_LINES * 2;
 
-function normalizeCellLines(lines: string[]): string[] {
-	return lines.map((line) => (line.endsWith("\n") ? line.slice(0, -1) : line));
-}
-
-function renderCellPreview(lines: string[], expanded: boolean, uiTheme: Theme): string {
-	const normalized = normalizeCellLines(lines);
-	if (normalized.length === 0) {
-		return `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", "(empty cell)")}`;
-	}
-
-	const maxLines = expanded ? normalized.length : Math.min(normalized.length, COLLAPSED_TEXT_LIMIT);
-	let text = "";
-
-	for (let i = 0; i < maxLines; i++) {
-		const isLast = i === maxLines - 1 && (expanded || normalized.length <= maxLines);
-		const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-		const line = normalized[i];
-		text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg("toolOutput", line)}`;
-	}
-
-	const remaining = normalized.length - maxLines;
-	if (remaining > 0) {
-		text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg(
-			"muted",
-			formatMoreItems(remaining, "line", uiTheme),
-		)}`;
-	}
-
-	return text;
-}
-
 export const notebookToolRenderer = {
 	renderCall(args: NotebookRenderArgs, uiTheme: Theme): Component {
-		const label = uiTheme.fg("toolTitle", uiTheme.bold("Notebook"));
-		let text = `${label} ${uiTheme.fg("accent", args.action || "?")}`;
-
 		const meta: string[] = [];
-		meta.push(`in ${args.notebookPath || "?"}`);
-		if (args.cellNumber !== undefined) meta.push(`cell:${args.cellNumber}`);
-		if (args.cellType) meta.push(`type:${args.cellType}`);
-
-		text += formatMeta(meta, uiTheme);
-
+		const notebookPath = args.notebookPath ?? args.notebook_path;
+		const cellNumber = args.cellNumber ?? args.cell_index;
+		const cellType = args.cellType ?? args.cell_type;
+		meta.push(`in ${notebookPath || "?"}`);
+		if (cellNumber !== undefined) meta.push(`cell:${cellNumber}`);
+		if (cellType) meta.push(`type:${cellType}`);
+
+		const text = renderStatusLine(
+			{ icon: "pending", title: "Notebook", description: args.action || "?", meta },
+			uiTheme,
+		);
 		return new Text(text, 0, 0);
 	},
 
@@ -258,10 +226,13 @@ export const notebookToolRenderer = {
 		result: { content: Array<{ type: string; text?: string }>; details?: NotebookToolDetails },
 		{ expanded }: RenderResultOptions,
 		uiTheme: Theme,
+		args?: NotebookRenderArgs,
 	): Component {
 		const content = result.content?.[0];
 		if (content?.type === "text" && content.text?.startsWith("Error:")) {
-			return new Text(formatErrorMessage(content.text, uiTheme), 0, 0);
+			const notebookPath = args?.notebookPath ?? args?.notebook_path ?? "?";
+			const header = renderStatusLine({ icon: "error", title: "Notebook", description: notebookPath }, uiTheme);
+			return new Text([header, formatErrorMessage(content.text, uiTheme)].join("\n"), 0, 0);
 		}
 
 		const details = result.details;
@@ -269,25 +240,38 @@ export const notebookToolRenderer = {
 		const cellIndex = details?.cellIndex;
 		const cellType = details?.cellType;
 		const totalCells = details?.totalCells;
-		const cellSource = details?.cellSource;
-		const lineCount = cellSource?.length;
-		const canExpand = cellSource !== undefined && cellSource.length > COLLAPSED_TEXT_LIMIT;
+		const cellSource = details?.cellSource ?? [];
+		const lineCount = cellSource.length;
 
-		const icon = uiTheme.styledSymbol("status.success", "success");
 		const actionLabel = action === "insert" ? "Inserted" : action === "delete" ? "Deleted" : "Edited";
 		const cellLabel = cellType || "cell";
-		const summaryParts = [`${actionLabel} ${cellLabel} at index ${cellIndex ?? "?"}`];
-		if (lineCount !== undefined) summaryParts.push(formatCount("line", lineCount));
+		const summaryParts = [`${actionLabel} ${cellLabel} ${cellIndex ?? "?"}`];
+		if (lineCount > 0) summaryParts.push(formatCount("line", lineCount));
 		if (totalCells !== undefined) summaryParts.push(`${totalCells} total`);
-		const summaryText = summaryParts.join(uiTheme.sep.dot);
 
-		const expandHint = expanded || !canExpand ? "" : formatExpandHint(uiTheme);
-		let text = `${icon} ${uiTheme.fg("dim", summaryText)}${expandHint}`;
+		const outputLines = summaryParts.map(part => uiTheme.fg("dim", part));
+		const codeText = cellSource.join("");
+		const language = cellType === "markdown" ? "markdown" : undefined;
 
-		if (cellSource) {
-			text += renderCellPreview(cellSource, expanded, uiTheme);
-		}
-
-		return new Text(text, 0, 0);
+		const notebookPath = args?.notebookPath ?? args?.notebook_path;
+		const notebookLabel = notebookPath ? `${actionLabel} ${notebookPath}` : "Notebook";
+		return {
+			render: (width: number) =>
+				renderCodeCell(
+					{
+						code: codeText,
+						language,
+						title: notebookLabel,
+						status: "complete",
+						output: outputLines.join("\n"),
+						codeMaxLines: expanded ? Number.POSITIVE_INFINITY : COLLAPSED_TEXT_LIMIT,
+						expanded,
+						width,
+					},
+					uiTheme,
+				),
+			invalidate: () => {},
+		};
 	},
+	mergeCallAndResult: true,
 };

package/src/tools/output-meta.ts

@@ -4,13 +4,12 @@
  * Tools populate details.meta using the fluent OutputMetaBuilder.
  * The tool wrapper automatically formats and appends notices at message boundary.
  */
-
 import type { AgentTool, AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
-import type { OutputSummary } from "@oh-my-pi/pi-coding-agent/session/streaming-output";
-import type { TruncationResult } from "@oh-my-pi/pi-coding-agent/tools/truncate";
-import { formatSize } from "@oh-my-pi/pi-coding-agent/tools/truncate";
+import type { OutputSummary } from "../session/streaming-output";
 import { renderError } from "./tool-errors";
+import type { TruncationResult } from "./truncate";
+import { formatSize } from "./truncate";
 
 /**
  * Truncation metadata for the output notice.

package/src/tools/output-utils.ts

@@ -1,5 +1,5 @@
-import { ArtifactManager } from "@oh-my-pi/pi-coding-agent/session/artifacts";
-import type { ToolSession } from "./index";
+import { ArtifactManager } from "../session/artifacts";
+import type { ToolSession } from ".";
 
 export interface TailBuffer {
 	append(chunk: string): void;

package/src/tools/path-utils.ts

@@ -1,6 +1,6 @@
-import { accessSync, constants } from "node:fs";
+import * as fs from "node:fs";
 import * as os from "node:os";
-import { isAbsolute, resolve as resolvePath } from "node:path";
+import * as path from "node:path";
 
 const UNICODE_SPACES = /[\u00A0\u2000-\u200A\u202F\u205F\u3000]/g;
 const NARROW_NO_BREAK_SPACE = "\u202F";
@@ -15,7 +15,7 @@ function tryMacOSScreenshotPath(filePath: string): string {
 
 function fileExists(filePath: string): boolean {
 	try {
-		accessSync(filePath, constants.F_OK);
+		fs.accessSync(filePath, fs.constants.F_OK);
 		return true;
 	} catch {
 		return false;
@@ -39,10 +39,10 @@ export function expandPath(filePath: string): string {
  */
 export function resolveToCwd(filePath: string, cwd: string): string {
 	const expanded = expandPath(filePath);
-	if (isAbsolute(expanded)) {
+	if (path.isAbsolute(expanded)) {
 		return expanded;
 	}
-	return resolvePath(cwd, expanded);
+	return path.resolve(cwd, expanded);
 }
 
 export function resolveReadPath(filePath: string, cwd: string): string {