@oh-my-pi/pi-coding-agent 3.20.1 → 3.24.0

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

@@ -7,6 +7,7 @@ import { type Theme, theme } from "../../../modes/interactive/theme/theme";
 import lspDescription from "../../../prompts/tools/lsp.md" with { type: "text" };
 import { logger } from "../../logger";
 import { once, untilAborted } from "../../utils";
+import type { ToolSession } from "../index";
 import { resolveToCwd } from "../path-utils";
 import {
 	ensureFileOpen,
@@ -687,7 +688,7 @@ export function createLspWritethrough(cwd: string, options?: WritethroughOptions
 }
 
 /** Create an LSP tool */
-export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolDetails, Theme> {
+export function createLspTool(session: ToolSession): AgentTool<typeof lspSchema, LspToolDetails, Theme> {
 	return {
 		name: "lsp",
 		label: "LSP",
@@ -713,7 +714,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 				include_declaration,
 			} = params;
 
-			const config = await getConfig(cwd);
+			const config = await getConfig(session.cwd);
 
 			// Status action doesn't need a file
 			if (action === "status") {
@@ -730,7 +731,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 
 			// Workspace diagnostics - check entire project
 			if (action === "workspace_diagnostics") {
-				const result = await runWorkspaceDiagnostics(cwd, config);
+				const result = await runWorkspaceDiagnostics(session.cwd, config);
 				return {
 					content: [
 						{
@@ -757,7 +758,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 				const allServerNames = new Set<string>();
 
 				for (const target of targets) {
-					const resolved = resolveToCwd(target, cwd);
+					const resolved = resolveToCwd(target, session.cwd);
 					const servers = getServersForFile(config, resolved);
 					if (servers.length === 0) {
 						results.push(`${theme.status.error} ${target}: No language server found`);
@@ -765,7 +766,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 					}
 
 					const uri = fileToUri(resolved);
-					const relPath = path.relative(cwd, resolved);
+					const relPath = path.relative(session.cwd, resolved);
 					const allDiagnostics: Diagnostic[] = [];
 
 					// Query all applicable servers for this file
@@ -773,12 +774,12 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						allServerNames.add(serverName);
 						try {
 							if (serverConfig.createClient) {
-								const linterClient = getLinterClient(serverName, serverConfig, cwd);
+								const linterClient = getLinterClient(serverName, serverConfig, session.cwd);
 								const diagnostics = await linterClient.lint(resolved);
 								allDiagnostics.push(...diagnostics);
 								continue;
 							}
-							const client = await getOrCreateClient(serverConfig, cwd);
+							const client = await getOrCreateClient(serverConfig, session.cwd);
 							await refreshFile(client, resolved);
 							const diagnostics = await waitForDiagnostics(client, uri);
 							allDiagnostics.push(...diagnostics);
@@ -847,7 +848,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 				};
 			}
 
-			const resolvedFile = file ? resolveToCwd(file, cwd) : null;
+			const resolvedFile = file ? resolveToCwd(file, session.cwd) : null;
 			const serverInfo = resolvedFile
 				? getLspServerForFile(config, resolvedFile)
 				: getServerForWorkspaceAction(config, action);
@@ -862,10 +863,10 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 			const [serverName, serverConfig] = serverInfo;
 
 			try {
-				const client = await getOrCreateClient(serverConfig, cwd);
+				const client = await getOrCreateClient(serverConfig, session.cwd);
 				let targetFile = resolvedFile;
 				if (action === "runnables" && !targetFile) {
-					targetFile = findFileForServer(cwd, serverConfig);
+					targetFile = findFileForServer(session.cwd, serverConfig);
 					if (!targetFile) {
 						return {
 							content: [{ type: "text", text: "Error: no matching files found for runnables" }],
@@ -914,7 +915,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 								output = "No definition found";
 							} else {
 								output = `Found ${locations.length} definition(s):\n${locations
-									.map((loc) => `  ${formatLocation(loc, cwd)}`)
+									.map((loc) => `  ${formatLocation(loc, session.cwd)}`)
 									.join("\n")}`;
 							}
 						}
@@ -931,7 +932,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						if (!result || result.length === 0) {
 							output = "No references found";
 						} else {
-							const lines = result.map((loc) => `  ${formatLocation(loc, cwd)}`);
+							const lines = result.map((loc) => `  ${formatLocation(loc, session.cwd)}`);
 							output = `Found ${result.length} reference(s):\n${lines.join("\n")}`;
 						}
 						break;
@@ -964,7 +965,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 								details: { action, serverName, success: false },
 							};
 						} else {
-							const relPath = path.relative(cwd, targetFile);
+							const relPath = path.relative(session.cwd, targetFile);
 							// Check if hierarchical (DocumentSymbol) or flat (SymbolInformation)
 							if ("selectionRange" in result[0]) {
 								// Hierarchical
@@ -998,10 +999,8 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						if (!result || result.length === 0) {
 							output = `No symbols matching "${query}"`;
 						} else {
-							const lines = result.map((s) => formatSymbolInformation(s, cwd));
-							output = `Found ${result.length} symbol(s) matching "${query}":\n${lines
-								.map((l) => `  ${l}`)
-								.join("\n")}`;
+							const lines = result.map((s) => formatSymbolInformation(s, session.cwd));
+							output = `Found ${result.length} symbol(s) matching "${query}":\n${lines.map((l) => `  ${l}`).join("\n")}`;
 						}
 						break;
 					}
@@ -1025,10 +1024,10 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						} else {
 							const shouldApply = apply !== false;
 							if (shouldApply) {
-								const applied = await applyWorkspaceEdit(result, cwd);
+								const applied = await applyWorkspaceEdit(result, session.cwd);
 								output = `Applied rename:\n${applied.map((a) => `  ${a}`).join("\n")}`;
 							} else {
-								const preview = formatWorkspaceEdit(result, cwd);
+								const preview = formatWorkspaceEdit(result, session.cwd);
 								output = `Rename preview:\n${preview.map((p) => `  ${p}`).join("\n")}`;
 							}
 						}
@@ -1114,7 +1113,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 							}
 
 							if (isCodeAction(resolvedAction) && resolvedAction.edit) {
-								const applied = await applyWorkspaceEdit(resolvedAction.edit, cwd);
+								const applied = await applyWorkspaceEdit(resolvedAction.edit, session.cwd);
 								output = `Applied "${codeAction.title}":\n${applied.map((a) => `  ${a}`).join("\n")}`;
 							} else {
 								const commandPayload = getCommandPayload(resolvedAction);
@@ -1136,9 +1135,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 								}
 								return `  [${i}] ${actionItem.title}`;
 							});
-							output = `Available code actions:\n${lines.join(
-								"\n",
-							)}\n\nUse action_index parameter to apply a specific action.`;
+							output = `Available code actions:\n${lines.join("\n")}\n\nUse action_index parameter to apply a specific action.`;
 						}
 						break;
 					}
@@ -1169,7 +1166,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 								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, cwd)}`;
+									return `  ${call.from.name}${detail} @ ${formatLocation(loc, session.cwd)}`;
 								});
 								output = `Found ${calls.length} caller(s) of "${item.name}":\n${lines.join("\n")}`;
 							}
@@ -1184,7 +1181,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 								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, cwd)}`;
+									return `  ${call.to.name}${detail} @ ${formatLocation(loc, session.cwd)}`;
 								});
 								output = `"${item.name}" calls ${calls.length} function(s):\n${lines.join("\n")}`;
 							}
@@ -1207,7 +1204,7 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						await rustAnalyzer.flycheck(client, resolvedFile ?? undefined);
 						const collected: Array<{ filePath: string; diagnostic: Diagnostic }> = [];
 						for (const [diagUri, diags] of client.diagnostics.entries()) {
-							const relPath = path.relative(cwd, uriToFile(diagUri));
+							const relPath = path.relative(session.cwd, uriToFile(diagUri));
 							for (const diag of diags) {
 								collected.push({ filePath: relPath, diagnostic: diag });
 							}
@@ -1274,13 +1271,13 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 						const result = await rustAnalyzer.ssr(client, query, replacement, !shouldApply);
 
 						if (shouldApply) {
-							const applied = await applyWorkspaceEdit(result, cwd);
+							const applied = await applyWorkspaceEdit(result, session.cwd);
 							output =
 								applied.length > 0
 									? `Applied SSR:\n${applied.map((a) => `  ${a}`).join("\n")}`
 									: "SSR: no matches found";
 						} else {
-							const preview = formatWorkspaceEdit(result, cwd);
+							const preview = formatWorkspaceEdit(result, session.cwd);
 							output =
 								preview.length > 0
 									? `SSR preview:\n${preview.map((p) => `  ${p}`).join("\n")}`
@@ -1366,4 +1363,10 @@ export function createLspTool(cwd: string): AgentTool<typeof lspSchema, LspToolD
 	};
 }
 
-export const lspTool = createLspTool(process.cwd());
+export const lspTool = createLspTool({
+	cwd: process.cwd(),
+	hasUI: false,
+	rulebookRules: [],
+	getSessionFile: () => null,
+	getSessionSpawns: () => null,
+});

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

@@ -237,12 +237,12 @@ function renderDiagnostics(
 			}
 			const severityColor = severityToColor(item.severity);
 			const location = formatDiagnosticLocation(item.file, item.line, item.col, theme);
-			output += `\n ${theme.fg("dim", branch)} ${theme.fg(severityColor, location)} ${theme.fg(
-				"dim",
-				`[${item.severity}]`,
-			)}`;
+			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", truncate(item.message, TRUNCATE_LENGTHS.LINE, theme.format.ellipsis))}`;
+				output += `\n ${theme.fg("dim", detailPrefix)}${theme.fg(
+					"muted",
+					truncate(item.message, TRUNCATE_LENGTHS.LINE, theme.format.ellipsis),
+				)}`;
 			}
 		}
 		return new Text(output, 0, 0);
@@ -326,10 +326,7 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 					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}`,
-					)}`;
+					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(
@@ -348,10 +345,7 @@ function renderReferences(refMatch: RegExpMatchArray, lines: string[], expanded:
 		}
 
 		if (files.length > maxFiles) {
-			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg(
-				"muted",
-				formatMoreItems(files.length - maxFiles, "file", theme),
-			)}`;
+			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", formatMoreItems(files.length - maxFiles, "file", theme))}`;
 		}
 
 		return output;
@@ -436,10 +430,7 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 			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", 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);
@@ -454,10 +445,10 @@ function renderSymbols(symbolsMatch: RegExpMatchArray, lines: string[], expanded
 		const sym = topLevel[i];
 		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}`)}`;
+		output += `\n ${theme.fg("dim", branch)} ${theme.fg("accent", sym.icon)} ${theme.fg("accent", sym.name)} ${theme.fg(
+			"muted",
+			`line ${sym.line}`,
+		)}`;
 	}
 	if (topLevelCount > 3) {
 		output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", `${theme.format.ellipsis} ${topLevelCount - 3} more`)}`;
@@ -503,7 +494,10 @@ function renderGeneric(text: string, lines: string[], expanded: boolean, theme:
 		for (let i = 0; i < previewLines.length; i++) {
 			const isLast = i === previewLines.length - 1 && lines.length <= 4;
 			const branch = isLast ? theme.tree.last : theme.tree.branch;
-			output += `\n ${theme.fg("dim", branch)} ${theme.fg("dim", truncate(previewLines[i].trim(), TRUNCATE_LENGTHS.CONTENT, theme.format.ellipsis))}`;
+			output += `\n ${theme.fg("dim", branch)} ${theme.fg(
+				"dim",
+				truncate(previewLines[i].trim(), TRUNCATE_LENGTHS.CONTENT, theme.format.ellipsis),
+			)}`;
 		}
 		if (lines.length > 4) {
 			output += `\n ${theme.fg("dim", theme.tree.last)} ${theme.fg("muted", formatMoreItems(lines.length - 4, "line", theme))}`;
@@ -550,3 +544,8 @@ function severityToColor(severity: string): "error" | "warning" | "accent" | "di
 			return "dim";
 	}
 }
+
+export const lspToolRenderer = {
+	renderCall,
+	renderResult,
+};

package/src/core/tools/notebook.ts

@@ -1,7 +1,20 @@
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
+import type { Component } from "@oh-my-pi/pi-tui";
+import { Text } from "@oh-my-pi/pi-tui";
 import { Type } from "@sinclair/typebox";
+import type { Theme } from "../../modes/interactive/theme/theme";
+import type { RenderResultOptions } from "../custom-tools/types";
+import type { ToolSession } from "../sdk";
 import { untilAborted } from "../utils";
 import { resolveToCwd } from "./path-utils";
+import {
+	formatCount,
+	formatErrorMessage,
+	formatExpandHint,
+	formatMeta,
+	formatMoreItems,
+	PREVIEW_LIMITS,
+} from "./render-utils";
 
 const notebookSchema = Type.Object({
 	action: Type.Union([Type.Literal("edit"), Type.Literal("insert"), Type.Literal("delete")], {
@@ -49,7 +62,7 @@ function splitIntoLines(content: string): string[] {
 	return content.split("\n").map((line, i, arr) => (i < arr.length - 1 ? `${line}\n` : line));
 }
 
-export function createNotebookTool(cwd: string): AgentTool<typeof notebookSchema> {
+export function createNotebookTool(session: ToolSession): AgentTool<typeof notebookSchema> {
 	return {
 		name: "notebook",
 		label: "Notebook",
@@ -67,7 +80,7 @@ export function createNotebookTool(cwd: string): AgentTool<typeof notebookSchema
 			}: { action: string; notebook_path: string; cell_index: number; content?: string; cell_type?: string },
 			signal?: AbortSignal,
 		) => {
-			const absolutePath = resolveToCwd(notebook_path, cwd);
+			const absolutePath = resolveToCwd(notebook_path, session.cwd);
 
 			return untilAborted(signal, async () => {
 				// Check if file exists
@@ -178,5 +191,100 @@ export function createNotebookTool(cwd: string): AgentTool<typeof notebookSchema
 	};
 }
 
-/** Default notebook tool using process.cwd() */
-export const notebookTool = createNotebookTool(process.cwd());
+// =============================================================================
+// TUI Renderer
+// =============================================================================
+
+interface NotebookRenderArgs {
+	action: string;
+	notebookPath: string;
+	cellNumber?: number;
+	cellType?: string;
+	content?: string;
+}
+
+const COLLAPSED_TEXT_LIMIT = PREVIEW_LIMITS.COLLAPSED_LINES * 2;
+
+function normalizeCellLines(lines: string[]): string[] {
+	return lines.map((line) => (line.endsWith("\n") ? line.slice(0, -1) : line));
+}
+
+function renderCellPreview(lines: string[], expanded: boolean, uiTheme: Theme): string {
+	const normalized = normalizeCellLines(lines);
+	if (normalized.length === 0) {
+		return `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("muted", "(empty cell)")}`;
+	}
+
+	const maxLines = expanded ? normalized.length : Math.min(normalized.length, COLLAPSED_TEXT_LIMIT);
+	let text = "";
+
+	for (let i = 0; i < maxLines; i++) {
+		const isLast = i === maxLines - 1 && (expanded || normalized.length <= maxLines);
+		const branch = isLast ? uiTheme.tree.last : uiTheme.tree.branch;
+		const line = normalized[i];
+		text += `\n ${uiTheme.fg("dim", branch)} ${uiTheme.fg("toolOutput", line)}`;
+	}
+
+	const remaining = normalized.length - maxLines;
+	if (remaining > 0) {
+		text += `\n ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg(
+			"muted",
+			formatMoreItems(remaining, "line", uiTheme),
+		)}`;
+	}
+
+	return text;
+}
+
+export const notebookToolRenderer = {
+	renderCall(args: NotebookRenderArgs, uiTheme: Theme): Component {
+		const label = uiTheme.fg("toolTitle", uiTheme.bold("Notebook"));
+		let text = `${label} ${uiTheme.fg("accent", args.action || "?")}`;
+
+		const meta: string[] = [];
+		meta.push(`in ${args.notebookPath || "?"}`);
+		if (args.cellNumber !== undefined) meta.push(`cell:${args.cellNumber}`);
+		if (args.cellType) meta.push(`type:${args.cellType}`);
+
+		text += formatMeta(meta, uiTheme);
+
+		return new Text(text, 0, 0);
+	},
+
+	renderResult(
+		result: { content: Array<{ type: string; text?: string }>; details?: NotebookToolDetails },
+		{ expanded }: RenderResultOptions,
+		uiTheme: Theme,
+	): Component {
+		const content = result.content?.[0];
+		if (content?.type === "text" && content.text?.startsWith("Error:")) {
+			return new Text(formatErrorMessage(content.text, uiTheme), 0, 0);
+		}
+
+		const details = result.details;
+		const action = details?.action ?? "edit";
+		const cellIndex = details?.cellIndex;
+		const cellType = details?.cellType;
+		const totalCells = details?.totalCells;
+		const cellSource = details?.cellSource;
+		const lineCount = cellSource?.length;
+		const canExpand = cellSource !== undefined && cellSource.length > COLLAPSED_TEXT_LIMIT;
+
+		const icon = uiTheme.styledSymbol("status.success", "success");
+		const actionLabel = action === "insert" ? "Inserted" : action === "delete" ? "Deleted" : "Edited";
+		const cellLabel = cellType || "cell";
+		const summaryParts = [`${actionLabel} ${cellLabel} at index ${cellIndex ?? "?"}`];
+		if (lineCount !== undefined) summaryParts.push(formatCount("line", lineCount));
+		if (totalCells !== undefined) summaryParts.push(`${totalCells} total`);
+		const summaryText = summaryParts.join(uiTheme.sep.dot);
+
+		const expandHint = formatExpandHint(expanded, canExpand, uiTheme);
+		let text = `${icon} ${uiTheme.fg("dim", summaryText)}${expandHint}`;
+
+		if (cellSource) {
+			text += renderCellPreview(cellSource, expanded, uiTheme);
+		}
+
+		return new Text(text, 0, 0);
+	},
+};