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

package/src/lsp/index.ts

@@ -1,15 +1,14 @@
-import type { Dirent } from "node:fs";
-import { existsSync, statSync } from "node:fs";
+import * as fs from "node:fs";
 import 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 Theme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import lspDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/lsp.md" with { type: "text" };
-import type { ToolSession } from "@oh-my-pi/pi-coding-agent/tools/index";
-import { resolveToCwd } from "@oh-my-pi/pi-coding-agent/tools/path-utils";
-import { throwIfAborted } from "@oh-my-pi/pi-coding-agent/tools/tool-errors";
 import { logger, once, untilAborted } from "@oh-my-pi/pi-utils";
 import type { BunFile } from "bun";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import { type Theme, theme } from "../modes/theme/theme";
+import lspDescription from "../prompts/tools/lsp.md" with { type: "text" };
+import type { ToolSession } from "../tools";
+import { resolveToCwd } from "../tools/path-utils";
+import { throwIfAborted } from "../tools/tool-errors";
 import {
 	ensureFileOpen,
 	getActiveClients,
@@ -254,21 +253,21 @@ function limitDiagnosticMessages(messages: string[]): string[] {
 }
 
 function findFileByExtensions(baseDir: string, extensions: string[], maxDepth: number): string | null {
-	const normalized = extensions.map((ext) => ext.toLowerCase());
+	const normalized = extensions.map(ext => ext.toLowerCase());
 	const search = (dir: string, depth: number): string | null => {
 		if (depth > maxDepth) return null;
-		const entries: Dirent[] = [];
+		const entries: fs.Dirent[] = [];
 		try {
 			const names = Array.from(new Bun.Glob("*").scanSync({ cwd: dir, onlyFiles: false }));
 			for (const name of names) {
 				const fullPath = path.join(dir, name);
 				let isDir = false;
 				try {
-					isDir = statSync(fullPath).isDirectory();
+					isDir = fs.statSync(fullPath).isDirectory();
 				} catch {
 					continue;
 				}
-				entries.push({ name, isFile: () => !isDir, isDirectory: () => isDir } as Dirent);
+				entries.push({ name, isFile: () => !isDir, isDirectory: () => isDir } as fs.Dirent);
 			}
 		} catch {
 			return null;
@@ -281,7 +280,7 @@ function findFileByExtensions(baseDir: string, extensions: string[], maxDepth: n
 
 			if (entry.isFile()) {
 				const lowerName = entry.name.toLowerCase();
-				if (normalized.some((ext) => lowerName.endsWith(ext))) {
+				if (normalized.some(ext => lowerName.endsWith(ext))) {
 					return fullPath;
 				}
 			} else if (entry.isDirectory()) {
@@ -362,22 +361,22 @@ interface ProjectType {
 /** Detect project type from root markers */
 function detectProjectType(cwd: string): ProjectType {
 	// Check for Rust (Cargo.toml)
-	if (existsSync(path.join(cwd, "Cargo.toml"))) {
+	if (fs.existsSync(path.join(cwd, "Cargo.toml"))) {
 		return { type: "rust", command: ["cargo", "check", "--message-format=short"], description: "Rust (cargo check)" };
 	}
 
 	// Check for TypeScript (tsconfig.json)
-	if (existsSync(path.join(cwd, "tsconfig.json"))) {
+	if (fs.existsSync(path.join(cwd, "tsconfig.json"))) {
 		return { type: "typescript", command: ["npx", "tsc", "--noEmit"], description: "TypeScript (tsc --noEmit)" };
 	}
 
 	// Check for Go (go.mod)
-	if (existsSync(path.join(cwd, "go.mod"))) {
+	if (fs.existsSync(path.join(cwd, "go.mod"))) {
 		return { type: "go", command: ["go", "build", "./..."], description: "Go (go build)" };
 	}
 
 	// Check for Python (pyproject.toml or pyrightconfig.json)
-	if (existsSync(path.join(cwd, "pyproject.toml")) || existsSync(path.join(cwd, "pyrightconfig.json"))) {
+	if (fs.existsSync(path.join(cwd, "pyproject.toml")) || fs.existsSync(path.join(cwd, "pyrightconfig.json"))) {
 		return { type: "python", command: ["pyright"], description: "Python (pyright)" };
 	}
 
@@ -412,10 +411,10 @@ async function runWorkspaceDiagnostics(
 					return { output: "No issues found", projectType };
 				}
 
-				const summary = formatDiagnosticsSummary(collected.map((d) => d.diagnostic));
-				const formatted = collected.slice(0, 50).map((d) => formatDiagnostic(d.diagnostic, d.filePath));
+				const summary = formatDiagnosticsSummary(collected.map(d => d.diagnostic));
+				const formatted = collected.slice(0, 50).map(d => formatDiagnostic(d.diagnostic, d.filePath));
 				const more = collected.length > 50 ? `\n  ... and ${collected.length - 50} more` : "";
-				return { output: `${summary}:\n${formatted.map((f) => `  ${f}`).join("\n")}${more}`, projectType };
+				return { output: `${summary}:\n${formatted.map(f => `  ${f}`).join("\n")}${more}`, projectType };
 			} catch (err) {
 				logger.debug("LSP diagnostics failed, falling back to shell", { error: String(err) });
 				// Fall through to shell command
@@ -571,10 +570,10 @@ async function getDiagnosticsForFile(
 		}
 	}
 
-	const formatted = uniqueDiagnostics.map((d) => formatDiagnostic(d, relPath));
+	const formatted = uniqueDiagnostics.map(d => formatDiagnostic(d, relPath));
 	const limited = limitDiagnosticMessages(formatted);
 	const summary = formatDiagnosticsSummary(uniqueDiagnostics);
-	const hasErrors = uniqueDiagnostics.some((d) => d.severity === 1);
+	const hasErrors = uniqueDiagnostics.some(d => d.severity === 1);
 
 	return {
 		server: serverNames.join(", "),
@@ -1096,8 +1095,8 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 					}
 
 					const summary = formatDiagnosticsSummary(uniqueDiagnostics);
-					const formatted = uniqueDiagnostics.map((d) => formatDiagnostic(d, relPath));
-					const output = `${summary}:\n${formatted.map((f) => `  ${f}`).join("\n")}`;
+					const formatted = uniqueDiagnostics.map(d => formatDiagnostic(d, relPath));
+					const output = `${summary}:\n${formatted.map(f => `  ${f}`).join("\n")}`;
 					return {
 						content: [{ type: "text", text: output }],
 						details: { action, serverName: Array.from(allServerNames).join(", "), success: true },
@@ -1187,7 +1186,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 						output = "No definition found";
 					} else {
 						const raw = Array.isArray(result) ? result : [result];
-						const locations = raw.flatMap((loc) => {
+						const locations = raw.flatMap(loc => {
 							if ("uri" in loc) {
 								return [loc as Location];
 							}
@@ -1203,7 +1202,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 							output = "No definition found";
 						} else {
 							output = `Found ${locations.length} definition(s):\n${locations
-								.map((loc) => `  ${formatLocation(loc, this.session.cwd)}`)
+								.map(loc => `  ${formatLocation(loc, this.session.cwd)}`)
 								.join("\n")}`;
 						}
 					}
@@ -1220,7 +1219,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 					if (!result || result.length === 0) {
 						output = "No references found";
 					} else {
-						const lines = result.map((loc) => `  ${formatLocation(loc, this.session.cwd)}`);
+						const lines = result.map(loc => `  ${formatLocation(loc, this.session.cwd)}`);
 						output = `Found ${result.length} reference(s):\n${lines.join("\n")}`;
 					}
 					break;
@@ -1257,11 +1256,11 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 						// Check if hierarchical (DocumentSymbol) or flat (SymbolInformation)
 						if ("selectionRange" in result[0]) {
 							// Hierarchical
-							const lines = (result as DocumentSymbol[]).flatMap((s) => formatDocumentSymbol(s));
+							const lines = (result as DocumentSymbol[]).flatMap(s => formatDocumentSymbol(s));
 							output = `Symbols in ${relPath}:\n${lines.join("\n")}`;
 						} else {
 							// Flat
-							const lines = (result as SymbolInformation[]).map((s) => {
+							const lines = (result as SymbolInformation[]).map(s => {
 								const line = s.location.range.start.line + 1;
 								const icon = symbolKindToIcon(s.kind);
 								return `${icon} ${s.name} @ line ${line}`;
@@ -1285,8 +1284,8 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 					if (!result || result.length === 0) {
 						output = `No symbols matching "${query}"`;
 					} else {
-						const lines = result.map((s) => formatSymbolInformation(s, this.session.cwd));
-						output = `Found ${result.length} symbol(s) matching "${query}":\n${lines.map((l) => `  ${l}`).join("\n")}`;
+						const lines = result.map(s => formatSymbolInformation(s, this.session.cwd));
+						output = `Found ${result.length} symbol(s) matching "${query}":\n${lines.map(l => `  ${l}`).join("\n")}`;
 					}
 					break;
 				}
@@ -1311,10 +1310,10 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 						const shouldApply = apply !== false;
 						if (shouldApply) {
 							const applied = await applyWorkspaceEdit(result, this.session.cwd);
-							output = `Applied rename:\n${applied.map((a) => `  ${a}`).join("\n")}`;
+							output = `Applied rename:\n${applied.map(a => `  ${a}`).join("\n")}`;
 						} else {
 							const preview = formatWorkspaceEdit(result, this.session.cwd);
-							output = `Rename preview:\n${preview.map((p) => `  ${p}`).join("\n")}`;
+							output = `Rename preview:\n${preview.map(p => `  ${p}`).join("\n")}`;
 						}
 					}
 					break;
@@ -1335,7 +1334,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 					const endCharacter = (end_character ?? column ?? 1) - 1;
 					const range = { start: position, end: { line: endLine, character: endCharacter } };
 					const relevantDiagnostics = diagnostics.filter(
-						(d) => d.range.start.line <= range.end.line && d.range.end.line >= range.start.line,
+						d => d.range.start.line <= range.end.line && d.range.end.line >= range.start.line,
 					);
 
 					const codeActionContext: { diagnostics: Diagnostic[]; only?: string[] } = {
@@ -1401,7 +1400,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 
 						if (isCodeAction(resolvedAction) && resolvedAction.edit) {
 							const applied = await applyWorkspaceEdit(resolvedAction.edit, this.session.cwd);
-							output = `Applied "${codeAction.title}":\n${applied.map((a) => `  ${a}`).join("\n")}`;
+							output = `Applied "${codeAction.title}":\n${applied.map(a => `  ${a}`).join("\n")}`;
 						} else {
 							const commandPayload = getCommandPayload(resolvedAction);
 							if (commandPayload) {
@@ -1450,7 +1449,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 						if (!calls || calls.length === 0) {
 							output = `No callers found for "${item.name}"`;
 						} else {
-							const lines = calls.map((call) => {
+							const lines = calls.map(call => {
 								const loc = { uri: call.from.uri, range: call.from.selectionRange };
 								const detail = call.from.detail ? ` (${call.from.detail})` : "";
 								return `  ${call.from.name}${detail} @ ${formatLocation(loc, this.session.cwd)}`;
@@ -1465,7 +1464,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 						if (!calls || calls.length === 0) {
 							output = `"${item.name}" doesn't call any functions`;
 						} else {
-							const lines = calls.map((call) => {
+							const lines = calls.map(call => {
 								const loc = { uri: call.to.uri, range: call.to.selectionRange };
 								const detail = call.to.detail ? ` (${call.to.detail})` : "";
 								return `  ${call.to.name}${detail} @ ${formatLocation(loc, this.session.cwd)}`;
@@ -1500,10 +1499,10 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 					if (collected.length === 0) {
 						output = "Flycheck: no issues found";
 					} else {
-						const summary = formatDiagnosticsSummary(collected.map((d) => d.diagnostic));
-						const formatted = collected.slice(0, 20).map((d) => formatDiagnostic(d.diagnostic, d.filePath));
+						const summary = formatDiagnosticsSummary(collected.map(d => d.diagnostic));
+						const formatted = collected.slice(0, 20).map(d => formatDiagnostic(d.diagnostic, d.filePath));
 						const more = collected.length > 20 ? `\n  ... and ${collected.length - 20} more` : "";
-						output = `Flycheck ${summary}:\n${formatted.map((f) => `  ${f}`).join("\n")}${more}`;
+						output = `Flycheck ${summary}:\n${formatted.map(f => `  ${f}`).join("\n")}${more}`;
 					}
 					break;
 				}
@@ -1561,13 +1560,13 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 						const applied = await applyWorkspaceEdit(result, this.session.cwd);
 						output =
 							applied.length > 0
-								? `Applied SSR:\n${applied.map((a) => `  ${a}`).join("\n")}`
+								? `Applied SSR:\n${applied.map(a => `  ${a}`).join("\n")}`
 								: "SSR: no matches found";
 					} else {
 						const preview = formatWorkspaceEdit(result, this.session.cwd);
 						output =
 							preview.length > 0
-								? `SSR preview:\n${preview.map((p) => `  ${p}`).join("\n")}`
+								? `SSR preview:\n${preview.map(p => `  ${p}`).join("\n")}`
 								: "SSR: no matches found";
 					}
 					break;
@@ -1592,7 +1591,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 					if (result.length === 0) {
 						output = "No runnables found";
 					} else {
-						const lines = result.map((r) => {
+						const lines = result.map(r => {
 							const args = r.args?.cargoArgs?.join(" ") || "";
 							return `  [${r.kind}] ${r.label}${args ? ` (cargo ${args})` : ""}`;
 						});
@@ -1620,7 +1619,7 @@ export class LspTool implements AgentTool<typeof lspSchema, LspToolDetails, Them
 					if (result.length === 0) {
 						output = "No related tests found";
 					} else {
-						output = `Found ${result.length} related test(s):\n${result.map((t) => `  ${t}`).join("\n")}`;
+						output = `Found ${result.length} related test(s):\n${result.map(t => `  ${t}`).join("\n")}`;
 					}
 					break;
 				}

package/src/lsp/lspmux.ts

@@ -1,5 +1,5 @@
-import { homedir, platform } from "node:os";
-import { join } from "node:path";
+import * as os from "node:os";
+import * as path from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
 import { TOML } from "bun";
 
@@ -63,14 +63,14 @@ const STATE_CACHE_TTL_MS = 5 * 60 * 1000;
  * Matches Rust's `dirs::config_dir()` behavior.
  */
 function getConfigPath(): string {
-	const home = homedir();
-	switch (platform()) {
+	const home = os.homedir();
+	switch (os.platform()) {
 		case "win32":
-			return join(process.env.APPDATA ?? join(home, "AppData", "Roaming"), "lspmux", "config.toml");
+			return path.join(process.env.APPDATA ?? path.join(home, "AppData", "Roaming"), "lspmux", "config.toml");
 		case "darwin":
-			return join(home, "Library", "Application Support", "lspmux", "config.toml");
+			return path.join(home, "Library", "Application Support", "lspmux", "config.toml");
 		default:
-			return join(process.env.XDG_CONFIG_HOME ?? join(home, ".config"), "lspmux", "config.toml");
+			return path.join(process.env.XDG_CONFIG_HOME ?? path.join(home, ".config"), "lspmux", "config.toml");
 	}
 }
 
@@ -108,7 +108,7 @@ async function checkServerRunning(binaryPath: string): Promise<boolean> {
 
 		const exited = await Promise.race([
 			proc.exited,
-			new Promise<null>((resolve) => setTimeout(() => resolve(null), LIVENESS_TIMEOUT_MS)),
+			new Promise<null>(resolve => setTimeout(() => resolve(null), LIVENESS_TIMEOUT_MS)),
 		]);
 
 		if (exited === null) {

package/src/lsp/render.ts

@@ -7,17 +7,12 @@
  * - Grouped references and symbols
  * - Collapsible/expandable views
  */
-
 import type { AgentToolResult, RenderResultOptions } from "@oh-my-pi/pi-agent-core";
-import { getLanguageFromPath, type Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import {
-	formatExpandHint,
-	formatMoreItems,
-	TRUNCATE_LENGTHS,
-	truncate,
-} from "@oh-my-pi/pi-coding-agent/tools/render-utils";
-import { Text } from "@oh-my-pi/pi-tui";
+import { type Component, Text } from "@oh-my-pi/pi-tui";
 import { highlight, supportsLanguage } from "cli-highlight";
+import { getLanguageFromPath, type Theme } from "../modes/theme/theme";
+import { formatExpandHint, formatMoreItems, TRUNCATE_LENGTHS, truncate } from "../tools/render-utils";
+import { renderOutputBlock, renderStatusLine } from "../tui";
 import type { LspParams, LspToolDetails } from "./types";
 
 // =============================================================================
@@ -30,16 +25,13 @@ import type { LspParams, LspToolDetails } from "./types";
  */
 export function renderCall(args: unknown, theme: Theme): Text {
 	const p = args as LspParams & { file?: string; files?: string[] };
-
-	let text = theme.fg("toolTitle", theme.bold("LSP"));
-	text += ` ${theme.fg("accent", p.action || "?")}`;
-
+	const meta: string[] = [];
 	if (p.file) {
-		text += ` ${theme.fg("muted", p.file)}`;
+		meta.push(p.file);
 	} else if (p.files?.length) {
-		text += ` ${theme.fg("muted", `${p.files.length} file(s)`)}`;
+		meta.push(`${p.files.length} file(s)`);
 	}
-
+	const text = renderStatusLine({ icon: "pending", title: "LSP", description: p.action || "?", meta }, theme);
 	return new Text(text, 0, 0);
 }
 
@@ -55,40 +47,74 @@ export function renderResult(
 	result: AgentToolResult<LspToolDetails>,
 	options: RenderResultOptions,
 	theme: Theme,
-): Text {
+	args?: LspParams & { file?: string; files?: string[] },
+): Component {
 	const content = result.content?.[0];
 	if (!content || content.type !== "text" || !("text" in content) || !content.text) {
-		return new Text(theme.fg("error", "No result"), 0, 0);
+		const header = renderStatusLine({ icon: "warning", title: "LSP", description: "No result" }, theme);
+		return new Text([header, theme.fg("dim", "No result")].join("\n"), 0, 0);
 	}
 
 	const text = content.text;
-	const lines = text.split("\n").filter((l) => l.trim());
+	const lines = text.split("\n");
 	const expanded = options.expanded;
 
-	// Detect result type and render accordingly
+	let label = "Result";
+	let state: "success" | "warning" | "error" = "success";
+	let bodyLines: string[] = [];
+
 	const codeBlockMatch = text.match(/```(\w*)\n([\s\S]*?)```/);
 	if (codeBlockMatch) {
-		return renderHover(codeBlockMatch, text, lines, expanded, theme);
-	}
-
-	const errorMatch = text.match(/(\d+)\s+error\(s\)/);
-	const warningMatch = text.match(/(\d+)\s+warning\(s\)/);
-	if (errorMatch || warningMatch || text.includes(theme.status.error)) {
-		return renderDiagnostics(errorMatch, warningMatch, lines, expanded, theme);
-	}
-
-	const refMatch = text.match(/(\d+)\s+reference\(s\)/);
-	if (refMatch) {
-		return renderReferences(refMatch, lines, expanded, theme);
+		label = "Hover";
+		bodyLines = renderHover(codeBlockMatch, text, lines, expanded, theme);
+	} else {
+		const errorMatch = text.match(/(\d+)\s+error\(s\)/);
+		const warningMatch = text.match(/(\d+)\s+warning\(s\)/);
+		if (errorMatch || warningMatch || text.includes(theme.status.error)) {
+			label = "Diagnostics";
+			const errorCount = errorMatch ? Number.parseInt(errorMatch[1], 10) : 0;
+			const warnCount = warningMatch ? Number.parseInt(warningMatch[1], 10) : 0;
+			state = errorCount > 0 ? "error" : warnCount > 0 ? "warning" : "success";
+			bodyLines = renderDiagnostics(errorMatch, warningMatch, lines, expanded, theme);
+		} else {
+			const refMatch = text.match(/(\d+)\s+reference\(s\)/);
+			if (refMatch) {
+				label = "References";
+				bodyLines = renderReferences(refMatch, lines, expanded, theme);
+			} else {
+				const symbolsMatch = text.match(/Symbols in (.+):/);
+				if (symbolsMatch) {
+					label = "Symbols";
+					bodyLines = renderSymbols(symbolsMatch, lines, expanded, theme);
+				} else {
+					label = "Response";
+					bodyLines = renderGeneric(text, lines, expanded, theme);
+				}
+			}
+		}
 	}
 
-	const symbolsMatch = text.match(/Symbols in (.+):/);
-	if (symbolsMatch) {
-		return renderSymbols(symbolsMatch, lines, expanded, theme);
+	const meta: string[] = [];
+	if (args?.action) meta.push(args.action);
+	if (args?.file) {
+		meta.push(args.file);
+	} else if (args?.files?.length) {
+		meta.push(`${args.files.length} file(s)`);
 	}
-
-	// Default fallback rendering
-	return renderGeneric(text, lines, expanded, theme);
+	const header = renderStatusLine({ icon: state, title: "LSP", description: label, meta }, theme);
+	return {
+		render: (width: number) =>
+			renderOutputBlock(
+				{
+					header,
+					state,
+					sections: [{ label: theme.fg("toolTitle", label), lines: bodyLines }],
+					width,
+				},
+				theme,
+			),
+		invalidate: () => {},
+	};
 }
 
 // =============================================================================
@@ -104,9 +130,11 @@ function renderHover(
 	_lines: string[],
 	expanded: boolean,
 	theme: Theme,
-): Text {
+): string[] {
 	const lang = codeBlockMatch[1] || "";
 	const code = codeBlockMatch[2].trim();
+	const codeStart = codeBlockMatch.index ?? 0;
+	const beforeCode = fullText.slice(0, codeStart).trimEnd();
 	const afterCode = fullText.slice(fullText.indexOf("```", 3) + 3).trim();
 
 	const codeLines = highlightCode(code, lang, theme);
@@ -119,6 +147,11 @@ function renderHover(
 		const top = `${theme.boxSharp.topLeft}${h.repeat(3)}`;
 		const bottom = `${theme.boxSharp.bottomLeft}${h.repeat(3)}`;
 		let output = `${icon}${langLabel}`;
+		if (beforeCode) {
+			for (const line of beforeCode.split("\n")) {
+				output += `\n ${theme.fg("muted", line)}`;
+			}
+		}
 		output += `\n ${theme.fg("mdCodeBlockBorder", top)}`;
 		for (const line of codeLines) {
 			output += `\n ${theme.fg("mdCodeBlockBorder", v)} ${line}`;
@@ -127,15 +160,19 @@ function renderHover(
 		if (afterCode) {
 			output += `\n ${theme.fg("muted", afterCode)}`;
 		}
-		return new Text(output, 0, 0);
+		return output.split("\n");
 	}
 
 	// Collapsed view
 	const firstCodeLine = codeLines[0] || "";
-	const hasMore = codeLines.length > 1 || Boolean(afterCode);
+	const hasMore = codeLines.length > 1 || Boolean(afterCode) || Boolean(beforeCode);
 	const expandHint = formatExpandHint(theme, expanded, hasMore);
 
 	let output = `${icon}${langLabel}${expandHint}`;
+	if (beforeCode) {
+		const preview = truncate(beforeCode, TRUNCATE_LENGTHS.TITLE, theme.format.ellipsis);
+		output += `\n ${theme.fg("dim", theme.tree.branch)} ${theme.fg("muted", preview)}`;
+	}
 	const h = theme.boxSharp.horizontal;
 	const v = theme.boxSharp.vertical;
 	const bottom = `${theme.boxSharp.bottomLeft}${h.repeat(3)}`;
@@ -155,7 +192,7 @@ function renderHover(
 		output += `\n ${theme.fg("mdCodeBlockBorder", bottom)}`;
 	}
 
-	return new Text(output, 0, 0);
+	return output.split("\n");
 }
 
 /**
@@ -206,7 +243,7 @@ function renderDiagnostics(
 	lines: string[],
 	expanded: boolean,
 	theme: Theme,
-): Text {
+): string[] {
 	const errorCount = errorMatch ? Number.parseInt(errorMatch[1], 10) : 0;
 	const warnCount = warningMatch ? Number.parseInt(warningMatch[1], 10) : 0;
 
@@ -222,11 +259,11 @@ function renderDiagnostics(
 	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(theme.status.error) || /:\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))
+		.map(line => parseDiagnosticLine(line))
 		.filter((diag): diag is ParsedDiagnostic => diag !== null);
-	const fallbackDiagnostics: RawDiagnostic[] = diagLines.map((line) => ({ raw: line.trim() }));
+	const fallbackDiagnostics: RawDiagnostic[] = diagLines.map(line => ({ raw: line.trim() }));
 
 	if (expanded) {
 		let output = `${icon} ${theme.fg("dim", meta.join(theme.sep.dot))}`;
@@ -253,7 +290,7 @@ function renderDiagnostics(
 				)}`;
 			}
 		}
-		return new Text(output, 0, 0);
+		return output.split("\n");
 	}
 
 	// Collapsed view
@@ -285,7 +322,7 @@ function renderDiagnostics(
 		)}`;
 	}
 
-	return new Text(output, 0, 0);
+	return output.split("\n");
 }
 
 // =============================================================================
@@ -295,12 +332,12 @@ function renderDiagnostics(
 /**
  * Render references grouped by file.
  */
-function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded: boolean, theme: Theme): Text {
+function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded: boolean, theme: Theme): string[] {
 	const refCount = Number.parseInt(refMatch[1], 10);
 	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));
+	const locLines = lines.filter(l => /^\s*\S+:\d+:\d+/.test(l));
 
 	// Group by file
 	const byFile = new Map<string, Array<[string, string]>>();
@@ -369,10 +406,10 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 	};
 
 	if (expanded) {
-		return new Text(renderGrouped(files.length, 3, false), 0, 0);
+		return renderGrouped(files.length, 3, false).split("\n");
 	}
 
-	return new Text(renderGrouped(3, 1, true), 0, 0);
+	return renderGrouped(3, 1, true).split("\n");
 }
 
 // =============================================================================
@@ -382,7 +419,7 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 /**
  * Render document symbols in a hierarchical tree.
  */
-function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded: boolean, theme: Theme): Text {
+function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded: boolean, theme: Theme): string[] {
 	const fileName = symbolsMatch[1];
 	const icon = theme.styledSymbol("status.info", "accent");
 
@@ -393,7 +430,7 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 		icon: string;
 	}
 
-	const symbolLines = lines.filter((l) => l.includes("@") && l.includes("line"));
+	const symbolLines = lines.filter(l => l.includes("@") && l.includes("line"));
 	const symbols: SymbolInfo[] = [];
 
 	for (const line of symbolLines) {
@@ -436,7 +473,7 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 		return prefix;
 	};
 
-	const topLevelCount = symbols.filter((s) => s.indent === 0).length;
+	const topLevelCount = symbols.filter(s => s.indent === 0).length;
 
 	if (expanded) {
 		let output = `${icon} ${theme.fg("dim", `in ${fileName}`)}`;
@@ -450,11 +487,11 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 			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);
+		return output.split("\n");
 	}
 
 	// Collapsed: show first 3 top-level symbols
-	const topLevel = symbols.filter((s) => s.indent === 0).slice(0, 3);
+	const topLevel = symbols.filter(s => s.indent === 0).slice(0, 3);
 	const hasMoreSymbols = symbols.length > topLevel.length;
 	const expandHint = formatExpandHint(theme, expanded, hasMoreSymbols);
 	let output = `${icon} ${theme.fg("dim", `in ${fileName}`)}${expandHint}`;
@@ -474,7 +511,7 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 		)}`;
 	}
 
-	return new Text(output, 0, 0);
+	return output.split("\n");
 }
 
 // =============================================================================
@@ -484,7 +521,7 @@ 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 {
+function renderGeneric(text: string, lines: string[], expanded: boolean, theme: Theme): string[] {
 	const hasError = text.includes("Error:") || text.includes(theme.status.error);
 	const hasSuccess = text.includes(theme.status.success) || text.includes("Applied");
 
@@ -502,7 +539,7 @@ function renderGeneric(text: string, lines: string[], expanded: boolean, theme:
 			const branch = isLast ? theme.tree.last : theme.tree.branch;
 			output += `\n ${theme.fg("dim", branch)} ${lines[i]}`;
 		}
-		return new Text(output, 0, 0);
+		return output.split("\n");
 	}
 
 	const firstLine = lines[0] || "No output";
@@ -530,7 +567,7 @@ function renderGeneric(text: string, lines: string[], expanded: boolean, theme:
 		}
 	}
 
-	return new Text(output, 0, 0);
+	return output.split("\n");
 }
 
 // =============================================================================
@@ -574,4 +611,5 @@ function severityToColor(severity: string): "error" | "warning" | "accent" | "di
 export const lspToolRenderer = {
 	renderCall,
 	renderResult,
+	mergeCallAndResult: true,
 };