pi-compact-tools 0.6.3 → 0.7.7

package/extensions/compact-tools-invocation.ts

@@ -1,117 +1,228 @@
-import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
-import { normalizeLineEndings } from "./compact-tools-core.ts";
-import type { ToolArgs } from "./compact-tools-types.ts";
-
-function pathFrom(args: ToolArgs): string {
-	const value = args.path ?? args.file_path;
-	return typeof value === "string" ? normalizeLineEndings(value) : "";
-}
-
-const INLINE_ARGUMENT_TOOLS = new Set(["grep", "find", "ls"]);
-
-function omitArgument(name: string, key: string): boolean {
-	if (key === "path" || key === "file_path") return true;
-	if (name === "read" && (key === "offset" || key === "limit")) return true;
-	if (name === "write" && key === "content") return true;
-	return (name === "grep" || name === "find") && key === "pattern";
-}
-
-function collectArgumentDetails(name: string, args: ToolArgs): ToolArgs {
-	const details: ToolArgs = {};
-	for (const [key, value] of Object.entries(args)) {
-		if (value !== undefined && !omitArgument(name, key)) details[key] = value;
-	}
-	return details;
-}
-
-export function getCallDetails(name: string, args: ToolArgs): string {
-	const path = pathFrom(args) || (INLINE_ARGUMENT_TOOLS.has(name) ? "." : "");
-	if (name === "read") return path;
-	if (name !== "grep" && name !== "find") return path;
-	const pattern = typeof args.pattern === "string" ? normalizeLineEndings(args.pattern) : "…";
-	return name === "grep" ? `/${pattern}/ in ${path}` : `${pattern} in ${path}`;
-}
-
-export function getArgumentDetails(name: string, args: ToolArgs): ToolArgs {
-	if (name === "edit" || INLINE_ARGUMENT_TOOLS.has(name)) return {};
-	return collectArgumentDetails(name, args);
-}
-
-export function getTextResult(result: AgentToolResult<unknown>): string {
-	const parts: string[] = [];
-	for (const item of result.content) {
-		if (item.type === "text") parts.push(item.text);
-	}
-	return normalizeLineEndings(parts.join("\n")).trimEnd();
-}
-
-type ResultDetails = {
-	diff?: unknown;
-	truncation?: {
-		firstLineExceedsLimit?: boolean;
-		outputLines?: number;
-	};
-	matchLimitReached?: unknown;
-	resultLimitReached?: unknown;
-	entryLimitReached?: unknown;
-	linesTruncated?: unknown;
-};
-
-function countTextLines(text: string): number {
-	const normalized = normalizeLineEndings(text).trimEnd();
-	if (!normalized) return 0;
-	let count = 1;
-	for (let index = 0; index < normalized.length; index++) {
-		if (normalized.charCodeAt(index) === 10) count++;
-	}
-	return count;
-}
-
-function stripGeneratedFooter(name: string, text: string, details: ResultDetails | undefined): string {
-	if (name === "read") {
-		return text.replace(/\n\n\[(?:Showing lines |\d+ more lines in file\.)[^\n]*\]$/u, "");
-	}
-	const hasGeneratedFooter = details?.truncation?.outputLines !== undefined
-		|| details?.matchLimitReached !== undefined
-		|| details?.resultLimitReached !== undefined
-		|| details?.entryLimitReached !== undefined
-		|| details?.linesTruncated !== undefined;
-	return hasGeneratedFooter ? text.replace(/\n\n\[[^\n]*\]$/u, "") : text;
-}
-
-export function formatResultLineSummary(
-	name: string,
-	args: ToolArgs,
-	result: AgentToolResult<unknown>,
-	output?: string,
-): string | undefined {
-	const details = result.details as ResultDetails | undefined;
-	const text = name === "edit" && typeof details?.diff === "string"
-		? details.diff
-		: output ?? (name === "write"
-			? String(args.content ?? "")
-			: result.content.some((item) => item.type === "text")
-				? getTextResult(result)
-				: undefined);
-	if (text === undefined) return undefined;
-	const truncationLines = details?.truncation?.outputLines;
-	const lineCount = !details?.truncation?.firstLineExceedsLimit
-		&& typeof truncationLines === "number"
-		&& Number.isInteger(truncationLines)
-		&& truncationLines >= 0
-		? truncationLines
-		: countTextLines(stripGeneratedFooter(name, text, details));
-	return `${lineCount} ${lineCount === 1 ? "line" : "lines"}`;
-}
-
-export function getFileOutput(
-	name: string,
-	args: ToolArgs,
-	result: AgentToolResult<unknown>,
-	isError: boolean,
-): string {
-	if (isError || name === "read" || name === "grep" || name === "find" || name === "ls") {
-		return getTextResult(result);
-	}
-	return name === "write" ? String(args.content ?? "") : "";
-}
+import type { AgentToolResult } from "@earendil-works/pi-coding-agent";
+import { normalizeLineEndings } from "./compact-tools-core.ts";
+import type { ToolArgs } from "./compact-tools-types.ts";
+
+function pathFrom(args: ToolArgs): string {
+	const value = args.path ?? args.file_path;
+	return typeof value === "string" ? normalizeLineEndings(value) : "";
+}
+
+const INLINE_ARGUMENT_TOOLS = new Set(["grep", "find", "ls"]);
+
+function omitArgument(name: string, key: string): boolean {
+	if (key === "path" || key === "file_path") return true;
+	if (name === "read" && (key === "offset" || key === "limit")) return true;
+	if (name === "write" && key === "content") return true;
+	return (name === "grep" || name === "find") && key === "pattern";
+}
+
+function collectArgumentDetails(name: string, args: ToolArgs): ToolArgs {
+	const details: ToolArgs = {};
+	for (const [key, value] of Object.entries(args)) {
+		if (value !== undefined && !omitArgument(name, key)) details[key] = value;
+	}
+	return details;
+}
+
+export function getCallDetails(name: string, args: ToolArgs): string {
+	const path = pathFrom(args) || (INLINE_ARGUMENT_TOOLS.has(name) ? "." : "");
+	if (name === "read") return path;
+	if (name !== "grep" && name !== "find") return path;
+	const pattern = typeof args.pattern === "string" ? normalizeLineEndings(args.pattern) : "…";
+	return name === "grep" ? `/${pattern}/ in ${path}` : `${pattern} in ${path}`;
+}
+
+export function getArgumentDetails(name: string, args: ToolArgs): ToolArgs {
+	if (name === "edit" || INLINE_ARGUMENT_TOOLS.has(name)) return {};
+	return collectArgumentDetails(name, args);
+}
+
+function shellSegments(command: string): string[] {
+	const segments: string[] = [];
+	let current = "";
+	let quote: "'" | '"' | "`" | undefined;
+	let escaped = false;
+	for (let index = 0; index < command.length; index++) {
+		const character = command[index]!;
+		if (escaped) {
+			current += character;
+			escaped = false;
+			continue;
+		}
+		if (character === "\\" && quote !== "'") {
+			current += character;
+			escaped = true;
+			continue;
+		}
+		if (quote) {
+			current += character;
+			if (character === quote) quote = undefined;
+			continue;
+		}
+		if (character === "'" || character === '"' || character === "`") {
+			quote = character;
+			current += character;
+			continue;
+		}
+		const pair = command.slice(index, index + 2);
+		if (character === "\n" || character === ";" || pair === "&&" || pair === "||") {
+			if (current.trim()) segments.push(current.trim());
+			current = "";
+			if (pair === "&&" || pair === "||") index++;
+			continue;
+		}
+		current += character;
+	}
+	if (current.trim()) segments.push(current.trim());
+	return segments;
+}
+
+function unquote(value: string): string {
+	return value.replace(/^["']|["']$/gu, "");
+}
+
+/** A calm collapsed label that describes intent without exposing command arguments. */
+export function summarizeShellCommand(name: string, command: string): string {
+	const allSegments = shellSegments(normalizeLineEndings(command));
+	const segments = allSegments.filter((segment) => !/^\s*(?:cd|pushd|popd)\b/iu.test(segment));
+	const primary = segments[0] ?? allSegments[0] ?? "";
+	if (!primary) return name === "powershell" ? "Prepare PowerShell command" : "Prepare shell command";
+
+	const words = primary.trim().split(/\s+/u).map(unquote);
+	while (words.length > 0) {
+		if (/^[A-Za-z_][A-Za-z\d_]*=.*/u.test(words[0] ?? "")
+			|| ["command", "env", "sudo", "time"].includes((words[0] ?? "").toLowerCase())) {
+			words.shift();
+			continue;
+		}
+		break;
+	}
+	const executable = (words[0] ?? "").replace(/^.*[\\/]/u, "").replace(/\.(?:cmd|exe|ps1)$/iu, "").toLowerCase();
+	const action = (words[1] ?? "").toLowerCase();
+	const subject = words[2] ?? "";
+
+	let summary: string;
+	if (["npm", "pnpm", "yarn", "bun"].includes(executable) && action === "run" && subject) {
+		summary = `Run ${subject} task`;
+	} else if (["npm", "pnpm", "yarn", "bun"].includes(executable) && ["test", "check"].includes(action)) {
+		summary = action === "test" ? "Run tests" : "Run project checks";
+	} else if (["npm", "pnpm", "yarn", "bun"].includes(executable) && ["install", "i", "ci"].includes(action)) {
+		summary = "Install dependencies";
+	} else if (executable === "git" && action === "status") {
+		summary = "Check repository status";
+	} else if (executable === "git" && action === "diff") {
+		summary = "Review repository changes";
+	} else if (executable === "git" && action === "log") {
+		summary = "Review commit history";
+	} else if (executable === "git" && ["fetch", "pull", "push", "clone"].includes(action)) {
+		summary = `${action[0]!.toUpperCase()}${action.slice(1)} repository`;
+	} else if (["rg", "grep", "select-string"].includes(executable)) {
+		summary = "Search text";
+	} else if (["find", "fd", "get-childitem", "ls", "dir"].includes(executable)) {
+		summary = executable === "ls" || executable === "dir" || executable === "get-childitem" ? "List files" : "Find files";
+	} else if (["cat", "type", "get-content"].includes(executable)) {
+		summary = "Read file content";
+	} else if (["tsc", "mypy", "pyright"].includes(executable)) {
+		summary = "Check types";
+	} else if (["jest", "vitest", "pytest", "invoke-pester"].includes(executable)) {
+		summary = "Run tests";
+	} else if (executable) {
+		const display = executable.replace(/[-_]+/gu, " ");
+		summary = `Run ${display}`;
+	} else {
+		summary = name === "powershell" ? "Run PowerShell command" : "Run shell command";
+	}
+
+	const remainingSteps = Math.max(0, segments.length - 1);
+	return remainingSteps > 0 ? `${summary} + ${remainingSteps} more ${remainingSteps === 1 ? "step" : "steps"}` : summary;
+}
+
+export function getTextResult(result: AgentToolResult<unknown>): string {
+	const parts: string[] = [];
+	for (const item of result.content) {
+		if (item.type === "text") parts.push(item.text);
+	}
+	return normalizeLineEndings(parts.join("\n")).trimEnd();
+}
+
+type ResultDetails = {
+	diff?: unknown;
+	truncation?: {
+		firstLineExceedsLimit?: boolean;
+		outputLines?: number;
+	};
+	matchLimitReached?: unknown;
+	resultLimitReached?: unknown;
+	entryLimitReached?: unknown;
+	linesTruncated?: unknown;
+};
+
+function countTextLines(text: string): number {
+	const normalized = normalizeLineEndings(text).trimEnd();
+	if (!normalized) return 0;
+	let count = 1;
+	for (let index = 0; index < normalized.length; index++) {
+		if (normalized.charCodeAt(index) === 10) count++;
+	}
+	return count;
+}
+
+/** Keep only the lines that the edit actually removed or added; discard context and ellipses. */
+export function getEditChanges(result: AgentToolResult<unknown>): string {
+	const diff = (result.details as ResultDetails | undefined)?.diff;
+	if (typeof diff !== "string") return "";
+	return normalizeLineEndings(diff)
+		.split("\n")
+		.filter((line) => line.startsWith("-") || line.startsWith("+"))
+		.join("\n")
+		.trimEnd();
+}
+
+function stripGeneratedFooter(name: string, text: string, details: ResultDetails | undefined): string {
+	if (name === "read") {
+		return text.replace(/\n\n\[(?:Showing lines |\d+ more lines in file\.)[^\n]*\]$/u, "");
+	}
+	const hasGeneratedFooter = details?.truncation?.outputLines !== undefined
+		|| details?.matchLimitReached !== undefined
+		|| details?.resultLimitReached !== undefined
+		|| details?.entryLimitReached !== undefined
+		|| details?.linesTruncated !== undefined;
+	return hasGeneratedFooter ? text.replace(/\n\n\[[^\n]*\]$/u, "") : text;
+}
+
+export function formatResultLineSummary(
+	name: string,
+	args: ToolArgs,
+	result: AgentToolResult<unknown>,
+	output?: string,
+): string | undefined {
+	const details = result.details as ResultDetails | undefined;
+	const text = name === "edit"
+		? getEditChanges(result)
+		: output ?? (name === "write"
+			? String(args.content ?? "")
+			: result.content.some((item) => item.type === "text")
+				? getTextResult(result)
+				: undefined);
+	if (text === undefined) return undefined;
+	const truncationLines = details?.truncation?.outputLines;
+	const lineCount = !details?.truncation?.firstLineExceedsLimit
+		&& typeof truncationLines === "number"
+		&& Number.isInteger(truncationLines)
+		&& truncationLines >= 0
+		? truncationLines
+		: countTextLines(stripGeneratedFooter(name, text, details));
+	return `${lineCount} ${lineCount === 1 ? "line" : "lines"}`;
+}
+
+export function getFileOutput(
+	name: string,
+	args: ToolArgs,
+	result: AgentToolResult<unknown>,
+	isError: boolean,
+): string {
+	if (isError || name === "read" || name === "grep" || name === "find" || name === "ls") {
+		return getTextResult(result);
+	}
+	return name === "write" ? String(args.content ?? "") : "";
+}

package/extensions/compact-tools-layout.ts

@@ -117,28 +117,6 @@ export function renderToolCall(title: string, details: string | undefined, theme
 	});
 }
 
-export function wrapEditResult(component: Component, theme: Theme): Component {
-	return new CachedComponent((width) => {
-		const lines = component.render(Math.max(1, width - 3));
-		const first = lines.findIndex((line) => visibleWidth(line.trim()) > 0);
-		if (first < 0) return [];
-		const contentLines = lines.slice(first);
-		let commonIndent = Number.POSITIVE_INFINITY;
-		for (const line of contentLines) {
-			const plain = stripTerminalSequences(line);
-			if (plain.trim().length === 0) continue;
-			commonIndent = Math.min(commonIndent, plain.match(/^ */)?.[0].length ?? 0);
-			if (commonIndent === 0) break;
-		}
-		if (!Number.isFinite(commonIndent)) commonIndent = 0;
-		const prefix = theme.fg("border", " │ ");
-		return contentLines.map((line) => {
-			const content = sliceByColumn(line, commonIndent, Math.max(0, visibleWidth(line) - commonIndent), true);
-			return `${prefix}${content}`;
-		});
-	}, () => component.invalidate?.());
-}
-
 export function styleMultiline(text: string, style: (line: string) => string): string {
 	return normalizeLineEndings(text).split("\n").map(style).join("\n");
 }
@@ -151,6 +129,29 @@ export function renderOutput(output: string, theme: Theme, isError: boolean): Co
 	return prefixedText(styled, theme.fg("border", " │ "));
 }
 
+/** Render an edit's changed lines without unchanged context, hunk metadata, or result prose. */
+export function renderEditChanges(changes: string, theme: Theme): Component | undefined {
+	const normalized = normalizeLineEndings(changes).trimEnd();
+	if (!normalized) return undefined;
+	const styled = normalized.split("\n").map((line) =>
+		theme.fg(line.startsWith("+") ? "success" : "error", line)
+	).join("\n");
+	return prefixedText(styled, theme.fg("border", " │ "));
+}
+
+/** Limit a result preview by rendered rows while preserving the full source component for expansion. */
+export function limitComponentLines(component: Component, maximumLines: number, theme: Theme): Component {
+	return new CachedComponent((width) => {
+		const lines = component.render(width);
+		if (lines.length <= maximumLines) return lines;
+		const omitted = lines.length - maximumLines;
+		return [
+			...lines.slice(0, maximumLines),
+			theme.fg("border", " │ ") + theme.fg("borderAccent", `… ${omitted} more ${omitted === 1 ? "line" : "lines"}`),
+		];
+	}, () => component.invalidate?.());
+}
+
 export function renderArguments(args: ToolArgs, theme: Theme): Component {
 	const json = JSON.stringify(args, null, 2) ?? "{}";
 	const styled = styleMultiline(json, (line) => theme.fg("toolOutput", line));

package/extensions/compact-tools-progress.ts

@@ -0,0 +1,158 @@
+import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
+import { stripTerminalSequences, truncateToWidth } from "@earendil-works/pi-tui";
+import { colorizeRgb, interpolateRgb, themeColorRgb, type Rgb } from "./compact-tools-color.ts";
+import type { ToolArgs } from "./compact-tools-types.ts";
+
+const GLOW_INTERVAL_MS = 80;
+const WHITE: Rgb = { r: 255, g: 255, b: 255 };
+
+const TOOL_PROGRESS_MESSAGES: Readonly<Record<string, string>> = {
+	read: "Reading file…",
+	write: "Writing file…",
+	edit: "Editing file…",
+	bash: "Running command…",
+	powershell: "Running command…",
+	grep: "Searching text…",
+	find: "Finding files…",
+	ls: "Listing files…",
+};
+
+function humanizeToolName(toolName: string, args: ToolArgs): string {
+	const routedName = (toolName === "mcp" || toolName.startsWith("mcp__")) && typeof args.tool === "string"
+		? args.tool
+		: toolName;
+	const readableName = stripTerminalSequences(routedName)
+		.replace(/[\u0000-\u001f\u007f]/gu, " ")
+		.replace(/^mcp__/iu, "")
+		.replace(/[_-]mcp$/iu, "")
+		.replace(/([A-Z]+)([A-Z][a-z])/gu, "$1 $2")
+		.replace(/([a-z\d])([A-Z])/gu, "$1 $2")
+		.replace(/[_-]+/gu, " ")
+		.replace(/\s+/gu, " ")
+		.trim();
+	return truncateToWidth(readableName, 40, "…");
+}
+
+/** Keep the working row calm and private; invocation details remain in the tool card. */
+export function formatToolProgress(toolName: string, args: ToolArgs): string {
+	const builtInMessage = TOOL_PROGRESS_MESSAGES[toolName];
+	if (builtInMessage) return builtInMessage;
+	const displayName = humanizeToolName(toolName, args);
+	return displayName ? `Using ${displayName}…` : "Running tool…";
+}
+
+function glowRadius(length: number): number {
+	return Math.max(2, Math.min(8, Math.ceil(length / 4)));
+}
+
+/** Render a thinking-summary-colored label with a proportional white highlight sweeping left to right. */
+export function glowProgressMessage(message: string, frame: number, theme: Theme): string {
+	const characters = [...message];
+	if (characters.length === 0) return "";
+	const radius = glowRadius(characters.length);
+	const center = frame % (characters.length + radius * 2) - radius;
+	const base = themeColorRgb(theme, "thinkingMax");
+	if (!base) {
+		return characters.map((character, index) =>
+			theme.fg(Math.abs(index - center) < radius ? "mdHeading" : "thinkingMax", character)).join("");
+	}
+	return characters.map((character, index) => {
+		const distance = Math.abs(index - center);
+		const strength = Math.max(0, 1 - distance / radius);
+		return colorizeRgb(theme, interpolateRgb(base, WHITE, strength), character);
+	}).join("");
+}
+
+function createGlowFrames(message: string, theme: Theme): string[] {
+	const length = [...message].length;
+	if (length === 0) return [""];
+	return Array.from({ length: length + glowRadius(length) * 2 }, (_, frame) =>
+		glowProgressMessage(message, frame, theme));
+}
+
+/** Owns Pi's single working row so animation remains continuous across thinking and tool execution. */
+export class ProgressController {
+	private context: ExtensionContext | undefined;
+	private readonly activeTools = new Map<string, string>();
+	private message: string | undefined;
+	private frames: string[] = [];
+	private frame = 0;
+	private timer: ReturnType<typeof setInterval> | undefined;
+
+	constructor(pi: ExtensionAPI) {
+		pi.on("agent_start", () => this.setMessage("Thinking…"));
+		pi.on("message_update", (event) => {
+			const type = event.assistantMessageEvent.type;
+			if (type === "thinking_start" || type === "thinking_delta") this.setMessage("Thinking…");
+			else if (type === "text_start" || type === "text_delta") this.setMessage("Responding…");
+			else if (type === "toolcall_start" || type === "toolcall_delta") this.setMessage("Preparing tools…");
+		});
+		pi.on("tool_execution_start", (event) => {
+			const message = formatToolProgress(event.toolName, event.args ?? {});
+			this.activeTools.set(event.toolCallId, message);
+			this.setMessage(message);
+		});
+		pi.on("tool_execution_end", (event) => {
+			this.activeTools.delete(event.toolCallId);
+			const remaining = [...this.activeTools.values()].at(-1);
+			this.setMessage(remaining ?? "Processing results…");
+		});
+		pi.on("agent_end", () => {
+			this.activeTools.clear();
+			this.clearMessage();
+		});
+	}
+
+	bind(ctx: ExtensionContext): void {
+		this.stopAnimation();
+		this.context = ctx;
+		this.activeTools.clear();
+		this.message = undefined;
+		this.frames = [];
+		this.frame = 0;
+		ctx.ui.setWorkingVisible(true);
+		ctx.ui.setWorkingIndicator({ frames: [] });
+	}
+
+	dispose(): void {
+		this.stopAnimation();
+		this.activeTools.clear();
+		this.context?.ui.setWorkingMessage();
+		this.context?.ui.setWorkingIndicator();
+		this.message = undefined;
+		this.frames = [];
+		this.context = undefined;
+	}
+
+	private setMessage(message: string): void {
+		if (!this.context || (this.message === message && this.timer)) return;
+		this.message = message;
+		this.frames = createGlowFrames(message, this.context.ui.theme);
+		this.frame = 0;
+		this.renderMessage();
+		if (this.timer) return;
+		this.timer = setInterval(() => {
+			this.frame++;
+			this.renderMessage();
+		}, GLOW_INTERVAL_MS);
+		this.timer.unref?.();
+	}
+
+	private renderMessage(): void {
+		if (!this.message || !this.context || this.frames.length === 0) return;
+		this.context.ui.setWorkingMessage(this.frames[this.frame % this.frames.length]);
+	}
+
+	private clearMessage(): void {
+		this.stopAnimation();
+		this.message = undefined;
+		this.frames = [];
+		this.frame = 0;
+		this.context?.ui.setWorkingMessage();
+	}
+
+	private stopAnimation(): void {
+		if (this.timer) clearInterval(this.timer);
+		this.timer = undefined;
+	}
+}