@nghyane/arcane 0.1.13 → 0.1.15

package/src/tools/write.ts

@@ -9,29 +9,28 @@ import type { Component } from "@nghyane/arcane-tui";
 import { Text } from "@nghyane/arcane-tui";
 import { untilAborted } from "@nghyane/arcane-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { createLspWritethrough, type FileDiagnosticsResult, type WritethroughCallback, writethroughNoop } from "../lsp";
-import { getLanguageFromPath, type Theme } from "../modes/theme/theme";
-import writeDescription from "../prompts/tools/write.md" with { type: "text" };
 import type { ToolSession } from "../sdk";
-import { Ellipsis, Hasher, type RenderCache, renderStatusLine, truncateToWidth } from "../tui";
-import { invalidateFsScanAfterWrite } from "./fs-cache-invalidation";
-import { type OutputMeta, outputMeta } from "./output-meta";
-import { resolveToCwd } from "./path-utils";
+import { getLanguageFromPath, type Theme } from "../theme/theme";
+import { renderStatusLine } from "../tui";
 import {
+	formatClickHint,
 	formatDiagnostics,
-	formatExpandHint,
-	formatMoreItems,
 	formatStatusIcon,
+	PREVIEW_LIMITS,
 	replaceTabs,
 	shortenPath,
-	ToolUIKit,
-} from "./render-utils";
+	TRUNCATE_LENGTHS,
+	truncateToWidth,
+} from "../ui/render-utils";
+import { invalidateFsScanAfterWrite } from "./fs-cache-invalidation";
+import { type OutputMeta, outputMeta } from "./output-meta";
+import { resolveToCwd } from "./path-utils";
 
 const writeSchema = Type.Object({
-	path: Type.String({ description: "Path to the file to write (relative or absolute)" }),
-	content: Type.String({ description: "Content to write to the file" }),
+	path: Type.String({ description: "File path (relative or absolute)" }),
+	content: Type.String({ description: "Complete file content to write" }),
 });
 
 export type WriteToolInput = Static<typeof writeSchema>;
@@ -69,10 +68,10 @@ type WriteParams = WriteToolInput;
  *
  * Creates or overwrites files with optional LSP formatting and diagnostics.
  */
-export class WriteTool implements AgentTool<typeof writeSchema, WriteToolDetails> {
+export class WriteTool implements AgentTool<typeof writeSchema, WriteToolDetails, Theme> {
 	readonly name = "write";
 	readonly label = "Write";
-	readonly description: string;
+	description = "Create a new file";
 	readonly parameters = writeSchema;
 	readonly nonAbortable = true;
 	readonly concurrency = "exclusive";
@@ -86,7 +85,6 @@ export class WriteTool implements AgentTool<typeof writeSchema, WriteToolDetails
 		this.#writethrough = enableLsp
 			? createLspWritethrough(session.cwd, { enableFormat, enableDiagnostics })
 			: writethroughNoop;
-		this.description = renderPromptTemplate(writeDescription);
 	}
 
 	async execute(
@@ -122,73 +120,8 @@ export class WriteTool implements AgentTool<typeof writeSchema, WriteToolDetails
 			};
 		});
 	}
-}
-
-// =============================================================================
-// TUI Renderer
-// =============================================================================
-
-interface WriteRenderArgs {
-	path?: string;
-	file_path?: string;
-	content?: string;
-}
 
-const WRITE_PREVIEW_LINES = 6;
-const WRITE_STREAMING_PREVIEW_LINES = 12;
-
-function countLines(text: string): number {
-	if (!text) return 0;
-	return text.split("\n").length;
-}
-
-function formatMetadataLine(lineCount: number | null, language: string | undefined, uiTheme: Theme): string {
-	const icon = uiTheme.getLangIcon(language);
-	if (lineCount !== null) {
-		return uiTheme.fg("dim", `${icon} ${lineCount} lines`);
-	}
-	return uiTheme.fg("dim", `${icon}`);
-}
-
-function formatStreamingContent(content: string, uiTheme: Theme, ui: ToolUIKit): string {
-	if (!content) return "";
-	const lines = content.split("\n");
-	const displayLines = lines.slice(-WRITE_STREAMING_PREVIEW_LINES);
-	const hidden = lines.length - displayLines.length;
-
-	let text = "\n\n";
-	if (hidden > 0) {
-		text += uiTheme.fg("dim", `… (${hidden} earlier lines)\n`);
-	}
-	for (const line of displayLines) {
-		text += `${uiTheme.fg("toolOutput", ui.truncate(replaceTabs(line), 80))}\n`;
-	}
-	text += uiTheme.fg("dim", `… (streaming)`);
-	return text;
-}
-
-function renderContentPreview(content: string, expanded: boolean, uiTheme: Theme, ui: ToolUIKit): string {
-	if (!content) return "";
-	const lines = content.split("\n");
-	const maxLines = expanded ? lines.length : Math.min(lines.length, WRITE_PREVIEW_LINES);
-	const displayLines = expanded ? lines : lines.slice(-maxLines);
-	const hidden = lines.length - displayLines.length;
-
-	let text = "\n\n";
-	for (const line of displayLines) {
-		text += `${uiTheme.fg("toolOutput", ui.truncate(replaceTabs(line), 80))}\n`;
-	}
-	if (!expanded && hidden > 0) {
-		const hint = formatExpandHint(uiTheme, expanded, hidden > 0);
-		const moreLine = `${formatMoreItems(hidden, "line")}${hint ? ` ${hint}` : ""}`;
-		text += uiTheme.fg("dim", moreLine);
-	}
-	return text;
-}
-
-export const writeToolRenderer = {
 	renderCall(args: WriteRenderArgs, options: RenderResultOptions, uiTheme: Theme): Component {
-		const ui = new ToolUIKit(uiTheme);
 		const rawPath = args.file_path || args.path || "";
 		const filePath = shortenPath(rawPath);
 		const lang = getLanguageFromPath(rawPath) ?? "text";
@@ -197,17 +130,18 @@ export const writeToolRenderer = {
 		const spinner =
 			options?.spinnerFrame !== undefined ? formatStatusIcon("running", uiTheme, options.spinnerFrame) : "";
 
-		let text = `${ui.title("Write")} ${spinner ? `${spinner} ` : ""}${langIcon} ${pathDisplay}`;
+		const title = uiTheme.fg("toolTitle", uiTheme.bold("Write"));
+		let text = `${title} ${spinner ? `${spinner} ` : ""}${langIcon} ${pathDisplay}`;
 
 		if (!args.content) {
 			return new Text(text, 0, 0);
 		}
 
 		// Show streaming preview of content (tail)
-		text += formatStreamingContent(args.content, uiTheme, ui);
+		text += formatStreamingContent(args.content, uiTheme);
 
 		return new Text(text, 0, 0);
-	},
+	}
 
 	renderResult(
 		result: { content: Array<{ type: string; text?: string }>; details?: WriteToolDetails },
@@ -215,60 +149,77 @@ export const writeToolRenderer = {
 		uiTheme: Theme,
 		args?: WriteRenderArgs,
 	): Component {
-		const ui = new ToolUIKit(uiTheme);
 		const rawPath = args?.file_path || args?.path || "";
 		const filePath = shortenPath(rawPath);
 		const fileContent = args?.content || "";
 		const lang = getLanguageFromPath(rawPath);
-		const langIcon = uiTheme.fg("muted", uiTheme.getLangIcon(lang));
-		const pathDisplay = filePath ? uiTheme.fg("accent", filePath) : uiTheme.fg("toolOutput", "…");
 		const lineCount = countLines(fileContent);
+		const diagnostics = result.details?.diagnostics;
+
+		const meta: string[] = [];
+		if (lineCount > 0) meta.push(`${lineCount} lines`);
+		if (lang) meta.push(lang);
 
-		// Build header with status icon
 		const header = renderStatusLine(
-			{
-				icon: "success",
-				title: "Write",
-				description: `${langIcon} ${pathDisplay}`,
-			},
+			{ icon: "success", title: "Write", description: filePath || "file", meta },
 			uiTheme,
 		);
-		const metadataLine = formatMetadataLine(lineCount, lang ?? "text", uiTheme);
-		const diagnostics = result.details?.diagnostics;
 
-		let cached: RenderCache | undefined;
+		// Tree-style content preview
+		const lines = fileContent ? fileContent.split("\n") : [];
+		const expanded = options.expanded;
+		const displayLines = expanded ? lines : lines.slice(-PREVIEW_LIMITS.WRITE_TAIL);
+		const skipped = lines.length - displayLines.length;
+
+		const bodyLines: string[] = [];
+		if (displayLines.length > 0) {
+			if (skipped > 0) {
+				bodyLines.push(uiTheme.fg("dim", `… ${skipped} more lines`));
+			}
+			for (let i = 0; i < displayLines.length; i++) {
+				bodyLines.push(uiTheme.fg("toolOutput", replaceTabs(displayLines[i])));
+			}
+			if (!expanded && skipped > 0) {
+				bodyLines.push(formatClickHint(uiTheme));
+			}
+		}
+
+		if (diagnostics) {
+			const diagText = formatDiagnostics(diagnostics, expanded, uiTheme, (fp: string) =>
+				uiTheme.getLangIcon(getLanguageFromPath(fp)),
+			);
+			if (diagText.trim()) bodyLines.push(diagText.trim());
+		}
+
+		const all = bodyLines.length > 0 ? [header, ...bodyLines] : [header];
+		return new Text(all.join("\n"), 0, 0);
+	}
+}
 
-		return {
-			render(width: number) {
-				const { expanded } = options;
-				const key = new Hasher().bool(expanded).u32(width).digest();
-				if (cached?.key === key) return cached.lines;
+interface WriteRenderArgs {
+	path?: string;
+	file_path?: string;
+	content?: string;
+}
 
-				let text = header;
-				text += `\n${metadataLine}`;
-				text += renderContentPreview(fileContent, expanded, uiTheme, ui);
+function countLines(text: string): number {
+	if (!text) return 0;
+	return text.split("\n").length;
+}
 
-				if (diagnostics) {
-					const diagText = formatDiagnostics(diagnostics, expanded, uiTheme, fp =>
-						uiTheme.getLangIcon(getLanguageFromPath(fp)),
-					);
-					if (diagText.trim()) {
-						const diagLines = diagText.split("\n");
-						const firstNonEmpty = diagLines.findIndex(line => line.trim());
-						if (firstNonEmpty >= 0) {
-							text += `\n${diagLines.slice(firstNonEmpty).join("\n")}`;
-						}
-					}
-				}
+function formatStreamingContent(content: string, uiTheme: Theme): string {
+	if (!content) return "";
+	const lines = content.split("\n");
+	const displayLines = lines.slice(-PREVIEW_LIMITS.EXPANDED_LINES);
+	const hidden = lines.length - displayLines.length;
 
-				const lines = text.split("\n").map(l => truncateToWidth(l, width, Ellipsis.Omit));
-				cached = { key, lines };
-				return lines;
-			},
-			invalidate() {
-				cached = undefined;
-			},
-		};
-	},
-	mergeCallAndResult: true,
-};
+	let text = "\n\n";
+	if (hidden > 0) {
+		text += uiTheme.fg("dim", `… (${hidden} earlier lines)\n`);
+	}
+	for (const line of displayLines) {
+		text += `${uiTheme.fg("toolOutput", truncateToWidth(replaceTabs(line), TRUNCATE_LENGTHS.CONTENT))}\n`;
+	}
+	text += uiTheme.fg("dim", `… (streaming)`);
+	return text;
+}

package/src/tui/code-cell.ts

@@ -1,8 +1,8 @@
 /**
  * Render a code cell with optional output section.
  */
-import { highlightCode, type Theme } from "../modes/theme/theme";
-import { formatDuration, formatExpandHint, formatMoreItems, replaceTabs } from "../tools/render-utils";
+import { highlightCode, type Theme } from "../theme/theme";
+import { formatClickHint, formatDuration, formatMoreItems, replaceTabs } from "../ui/render-utils";
 import { renderOutputBlock } from "./output-block";
 import type { State } from "./types";
 import { getStateIcon } from "./utils";
@@ -78,7 +78,7 @@ export function renderCodeCell(options: CodeCellOptions, theme: Theme): string[]
 	const codeLines = rawCodeLines.slice(0, maxCodeLines);
 	const hiddenCodeLines = rawCodeLines.length - codeLines.length;
 	if (hiddenCodeLines > 0) {
-		const hint = formatExpandHint(theme, expanded, hiddenCodeLines > 0);
+		const hint = formatClickHint(theme, expanded, hiddenCodeLines > 0);
 		const moreLine = `${formatMoreItems(hiddenCodeLines, "line")}${hint ? ` ${hint}` : ""}`;
 		codeLines.push(theme.fg("dim", moreLine));
 	}
@@ -93,7 +93,7 @@ export function renderCodeCell(options: CodeCellOptions, theme: Theme): string[]
 		outputLines.push(...displayLines);
 		const remaining = rawLines.length - maxLines;
 		if (remaining > 0) {
-			const hint = formatExpandHint(theme, expanded, remaining > 0);
+			const hint = formatClickHint(theme, expanded, remaining > 0);
 			const moreLine = `${formatMoreItems(remaining, "line")}${hint ? ` ${hint}` : ""}`;
 			outputLines.push(theme.fg("dim", moreLine));
 		}

package/src/tui/file-list.ts

@@ -1,8 +1,8 @@
 /**
  * Render file listings with optional icons and metadata.
  */
-import type { Theme } from "../modes/theme/theme";
-import { getLanguageFromPath } from "../modes/theme/theme";
+import type { Theme } from "../theme/theme";
+import { getLanguageFromPath } from "../theme/theme";
 import { renderTreeList } from "./tree-list";
 
 export interface FileEntry {

package/src/tui/output-block.ts

@@ -2,7 +2,7 @@
  * Bordered output container with optional header and sections.
  */
 import { padding, visibleWidth } from "@nghyane/arcane-tui";
-import type { Theme } from "../modes/theme/theme";
+import type { Theme } from "../theme/theme";
 import type { State } from "./types";
 import type { RenderCache } from "./utils";
 import { getStateBgColor, Hasher, padToWidth, truncateToWidth } from "./utils";

package/src/tui/status-line.ts

@@ -1,7 +1,7 @@
 /**
  * Standardized status header rendering for tool output.
  */
-import type { Theme, ThemeColor } from "../modes/theme/theme";
+import type { Theme, ThemeColor } from "../theme/theme";
 import type { IconType } from "./types";
 import { getStateIcon } from "./utils";
 

package/src/tui/tree-list.ts

@@ -1,8 +1,8 @@
 /**
  * Hierarchical tree list rendering helper.
  */
-import type { Theme } from "../modes/theme/theme";
-import { formatMoreItems, replaceTabs } from "../tools/render-utils";
+import type { Theme } from "../theme/theme";
+import { formatMoreItems, replaceTabs } from "../ui/render-utils";
 import type { TreeContext } from "./types";
 import { getTreeBranch, getTreeContinuePrefix } from "./utils";
 

package/src/tui/types.ts

@@ -1,7 +1,7 @@
 /**
  * Shared types for TUI rendering components.
  */
-import type { Theme } from "../modes/theme/theme";
+import type { Theme } from "../theme/theme";
 
 export type State = "pending" | "running" | "success" | "error" | "warning";
 export type IconType = "success" | "error" | "running" | "pending" | "warning" | "info";

package/src/tui/utils.ts

@@ -2,7 +2,7 @@
  * Shared helpers for tool-rendered UI components.
  */
 import { padding, visibleWidth } from "@nghyane/arcane-tui";
-import type { Theme, ThemeBg } from "../modes/theme/theme";
+import type { Theme, ThemeBg } from "../theme/theme";
 import type { IconType, State } from "./types";
 
 export { Ellipsis, truncateToWidth } from "@nghyane/arcane-tui";

package/src/{tools → ui}/render-utils.ts

@@ -6,10 +6,69 @@
  */
 import * as os from "node:os";
 import { type Ellipsis, truncateToWidth } from "@nghyane/arcane-tui";
-import type { Theme } from "../modes/theme/theme";
+import type { Theme } from "../theme/theme";
 
 export { Ellipsis, replaceTabs, truncateToWidth } from "@nghyane/arcane-tui";
 
+// =============================================================================
+// Tool Tiers
+// =============================================================================
+
+export type ToolTier = "quiet" | "action" | "interactive" | "subagent" | "default";
+
+const TOOL_TIERS: Record<string, ToolTier> = {
+	// Quiet — dim, 1 line, no expand
+	read: "quiet",
+	grep: "quiet",
+	find: "quiet",
+	fetch: "quiet",
+	search_code: "quiet",
+	lsp: "quiet",
+	browser: "quiet",
+	github: "quiet",
+	notebook: "quiet",
+	undo_edit: "quiet",
+	generate_image: "quiet",
+
+	// Action — normal color, show output, some expandable
+	bash: "action",
+	ssh: "action",
+	python: "action",
+	edit: "action",
+	write: "action",
+	web_search: "action",
+	exa_search: "action",
+	exa_search_deep: "action",
+	exa_search_code: "action",
+	exa_crawl: "action",
+	exa_company: "action",
+	exa_linkedin: "action",
+	exa_researcher_start: "action",
+	exa_researcher_poll: "action",
+
+	// Interactive — inline result, no expand
+	ask: "interactive",
+	todo_write: "interactive",
+
+	// Subagent — tool history + conclusion
+	task: "subagent",
+	explore: "subagent",
+	librarian: "subagent",
+	oracle: "subagent",
+	code_review: "subagent",
+};
+
+export function getToolTier(toolName: string): ToolTier {
+	return TOOL_TIERS[toolName] ?? "default";
+}
+
+/** Tools that gather context (read-only information retrieval). Grouped into context batches. */
+const CONTEXT_TOOLS = new Set(["read", "grep", "find", "fetch", "search_code", "lsp", "notebook"]);
+
+export function isContextTool(toolName: string): boolean {
+	return CONTEXT_TOOLS.has(toolName);
+}
+
 // =============================================================================
 // Standardized Display Constants
 // =============================================================================
@@ -23,13 +82,23 @@ export const PREVIEW_LIMITS = {
 	/** Items (files, results) shown in collapsed view */
 	COLLAPSED_ITEMS: 8,
 	/** Output preview lines in collapsed view */
-	OUTPUT_COLLAPSED: 3,
+	OUTPUT_COLLAPSED: 4,
 	/** Output preview lines in expanded view */
-	OUTPUT_EXPANDED: 10,
+	OUTPUT_EXPANDED: 12,
 	/** Max hunks shown when collapsed (edit tool) */
 	DIFF_COLLAPSED_HUNKS: 8,
 	/** Max diff lines shown when collapsed (edit tool) */
-	DIFF_COLLAPSED_LINES: 40,
+	DIFF_COLLAPSED_LINES: 20,
+	/** Tail lines for write tool collapsed view */
+	WRITE_TAIL: 6,
+	/** Streaming preview lines (edit/write) */
+	STREAMING_PREVIEW: 6,
+	/** Subagent tool history entries when streaming */
+	SUBAGENT_STREAMING_TOOLS: 4,
+	/** Subagent tool history entries when collapsed */
+	SUBAGENT_COLLAPSED_TOOLS: 3,
+	/** Subagent conclusion lines when collapsed */
+	SUBAGENT_CONCLUSION: 6,
 } as const;
 
 /** Truncation lengths for different content types */
@@ -44,11 +113,12 @@ export const TRUNCATE_LENGTHS = {
 	LINE: 110,
 	/** Very short (task previews, badges) */
 	SHORT: 40,
+	/** Subagent error messages */
+	SUBAGENT_ERROR: 70,
+	/** Subagent tool args preview */
+	TOOL_ARGS: 50,
 } as const;
 
-/** Standard expand hint text */
-export const EXPAND_HINT = "(Ctrl+O for more)";
-
 // =============================================================================
 // Text Truncation Utilities
 // =============================================================================
@@ -167,16 +237,6 @@ export function formatStatusIcon(status: ToolUIStatus, theme: Theme, spinnerFram
 	}
 }
 
-/**
- * Format the expand hint with proper theming.
- * Returns empty string if already expanded or there is nothing more to show.
- */
-export function formatExpandHint(theme: Theme, expanded?: boolean, hasMore?: boolean): string {
-	if (expanded) return "";
-	if (hasMore === false) return "";
-	return theme.fg("dim", wrapBrackets(EXPAND_HINT, theme));
-}
-
 /**
  * Format a badge like [done] or [failed] with brackets and color.
  */
@@ -195,16 +255,14 @@ export function formatMoreItems(remaining: number, itemType: string): string {
 	return `… ${safeRemaining} more ${pluralize(itemType, safeRemaining)}`;
 }
 
-export function formatMeta(meta: string[], theme: Theme): string {
-	return meta.length > 0 ? ` ${theme.fg("muted", meta.join(theme.sep.dot))}` : "";
-}
-
-export function formatScope(scopePath: string | undefined, theme: Theme): string {
-	return scopePath ? ` ${theme.fg("muted", `in ${scopePath}`)}` : "";
-}
-
-export function formatTruncationSuffix(truncated: boolean, theme: Theme): string {
-	return truncated ? theme.fg("warning", " (truncated)") : "";
+/**
+ * Render a subtle "click to expand" hint for truncated content.
+ * Returns empty string if already expanded or nothing to expand.
+ */
+export function formatClickHint(theme: Theme, expanded?: boolean, hasMore?: boolean): string {
+	if (expanded) return "";
+	if (hasMore === false) return "";
+	return theme.fg("dim", wrapBrackets("click to expand", theme));
 }
 
 export function formatErrorMessage(message: string | undefined, theme: Theme): string {
@@ -216,110 +274,13 @@ export function formatEmptyMessage(message: string, theme: Theme): string {
 	return `${theme.styledSymbol("status.warning", "warning")} ${theme.fg("muted", message)}`;
 }
 
-// =============================================================================
-// Tool UI Kit
-// =============================================================================
-
-export type ToolUIStatus = "success" | "error" | "warning" | "info" | "pending" | "running" | "aborted";
+type ToolUIStatus = "success" | "error" | "warning" | "info" | "pending" | "running" | "aborted";
 export type ToolUIColor = "success" | "error" | "warning" | "accent" | "muted";
 
-export interface ToolUITitleOptions {
-	bold?: boolean;
-}
-
 // =============================================================================
 // Diagnostic Formatting
 // =============================================================================
 
-export class ToolUIKit {
-	constructor(public theme: Theme) {}
-
-	title(label: string, options?: ToolUITitleOptions): string {
-		const content = options?.bold === false ? label : this.theme.bold(label);
-		return this.theme.fg("toolTitle", content);
-	}
-
-	meta(meta: string[]): string {
-		return formatMeta(meta, this.theme);
-	}
-
-	count(label: string, count: number): string {
-		return formatCount(label, count);
-	}
-
-	moreItems(remaining: number, itemType: string): string {
-		return formatMoreItems(remaining, itemType);
-	}
-
-	expandHint(expanded: boolean, hasMore: boolean): string {
-		return formatExpandHint(this.theme, expanded, hasMore);
-	}
-
-	scope(scopePath?: string): string {
-		return formatScope(scopePath, this.theme);
-	}
-
-	truncationSuffix(truncated: boolean): string {
-		return formatTruncationSuffix(truncated, this.theme);
-	}
-
-	errorMessage(message: string | undefined): string {
-		return formatErrorMessage(message, this.theme);
-	}
-
-	emptyMessage(message: string): string {
-		return formatEmptyMessage(message, this.theme);
-	}
-
-	badge(label: string, color: ToolUIColor): string {
-		return formatBadge(label, color, this.theme);
-	}
-
-	statusIcon(status: ToolUIStatus, spinnerFrame?: number): string {
-		return formatStatusIcon(status, this.theme, spinnerFrame);
-	}
-
-	wrapBrackets(text: string): string {
-		return wrapBrackets(text, this.theme);
-	}
-
-	truncate(text: string, maxLen: number): string {
-		return truncateToWidth(text, maxLen);
-	}
-
-	previewLines(text: string, maxLines: number, maxLineLen: number): string[] {
-		return getPreviewLines(text, maxLines, maxLineLen);
-	}
-
-	formatBytes(bytes: number): string {
-		return formatBytes(bytes);
-	}
-
-	formatTokens(tokens: number): string {
-		return formatTokens(tokens);
-	}
-
-	formatDuration(ms: number): string {
-		return formatDuration(ms);
-	}
-
-	formatAge(ageSeconds: number | null | undefined): string {
-		return formatAge(ageSeconds);
-	}
-
-	formatDiagnostics(
-		diag: { errored: boolean; summary: string; messages: string[] },
-		expanded: boolean,
-		getLangIcon: (filePath: string) => string,
-	): string {
-		return formatDiagnostics(diag, expanded, this.theme, getLangIcon);
-	}
-
-	formatDiffStats(added: number, removed: number, hunks: number): string {
-		return formatDiffStats(added, removed, hunks, this.theme);
-	}
-}
-
 interface ParsedDiagnostic {
 	filePath: string;
 	line: number;
@@ -477,7 +438,7 @@ export function formatDiagnostics(
 		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
 			"muted",
 			`… ${remaining} more`,
-		)} ${formatExpandHint(theme)}`;
+		)} ${formatClickHint(theme)}`;
 	}
 
 	return output;

package/src/utils/external-editor.ts

@@ -40,10 +40,10 @@ export async function openInEditor(
 		const stdio = options?.stdio ?? ["inherit", "inherit", "inherit"];
 
 		const child = spawn(editor, [...editorArgs, tmpFile], { stdio });
-		const exitCode = await new Promise<number>((resolve, reject) => {
-			child.once("exit", (code, signal) => resolve(code ?? (signal ? -1 : 0)));
-			child.once("error", error => reject(error));
-		});
+		const { promise: exitPromise, resolve, reject } = Promise.withResolvers<number>();
+		child.once("exit", (code, signal) => resolve(code ?? (signal ? -1 : 0)));
+		child.once("error", error => reject(error));
+		const exitCode = await exitPromise;
 
 		if (exitCode === 0) {
 			return (await Bun.file(tmpFile).text()).replace(/\n$/, "");

package/src/utils/file-mentions.ts

@@ -18,7 +18,7 @@ import {
 	truncateStringToBytesFromStart,
 } from "../session/streaming-output";
 import { resolveReadPath } from "../tools/path-utils";
-import { formatAge } from "../tools/render-utils";
+import { formatAge } from "../ui/render-utils";
 import { fuzzyMatch } from "./fuzzy";
 import { formatDimensionNote, resizeImage } from "./image-resize";
 import { detectSupportedImageMimeTypeFromFile } from "./mime";