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

package/src/tools/ask.ts

@@ -14,16 +14,16 @@
  *   - If you recommend a specific option, make that the first option in the list
  *     and add "(Recommended)" at the end of the label
  */
-
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { type Theme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import askDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/ask.md" with { type: "text" };
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
-import type { ToolSession } from "./index";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { type Theme, theme } from "../modes/theme/theme";
+import askDescription from "../prompts/tools/ask.md" with { type: "text" };
+import { renderStatusLine } from "../tui";
+import type { ToolSession } from ".";
 import { ToolUIKit } from "./render-utils";
 
 // =============================================================================
@@ -237,7 +237,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 			const results: QuestionResult[] = [];
 
 			for (const q of params.questions) {
-				const optionLabels = q.options.map((o) => o.label);
+				const optionLabels = q.options.map(o => o.label);
 				const { selectedOptions, customInput } = await askSingleQuestion(
 					ui,
 					q.question,
@@ -266,7 +266,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 		const question = params.question ?? "";
 		const options = params.options ?? [];
 		const multi = params.multi ?? false;
-		const optionLabels = options.map((o) => o.label);
+		const optionLabels = options.map(o => o.label);
 
 		if (!question || optionLabels.length === 0) {
 			return {
@@ -381,36 +381,56 @@ export const askToolRenderer = {
 		const { details } = result;
 		if (!details) {
 			const txt = result.content[0];
-			return new Text(txt?.type === "text" && txt.text ? txt.text : "", 0, 0);
+			const fallback = txt?.type === "text" && txt.text ? txt.text : "";
+			const header = renderStatusLine({ icon: "warning", title: "Ask" }, uiTheme);
+			return new Text([header, uiTheme.fg("dim", fallback)].join("\n"), 0, 0);
 		}
 
 		// Multi-part results
 		if (details.results && details.results.length > 0) {
 			const lines: string[] = [];
-
-			for (const r of details.results) {
+			const hasAnySelection = details.results.some(
+				r => r.customInput || (r.selectedOptions && r.selectedOptions.length > 0),
+			);
+			const header = renderStatusLine(
+				{
+					icon: hasAnySelection ? "success" : "warning",
+					title: "Ask",
+					meta: [`${details.results.length} questions`],
+				},
+				uiTheme,
+			);
+			lines.push(header);
+
+			for (let i = 0; i < details.results.length; i++) {
+				const r = details.results[i];
+				const isLastQuestion = i === details.results.length - 1;
+				const branch = isLastQuestion ? uiTheme.tree.last : uiTheme.tree.branch;
+				const continuation = isLastQuestion ? "   " : `${uiTheme.fg("dim", uiTheme.tree.vertical)}  `;
 				const hasSelection = r.customInput || r.selectedOptions.length > 0;
 				const statusIcon = hasSelection
 					? uiTheme.styledSymbol("status.success", "success")
 					: uiTheme.styledSymbol("status.warning", "warning");
 
-				lines.push(`${statusIcon} ${uiTheme.fg("dim", `[${r.id}]`)} ${uiTheme.fg("accent", r.question)}`);
+				lines.push(
+					` ${uiTheme.fg("dim", branch)} ${statusIcon} ${uiTheme.fg("dim", `[${r.id}]`)} ${uiTheme.fg("accent", r.question)}`,
+				);
 
 				if (r.customInput) {
 					lines.push(
-						` ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.success", "success")} ${uiTheme.fg("toolOutput", r.customInput)}`,
+						`${continuation}${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.success", "success")} ${uiTheme.fg("toolOutput", r.customInput)}`,
 					);
 				} else if (r.selectedOptions.length > 0) {
 					for (let j = 0; j < r.selectedOptions.length; j++) {
 						const isLast = j === r.selectedOptions.length - 1;
-						const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
+						const optBranch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
 						lines.push(
-							` ${uiTheme.fg("dim", branch)} ${uiTheme.fg("success", uiTheme.checkbox.checked)} ${uiTheme.fg("toolOutput", r.selectedOptions[j])}`,
+							`${continuation}${uiTheme.fg("dim", optBranch)} ${uiTheme.fg("success", uiTheme.checkbox.checked)} ${uiTheme.fg("toolOutput", r.selectedOptions[j])}`,
 						);
 					}
 				} else {
 					lines.push(
-						` ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.warning", "warning")} ${uiTheme.fg("warning", "Cancelled")}`,
+						`${continuation}${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.warning", "warning")} ${uiTheme.fg("warning", "Cancelled")}`,
 					);
 				}
 			}
@@ -425,11 +445,12 @@ export const askToolRenderer = {
 		}
 
 		const hasSelection = details.customInput || (details.selectedOptions && details.selectedOptions.length > 0);
-		const statusIcon = hasSelection
-			? uiTheme.styledSymbol("status.success", "success")
-			: uiTheme.styledSymbol("status.warning", "warning");
+		const header = renderStatusLine(
+			{ icon: hasSelection ? "success" : "warning", title: "Ask", description: details.question },
+			uiTheme,
+		);
 
-		let text = `${statusIcon} ${uiTheme.fg("accent", details.question)}`;
+		let text = header;
 
 		if (details.customInput) {
 			text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.styledSymbol("status.success", "success")} ${uiTheme.fg("toolOutput", details.customInput)}`;

package/src/tools/bash-interceptor.ts

@@ -5,11 +5,7 @@
  * this interceptor provides helpful error messages directing them to use
  * the specialized tools instead.
  */
-
-import {
-	type BashInterceptorRule,
-	DEFAULT_BASH_INTERCEPTOR_RULES,
-} from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import { type BashInterceptorRule, DEFAULT_BASH_INTERCEPTOR_RULES } from "../config/settings-manager";
 
 export interface InterceptionResult {
 	/** If true, the bash command should be blocked */

package/src/tools/bash.ts

@@ -1,22 +1,22 @@
-import { relative, resolve, sep } from "node:path";
+import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import { type BashExecutorOptions, executeBash } from "@oh-my-pi/pi-coding-agent/exec/bash-executor";
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { truncateToVisualLines } from "@oh-my-pi/pi-coding-agent/modes/components/visual-truncate";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import bashDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/bash.md" with { type: "text" };
-import type { OutputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
-import { ToolError } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
 import type { Component } from "@oh-my-pi/pi-tui";
-import { Text, truncateToWidth } from "@oh-my-pi/pi-tui";
+import { Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
-
+import { renderPromptTemplate } from "../config/prompt-templates";
+import { type BashExecutorOptions, executeBash } from "../exec/bash-executor";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { truncateToVisualLines } from "../modes/components/visual-truncate";
+import type { Theme } from "../modes/theme/theme";
+import bashDescription from "../prompts/tools/bash.md" with { type: "text" };
+import { renderOutputBlock, renderStatusLine } from "../tui";
+import type { ToolSession } from ".";
 import { checkBashInterception, checkSimpleLsInterception } from "./bash-interceptor";
-import type { ToolSession } from "./index";
+import type { OutputMeta } from "./output-meta";
 import { allocateOutputArtifact, createTailBuffer } from "./output-utils";
 import { resolveToCwd } from "./path-utils";
-import { ToolUIKit } from "./render-utils";
+import { formatBytes, wrapBrackets } from "./render-utils";
+import { ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { DEFAULT_MAX_BYTES } from "./truncate";
 
@@ -106,7 +106,7 @@ export class BashTool implements AgentTool<typeof bashSchema, BashToolDetails> {
 			env: extraEnv,
 			artifactPath,
 			artifactId,
-			onChunk: (chunk) => {
+			onChunk: chunk => {
 				tailBuffer.append(chunk);
 				if (onUpdate) {
 					onUpdate({
@@ -158,35 +158,37 @@ interface BashRenderContext {
 	timeout?: number;
 }
 
+function formatBashCommand(args: BashRenderArgs, uiTheme: Theme): string {
+	const command = args.command || uiTheme.format.ellipsis;
+	const prompt = "$";
+	const cwd = process.cwd();
+	let displayWorkdir = args.cwd;
+
+	if (displayWorkdir) {
+		const resolvedCwd = path.resolve(cwd);
+		const resolvedWorkdir = path.resolve(displayWorkdir);
+		if (resolvedWorkdir === resolvedCwd) {
+			displayWorkdir = undefined;
+		} else {
+			const relativePath = path.relative(resolvedCwd, resolvedWorkdir);
+			const isWithinCwd =
+				relativePath && !relativePath.startsWith("..") && !relativePath.startsWith(`..${path.sep}`);
+			if (isWithinCwd) {
+				displayWorkdir = relativePath;
+			}
+		}
+	}
+
+	return displayWorkdir ? `${prompt} cd ${displayWorkdir} && ${command}` : `${prompt} ${command}`;
+}
+
 // Preview line limit when not expanded (matches tool-execution behavior)
 export const BASH_PREVIEW_LINES = 10;
 
 export const bashToolRenderer = {
 	renderCall(args: BashRenderArgs, uiTheme: Theme): Component {
-		const ui = new ToolUIKit(uiTheme);
-		const command = args.command || uiTheme.format.ellipsis;
-		const prompt = uiTheme.fg("accent", "$");
-		const cwd = process.cwd();
-		let displayWorkdir = args.cwd;
-
-		if (displayWorkdir) {
-			const resolvedCwd = resolve(cwd);
-			const resolvedWorkdir = resolve(displayWorkdir);
-			if (resolvedWorkdir === resolvedCwd) {
-				displayWorkdir = undefined;
-			} else {
-				const relativePath = relative(resolvedCwd, resolvedWorkdir);
-				const isWithinCwd = relativePath && !relativePath.startsWith("..") && !relativePath.startsWith(`..${sep}`);
-				if (isWithinCwd) {
-					displayWorkdir = relativePath;
-				}
-			}
-		}
-
-		const cmdText = displayWorkdir
-			? `${prompt} ${uiTheme.fg("dim", `cd ${displayWorkdir} &&`)} ${command}`
-			: `${prompt} ${command}`;
-		const text = ui.title(cmdText);
+		const cmdText = formatBashCommand(args, uiTheme);
+		const text = renderStatusLine({ icon: "pending", title: "Bash", description: cmdText }, uiTheme);
 		return new Text(text, 0, 0);
 	},
 
@@ -194,19 +196,23 @@ export const bashToolRenderer = {
 		result: {
 			content: Array<{ type: string; text?: string }>;
 			details?: BashToolDetails;
+			isError?: boolean;
 		},
 		options: RenderResultOptions & { renderContext?: BashRenderContext },
 		uiTheme: Theme,
+		args?: BashRenderArgs,
 	): Component {
-		const ui = new ToolUIKit(uiTheme);
+		const cmdText = args ? formatBashCommand(args, uiTheme) : undefined;
+		const isError = result.isError === true;
+		const header = renderStatusLine({ icon: isError ? "error" : "success", title: "Bash" }, uiTheme);
 		const { renderContext } = options;
 		const details = result.details;
 		const expanded = renderContext?.expanded ?? options.expanded;
 		const previewLines = renderContext?.previewLines ?? BASH_DEFAULT_PREVIEW_LINES;
 
 		// Get output from context (preferred) or fall back to result content
-		const output = renderContext?.output ?? (result.content?.find((c) => c.type === "text")?.text ?? "").trim();
-		const displayOutput = output;
+		const output = renderContext?.output ?? result.content?.find(c => c.type === "text")?.text ?? "";
+		const displayOutput = output.trimEnd();
 		const showingFullOutput = expanded && renderContext?.isFullOutput === true;
 
 		// Build truncation warning lines (static, doesn't depend on width)
@@ -214,7 +220,10 @@ export const bashToolRenderer = {
 		const timeoutSeconds = renderContext?.timeout;
 		const timeoutLine =
 			typeof timeoutSeconds === "number"
-				? uiTheme.fg("dim", ui.wrapBrackets(`Timeout: ${timeoutSeconds}s`))
+				? uiTheme.fg(
+						"dim",
+						`${uiTheme.format.bracketLeft}Timeout: ${timeoutSeconds}s${uiTheme.format.bracketRight}`,
+					)
 				: undefined;
 		let warningLine: string | undefined;
 		if (truncation && !showingFullOutput) {
@@ -226,72 +235,57 @@ export const bashToolRenderer = {
 				warnings.push(`Truncated: showing ${truncation.outputLines} of ${truncation.totalLines} lines`);
 			} else {
 				warnings.push(
-					`Truncated: ${truncation.outputLines} lines shown (${ui.formatBytes(truncation.outputBytes)} limit)`,
+					`Truncated: ${truncation.outputLines} lines shown (${formatBytes(truncation.outputBytes)} limit)`,
 				);
 			}
 			if (warnings.length > 0) {
-				warningLine = uiTheme.fg("warning", ui.wrapBrackets(warnings.join(". ")));
+				warningLine = uiTheme.fg("warning", wrapBrackets(warnings.join(". "), uiTheme));
 			}
 		}
 
-		if (!displayOutput) {
-			// No output - just show warning if any
-			const lines = [timeoutLine, warningLine].filter(Boolean) as string[];
-			return new Text(lines.join("\n"), 0, 0);
-		}
-
-		if (expanded) {
-			// Show all lines when expanded
-			const styledOutput = displayOutput
-				.split("\n")
-				.map((line) => uiTheme.fg("toolOutput", line))
-				.join("\n");
-			const lines = [styledOutput, timeoutLine, warningLine].filter(Boolean) as string[];
-			return new Text(lines.join("\n"), 0, 0);
-		}
-
-		// Collapsed: use width-aware caching component
-		const styledOutput = displayOutput
-			.split("\n")
-			.map((line) => uiTheme.fg("toolOutput", line))
-			.join("\n");
-		const textContent = `\n${styledOutput}`;
-
-		let cachedWidth: number | undefined;
-		let cachedLines: string[] | undefined;
-		let cachedSkipped: number | undefined;
-
 		return {
 			render: (width: number): string[] => {
-				if (cachedLines === undefined || cachedWidth !== width) {
-					const result = truncateToVisualLines(textContent, previewLines, width);
-					cachedLines = result.visualLines;
-					cachedSkipped = result.skippedCount;
-					cachedWidth = width;
-				}
 				const outputLines: string[] = [];
-				if (cachedSkipped && cachedSkipped > 0) {
-					outputLines.push("");
-					const skippedLine = uiTheme.fg(
-						"dim",
-						`${uiTheme.format.ellipsis} (${cachedSkipped} earlier lines, showing ${cachedLines.length} of ${cachedSkipped + cachedLines.length}) (ctrl+o to expand)`,
-					);
-					outputLines.push(truncateToWidth(skippedLine, width, uiTheme.fg("dim", uiTheme.format.ellipsis)));
-				}
-				outputLines.push(...cachedLines);
-				if (timeoutLine) {
-					outputLines.push(truncateToWidth(timeoutLine, width, uiTheme.fg("dim", uiTheme.format.ellipsis)));
+				const hasOutput = displayOutput.trim().length > 0;
+				if (hasOutput) {
+					if (expanded) {
+						outputLines.push(...displayOutput.split("\n").map(line => uiTheme.fg("toolOutput", line)));
+					} else {
+						const styledOutput = displayOutput
+							.split("\n")
+							.map(line => uiTheme.fg("toolOutput", line))
+							.join("\n");
+						const textContent = styledOutput;
+						const result = truncateToVisualLines(textContent, previewLines, width);
+						if (result.skippedCount > 0) {
+							outputLines.push(
+								uiTheme.fg(
+									"dim",
+									`${uiTheme.format.ellipsis} (${result.skippedCount} earlier lines, showing ${result.visualLines.length} of ${result.skippedCount + result.visualLines.length}) (ctrl+o to expand)`,
+								),
+							);
+						}
+						outputLines.push(...result.visualLines);
+					}
 				}
-				if (warningLine) {
-					outputLines.push(truncateToWidth(warningLine, width, uiTheme.fg("warning", uiTheme.format.ellipsis)));
-				}
-				return outputLines;
-			},
-			invalidate: () => {
-				cachedWidth = undefined;
-				cachedLines = undefined;
-				cachedSkipped = undefined;
+				if (timeoutLine) outputLines.push(timeoutLine);
+				if (warningLine) outputLines.push(warningLine);
+
+				return renderOutputBlock(
+					{
+						header,
+						state: isError ? "error" : "success",
+						sections: [
+							{ lines: cmdText ? [uiTheme.fg("dim", cmdText)] : [] },
+							{ label: uiTheme.fg("toolTitle", "Output"), lines: outputLines },
+						],
+						width,
+					},
+					uiTheme,
+				);
 			},
+			invalidate: () => {},
 		};
 	},
+	mergeCallAndResult: true,
 };

package/src/tools/calculator.ts

@@ -1,19 +1,18 @@
 import type { AgentTool, AgentToolResult } from "@oh-my-pi/pi-agent-core";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-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 calculatorDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/calculator.md" with { type: "text" };
 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 } from "@sinclair/typebox";
-import type { ToolSession } from "./index";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import type { Theme } from "../modes/theme/theme";
+import calculatorDescription from "../prompts/tools/calculator.md" with { type: "text" };
+import { renderStatusLine, renderTreeList } from "../tui";
+import type { ToolSession } from ".";
 import {
 	formatCount,
 	formatEmptyMessage,
-	formatExpandHint,
-	formatMeta,
-	formatMoreItems,
+	formatErrorMessage,
 	PREVIEW_LIMITS,
 	TRUNCATE_LENGTHS,
 	truncate,
@@ -418,13 +417,13 @@ export class CalculatorTool implements AgentTool<typeof calculatorSchema, Calcul
 		signal?: AbortSignal,
 	): Promise<AgentToolResult<CalculatorToolDetails>> {
 		return untilAborted(signal, async () => {
-			const results = calculations.map((calc) => {
+			const results = calculations.map(calc => {
 				const value = evaluateExpression(calc.expression);
 				const output = `${calc.prefix}${formatResult(value)}${calc.suffix}`;
 				return { expression: calc.expression, value, output };
 			});
 
-			const outputText = results.map((result) => result.output).join("\n");
+			const outputText = results.map(result => result.output).join("\n");
 			return {
 				content: [{ type: "text", text: outputText }],
 				details: { results },
@@ -453,16 +452,11 @@ export const calculatorToolRenderer = {
 	 * Format: "Calc <expression> (N calcs)"
 	 */
 	renderCall(args: CalculatorRenderArgs, uiTheme: Theme): Component {
-		const label = uiTheme.fg("toolTitle", uiTheme.bold("Calc"));
 		const count = args.calculations?.length ?? 0;
 		const firstExpression = args.calculations?.[0]?.expression;
-		let text = label;
-		if (firstExpression) {
-			text += ` ${uiTheme.fg("accent", truncate(firstExpression, TRUNCATE_LENGTHS.TITLE, "..."))}`;
-		}
-		const meta: string[] = [];
-		if (count > 0) meta.push(formatCount("calc", count));
-		text += formatMeta(meta, uiTheme);
+		const description = firstExpression ? truncate(firstExpression, TRUNCATE_LENGTHS.TITLE, "...") : undefined;
+		const meta = count > 0 ? [formatCount("calc", count)] : [];
+		const text = renderStatusLine({ icon: "pending", title: "Calc", description, meta }, uiTheme);
 		return new Text(text, 0, 0);
 	},
 
@@ -471,46 +465,54 @@ export const calculatorToolRenderer = {
 	 * Collapsed mode shows first N items with expand hint; expanded shows all.
 	 */
 	renderResult(
-		result: { content: Array<{ type: string; text?: string }>; details?: CalculatorToolDetails },
+		result: { content: Array<{ type: string; text?: string }>; details?: CalculatorToolDetails; isError?: boolean },
 		{ expanded }: RenderResultOptions,
 		uiTheme: Theme,
+		args?: CalculatorRenderArgs,
 	): 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) {
+			const header = renderStatusLine({ icon: "error", title: "Calc" }, uiTheme);
+			return new Text([header, formatErrorMessage(textContent, uiTheme)].join("\n"), 0, 0);
+		}
 
 		// Prefer structured details; fall back to parsing text content
-		let outputs = details?.results?.map((entry) => entry.output) ?? [];
+		let outputs = details?.results?.map(entry => `${entry.expression} = ${entry.output}`) ?? [];
 		if (outputs.length === 0 && textContent.trim()) {
-			outputs = textContent.split("\n").filter((line) => line.trim().length > 0);
+			const rawOutputs = textContent.split("\n").filter(line => line.trim().length > 0);
+			const expressions = args?.calculations?.map(calc => calc.expression) ?? [];
+			if (expressions.length === rawOutputs.length && expressions.length > 0) {
+				outputs = rawOutputs.map((output, index) => `${expressions[index]} = ${output}`);
+			} else {
+				outputs = rawOutputs;
+			}
 		}
 
 		if (outputs.length === 0) {
-			return new Text(formatEmptyMessage("No results", uiTheme), 0, 0);
-		}
-
-		// Limit visible items in collapsed mode
-		const maxItems = expanded ? outputs.length : Math.min(outputs.length, COLLAPSED_LIST_LIMIT);
-		const hasMore = outputs.length > maxItems;
-		const icon = uiTheme.styledSymbol("status.success", "success");
-		const summary = uiTheme.fg("dim", formatCount("result", outputs.length));
-		const expandHint = formatExpandHint(uiTheme, expanded, hasMore);
-		let text = `${icon} ${summary}${expandHint}`;
-
-		// Render each result as a tree branch
-		for (let i = 0; i < maxItems; i += 1) {
-			const isLast = i === maxItems - 1 && !hasMore;
-			const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
-			text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg("toolOutput", outputs[i])}`;
-		}
-
-		// Show overflow indicator for collapsed mode
-		if (hasMore) {
-			text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg(
-				"muted",
-				formatMoreItems(outputs.length - maxItems, "result", uiTheme),
-			)}`;
+			const header = renderStatusLine({ icon: "warning", title: "Calc" }, uiTheme);
+			return new Text([header, formatEmptyMessage("No results", uiTheme)].join("\n"), 0, 0);
 		}
 
-		return new Text(text, 0, 0);
+		const description = args?.calculations?.[0]?.expression
+			? truncate(args.calculations[0].expression, TRUNCATE_LENGTHS.TITLE, "...")
+			: undefined;
+		const header = renderStatusLine(
+			{ icon: "success", title: "Calc", description, meta: [formatCount("result", outputs.length)] },
+			uiTheme,
+		);
+		const lines = renderTreeList(
+			{
+				items: outputs,
+				expanded,
+				maxCollapsed: COLLAPSED_LIST_LIMIT,
+				itemType: "result",
+				renderItem: output => uiTheme.fg("toolOutput", output),
+			},
+			uiTheme,
+		);
+
+		return new Text([header, ...lines].join("\n"), 0, 0);
 	},
+	mergeCallAndResult: true,
 };

package/src/tools/complete.ts

@@ -3,14 +3,13 @@
  *
  * Subagents must call this tool to finish and return structured JSON output.
  */
-
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
-import { subprocessToolRegistry } from "@oh-my-pi/pi-coding-agent/task/subprocess-tool-registry";
 import type { Static, TObject } from "@sinclair/typebox";
 import { Type } from "@sinclair/typebox";
 import Ajv, { type ErrorObject, type ValidateFunction } from "ajv";
-import type { ToolSession } from "./index";
+import { subprocessToolRegistry } from "../task/subprocess-tool-registry";
+import type { ToolSession } from ".";
 import { jtdToJsonSchema } from "./jtd-to-json-schema";
 
 export interface CompleteDetails {
@@ -46,7 +45,7 @@ function formatSchema(schema: unknown): string {
 function formatAjvErrors(errors: ErrorObject[] | null | undefined): string {
 	if (!errors || errors.length === 0) return "Unknown schema validation error.";
 	return errors
-		.map((err) => {
+		.map(err => {
 			const path = err.instancePath ? `${err.instancePath}: ` : "";
 			return `${path}${err.message ?? "invalid"}`;
 		})
@@ -137,6 +136,6 @@ export class CompleteTool implements AgentTool<TObject, CompleteDetails> {
 
 // Register subprocess tool handler for extraction + termination.
 subprocessToolRegistry.register<CompleteDetails>("complete", {
-	extractData: (event) => event.result?.details as CompleteDetails | undefined,
+	extractData: event => event.result?.details as CompleteDetails | undefined,
 	shouldTerminate: () => true,
 });

package/src/tools/context.ts

@@ -1,6 +1,6 @@
 import type { AgentToolContext, ToolCallContext } from "@oh-my-pi/pi-agent-core";
-import type { CustomToolContext } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import type { ExtensionUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
+import type { CustomToolContext } from "../extensibility/custom-tools/types";
+import type { ExtensionUIContext } from "../extensibility/extensions/types";
 
 declare module "@oh-my-pi/pi-agent-core" {
 	interface AgentToolContext extends CustomToolContext {