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

package/src/tools/list-limit.ts

@@ -1,4 +1,4 @@
-import type { LimitsMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
+import type { LimitsMeta } from "./output-meta";
 
 export interface ListLimitResult<T> {
 	items: T[];

package/src/tools/ls.ts

@@ -1,15 +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 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 { 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,
@@ -19,6 +18,7 @@ import {
 	formatErrorMessage,
 	PREVIEW_LIMITS,
 } from "./render-utils";
+import { ToolError, throwIfAborted } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { type TruncationResult, truncateHead } from "./truncate";
 
@@ -224,7 +224,7 @@ export const lsToolRenderer = {
 		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) {
 			const header = renderStatusLine({ icon: "error", title: "Ls", description: args?.path || "." }, uiTheme);
@@ -243,7 +243,7 @@ export const lsToolRenderer = {
 		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
 		}
 

package/src/tools/notebook.ts

@@ -1,13 +1,13 @@
 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 { 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 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, PREVIEW_LIMITS } from "./render-utils";
 
@@ -249,7 +249,7 @@ export const notebookToolRenderer = {
 		if (lineCount > 0) summaryParts.push(formatCount("line", lineCount));
 		if (totalCells !== undefined) summaryParts.push(`${totalCells} total`);
 
-		const outputLines = summaryParts.map((part) => uiTheme.fg("dim", part));
+		const outputLines = summaryParts.map(part => uiTheme.fg("dim", part));
 		const codeText = cellSource.join("");
 		const language = cellType === "markdown" ? "markdown" : undefined;
 

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,4 +1,4 @@
-import { ArtifactManager } from "@oh-my-pi/pi-coding-agent/session/artifacts";
+import { ArtifactManager } from "../session/artifacts";
 import type { ToolSession } from ".";
 
 export interface TailBuffer {

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 {

package/src/tools/python.ts

@@ -1,24 +1,24 @@
-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 type { ImageContent } from "@oh-my-pi/pi-ai";
-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 { 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 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 } from "@oh-my-pi/pi-tui";
 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 { OutputSink, type OutputSummary } from "../session/streaming-output";
+import { getTreeBranch, getTreeContinuePrefix, renderCodeCell } from "../tui";
 import type { ToolSession } from ".";
+import type { OutputMeta } from "./output-meta";
 import { allocateOutputArtifact, createTailBuffer } from "./output-utils";
 import { resolveToCwd } from "./path-utils";
 import { shortenPath, ToolUIKit, truncate } from "./render-utils";
+import { ToolAbortError, ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { DEFAULT_MAX_BYTES } from "./truncate";
 
@@ -177,9 +177,8 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 		// Clamp to reasonable range: 1s - 600s (10 min)
 		timeoutSec = Math.max(1, Math.min(600, timeoutSec));
 		const timeoutMs = timeoutSec * 1000;
-		const controller = new AbortController();
-		const onAbort = () => controller.abort();
-		signal?.addEventListener("abort", onAbort, { once: true });
+		const timeoutSignal = AbortSignal.timeout(timeoutMs);
+		const combinedSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
 		let outputSink: OutputSink | undefined;
 		let outputSummary: OutputSummary | undefined;
 		let outputDumped = false;
@@ -226,7 +225,7 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 
 			const buildUpdateDetails = (): PythonToolDetails => {
 				const details: PythonToolDetails = {
-					cells: cellResults.map((cell) => ({
+					cells: cellResults.map(cell => ({
 						...cell,
 						statusEvents: cell.statusEvents ? [...cell.statusEvents] : undefined,
 					})),
@@ -258,7 +257,7 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 			outputSink = new OutputSink({
 				artifactPath,
 				artifactId,
-				onChunk: (chunk) => {
+				onChunk: chunk => {
 					appendTail(chunk);
 					pushUpdate();
 				},
@@ -267,7 +266,7 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 			const baseExecutorOptions: Omit<PythonExecutorOptions, "reset"> = {
 				cwd: commandCwd,
 				timeoutMs,
-				signal: controller.signal,
+				signal: combinedSignal,
 				sessionId,
 				kernelMode: this.session.settings?.getPythonKernelMode?.() ?? "session",
 				useSharedGateway: this.session.settings?.getPythonSharedGateway?.() ?? true,
@@ -289,7 +288,7 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 				const executorOptions: PythonExecutorOptions = {
 					...baseExecutorOptions,
 					reset: isFirstCell ? reset : false,
-					onChunk: async (chunk) => {
+					onChunk: async chunk => {
 						await outputSink!.push(chunk);
 					},
 				};
@@ -398,7 +397,6 @@ export class PythonTool implements AgentTool<typeof pythonSchema> {
 
 			return resultBuilder.done();
 		} finally {
-			signal?.removeEventListener("abort", onAbort);
 			if (!outputDumped) {
 				try {
 					await finalizeOutput();
@@ -640,14 +638,14 @@ function formatStatusEventExpanded(event: PythonStatusEvent, theme: Theme): stri
 	switch (op) {
 		case "find":
 		case "glob":
-			if (data.matches) addItems(data.matches as unknown[], (m) => String(m));
+			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));
+			if (data.items) addItems(data.items as unknown[], m => String(m));
 			break;
 		case "grep":
 			if (data.hits) {
-				addItems(data.hits as unknown[], (h) => {
+				addItems(data.hits as unknown[], h => {
 					const hit = h as { line: number; text: string };
 					return `${hit.line}: ${truncate(hit.text, 60, theme.format.ellipsis)}`;
 				});
@@ -655,7 +653,7 @@ function formatStatusEventExpanded(event: PythonStatusEvent, theme: Theme): stri
 			break;
 		case "rgrep":
 			if (data.hits) {
-				addItems(data.hits as unknown[], (h) => {
+				addItems(data.hits as unknown[], h => {
 					const hit = h as { file: string; line: number; text: string };
 					return `${shortenPath(hit.file)}:${hit.line}: ${truncate(hit.text, 50, theme.format.ellipsis)}`;
 				});
@@ -663,28 +661,28 @@ function formatStatusEventExpanded(event: PythonStatusEvent, theme: Theme): stri
 			break;
 		case "rsed":
 			if (data.changed) {
-				addItems(data.changed as unknown[], (c) => {
+				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);
+			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) => {
+				addItems(data.entries as unknown[], e => {
 					const entry = e as { sha: string; subject: string };
 					return `${entry.sha} ${truncate(entry.subject, 50, theme.format.ellipsis)}`;
 				});
 			}
 			break;
 		case "git_status":
-			if (data.files) addItems(data.files as unknown[], (f) => String(f));
+			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));
+			if (data.branches) addItems(data.branches as unknown[], b => String(b));
 			break;
 		case "read":
 		case "cat":
@@ -750,7 +748,7 @@ function formatCellOutputLines(
 	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) => theme.fg("toolOutput", line));
+	const outputLines = displayLines.map(line => theme.fg("toolOutput", line));
 
 	if (outputLines.length === 0) {
 		return { lines: [], hiddenCount: 0 };
@@ -767,13 +765,14 @@ export const pythonToolRenderer = {
 		let displayWorkdir = args.cwd;
 
 		if (displayWorkdir) {
-			const resolvedCwd = resolve(cwd);
-			const resolvedWorkdir = resolve(displayWorkdir);
+			const resolvedCwd = path.resolve(cwd);
+			const resolvedWorkdir = path.resolve(displayWorkdir);
 			if (resolvedWorkdir === resolvedCwd) {
 				displayWorkdir = undefined;
 			} else {
-				const relativePath = relative(resolvedCwd, resolvedWorkdir);
-				const isWithinCwd = relativePath && !relativePath.startsWith("..") && !relativePath.startsWith(`..${sep}`);
+				const relativePath = path.relative(resolvedCwd, resolvedWorkdir);
+				const isWithinCwd =
+					relativePath && !relativePath.startsWith("..") && !relativePath.startsWith(`..${path.sep}`);
 				if (isWithinCwd) {
 					displayWorkdir = relativePath;
 				}
@@ -832,7 +831,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 ?? "").trimEnd();
+		const output = renderContext?.output ?? (result.content?.find(c => c.type === "text")?.text ?? "").trimEnd();
 
 		const jsonOutputs = details?.jsonOutputs ?? [];
 		const jsonLines = jsonOutputs.flatMap((value, index) => {
@@ -951,7 +950,7 @@ export const pythonToolRenderer = {
 		if (expanded) {
 			const styledOutput = combinedOutput
 				.split("\n")
-				.map((line) => uiTheme.fg("toolOutput", line))
+				.map(line => uiTheme.fg("toolOutput", line))
 				.join("\n");
 			const lines = [
 				styledOutput,
@@ -964,7 +963,7 @@ export const pythonToolRenderer = {
 
 		const styledOutput = combinedOutput
 			.split("\n")
-			.map((line) => uiTheme.fg("toolOutput", line))
+			.map(line => uiTheme.fg("toolOutput", line))
 			.join("\n");
 		const textContent = `\n${styledOutput}`;
 

package/src/tools/read.ts

@@ -1,28 +1,28 @@
-import { homedir } from "node:os";
+import * as os from "node:os";
 import path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
-import { CONFIG_DIR_NAME } from "@oh-my-pi/pi-coding-agent/config";
-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 { getLanguageFromPath, type Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import readDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/read.md" with { type: "text" };
-import type { ToolSession } from "@oh-my-pi/pi-coding-agent/sdk";
-import type { OutputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
-import { ToolAbortError, ToolError, throwIfAborted } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
-import { renderCodeCell, renderOutputBlock, renderStatusLine } from "@oh-my-pi/pi-coding-agent/tui";
-import { formatDimensionNote, resizeImage } from "@oh-my-pi/pi-coding-agent/utils/image-resize";
-import { detectSupportedImageMimeTypeFromFile } from "@oh-my-pi/pi-coding-agent/utils/mime";
-import { ensureTool } from "@oh-my-pi/pi-coding-agent/utils/tools-manager";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { ptree } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
+import { CONFIG_DIR_NAME } from "../config";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { getLanguageFromPath, type Theme } from "../modes/theme/theme";
+import readDescription from "../prompts/tools/read.md" with { type: "text" };
+import type { ToolSession } from "../sdk";
+import { renderCodeCell, renderOutputBlock, renderStatusLine } from "../tui";
+import { formatDimensionNote, resizeImage } from "../utils/image-resize";
+import { detectSupportedImageMimeTypeFromFile } from "../utils/mime";
+import { ensureTool } from "../utils/tools-manager";
 import { runFd } from "./find";
 import { applyListLimit } from "./list-limit";
 import { LsTool } from "./ls";
+import type { OutputMeta } from "./output-meta";
 import { resolveReadPath, resolveToCwd } from "./path-utils";
 import { shortenPath, wrapBrackets } from "./render-utils";
+import { ToolAbortError, ToolError, throwIfAborted } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import {
 	DEFAULT_MAX_BYTES,
@@ -37,7 +37,7 @@ import {
 const CONVERTIBLE_EXTENSIONS = new Set([".pdf", ".doc", ".docx", ".ppt", ".pptx", ".xls", ".xlsx", ".rtf", ".epub"]);
 
 // Remote mount path prefix (sshfs mounts) - skip fuzzy matching to avoid hangs
-const REMOTE_MOUNT_PREFIX = path.join(homedir(), CONFIG_DIR_NAME, "remote") + path.sep;
+const REMOTE_MOUNT_PREFIX = path.join(os.homedir(), CONFIG_DIR_NAME, "remote") + path.sep;
 
 function isRemoteMountPath(absolutePath: string): boolean {
 	return absolutePath.startsWith(REMOTE_MOUNT_PREFIX);
@@ -202,8 +202,8 @@ async function listCandidateFiles(
 		if (output) {
 			const nestedGitignores = output
 				.split("\n")
-				.map((line) => line.replace(/\r$/, "").trim())
-				.filter((line) => line.length > 0);
+				.map(line => line.replace(/\r$/, "").trim())
+				.filter(line => line.length > 0);
 			for (const file of nestedGitignores) {
 				const normalized = file.replace(/\\/g, "/");
 				if (normalized.includes("/node_modules/") || normalized.includes("/.git/")) {
@@ -238,8 +238,8 @@ async function listCandidateFiles(
 
 	const files = output
 		.split("\n")
-		.map((line) => line.replace(/\r$/, "").trim())
-		.filter((line) => line.length > 0);
+		.map(line => line.replace(/\r$/, "").trim())
+		.filter(line => line.length > 0);
 
 	return { files, truncated: files.length >= MAX_FUZZY_CANDIDATES };
 }
@@ -337,7 +337,7 @@ async function findReadPathSuggestions(
 	});
 
 	const listLimit = applyListLimit(matches, { limit: MAX_FUZZY_RESULTS });
-	const suggestions = listLimit.items.map((match) => match.path);
+	const suggestions = listLimit.items.map(match => match.path);
 
 	return { suggestions, scopeLabel, truncated };
 }
@@ -446,7 +446,7 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 
 					if (suggestions?.suggestions.length) {
 						const scopeLabel = suggestions.scopeLabel ? ` in ${suggestions.scopeLabel}` : "";
-						message += `\n\nClosest matches${scopeLabel}:\n${suggestions.suggestions.map((match) => `- ${match}`).join("\n")}`;
+						message += `\n\nClosest matches${scopeLabel}:\n${suggestions.suggestions.map(match => `- ${match}`).join("\n")}`;
 						if (suggestions.truncated) {
 							message += `\n[Search truncated to first ${MAX_FUZZY_CANDIDATES} paths. Refine the path if the match isn't listed.]`;
 						}
@@ -856,8 +856,8 @@ export const readToolRenderer = {
 		args?: ReadRenderArgs,
 	): Component {
 		const details = result.details;
-		const contentText = result.content?.find((c) => c.type === "text")?.text ?? "";
-		const imageContent = result.content?.find((c) => c.type === "image");
+		const contentText = result.content?.find(c => c.type === "text")?.text ?? "";
+		const imageContent = result.content?.find(c => c.type === "image");
 		const rawPath = args?.file_path || args?.path || "";
 		const filePath = shortenPath(rawPath);
 		const lang = getLanguageFromPath(rawPath);
@@ -892,7 +892,7 @@ export const readToolRenderer = {
 				{ icon: "success", title: "Read", description: filePath || rawPath || "image" },
 				uiTheme,
 			);
-			const detailLines = contentText ? contentText.split("\n").map((line) => uiTheme.fg("toolOutput", line)) : [];
+			const detailLines = contentText ? contentText.split("\n").map(line => uiTheme.fg("toolOutput", line)) : [];
 			const lines = [...detailLines, ...warningLines];
 			return {
 				render: (width: number) =>

package/src/tools/render-utils.ts

@@ -4,10 +4,9 @@
  * Provides consistent formatting, truncation, and display patterns across all
  * tool renderers to ensure a unified TUI experience.
  */
-
-import { homedir } from "node:os";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import { getTreeBranch } from "@oh-my-pi/pi-coding-agent/tui/utils";
+import * as os from "node:os";
+import type { Theme } from "../modes/theme/theme";
+import { getTreeBranch } from "../tui/utils";
 
 // =============================================================================
 // Standardized Display Constants
@@ -62,8 +61,8 @@ export function truncate(text: string, maxLen: number, ellipsis: string): string
  * Get first N lines of text as preview, with each line truncated.
  */
 export function getPreviewLines(text: string, maxLines: number, maxLineLen: number, ellipsis: string): string[] {
-	const lines = text.split("\n").filter((l) => l.trim());
-	return lines.slice(0, maxLines).map((l) => truncate(l.trim(), maxLineLen, ellipsis));
+	const lines = text.split("\n").filter(l => l.trim());
+	return lines.slice(0, maxLines).map(l => truncate(l.trim(), maxLineLen, ellipsis));
 }
 
 // =============================================================================
@@ -554,7 +553,7 @@ export function truncateDiffByHunk(
 
 	const segments = parseDiffSegments(lines);
 
-	const changeSegments = segments.filter((s) => s.isChange);
+	const changeSegments = segments.filter(s => s.isChange);
 	const changeLineCount = changeSegments.reduce((sum, s) => sum + s.lines.length, 0);
 
 	if (changeLineCount > maxLines) {
@@ -579,7 +578,7 @@ export function truncateDiffByHunk(
 	}
 
 	const contextBudget = maxLines - changeLineCount;
-	const contextSegments = segments.filter((s) => !s.isChange && !s.isEllipsis);
+	const contextSegments = segments.filter(s => !s.isChange && !s.isEllipsis);
 	const totalContextLines = contextSegments.reduce((sum, s) => sum + s.lines.length, 0);
 
 	const kept: string[] = [];
@@ -643,7 +642,7 @@ export function truncateDiffByHunk(
 // =============================================================================
 
 export function shortenPath(filePath: string, homeDir?: string): string {
-	const home = homeDir ?? homedir();
+	const home = homeDir ?? os.homedir();
 	if (home && filePath.startsWith(home)) {
 		return `~${filePath.slice(home.length)}`;
 	}

package/src/tools/renderers.ts

@@ -3,14 +3,13 @@
  *
  * These provide rich visualization for tool calls and results in the TUI.
  */
-
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { lspToolRenderer } from "@oh-my-pi/pi-coding-agent/lsp/render";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import { editToolRenderer } from "@oh-my-pi/pi-coding-agent/patch";
-import { taskToolRenderer } from "@oh-my-pi/pi-coding-agent/task/render";
-import { webSearchToolRenderer } from "@oh-my-pi/pi-coding-agent/web/search/render";
 import type { Component } from "@oh-my-pi/pi-tui";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { lspToolRenderer } from "../lsp/render";
+import type { Theme } from "../modes/theme/theme";
+import { editToolRenderer } from "../patch";
+import { taskToolRenderer } from "../task/render";
+import { webSearchToolRenderer } from "../web/search/render";
 import { askToolRenderer } from "./ask";
 import { bashToolRenderer } from "./bash";
 import { calculatorToolRenderer } from "./calculator";

package/src/tools/review.ts

@@ -5,12 +5,17 @@
  * Hidden by default - only enabled when explicitly listed in agent's tools.
  * Reviewers finish via `complete` tool with SubmitReviewDetails schema.
  */
-
+// ─────────────────────────────────────────────────────────────────────────────
+// Subprocess tool handlers - registered for extraction/rendering in task tool
+// ─────────────────────────────────────────────────────────────────────────────
+import path from "node:path";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import type { Theme, ThemeColor } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import { StringEnum } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Container, Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
+import type { Theme, ThemeColor } from "../modes/theme/theme";
+import { subprocessToolRegistry } from "../task/subprocess-tool-registry";
 
 export type FindingPriority = "P0" | "P1" | "P2" | "P3";
 
@@ -145,17 +150,9 @@ export interface SubmitReviewDetails {
 // Re-export types for external use
 export type { ReportFindingDetails };
 
-// ─────────────────────────────────────────────────────────────────────────────
-// Subprocess tool handlers - registered for extraction/rendering in task tool
-// ─────────────────────────────────────────────────────────────────────────────
-
-import path from "node:path";
-import { StringEnum } from "@oh-my-pi/pi-ai";
-import { subprocessToolRegistry } from "@oh-my-pi/pi-coding-agent/task/subprocess-tool-registry";
-
 // Register report_finding handler
 subprocessToolRegistry.register<ReportFindingDetails>("report_finding", {
-	extractData: (event) => event.result?.details as ReportFindingDetails | undefined,
+	extractData: event => event.result?.details as ReportFindingDetails | undefined,
 
 	renderInline: (data, theme) => {
 		const { label, icon, color } = getPriorityDisplay(data.priority, theme);