@oh-my-pi/pi-coding-agent 3.14.0 → 3.15.0

package/src/core/tools/lsp/render.ts

@@ -14,14 +14,6 @@ import { highlight, supportsLanguage } from "cli-highlight";
 import type { Theme } from "../../../modes/interactive/theme/theme";
 import type { LspParams, LspToolDetails } from "./types";
 
-// =============================================================================
-// Tree Drawing Characters
-// =============================================================================
-
-const TREE_MID = "├─";
-const TREE_END = "└─";
-const TREE_PIPE = "│";
-
 // =============================================================================
 // Call Rendering
 // =============================================================================
@@ -75,7 +67,7 @@ export function renderResult(
 
 	const errorMatch = text.match(/(\d+)\s+error\(s\)/);
 	const warningMatch = text.match(/(\d+)\s+warning\(s\)/);
-	if (errorMatch || warningMatch || text.includes("✗")) {
+	if (errorMatch || warningMatch || text.includes(theme.status.error)) {
 		return renderDiagnostics(errorMatch, warningMatch, lines, expanded, theme);
 	}
 
@@ -112,16 +104,20 @@ function renderHover(
 	const afterCode = fullText.slice(fullText.indexOf("```", 3) + 3).trim();
 
 	const codeLines = highlightCode(code, lang, theme);
-	const icon = theme.fg("accent", "●");
+	const icon = theme.styledSymbol("status.info", "accent");
 	const langLabel = lang ? theme.fg("mdCodeBlockBorder", ` ${lang}`) : "";
 
 	if (expanded) {
+		const h = theme.boxSharp.horizontal;
+		const v = theme.boxSharp.vertical;
+		const top = `${theme.boxSharp.topLeft}${h.repeat(3)}`;
+		const bottom = `${theme.boxSharp.bottomLeft}${h.repeat(3)}`;
 		let output = `${icon} ${theme.fg("toolTitle", "Hover")}${langLabel}`;
-		output += `\n ${theme.fg("mdCodeBlockBorder", "┌───")}`;
+		output += `\n ${theme.fg("mdCodeBlockBorder", top)}`;
 		for (const line of codeLines) {
-			output += `\n ${theme.fg("mdCodeBlockBorder", "│")} ${line}`;
+			output += `\n ${theme.fg("mdCodeBlockBorder", v)} ${line}`;
 		}
-		output += `\n ${theme.fg("mdCodeBlockBorder", "└───")}`;
+		output += `\n ${theme.fg("mdCodeBlockBorder", bottom)}`;
 		if (afterCode) {
 			output += `\n ${theme.fg("muted", afterCode)}`;
 		}
@@ -133,17 +129,25 @@ function renderHover(
 	const expandHint = theme.fg("dim", " (Ctrl+O to expand)");
 
 	let output = `${icon} ${theme.fg("toolTitle", "Hover")}${langLabel}${expandHint}`;
-	output += `\n ${theme.fg("mdCodeBlockBorder", "│")} ${firstCodeLine}`;
+	const h = theme.boxSharp.horizontal;
+	const v = theme.boxSharp.vertical;
+	const bottom = `${theme.boxSharp.bottomLeft}${h.repeat(3)}`;
+	output += `\n ${theme.fg("mdCodeBlockBorder", v)} ${firstCodeLine}`;
 
 	if (codeLines.length > 1) {
-		output += `\n ${theme.fg("mdCodeBlockBorder", "│")} ${theme.fg("muted", `… ${codeLines.length - 1} more lines`)}`;
+		output += `\n ${theme.fg("mdCodeBlockBorder", v)} ${theme.fg(
+			"muted",
+			`${theme.format.ellipsis} ${codeLines.length - 1} more lines`,
+		)}`;
 	}
 
 	if (afterCode) {
-		const docPreview = afterCode.length > 60 ? `${afterCode.slice(0, 60)}…` : afterCode;
-		output += `\n ${theme.fg("dim", TREE_END)} ${theme.fg("muted", docPreview)}`;
+		const ellipsis = theme.format.ellipsis;
+		const sliceLen = Math.max(0, 60 - ellipsis.length);
+		const docPreview = afterCode.length > 60 ? `${afterCode.slice(0, sliceLen)}${ellipsis}` : afterCode;
+		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", docPreview)}`;
 	} else {
-		output += `\n ${theme.fg("mdCodeBlockBorder", "└───")}`;
+		output += `\n ${theme.fg("mdCodeBlockBorder", bottom)}`;
 	}
 
 	return new Text(output, 0, 0);
@@ -196,23 +200,44 @@ function renderDiagnostics(
 	const warnCount = warningMatch ? Number.parseInt(warningMatch[1], 10) : 0;
 
 	const icon =
-		errorCount > 0 ? theme.fg("error", "●") : warnCount > 0 ? theme.fg("warning", "●") : theme.fg("success", "●");
+		errorCount > 0
+			? theme.styledSymbol("status.error", "error")
+			: warnCount > 0
+				? theme.styledSymbol("status.warning", "warning")
+				: theme.styledSymbol("status.success", "success");
 
 	const meta: string[] = [];
 	if (errorCount > 0) meta.push(`${errorCount} error${errorCount !== 1 ? "s" : ""}`);
 	if (warnCount > 0) meta.push(`${warnCount} warning${warnCount !== 1 ? "s" : ""}`);
 	if (meta.length === 0) meta.push("No issues");
 
-	const diagLines = lines.filter((l) => l.includes("✗") || /:\d+:\d+/.test(l));
+	const diagLines = lines.filter((l) => l.includes(theme.status.error) || /:\d+:\d+/.test(l));
+	const parsedDiagnostics = diagLines
+		.map((line) => parseDiagnosticLine(line))
+		.filter((diag): diag is ParsedDiagnostic => diag !== null);
+	const fallbackDiagnostics: RawDiagnostic[] = diagLines.map((line) => ({ raw: line.trim() }));
 
 	if (expanded) {
 		let output = `${icon} ${theme.fg("toolTitle", "Diagnostics")} ${theme.fg("dim", meta.join(", "))}`;
-		for (let i = 0; i < diagLines.length; i++) {
-			const isLast = i === diagLines.length - 1;
-			const branch = isLast ? TREE_END : TREE_MID;
-			const line = diagLines[i].trim();
-			const color = line.includes("[error]") ? "error" : line.includes("[warning]") ? "warning" : "dim";
-			output += `\n ${theme.fg("dim", branch)} ${theme.fg(color, line)}`;
+		const items: DiagnosticItem[] = parsedDiagnostics.length > 0 ? parsedDiagnostics : fallbackDiagnostics;
+		for (let i = 0; i < items.length; i++) {
+			const item = items[i];
+			const isLast = i === items.length - 1;
+			const branch = isLast ? theme.tree.last : theme.tree.branch;
+			const detailPrefix = isLast ? "   " : `${theme.tree.vertical}  `;
+			if ("raw" in item) {
+				output += `\n ${theme.fg("dim", branch)} ${theme.fg("muted", item.raw)}`;
+				continue;
+			}
+			const severityColor = severityToColor(item.severity);
+			const location = `${item.file}:${item.line}:${item.col}`;
+			output += `\n ${theme.fg("dim", branch)} ${theme.fg(severityColor, location)} ${theme.fg(
+				"dim",
+				`[${item.severity}]`,
+			)}`;
+			if (item.message) {
+				output += `\n ${theme.fg("dim", detailPrefix)}${theme.fg("muted", trimTo(item.message, 120, theme))}`;
+			}
 		}
 		return new Text(output, 0, 0);
 	}
@@ -221,14 +246,28 @@ function renderDiagnostics(
 	const expandHint = theme.fg("dim", " (Ctrl+O to expand)");
 	let output = `${icon} ${theme.fg("toolTitle", "Diagnostics")} ${theme.fg("dim", meta.join(", "))}${expandHint}`;
 
-	const previewLines = diagLines.length > 0 ? diagLines.slice(0, 4) : lines.slice(0, 4);
-	for (let i = 0; i < previewLines.length; i++) {
-		const isLast = i === previewLines.length - 1 && diagLines.length <= 4;
-		const branch = isLast ? TREE_END : TREE_MID;
-		output += `\n ${theme.fg("dim", branch)} ${previewLines[i].trim()}`;
+	const previewItems: DiagnosticItem[] =
+		parsedDiagnostics.length > 0 ? parsedDiagnostics.slice(0, 3) : fallbackDiagnostics.slice(0, 3);
+	const remaining =
+		(parsedDiagnostics.length > 0 ? parsedDiagnostics.length : fallbackDiagnostics.length) - previewItems.length;
+	for (let i = 0; i < previewItems.length; i++) {
+		const item = previewItems[i];
+		const isLast = i === previewItems.length - 1 && remaining <= 0;
+		const branch = isLast ? theme.tree.last : theme.tree.branch;
+		if ("raw" in item) {
+			output += `\n ${theme.fg("dim", branch)} ${theme.fg("muted", item.raw)}`;
+			continue;
+		}
+		const severityColor = severityToColor(item.severity);
+		const location = `${item.file}:${item.line}:${item.col}`;
+		const message = item.message ? ` ${theme.fg("muted", trimTo(item.message, 80, theme))}` : "";
+		output += `\n ${theme.fg("dim", branch)} ${theme.fg(severityColor, location)}${message}`;
 	}
-	if (diagLines.length > 4) {
-		output += `\n ${theme.fg("dim", TREE_END)} ${theme.fg("muted", `… ${diagLines.length - 4} more`)}`;
+	if (remaining > 0) {
+		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
+			"muted",
+			`${theme.format.ellipsis} ${remaining} more`,
+		)}`;
 	}
 
 	return new Text(output, 0, 0);
@@ -243,7 +282,8 @@ function renderDiagnostics(
  */
 function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded: boolean, theme: Theme): Text {
 	const refCount = Number.parseInt(refMatch[1], 10);
-	const icon = refCount > 0 ? theme.fg("success", "●") : theme.fg("warning", "●");
+	const icon =
+		refCount > 0 ? theme.styledSymbol("status.success", "success") : theme.styledSymbol("status.warning", "warning");
 
 	const locLines = lines.filter((l) => /^\s*\S+:\d+:\d+/.test(l));
 
@@ -269,41 +309,55 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 			const file = filesToShow[fi];
 			const locs = byFile.get(file)!;
 			const isLastFile = fi === filesToShow.length - 1 && files.length <= maxFiles;
-			const fileBranch = isLastFile ? TREE_END : TREE_MID;
-			const fileCont = isLastFile ? "   " : `${TREE_PIPE}  `;
-
-			if (locs.length === 1) {
-				output += `\n ${theme.fg("dim", fileBranch)} ${theme.fg("accent", file)}:${theme.fg(
-					"muted",
-					`${locs[0][0]}:${locs[0][1]}`,
-				)}`;
-			} else {
-				output += `\n ${theme.fg("dim", fileBranch)} ${theme.fg("accent", file)}`;
+			const fileBranch = isLastFile ? theme.tree.last : theme.tree.branch;
+			const fileCont = isLastFile ? "   " : `${theme.tree.vertical}  `;
 
-				const locsToShow = locs.slice(0, maxLocsPerFile);
-				const locStrs = locsToShow.map(([l, c]) => `${l}:${c}`);
-				const locsText = locStrs.join(", ");
-				const hasMore = locs.length > maxLocsPerFile;
+			const fileMeta = `${locs.length} reference${locs.length !== 1 ? "s" : ""}`;
+			output += `\n ${theme.fg("dim", fileBranch)} ${theme.fg("accent", file)} ${theme.fg("dim", fileMeta)}`;
 
-				output += `\n ${theme.fg("dim", fileCont)}${theme.fg("dim", TREE_END)} ${theme.fg("muted", locsText)}`;
-				if (hasMore) {
-					output += theme.fg("dim", ` … +${locs.length - maxLocsPerFile} more`);
+			if (maxLocsPerFile > 0) {
+				const locsToShow = locs.slice(0, maxLocsPerFile);
+				for (let li = 0; li < locsToShow.length; li++) {
+					const [line, col] = locsToShow[li];
+					const isLastLoc = li === locsToShow.length - 1 && locs.length <= maxLocsPerFile;
+					const locBranch = isLastLoc ? theme.tree.last : theme.tree.branch;
+					const locCont = isLastLoc ? "   " : `${theme.tree.vertical}  `;
+					output += `\n ${theme.fg("dim", fileCont)}${theme.fg("dim", locBranch)} ${theme.fg(
+						"muted",
+						`line ${line}, col ${col}`,
+					)}`;
+					if (expanded) {
+						const context = `at ${file}:${line}:${col}`;
+						output += `\n ${theme.fg("dim", fileCont)}${theme.fg("dim", locCont)}${theme.fg(
+							"muted",
+							trimTo(context, 120, theme),
+						)}`;
+					}
+				}
+				if (locs.length > maxLocsPerFile) {
+					output += `\n ${theme.fg("dim", fileCont)}${theme.fg("dim", theme.tree.last)} ${theme.fg(
+						"muted",
+						`${theme.format.ellipsis} ${locs.length - maxLocsPerFile} more`,
+					)}`;
 				}
 			}
 		}
 
 		if (files.length > maxFiles) {
-			output += `\n ${theme.fg("dim", TREE_END)} ${theme.fg("muted", `… ${files.length - maxFiles} more files`)}`;
+			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
+				"muted",
+				`${theme.format.ellipsis} ${files.length - maxFiles} more files`,
+			)}`;
 		}
 
 		return output;
 	};
 
 	if (expanded) {
-		return new Text(renderGrouped(files.length, 30, false), 0, 0);
+		return new Text(renderGrouped(files.length, 3, false), 0, 0);
 	}
 
-	return new Text(renderGrouped(4, 10, true), 0, 0);
+	return new Text(renderGrouped(3, 1, true), 0, 0);
 }
 
 // =============================================================================
@@ -315,12 +369,13 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
  */
 function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded: boolean, theme: Theme): Text {
 	const fileName = symbolsMatch[1];
-	const icon = theme.fg("accent", "●");
+	const icon = theme.styledSymbol("status.info", "accent");
 
 	interface SymbolInfo {
 		name: string;
 		line: string;
 		indent: number;
+		icon: string;
 	}
 
 	const symbolLines = lines.filter((l) => l.includes("@") && l.includes("line"));
@@ -328,9 +383,9 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 
 	for (const line of symbolLines) {
 		const indent = line.match(/^(\s*)/)?.[1].length ?? 0;
-		const symMatch = line.trim().match(/^(.+?)\s*@\s*line\s*(\d+)/);
+		const symMatch = line.trim().match(/^(\S+)\s+(.+?)\s*@\s*line\s*(\d+)/);
 		if (symMatch) {
-			symbols.push({ name: symMatch[1], line: symMatch[2], indent });
+			symbols.push({ icon: symMatch[1], name: symMatch[2], line: symMatch[3], indent });
 		}
 	}
 
@@ -360,7 +415,7 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 			if (ancestorIdx >= 0 && isLastSibling(ancestorIdx)) {
 				prefix += "   ";
 			} else {
-				prefix += `${TREE_PIPE}  `;
+				prefix += `${theme.tree.vertical}  `;
 			}
 		}
 		return prefix;
@@ -374,28 +429,37 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 		for (let i = 0; i < symbols.length; i++) {
 			const sym = symbols[i];
 			const prefix = getPrefix(i);
-			const branch = isLastSibling(i) ? TREE_END : TREE_MID;
-			output += `\n${prefix}${theme.fg("dim", branch)} ${theme.fg("accent", sym.name)} ${theme.fg(
-				"muted",
-				`@${sym.line}`,
+			const isLast = isLastSibling(i);
+			const branch = isLast ? theme.tree.last : theme.tree.branch;
+			const detailPrefix = isLast ? "   " : `${theme.tree.vertical}  `;
+			output += `\n${prefix}${theme.fg("dim", branch)} ${theme.fg("accent", sym.icon)} ${theme.fg(
+				"accent",
+				sym.name,
 			)}`;
+			output += `\n${prefix}${theme.fg("dim", detailPrefix)}${theme.fg("muted", `line ${sym.line}`)}`;
 		}
 		return new Text(output, 0, 0);
 	}
 
-	// Collapsed: show first 4 top-level symbols
+	// Collapsed: show first 3 top-level symbols
 	const expandHint = theme.fg("dim", " (Ctrl+O to expand)");
 	let output = `${icon} ${theme.fg("toolTitle", "Symbols")} ${theme.fg("dim", `in ${fileName}`)}${expandHint}`;
 
-	const topLevel = symbols.filter((s) => s.indent === 0).slice(0, 4);
+	const topLevel = symbols.filter((s) => s.indent === 0).slice(0, 3);
 	for (let i = 0; i < topLevel.length; i++) {
 		const sym = topLevel[i];
-		const isLast = i === topLevel.length - 1 && topLevelCount <= 4;
-		const branch = isLast ? TREE_END : TREE_MID;
-		output += `\n ${theme.fg("dim", branch)} ${theme.fg("accent", sym.name)} ${theme.fg("muted", `@${sym.line}`)}`;
+		const isLast = i === topLevel.length - 1 && topLevelCount <= 3;
+		const branch = isLast ? theme.tree.last : theme.tree.branch;
+		output += `\n ${theme.fg("dim", branch)} ${theme.fg("accent", sym.icon)} ${theme.fg(
+			"accent",
+			sym.name,
+		)} ${theme.fg("muted", `line ${sym.line}`)}`;
 	}
-	if (topLevelCount > 4) {
-		output += `\n ${theme.fg("dim", TREE_END)} ${theme.fg("muted", `… ${topLevelCount - 4} more`)}`;
+	if (topLevelCount > 3) {
+		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
+			"muted",
+			`${theme.format.ellipsis} ${topLevelCount - 3} more`,
+		)}`;
 	}
 
 	return new Text(output, 0, 0);
@@ -409,20 +473,22 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
  * Generic fallback rendering for unknown result types.
  */
 function renderGeneric(text: string, lines: string[], expanded: boolean, theme: Theme): Text {
-	const hasError = text.includes("Error:") || text.includes("✗");
-	const hasSuccess = text.includes("✓") || text.includes("Applied");
+	const hasError = text.includes("Error:") || text.includes(theme.status.error);
+	const hasSuccess = text.includes(theme.status.success) || text.includes("Applied");
 
 	const icon =
 		hasError && !hasSuccess
-			? theme.fg("error", "●")
+			? theme.styledSymbol("status.error", "error")
 			: hasSuccess && !hasError
-				? theme.fg("success", "●")
-				: theme.fg("accent", "●");
+				? theme.styledSymbol("status.success", "success")
+				: theme.styledSymbol("status.info", "accent");
 
 	if (expanded) {
-		let output = `${icon} ${theme.fg("toolTitle", "LSP")}`;
-		for (const line of lines) {
-			output += `\n ${line}`;
+		let output = `${icon} ${theme.fg("toolTitle", "LSP")} ${theme.fg("dim", "Output")}`;
+		for (let i = 0; i < lines.length; i++) {
+			const isLast = i === lines.length - 1;
+			const branch = isLast ? theme.tree.last : theme.tree.branch;
+			output += `\n ${theme.fg("dim", branch)} ${lines[i]}`;
 		}
 		return new Text(output, 0, 0);
 	}
@@ -435,13 +501,60 @@ function renderGeneric(text: string, lines: string[], expanded: boolean, theme:
 		const previewLines = lines.slice(1, 4);
 		for (let i = 0; i < previewLines.length; i++) {
 			const isLast = i === previewLines.length - 1 && lines.length <= 4;
-			const branch = isLast ? TREE_END : TREE_MID;
+			const branch = isLast ? theme.tree.last : theme.tree.branch;
 			output += `\n ${theme.fg("dim", branch)} ${theme.fg("dim", previewLines[i].trim().slice(0, 80))}`;
 		}
 		if (lines.length > 4) {
-			output += `\n ${theme.fg("dim", TREE_END)} ${theme.fg("muted", `… ${lines.length - 4} more lines`)}`;
+			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
+				"muted",
+				`${theme.format.ellipsis} ${lines.length - 4} more lines`,
+			)}`;
 		}
 	}
 
 	return new Text(output, 0, 0);
 }
+
+// =============================================================================
+// Parsing Helpers
+// =============================================================================
+
+interface ParsedDiagnostic {
+	file: string;
+	line: string;
+	col: string;
+	severity: string;
+	message: string;
+}
+
+interface RawDiagnostic {
+	raw: string;
+}
+
+type DiagnosticItem = ParsedDiagnostic | RawDiagnostic;
+
+function parseDiagnosticLine(line: string): ParsedDiagnostic | null {
+	const match = line.trim().match(/^(.*):(\d+):(\d+)\s+\[(\w+)\]\s*(.*)$/);
+	if (!match) return null;
+	const [, file, lineNum, colNum, severity, message] = match;
+	return { file, line: lineNum, col: colNum, severity: severity.toLowerCase(), message };
+}
+
+function severityToColor(severity: string): "error" | "warning" | "accent" | "dim" {
+	switch (severity) {
+		case "error":
+			return "error";
+		case "warning":
+			return "warning";
+		case "info":
+			return "accent";
+		default:
+			return "dim";
+	}
+}
+
+function trimTo(value: string, maxLength: number, theme: Theme): string {
+	if (value.length <= maxLength) return value;
+	const sliceLen = Math.max(0, maxLength - theme.format.ellipsis.length);
+	return `${value.slice(0, sliceLen)}${theme.format.ellipsis}`;
+}

package/src/core/tools/lsp/types.ts

@@ -316,6 +316,28 @@ export interface Hover {
 	range?: Range;
 }
 
+// =============================================================================
+// Linter Client Interface
+// =============================================================================
+
+/**
+ * Interface for linter/formatter clients.
+ * Can be implemented using LSP protocol or CLI tools.
+ */
+export interface LinterClient {
+	/** Format file content. Returns formatted content. */
+	format(filePath: string, content: string): Promise<string>;
+
+	/** Get diagnostics for a file. Content should already be written to disk. */
+	lint(filePath: string): Promise<Diagnostic[]>;
+
+	/** Dispose of any resources (e.g., LSP connection) */
+	dispose?(): void;
+}
+
+/** Factory function to create a LinterClient */
+export type LinterClientFactory = (config: ServerConfig, cwd: string) => LinterClient;
+
 // =============================================================================
 // Server Configuration
 // =============================================================================
@@ -341,6 +363,11 @@ export interface ServerConfig {
 	isLinter?: boolean;
 	/** Resolved absolute path to the command binary (set during config loading) */
 	resolvedCommand?: string;
+	/**
+	 * Custom linter client factory. If provided, creates a custom client instead of using LSP.
+	 * The client handles format/lint operations. Useful for tools with buggy LSP implementations.
+	 */
+	createClient?: LinterClientFactory;
 }
 
 // =============================================================================

package/src/core/tools/lsp/utils.ts

@@ -1,4 +1,5 @@
 import path from "node:path";
+import { type Theme, theme } from "../../../modes/interactive/theme/theme";
 import type {
 	Diagnostic,
 	DiagnosticSeverity,
@@ -197,13 +198,6 @@ const SEVERITY_NAMES: Record<DiagnosticSeverity, string> = {
 	4: "hint",
 };
 
-const SEVERITY_ICONS: Record<DiagnosticSeverity, string> = {
-	1: "✖",
-	2: "⚠",
-	3: "ℹ",
-	4: "💡",
-};
-
 /**
  * Convert diagnostic severity number to string name.
  */
@@ -215,7 +209,21 @@ export function severityToString(severity?: DiagnosticSeverity): string {
  * Get icon for diagnostic severity.
  */
 export function severityToIcon(severity?: DiagnosticSeverity): string {
-	return SEVERITY_ICONS[severity ?? 1] ?? "?";
+	const currentTheme = theme as Theme | undefined;
+	const fallback = currentTheme?.format?.bullet ?? "*";
+	const status = currentTheme?.status;
+	switch (severity ?? 1) {
+		case 1:
+			return status?.error ?? fallback;
+		case 2:
+			return status?.warning ?? fallback;
+		case 3:
+			return status?.info ?? fallback;
+		case 4:
+			return currentTheme?.format?.bullet ?? fallback;
+		default:
+			return status?.error ?? fallback;
+	}
 }
 
 /**
@@ -305,7 +313,7 @@ export function formatWorkspaceEdit(edit: WorkspaceEdit, cwd: string): string[]
 						break;
 					case "rename":
 						results.push(
-							`RENAME: ${path.relative(cwd, uriToFile(change.oldUri))} → ${path.relative(cwd, uriToFile(change.newUri))}`,
+							`RENAME: ${path.relative(cwd, uriToFile(change.oldUri))} ${theme.nav.cursor} ${path.relative(cwd, uriToFile(change.newUri))}`,
 						);
 						break;
 					case "delete":
@@ -328,30 +336,62 @@ export function formatTextEdit(edit: TextEdit, maxLength = 50): string {
 		edit.newText.length > maxLength
 			? `${edit.newText.slice(0, maxLength).replace(/\n/g, "\\n")}...`
 			: edit.newText.replace(/\n/g, "\\n");
-	return `line ${range} → "${preview}"`;
+	return `line ${range} ${theme.nav.cursor} "${preview}"`;
 }
 
 // =============================================================================
 // Symbol Formatting
 // =============================================================================
 
-const SYMBOL_KIND_ICONS: Partial<Record<SymbolKind, string>> = {
-	5: "○", // Class
-	6: "ƒ", // Method
-	11: "◇", // Interface
-	12: "ƒ", // Function
-	13: "◆", // Variable
-	14: "◆", // Constant
-	10: "◎", // Enum
-	23: "□", // Struct
-	2: "◫", // Module
-};
+function getSymbolKindIcons(): Record<SymbolKind, string> {
+	const currentTheme = theme as Theme | undefined;
+	const fallback = currentTheme?.format?.bullet ?? "*";
+	const dash = currentTheme?.format?.dash ?? fallback;
+	const icon = currentTheme?.icon;
+
+	const file = icon?.file ?? fallback;
+	const folder = icon?.folder ?? fallback;
+	const pkg = icon?.package ?? folder;
+	const model = icon?.model ?? fallback;
+	const func = icon?.auto ?? dash;
+
+	return {
+		1: file, // File
+		2: folder, // Module
+		3: folder, // Namespace
+		4: pkg, // Package
+		5: model, // Class
+		6: func, // Method
+		7: fallback, // Property
+		8: fallback, // Field
+		9: func, // Constructor
+		10: fallback, // Enum
+		11: model, // Interface
+		12: func, // Function
+		13: fallback, // Variable
+		14: fallback, // Constant
+		15: fallback, // String
+		16: fallback, // Number
+		17: fallback, // Boolean
+		18: fallback, // Array
+		19: fallback, // Object
+		20: fallback, // Key
+		21: fallback, // Null
+		22: fallback, // EnumMember
+		23: folder, // Struct
+		24: fallback, // Event
+		25: fallback, // Operator
+		26: fallback, // TypeParameter
+	};
+}
 
 /**
  * Get icon for symbol kind.
  */
 export function symbolKindToIcon(kind: SymbolKind): string {
-	return SYMBOL_KIND_ICONS[kind] ?? "•";
+	const currentTheme = theme as Theme | undefined;
+	const bullet = currentTheme?.format?.bullet ?? "*";
+	return getSymbolKindIcons()[kind] ?? bullet;
 }
 
 /**

package/src/core/tools/notebook.ts

@@ -26,6 +26,8 @@ export interface NotebookToolDetails {
 	cellType?: string;
 	/** Total cell count after operation */
 	totalCells: number;
+	/** Cell content lines after operation (or removed content for delete) */
+	cellSource?: string[];
 }
 
 interface NotebookCell {
@@ -110,12 +112,14 @@ export function createNotebookTool(cwd: string): AgentTool<typeof notebookSchema
 				// Perform the action
 				let resultMessage: string;
 				let finalCellType: string | undefined;
+				let cellSource: string[] | undefined;
 
 				switch (action) {
 					case "edit": {
 						const sourceLines = splitIntoLines(content!);
 						notebook.cells[cell_index].source = sourceLines;
 						finalCellType = notebook.cells[cell_index].cell_type;
+						cellSource = sourceLines;
 						resultMessage = `Replaced cell ${cell_index} (${finalCellType})`;
 						break;
 					}
@@ -133,11 +137,14 @@ export function createNotebookTool(cwd: string): AgentTool<typeof notebookSchema
 						}
 						notebook.cells.splice(cell_index, 0, newCell);
 						finalCellType = newCellType;
+						cellSource = sourceLines;
 						resultMessage = `Inserted ${newCellType} cell at position ${cell_index}`;
 						break;
 					}
 					case "delete": {
-						finalCellType = notebook.cells[cell_index].cell_type;
+						const removedCell = notebook.cells[cell_index];
+						finalCellType = removedCell.cell_type;
+						cellSource = removedCell.source;
 						notebook.cells.splice(cell_index, 1);
 						resultMessage = `Deleted cell ${cell_index} (${finalCellType})`;
 						break;
@@ -163,6 +170,7 @@ export function createNotebookTool(cwd: string): AgentTool<typeof notebookSchema
 						cellIndex: cell_index,
 						cellType: finalCellType,
 						totalCells: newCellCount,
+						cellSource,
 					},
 				};
 			});