@nghyane/arcane 0.1.13 → 0.1.15

package/src/tools/python.ts

@@ -6,67 +6,43 @@ import type { Component } from "@nghyane/arcane-tui";
 import { Text } from "@nghyane/arcane-tui";
 import { getProjectDir } from "@nghyane/arcane-utils/dirs";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
-import { executePython, getPreludeDocs, type PythonExecutorOptions } from "../ipy/executor";
-import type { PreludeHelper, PythonStatusEvent } from "../ipy/kernel";
-import { truncateToVisualLines } from "../modes/components/visual-truncate";
-import type { Theme } from "../modes/theme/theme";
-import pythonDescription from "../prompts/tools/python.md" with { type: "text" };
+import { executePython, type PythonExecutorOptions } from "../ipy/executor";
+import type { PythonStatusEvent } from "../ipy/kernel";
 import { DEFAULT_MAX_BYTES, OutputSink, type OutputSummary } from "../session/streaming-output";
-import { getTreeBranch, getTreeContinuePrefix, renderCodeCell } from "../tui";
+import type { Theme } from "../theme/theme";
+import { renderCodeCell, renderStatusLine } from "../tui";
+import { formatClickHint, PREVIEW_LIMITS, replaceTabs } from "../ui/render-utils";
 import type { ToolSession } from ".";
-import type { OutputMeta } from "./output-meta";
+import { type OutputMeta, toolResult } from "./output-meta";
 import { allocateOutputArtifact, createTailBuffer } from "./output-utils";
 import { resolveToCwd } from "./path-utils";
-import { replaceTabs, shortenPath, ToolUIKit, truncateToWidth } from "./render-utils";
 import { ToolAbortError, ToolError } from "./tool-errors";
-import { toolResult } from "./tool-result";
 
 export const PYTHON_DEFAULT_PREVIEW_LINES = 10;
 
-type PreludeCategory = {
-	name: string;
-	functions: PreludeHelper[];
-};
-
-function groupPreludeHelpers(helpers: PreludeHelper[]): PreludeCategory[] {
-	const categories: PreludeCategory[] = [];
-	const byName = new Map<string, PreludeHelper[]>();
-	for (const helper of helpers) {
-		let bucket = byName.get(helper.category);
-		if (!bucket) {
-			bucket = [];
-			byName.set(helper.category, bucket);
-			categories.push({ name: helper.category, functions: bucket });
-		}
-		bucket.push(helper);
-	}
-	return categories;
-}
-
-export const pythonSchema = Type.Object({
+const pythonSchema = Type.Object({
 	cells: Type.Array(
 		Type.Object({
 			code: Type.String({ description: "Python code to execute" }),
-			title: Type.Optional(Type.String({ description: "Cell label, e.g. 'imports', 'helper'" })),
+			title: Type.Optional(Type.String({ description: "Optional label for the cell" })),
 		}),
-		{ description: "Cells to execute sequentially in persistent kernel" },
+		{ description: "Code cells to execute sequentially" },
 	),
-	timeout: Type.Optional(Type.Number({ description: "Timeout in seconds (default: 30)" })),
-	cwd: Type.Optional(Type.String({ description: "Working directory (default: cwd)" })),
-	reset: Type.Optional(Type.Boolean({ description: "Restart kernel before execution" })),
+	timeout: Type.Optional(Type.Number({ description: "Timeout in seconds" })),
+	cwd: Type.Optional(Type.String({ description: "Working directory" })),
+	reset: Type.Optional(Type.Boolean({ description: "Reset kernel state before execution" })),
 });
-export type PythonToolParams = Static<typeof pythonSchema>;
+type PythonToolParams = Static<typeof pythonSchema>;
 
-export type PythonToolResult = {
+type PythonToolResult = {
 	content: Array<{ type: "text"; text: string }>;
 	details: PythonToolDetails | undefined;
 };
 
-export type PythonProxyExecutor = (params: PythonToolParams, signal?: AbortSignal) => Promise<PythonToolResult>;
+type PythonProxyExecutor = (params: PythonToolParams, signal?: AbortSignal) => Promise<PythonToolResult>;
 
-export interface PythonCellResult {
+interface PythonCellResult {
 	index: number;
 	title?: string;
 	code: string;
@@ -88,64 +64,14 @@ export interface PythonToolDetails {
 	meta?: OutputMeta;
 }
 
-function formatJsonScalar(value: unknown): string {
-	if (value === null) return "null";
-	if (value === undefined) return "undefined";
-	if (typeof value === "string") return JSON.stringify(value);
-	if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") return String(value);
-	if (typeof value === "function") return "[function]";
-	return "[object]";
-}
-
-function renderJsonTree(value: unknown, theme: Theme, expanded: boolean, maxDepth = expanded ? 6 : 2): string[] {
-	const maxItems = expanded ? 20 : 5;
-
-	const renderNode = (node: unknown, prefix: string, depth: number, isLast: boolean, label?: string): string[] => {
-		const branch = getTreeBranch(isLast, theme);
-		const displayLabel = label ? `${label}: ` : "";
-
-		if (depth >= maxDepth || node === null || typeof node !== "object") {
-			return [`${prefix}${branch} ${displayLabel}${formatJsonScalar(node)}`];
-		}
-
-		const isArray = Array.isArray(node);
-		const entries = isArray
-			? node.map((val, index) => [String(index), val] as const)
-			: Object.entries(node as object);
-		const header = `${prefix}${branch} ${displayLabel}${isArray ? `Array(${entries.length})` : `Object(${entries.length})`}`;
-		const lines = [header];
-
-		const childPrefix = prefix + getTreeContinuePrefix(isLast, theme);
-		const visible = entries.slice(0, maxItems);
-		for (let i = 0; i < visible.length; i++) {
-			const [key, val] = visible[i];
-			const childLast = i === visible.length - 1 && (expanded || entries.length <= maxItems);
-			lines.push(...renderNode(val, childPrefix, depth + 1, childLast, isArray ? `[${key}]` : key));
-		}
-		if (!expanded && entries.length > maxItems) {
-			const moreBranch = theme.tree.last;
-			lines.push(`${childPrefix}${moreBranch} ${entries.length - maxItems} more item(s)`);
-		}
-		return lines;
-	};
-
-	return renderNode(value, "", 0, true);
-}
-
-export function getPythonToolDescription(): string {
-	const helpers = getPreludeDocs();
-	const categories = groupPreludeHelpers(helpers);
-	return renderPromptTemplate(pythonDescription, { categories });
-}
-
 export interface PythonToolOptions {
 	proxyExecutor?: PythonProxyExecutor;
 }
 
-export class PythonTool implements AgentTool<typeof pythonSchema> {
+export class PythonTool implements AgentTool<typeof pythonSchema, any, Theme> {
 	readonly name = "python";
 	readonly label = "Python";
-	readonly description: string;
+	description = "Execute Python code in a persistent kernel";
 	readonly parameters = pythonSchema;
 	readonly concurrency = "exclusive";
 
@@ -156,7 +82,6 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 		options?: PythonToolOptions,
 	) {
 		this.#proxyExecutor = options?.proxyExecutor;
-		this.description = getPythonToolDescription();
 	}
 
 	async execute(
@@ -480,361 +405,26 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 			}
 		}
 	}
-}
-
-interface PythonRenderArgs {
-	cells?: Array<{ code: string; title?: string }>;
-	timeout?: number;
-	cwd?: string;
-}
-
-interface PythonRenderContext {
-	output?: string;
-	expanded?: boolean;
-	previewLines?: number;
-	timeout?: number;
-}
-
-/** Format a status event as a single line for display. */
-function formatStatusEvent(event: PythonStatusEvent, theme: Theme): string {
-	const { op, ...data } = event;
-
-	// Map operations to available theme icons
-	type AvailableIcon = "icon.file" | "icon.folder" | "icon.git" | "icon.package";
-	const opIcons: Record<string, AvailableIcon> = {
-		// File I/O
-		read: "icon.file",
-		write: "icon.file",
-		append: "icon.file",
-		cat: "icon.file",
-		touch: "icon.file",
-		lines: "icon.file",
-		// Navigation/Directory
-		ls: "icon.folder",
-		cd: "icon.folder",
-		pwd: "icon.folder",
-		mkdir: "icon.folder",
-		tree: "icon.folder",
-		stat: "icon.folder",
-		// Search (use file icon since no search icon)
-		find: "icon.file",
-		grep: "icon.file",
-		rgrep: "icon.file",
-		glob: "icon.file",
-		// Edit operations (use file icon)
-		replace: "icon.file",
-		sed: "icon.file",
-		rsed: "icon.file",
-		delete_lines: "icon.file",
-		delete_matching: "icon.file",
-		insert_at: "icon.file",
-		// Git
-		git_status: "icon.git",
-		git_diff: "icon.git",
-		git_log: "icon.git",
-		git_show: "icon.git",
-		git_branch: "icon.git",
-		git_file_at: "icon.git",
-		git_has_changes: "icon.git",
-		// Shell/batch (use package icon)
-		run: "icon.package",
-		sh: "icon.package",
-		env: "icon.package",
-		batch: "icon.package",
-	};
-
-	const iconKey = opIcons[op] ?? "icon.file";
-	const icon = theme.styledSymbol(iconKey, "muted");
-
-	// Format the status message based on operation type
-	const parts: string[] = [];
-
-	// Error handling
-	if (data.error) {
-		return `${icon} ${theme.fg("warning", op)}: ${theme.fg("dim", String(data.error))}`;
-	}
-
-	// Build description based on common fields
-	switch (op) {
-		case "read":
-			parts.push(`${data.chars} chars`);
-			if (data.path) parts.push(`from ${shortenPath(String(data.path))}`);
-			break;
-		case "write":
-		case "append":
-			parts.push(`${data.chars} chars`);
-			if (data.path) parts.push(`to ${shortenPath(String(data.path))}`);
-			break;
-		case "cat":
-			parts.push(`${data.files} file${(data.files as number) !== 1 ? "s" : ""}`);
-			parts.push(`${data.chars} chars`);
-			break;
-		case "find":
-		case "glob":
-			parts.push(`${data.count} match${(data.count as number) !== 1 ? "es" : ""}`);
-			if (data.pattern) parts.push(`for "${truncateToWidth(String(data.pattern), 20)}"`);
-			break;
-		case "grep":
-			parts.push(`${data.count} match${(data.count as number) !== 1 ? "es" : ""}`);
-			if (data.path) parts.push(`in ${shortenPath(String(data.path))}`);
-			break;
-		case "rgrep":
-			parts.push(`${data.count} match${(data.count as number) !== 1 ? "es" : ""}`);
-			if (data.pattern) parts.push(`for "${truncateToWidth(String(data.pattern), 20)}"`);
-			break;
-		case "ls":
-			parts.push(`${data.count} entr${(data.count as number) !== 1 ? "ies" : "y"}`);
-			break;
-		case "env":
-			if (data.action === "set") {
-				parts.push(`set ${data.key}=${truncateToWidth(String(data.value ?? ""), 30)}`);
-			} else if (data.action === "get") {
-				parts.push(`${data.key}=${truncateToWidth(String(data.value ?? ""), 30)}`);
-			} else {
-				parts.push(`${data.count} variable${(data.count as number) !== 1 ? "s" : ""}`);
-			}
-			break;
-		case "stat":
-			if (data.is_dir) {
-				parts.push("directory");
-			} else {
-				parts.push(`${data.size} bytes`);
-			}
-			if (data.path) parts.push(shortenPath(String(data.path)));
-			break;
-		case "replace":
-		case "sed":
-			parts.push(`${data.count} replacement${(data.count as number) !== 1 ? "s" : ""}`);
-			if (data.path) parts.push(`in ${shortenPath(String(data.path))}`);
-			break;
-		case "rsed":
-			parts.push(`${data.count} replacement${(data.count as number) !== 1 ? "s" : ""}`);
-			if (data.files) parts.push(`in ${data.files} file${(data.files as number) !== 1 ? "s" : ""}`);
-			break;
-		case "git_status":
-			if (data.clean) {
-				parts.push("clean");
-			} else {
-				const statusParts: string[] = [];
-				if (data.staged) statusParts.push(`${data.staged} staged`);
-				if (data.modified) statusParts.push(`${data.modified} modified`);
-				if (data.untracked) statusParts.push(`${data.untracked} untracked`);
-				parts.push(statusParts.join(", ") || "unknown");
-			}
-			if (data.branch) parts.push(`on ${data.branch}`);
-			break;
-		case "git_log":
-			parts.push(`${data.commits} commit${(data.commits as number) !== 1 ? "s" : ""}`);
-			break;
-		case "git_diff":
-			parts.push(`${data.lines} line${(data.lines as number) !== 1 ? "s" : ""}`);
-			if (data.staged) parts.push("(staged)");
-			break;
-		case "diff":
-			if (data.identical) {
-				parts.push("files identical");
-			} else {
-				parts.push("files differ");
-			}
-			break;
-		case "batch":
-			parts.push(`${data.files} file${(data.files as number) !== 1 ? "s" : ""} processed`);
-			break;
-		case "wc":
-			parts.push(`${data.lines}L ${data.words}W ${data.chars}C`);
-			break;
-		case "lines":
-			parts.push(`${data.count} line${(data.count as number) !== 1 ? "s" : ""}`);
-			if (data.start && data.end) parts.push(`(${data.start}-${data.end})`);
-			break;
-		case "delete_lines":
-		case "delete_matching":
-			parts.push(`${data.count} line${(data.count as number) !== 1 ? "s" : ""} deleted`);
-			break;
-		case "insert_at":
-			parts.push(`${data.lines_inserted} line${(data.lines_inserted as number) !== 1 ? "s" : ""} inserted`);
-			break;
-		case "cd":
-		case "pwd":
-		case "mkdir":
-		case "touch":
-			if (data.path) parts.push(shortenPath(String(data.path)));
-			break;
-		case "rm":
-		case "mv":
-		case "cp":
-			if (data.src) parts.push(`${shortenPath(String(data.src))} → ${shortenPath(String(data.dst))}`);
-			else if (data.path) parts.push(shortenPath(String(data.path)));
-			break;
-		default:
-			// Generic formatting for other operations
-			if (data.count !== undefined) {
-				parts.push(String(data.count));
-			}
-			if (data.path) {
-				parts.push(shortenPath(String(data.path)));
-			}
-	}
-
-	const desc = parts.length > 0 ? parts.join(" · ") : "";
-	return `${icon} ${theme.fg("muted", op)}${desc ? ` ${theme.fg("dim", desc)}` : ""}`;
-}
-
-/** Format status event with expanded detail lines. */
-function formatStatusEventExpanded(event: PythonStatusEvent, theme: Theme): string[] {
-	const lines: string[] = [];
-	const { op, ...data } = event;
-
-	// Main status line
-	lines.push(formatStatusEvent(event, theme));
-
-	// Add detail lines for operations with list data
-	const addItems = (items: unknown[], formatter: (item: unknown) => string, max = 5) => {
-		const arr = Array.isArray(items) ? items : [];
-		for (let i = 0; i < Math.min(arr.length, max); i++) {
-			lines.push(`   ${theme.fg("dim", formatter(arr[i]))}`);
-		}
-		if (arr.length > max) {
-			lines.push(`   ${theme.fg("dim", `… ${arr.length - max} more`)}`);
-		}
-	};
-
-	// Add preview lines (truncated content)
-	const addPreview = (preview: string, maxLines = 3) => {
-		const previewLines = String(preview).split("\n").slice(0, maxLines);
-		for (const line of previewLines) {
-			lines.push(`   ${theme.fg("toolOutput", truncateToWidth(replaceTabs(line), 80))}`);
-		}
-		const totalLines = String(preview).split("\n").length;
-		if (totalLines > maxLines) {
-			lines.push(`   ${theme.fg("dim", `… ${totalLines - maxLines} more lines`)}`);
-		}
-	};
-
-	switch (op) {
-		case "find":
-		case "glob":
-			if (data.matches) addItems(data.matches as unknown[], m => String(m));
-			break;
-		case "ls":
-			if (data.items) addItems(data.items as unknown[], m => String(m));
-			break;
-		case "grep":
-			if (data.hits) {
-				addItems(data.hits as unknown[], h => {
-					const hit = h as { line: number; text: string };
-					return `${hit.line}: ${truncateToWidth(hit.text, 60)}`;
-				});
-			}
-			break;
-		case "rgrep":
-			if (data.hits) {
-				addItems(data.hits as unknown[], h => {
-					const hit = h as { file: string; line: number; text: string };
-					return `${shortenPath(hit.file)}:${hit.line}: ${truncateToWidth(hit.text, 50)}`;
-				});
-			}
-			break;
-		case "rsed":
-			if (data.changed) {
-				addItems(data.changed as unknown[], c => {
-					const change = c as { file: string; count: number };
-					return `${shortenPath(change.file)}: ${change.count} replacement${change.count !== 1 ? "s" : ""}`;
-				});
-			}
-			break;
-		case "env":
-			if (data.keys) addItems(data.keys as unknown[], k => String(k), 10);
-			break;
-		case "git_log":
-			if (data.entries) {
-				addItems(data.entries as unknown[], e => {
-					const entry = e as { sha: string; subject: string };
-					return `${entry.sha} ${truncateToWidth(entry.subject, 50)}`;
-				});
-			}
-			break;
-		case "git_status":
-			if (data.files) addItems(data.files as unknown[], f => String(f));
-			break;
-		case "git_branch":
-			if (data.branches) addItems(data.branches as unknown[], b => String(b));
-			break;
-		case "read":
-		case "cat":
-		case "head":
-		case "tail":
-		case "tree":
-		case "diff":
-		case "lines":
-		case "git_diff":
-		case "sh":
-			if (data.preview) addPreview(String(data.preview));
-			break;
-	}
-
-	return lines;
-}
 
-/** Render status events as tree lines. */
-function renderStatusEvents(events: PythonStatusEvent[], theme: Theme, expanded: boolean): string[] {
-	if (events.length === 0) return [];
-
-	const maxCollapsed = 3;
-	const maxExpanded = 10;
-	const displayCount = expanded ? Math.min(events.length, maxExpanded) : Math.min(events.length, maxCollapsed);
-
-	const lines: string[] = [];
-	for (let i = 0; i < displayCount; i++) {
-		const isLast = i === displayCount - 1 && (expanded || events.length <= maxCollapsed);
-		const branch = isLast ? theme.tree.last : theme.tree.branch;
-
-		if (expanded) {
-			// Show expanded details for each event
-			const eventLines = formatStatusEventExpanded(events[i], theme);
-			lines.push(`${theme.fg("dim", branch)} ${eventLines[0]}`);
-			const continueBranch = isLast ? "   " : `${theme.tree.vertical}  `;
-			for (let j = 1; j < eventLines.length; j++) {
-				lines.push(`${theme.fg("dim", continueBranch)}${eventLines[j]}`);
+	buildRenderContext(info: {
+		args: PythonToolParams;
+		result?: { content: Array<{ type: string; text?: string }>; details?: PythonToolDetails };
+		expanded: boolean;
+		getTextOutput: () => string;
+	}): Record<string, unknown> {
+		const context: Record<string, unknown> = {};
+		if (info.result) {
+			context.output = info.getTextOutput().trimEnd();
+			context.expanded = info.expanded;
+			context.previewLines = PYTHON_DEFAULT_PREVIEW_LINES;
+			if (typeof info.args.timeout === "number" && Number.isFinite(info.args.timeout)) {
+				context.timeout = Math.max(1, Math.min(600, info.args.timeout));
 			}
-		} else {
-			lines.push(`${theme.fg("dim", branch)} ${formatStatusEvent(events[i], theme)}`);
 		}
+		return context;
 	}
 
-	if (!expanded && events.length > maxCollapsed) {
-		lines.push(`${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", `… ${events.length - maxCollapsed} more`)}`);
-	} else if (expanded && events.length > maxExpanded) {
-		lines.push(`${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", `… ${events.length - maxExpanded} more`)}`);
-	}
-
-	return lines;
-}
-
-function formatCellOutputLines(
-	cell: PythonCellResult,
-	expanded: boolean,
-	previewLines: number,
-	theme: Theme,
-): { lines: string[]; hiddenCount: number } {
-	const rawLines = cell.output ? cell.output.split("\n") : [];
-	const displayLines = expanded ? rawLines : rawLines.slice(-previewLines);
-	const hiddenCount = rawLines.length - displayLines.length;
-	const outputLines = displayLines.map(line => {
-		const cleaned = replaceTabs(line);
-		return cell.status === "error" ? theme.fg("error", cleaned) : theme.fg("toolOutput", cleaned);
-	});
-
-	if (outputLines.length === 0) {
-		return { lines: [], hiddenCount: 0 };
-	}
-
-	return { lines: outputLines, hiddenCount };
-}
-
-export const pythonToolRenderer = {
 	renderCall(args: PythonRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
-		const ui = new ToolUIKit(uiTheme);
 		const cells = args.cells ?? [];
 		const cwd = getProjectDir();
 		let displayWorkdir = args.cwd;
@@ -858,7 +448,7 @@ export const pythonToolRenderer = {
 		if (cells.length === 0) {
 			const prompt = uiTheme.fg("accent", ">>>");
 			const prefix = workdirLabel ? `${uiTheme.fg("dim", `${workdirLabel} && `)}` : "";
-			const text = ui.title(`${prompt} ${prefix}…`);
+			const text = uiTheme.fg("toolTitle", uiTheme.bold(`${prompt} ${prefix}…`));
 			return new Text(text, 0, 0);
 		}
 
@@ -903,216 +493,75 @@ export const pythonToolRenderer = {
 				cached = undefined;
 			},
 		};
-	},
+	}
 
 	renderResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: PythonToolDetails },
 		options: RenderResultOptions & { renderContext?: PythonRenderContext },
 		uiTheme: Theme,
 	): Component {
-		const ui = new ToolUIKit(uiTheme);
 		const details = result.details;
-
-		const output =
-			options.renderContext?.output ?? (result.content?.find(c => c.type === "text")?.text ?? "").trimEnd();
-
-		const jsonOutputs = details?.jsonOutputs ?? [];
-		const jsonLines = jsonOutputs.flatMap((value, index) => {
-			const header = `JSON output ${index + 1}`;
-			const treeLines = renderJsonTree(value, uiTheme, options.renderContext?.expanded ?? options.expanded);
-			return [header, ...treeLines];
-		});
-
+		const output = (
+			options.renderContext?.output ??
+			result.content?.find(c => c.type === "text")?.text ??
+			""
+		).trimEnd();
+		const outputLines = output ? output.split("\n") : [];
+		const total = outputLines.length;
+		const isError = details?.cells?.some(c => c.status === "error") ?? false;
 		const truncation = details?.meta?.truncation;
-		const timeoutSeconds = options.renderContext?.timeout;
-		const timeoutLine =
-			typeof timeoutSeconds === "number"
-				? uiTheme.fg("dim", ui.wrapBrackets(`Timeout: ${timeoutSeconds}s`))
-				: undefined;
-		let warningLine: string | undefined;
-		if (truncation) {
-			const warnings: string[] = [];
-			if (truncation.artifactId) {
-				warnings.push(`Full output: artifact://${truncation.artifactId}`);
-			}
-			if (truncation.truncatedBy === "lines") {
-				warnings.push(`Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines`);
-			} else {
-				warnings.push(
-					`Truncated: ${truncation.outputLines} lines shown (${ui.formatBytes(truncation.outputBytes)} limit)`,
-				);
-			}
-			if (warnings.length > 0) {
-				warningLine = uiTheme.fg("warning", ui.wrapBrackets(warnings.join(". ")));
-			}
+		const expanded = options.renderContext?.expanded ?? options.expanded;
+
+		// Build header
+		const cellCount = details?.cells?.length ?? 0;
+		const codePreview = details?.cells?.[0]?.code?.split("\n")[0]?.slice(0, 60) ?? "\u2026";
+		const meta: string[] = [];
+		if (cellCount > 1) meta.push(`${cellCount} cells`);
+		if (total > 0) meta.push(`${total} lines`);
+		if (details?.cells?.some(c => c.durationMs)) {
+			const totalMs = details.cells.reduce((sum, c) => sum + (c.durationMs ?? 0), 0);
+			if (totalMs > 0) meta.push(`${(totalMs / 1000).toFixed(1)}s`);
 		}
 
-		const cellResults = details?.cells;
-		if (cellResults && cellResults.length > 0) {
-			// Cache state following Box pattern
-			let cached: { key: string; width: number; result: string[] } | undefined;
-
-			return {
-				render: (width: number): string[] => {
-					// Read mutable state at render time
-					const expanded = options.renderContext?.expanded ?? options.expanded;
-					const previewLines = options.renderContext?.previewLines ?? PYTHON_DEFAULT_PREVIEW_LINES;
-					const key = `${expanded}|${previewLines}|${options.spinnerFrame}`;
-					if (cached && cached.key === key && cached.width === width) {
-						return cached.result;
-					}
-
-					const lines: string[] = [];
-					for (let i = 0; i < cellResults.length; i++) {
-						const cell = cellResults[i];
-						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", `… ${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,
-								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,
-							},
-							uiTheme,
-						);
-						lines.push(...cellLines);
-						if (i < cellResults.length - 1) {
-							lines.push("");
-						}
-					}
-					if (jsonLines.length > 0) {
-						if (lines.length > 0) {
-							lines.push("");
-						}
-						lines.push(...jsonLines);
-					}
-					if (timeoutLine) {
-						lines.push(timeoutLine);
-					}
-					if (warningLine) {
-						lines.push(warningLine);
-					}
-					cached = { key, width, result: lines };
-					return lines;
-				},
-				invalidate: () => {
-					cached = undefined;
-				},
-			};
-		}
-
-		const displayOutput = output;
-		const combinedOutput = [displayOutput, ...jsonLines].filter(Boolean).join("\n");
-
-		const statusEvents = details?.statusEvents ?? [];
-		const statusLines = renderStatusEvents(
-			statusEvents,
+		const header = renderStatusLine(
+			{ icon: isError ? "error" : "success", title: "Python", description: `>>> ${codePreview}`, meta },
 			uiTheme,
-			options.renderContext?.expanded ?? options.expanded,
 		);
 
-		if (!combinedOutput && statusLines.length === 0) {
-			const lines = [timeoutLine, warningLine].filter(Boolean) as string[];
-			return new Text(lines.join("\n"), 0, 0);
-		}
+		// Tree-style body
+		const showAll = isError || expanded;
+		const displayLines = showAll ? outputLines : outputLines.slice(-PREVIEW_LIMITS.OUTPUT_COLLAPSED);
+		const skipped = total - displayLines.length;
 
-		if (!combinedOutput && statusLines.length > 0) {
-			const lines = [uiTheme.fg("dim", "Status"), ...statusLines, timeoutLine, warningLine].filter(
-				Boolean,
-			) as string[];
-			return new Text(lines.join("\n"), 0, 0);
+		const bodyLines: string[] = [];
+		if (skipped > 0) {
+			bodyLines.push(uiTheme.fg("dim", `\u2026 (${skipped} earlier lines)`));
 		}
-
-		if (options.renderContext?.expanded ?? options.expanded) {
-			const styledOutput = combinedOutput
-				.split("\n")
-				.map(line => uiTheme.fg("toolOutput", line))
-				.join("\n");
-			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);
+		const hasTruncation = Boolean(truncation);
+		for (let i = 0; i < displayLines.length; i++) {
+			bodyLines.push(uiTheme.fg("toolOutput", replaceTabs(displayLines[i])));
+		}
+		if (hasTruncation) {
+			bodyLines.push(uiTheme.fg("warning", "output truncated"));
+		}
+		if (!showAll && skipped > 0) {
+			bodyLines.push(formatClickHint(uiTheme));
 		}
 
-		const styledOutput = combinedOutput
-			.split("\n")
-			.map(line => uiTheme.fg("toolOutput", line))
-			.join("\n");
-		const textContent = `\n${styledOutput}`;
+		const lines = bodyLines.length > 0 ? [header, ...bodyLines] : [header];
+		return new Text(lines.join("\n"), 0, 0);
+	}
+}
 
-		let cachedWidth: number | undefined;
-		let cachedLines: string[] | undefined;
-		let cachedSkipped: number | undefined;
-		let cachedPreviewLines: number | undefined;
+interface PythonRenderArgs {
+	cells?: Array<{ code: string; title?: string }>;
+	timeout?: number;
+	cwd?: string;
+}
 
-		return {
-			render: (width: number): string[] => {
-				// Read mutable state at render time
-				const previewLines = options.renderContext?.previewLines ?? PYTHON_DEFAULT_PREVIEW_LINES;
-				if (cachedLines === undefined || cachedWidth !== width || cachedPreviewLines !== previewLines) {
-					const result = truncateToVisualLines(textContent, previewLines, width);
-					cachedLines = result.visualLines;
-					cachedSkipped = result.skippedCount;
-					cachedWidth = width;
-					cachedPreviewLines = previewLines;
-				}
-				const outputLines: string[] = [];
-				if (cachedSkipped && cachedSkipped > 0) {
-					outputLines.push("");
-					const skippedLine = uiTheme.fg(
-						"dim",
-						`… (${cachedSkipped} earlier lines, showing ${cachedLines.length} of ${cachedSkipped + cachedLines.length}) (ctrl+o to expand)`,
-					);
-					outputLines.push(truncateToWidth(skippedLine, width));
-				}
-				outputLines.push(...cachedLines);
-				if (statusLines.length > 0) {
-					outputLines.push(truncateToWidth(uiTheme.fg("dim", "Status"), width));
-					for (const statusLine of statusLines) {
-						outputLines.push(truncateToWidth(statusLine, width));
-					}
-				}
-				if (timeoutLine) {
-					outputLines.push(truncateToWidth(timeoutLine, width));
-				}
-				if (warningLine) {
-					outputLines.push(truncateToWidth(warningLine, width));
-				}
-				return outputLines;
-			},
-			invalidate: () => {
-				cachedWidth = undefined;
-				cachedLines = undefined;
-				cachedSkipped = undefined;
-				cachedPreviewLines = undefined;
-			},
-		};
-	},
-	mergeCallAndResult: true,
-	inline: true,
-};
+interface PythonRenderContext {
+	output?: string;
+	expanded?: boolean;
+	previewLines?: number;
+	timeout?: number;
+}