@oh-my-pi/pi-coding-agent 8.0.16 → 8.1.0

package/src/tools/ls.ts

@@ -1,13 +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 { 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 { renderFileList, renderStatusLine } from "@oh-my-pi/pi-coding-agent/tui";
 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 { ToolSession } from ".";
 import { applyListLimit } from "./list-limit";
 import { resolveToCwd } from "./path-utils";
 import {
@@ -16,10 +17,6 @@ import {
 	formatCount,
 	formatEmptyMessage,
 	formatErrorMessage,
-	formatExpandHint,
-	formatMeta,
-	formatMoreItems,
-	formatTruncationSuffix,
 	PREVIEW_LIMITS,
 } from "./render-utils";
 import { toolResult } from "./tool-result";
@@ -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,19 +221,22 @@ 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 ?? "";
 
 		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] : [];
@@ -252,7 +248,8 @@ export const lsToolRenderer = {
 		}
 
 		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

@@ -3,19 +3,13 @@ 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 { renderCodeCell, renderStatusLine } from "@oh-my-pi/pi-coding-agent/tui";
 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 { 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-utils.ts

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

package/src/tools/python.ts

@@ -6,18 +6,19 @@ import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibilit
 import { executePython, getPreludeDocs, type PythonExecutorOptions } from "@oh-my-pi/pi-coding-agent/ipy/executor";
 import type { PreludeHelper, PythonStatusEvent } from "@oh-my-pi/pi-coding-agent/ipy/kernel";
 import { truncateToVisualLines } from "@oh-my-pi/pi-coding-agent/modes/components/visual-truncate";
-import { highlightCode, type Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import pythonDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/python.md" with { type: "text" };
 import { OutputSink, type OutputSummary } from "@oh-my-pi/pi-coding-agent/session/streaming-output";
 import type { OutputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
 import { ToolAbortError, ToolError } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
+import { getTreeBranch, getTreeContinuePrefix, renderCodeCell } from "@oh-my-pi/pi-coding-agent/tui";
 import type { Component } from "@oh-my-pi/pi-tui";
-import { Text, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
+import { Text, truncateToWidth } from "@oh-my-pi/pi-tui";
 import { type Static, Type } from "@sinclair/typebox";
-import type { ToolSession } from "./index";
+import type { ToolSession } from ".";
 import { allocateOutputArtifact, createTailBuffer } from "./output-utils";
 import { resolveToCwd } from "./path-utils";
-import { getTreeBranch, getTreeContinuePrefix, shortenPath, ToolUIKit, truncate } from "./render-utils";
+import { shortenPath, ToolUIKit, truncate } from "./render-utils";
 import { toolResult } from "./tool-result";
 import { DEFAULT_MAX_BYTES } from "./truncate";
 
@@ -740,56 +741,6 @@ function renderStatusEvents(events: PythonStatusEvent[], theme: Theme, expanded:
 	return lines;
 }
 
-function applyCellBackground(line: string, width: number, bgFn?: (text: string) => string): string {
-	if (!bgFn) return line;
-	if (width <= 0) return bgFn(line);
-	const paddingNeeded = Math.max(0, width - visibleWidth(line));
-	const padded = line + " ".repeat(paddingNeeded);
-	return bgFn(padded);
-}
-
-function highlightPythonCode(code?: string): string[] {
-	return highlightCode(code ?? "", "python");
-}
-
-function formatCellStatus(cell: PythonCellResult, ui: ToolUIKit, spinnerFrame?: number): string | undefined {
-	switch (cell.status) {
-		case "pending":
-			return `${ui.statusIcon("pending")} ${ui.theme.fg("muted", "pending")}`;
-		case "running":
-			return `${ui.statusIcon("running", spinnerFrame)} ${ui.theme.fg("muted", "running")}`;
-		case "complete":
-			return ui.statusIcon("success");
-		case "error":
-			return ui.statusIcon("error");
-	}
-}
-
-function formatCellHeader(
-	cell: PythonCellResult,
-	index: number,
-	total: number,
-	ui: ToolUIKit,
-	spinnerFrame?: number,
-	workdirLabel?: string,
-): string {
-	const indexLabel = ui.theme.fg("accent", `[${index + 1}/${total}]`);
-	const title = cell.title ? ` ${cell.title}` : "";
-	const metaParts: string[] = [];
-	if (workdirLabel) {
-		metaParts.push(ui.theme.fg("dim", workdirLabel));
-	}
-	if (cell.durationMs !== undefined) {
-		metaParts.push(ui.theme.fg("dim", `(${ui.formatDuration(cell.durationMs)})`));
-	}
-	const statusLabel = formatCellStatus(cell, ui, spinnerFrame);
-	if (statusLabel) {
-		metaParts.push(statusLabel);
-	}
-	const meta = metaParts.length > 0 ? ` ${metaParts.join(ui.theme.fg("dim", ui.theme.sep.dot))}` : "";
-	return `${indexLabel}${title}${meta}`;
-}
-
 function formatCellOutputLines(
 	cell: PythonCellResult,
 	expanded: boolean,
@@ -808,101 +759,6 @@ function formatCellOutputLines(
 	return { lines: outputLines, hiddenCount };
 }
 
-function renderCellBlock(
-	cell: PythonCellResult,
-	index: number,
-	total: number,
-	ui: ToolUIKit,
-	options: {
-		expanded: boolean;
-		previewLines: number;
-		spinnerFrame?: number;
-		showOutput: boolean;
-		workdirLabel?: string;
-		width: number;
-		bgFn?: (text: string) => string;
-	},
-): string[] {
-	const { expanded, previewLines, spinnerFrame, showOutput, workdirLabel, width, bgFn } = options;
-	const h = ui.theme.boxSharp.horizontal;
-	const v = ui.theme.boxSharp.vertical;
-	const cap = h.repeat(3);
-	const border = (text: string) => ui.theme.fg("dim", text);
-	const lineWidth = Math.max(0, width);
-
-	const buildBarLine = (leftChar: string, label?: string): string => {
-		const left = border(`${leftChar}${cap}`);
-		if (lineWidth <= 0) return left;
-		const rawLabel = label ? ` ${label} ` : " ";
-		const maxLabelWidth = Math.max(0, lineWidth - visibleWidth(left));
-		const trimmedLabel = truncateToWidth(rawLabel, maxLabelWidth, ui.theme.format.ellipsis);
-		const fillCount = Math.max(0, lineWidth - visibleWidth(left + trimmedLabel));
-		return `${left}${trimmedLabel}${border(h.repeat(fillCount))}`;
-	};
-
-	const lines: string[] = [];
-	lines.push(
-		applyCellBackground(
-			buildBarLine(ui.theme.boxSharp.topLeft, formatCellHeader(cell, index, total, ui, spinnerFrame, workdirLabel)),
-			lineWidth,
-			bgFn,
-		),
-	);
-
-	const codePrefix = border(`${v} `);
-	const codeWidth = Math.max(0, lineWidth - visibleWidth(codePrefix));
-	const codeLines = highlightPythonCode(cell.code);
-	for (const line of codeLines) {
-		const text = truncateToWidth(line, codeWidth, ui.theme.format.ellipsis);
-		lines.push(applyCellBackground(`${codePrefix}${text}`, lineWidth, bgFn));
-	}
-
-	const statusLines = renderStatusEvents(cell.statusEvents ?? [], ui.theme, expanded);
-	const outputContent = formatCellOutputLines(cell, expanded, previewLines, ui.theme);
-	const hasOutput = outputContent.lines.length > 0;
-	const hasStatus = statusLines.length > 0;
-	const showOutputSection = showOutput && (hasOutput || hasStatus);
-
-	if (showOutputSection) {
-		lines.push(
-			applyCellBackground(
-				buildBarLine(ui.theme.boxSharp.teeRight, ui.theme.fg("toolTitle", "Output")),
-				lineWidth,
-				bgFn,
-			),
-		);
-
-		for (const line of outputContent.lines) {
-			const text = truncateToWidth(line, codeWidth, ui.theme.format.ellipsis);
-			lines.push(applyCellBackground(`${codePrefix}${text}`, lineWidth, bgFn));
-		}
-		if (!expanded && outputContent.hiddenCount > 0) {
-			const hint = ui.theme.fg(
-				"dim",
-				`${ui.theme.format.ellipsis} ${outputContent.hiddenCount} more lines (ctrl+o to expand)`,
-			);
-			lines.push(
-				applyCellBackground(
-					`${codePrefix}${truncateToWidth(hint, codeWidth, ui.theme.format.ellipsis)}`,
-					lineWidth,
-					bgFn,
-				),
-			);
-		}
-
-		for (const line of statusLines) {
-			const text = truncateToWidth(line, codeWidth, ui.theme.format.ellipsis);
-			lines.push(applyCellBackground(`${codePrefix}${text}`, lineWidth, bgFn));
-		}
-	}
-
-	const bottomLeft = border(`${ui.theme.boxSharp.bottomLeft}${cap}`);
-	const bottomFillCount = Math.max(0, lineWidth - visibleWidth(bottomLeft));
-	const bottomLine = `${bottomLeft}${border(h.repeat(bottomFillCount))}`;
-	lines.push(applyCellBackground(bottomLine, lineWidth, bgFn));
-	return lines;
-}
-
 export const pythonToolRenderer = {
 	renderCall(args: PythonRenderArgs, uiTheme: Theme): Component {
 		const ui = new ToolUIKit(uiTheme);
@@ -937,23 +793,24 @@ export const pythonToolRenderer = {
 				const lines: string[] = [];
 				for (let i = 0; i < cells.length; i++) {
 					const cell = cells[i];
-					const cellResult: PythonCellResult = {
-						index: i,
-						title: cell.title,
-						code: cell.code,
-						output: "",
-						status: "pending",
-					};
-					lines.push(
-						...renderCellBlock(cellResult, i, cells.length, ui, {
-							expanded: true,
-							previewLines: PYTHON_DEFAULT_PREVIEW_LINES,
-							showOutput: false,
-							workdirLabel: i === 0 ? workdirLabel : undefined,
+					const cellTitle = cell.title;
+					const combinedTitle =
+						cellTitle && workdirLabel ? `${workdirLabel} · ${cellTitle}` : (cellTitle ?? workdirLabel);
+					const cellLines = renderCodeCell(
+						{
+							code: cell.code,
+							language: "python",
+							index: i,
+							total: cells.length,
+							title: combinedTitle,
+							status: "pending",
 							width,
-							bgFn: (text: string) => uiTheme.bg("toolPendingBg", text),
-						}),
+							codeMaxLines: PYTHON_DEFAULT_PREVIEW_LINES,
+							expanded: true,
+						},
+						uiTheme,
 					);
+					lines.push(...cellLines);
 					if (i < cells.length - 1) {
 						lines.push("");
 					}
@@ -975,7 +832,7 @@ export const pythonToolRenderer = {
 
 		const expanded = renderContext?.expanded ?? options.expanded;
 		const previewLines = renderContext?.previewLines ?? PYTHON_DEFAULT_PREVIEW_LINES;
-		const output = renderContext?.output ?? (result.content?.find((c) => c.type === "text")?.text ?? "").trim();
+		const output = renderContext?.output ?? (result.content?.find((c) => c.type === "text")?.text ?? "").trimEnd();
 
 		const jsonOutputs = details?.jsonOutputs ?? [];
 		const jsonLines = jsonOutputs.flatMap((value, index) => {
@@ -1015,23 +872,42 @@ export const pythonToolRenderer = {
 					const lines: string[] = [];
 					for (let i = 0; i < cellResults.length; i++) {
 						const cell = cellResults[i];
-						const showOutput = cell.status !== "pending";
-						const bgColor =
-							cell.status === "error"
-								? "toolErrorBg"
-								: cell.status === "complete"
-									? "toolSuccessBg"
-									: "toolPendingBg";
-						lines.push(
-							...renderCellBlock(cell, i, cellResults.length, ui, {
-								expanded,
-								previewLines,
+						const statusLines = renderStatusEvents(cell.statusEvents ?? [], uiTheme, expanded);
+						const outputContent = formatCellOutputLines(cell, expanded, previewLines, uiTheme);
+						const outputLines = [...outputContent.lines];
+						if (!expanded && outputContent.hiddenCount > 0) {
+							outputLines.push(
+								uiTheme.fg(
+									"dim",
+									`${uiTheme.format.ellipsis} ${outputContent.hiddenCount} more lines (ctrl+o to expand)`,
+								),
+							);
+						}
+						if (statusLines.length > 0) {
+							if (outputLines.length > 0) {
+								outputLines.push(uiTheme.fg("dim", "Status"));
+							}
+							outputLines.push(...statusLines);
+						}
+						const cellLines = renderCodeCell(
+							{
+								code: cell.code,
+								language: "python",
+								index: i,
+								total: cellResults.length,
+								title: cell.title,
+								status: cell.status,
 								spinnerFrame: options.spinnerFrame,
-								showOutput,
+								duration: cell.durationMs,
+								output: outputLines.length > 0 ? outputLines.join("\n") : undefined,
+								outputMaxLines: outputLines.length,
+								codeMaxLines: expanded ? Number.POSITIVE_INFINITY : PYTHON_DEFAULT_PREVIEW_LINES,
+								expanded,
 								width,
-								bgFn: (text: string) => uiTheme.bg(bgColor, text),
-							}),
+							},
+							uiTheme,
 						);
+						lines.push(...cellLines);
 						if (i < cellResults.length - 1) {
 							lines.push("");
 						}
@@ -1066,7 +942,9 @@ export const pythonToolRenderer = {
 		}
 
 		if (!combinedOutput && statusLines.length > 0) {
-			const lines = [...statusLines, timeoutLine, warningLine].filter(Boolean) as string[];
+			const lines = [uiTheme.fg("dim", "Status"), ...statusLines, timeoutLine, warningLine].filter(
+				Boolean,
+			) as string[];
 			return new Text(lines.join("\n"), 0, 0);
 		}
 
@@ -1075,7 +953,12 @@ export const pythonToolRenderer = {
 				.split("\n")
 				.map((line) => uiTheme.fg("toolOutput", line))
 				.join("\n");
-			const lines = [styledOutput, ...statusLines, timeoutLine, warningLine].filter(Boolean) as string[];
+			const lines = [
+				styledOutput,
+				...(statusLines.length > 0 ? [uiTheme.fg("dim", "Status"), ...statusLines] : []),
+				timeoutLine,
+				warningLine,
+			].filter(Boolean) as string[];
 			return new Text(lines.join("\n"), 0, 0);
 		}
 
@@ -1107,8 +990,13 @@ export const pythonToolRenderer = {
 					outputLines.push(truncateToWidth(skippedLine, width, uiTheme.fg("dim", uiTheme.format.ellipsis)));
 				}
 				outputLines.push(...cachedLines);
-				for (const statusLine of statusLines) {
-					outputLines.push(truncateToWidth(statusLine, width, uiTheme.fg("dim", uiTheme.format.ellipsis)));
+				if (statusLines.length > 0) {
+					outputLines.push(
+						truncateToWidth(uiTheme.fg("dim", "Status"), width, uiTheme.fg("dim", uiTheme.format.ellipsis)),
+					);
+					for (const statusLine of statusLines) {
+						outputLines.push(truncateToWidth(statusLine, width, uiTheme.fg("dim", uiTheme.format.ellipsis)));
+					}
 				}
 				if (timeoutLine) {
 					outputLines.push(truncateToWidth(timeoutLine, width, uiTheme.fg("dim", uiTheme.format.ellipsis)));