pi-open-tui 0.3.14 → 0.4.1

package/extensions/open-tui/git.ts

@@ -58,7 +58,7 @@ export async function readGitStatus(
 	options: { readCommit?: boolean; readTag?: boolean; readCounts?: boolean } = {},
 ): Promise<GitStatus> {
 	const stdout = await gitExec(
-		["status", "--porcelain=v1", "--branch", "--show-stash"],
+		["status", "--porcelain=v1", "--branch"],
 		cwd,
 	);
 	if (stdout === null) {
@@ -67,7 +67,6 @@ export async function readGitStatus(
 
 	const status = emptyGitStatus();
 	const lines = stdout.split("\n");
-	let stashSupported = true;
 
 	for (const line of lines) {
 		if (line.startsWith("## ")) {
@@ -89,17 +88,7 @@ export async function readGitStatus(
 			continue;
 		}
 
-		if (line.startsWith("# stash ")) {
-			const stashCount = parseInt(line.slice(8).trim(), 10);
-			if (!Number.isNaN(stashCount)) {
-				status.stashed = stashCount;
-				stashSupported = true;
-			}
-			continue;
-		}
-
-		// ponytail: skip file-entry counting when only branch/commit display is on;
-		// the first `git status` call itself can't be split, but the stash fallback below can.
+		// Skip file-entry counting and the separate stash query for branch-only display.
 		if (options.readCounts === false) continue;
 		if (line.length < 3) continue;
 		const x = line[0]!;
@@ -107,19 +96,21 @@ export async function readGitStatus(
 
 		if (x === "U" || y === "U" || (x === "A" && y === "A") || (x === "D" && y === "D")) status.conflicted++;
 		else if (x === "?" && y === "?") status.untracked++;
-		else if (x === "R") status.renamed++;
-		else if (x === "D" || y === "D") status.deleted++;
+		else if (x === "R") {
+			status.renamed++;
+			if (y === "M") status.modified++;
+			else if (y === "D") status.deleted++;
+		} else if (x === "D" || y === "D") status.deleted++;
 		else {
 			if (x !== " " && x !== "?") status.staged++;
 			if (y === "M" || y === "D") status.modified++;
 		}
 	}
 
-	if (options.readCounts !== false && stashSupported && status.stashed === 0 && !stdout.includes("# stash")) {
-		const stashOut = await gitExec(["stash", "list", "--count"], cwd);
+	if (options.readCounts !== false) {
+		const stashOut = await gitExec(["stash", "list", "--format=%H"], cwd);
 		if (stashOut !== null) {
-			const count = parseInt(stashOut.trim(), 10);
-			if (!Number.isNaN(count)) status.stashed = count;
+			status.stashed = stashOut.split("\n").filter((line) => line.trim() !== "").length;
 		}
 	}
 
@@ -138,16 +129,3 @@ export async function readGitStatus(
 
 	return status;
 }
-
-export function hasGitChanges(s: GitStatus): boolean {
-	return (
-		s.modified > 0 ||
-		s.untracked > 0 ||
-		s.staged > 0 ||
-		s.conflicted > 0 ||
-		s.renamed > 0 ||
-		s.deleted > 0 ||
-		s.ahead > 0 ||
-		s.behind > 0
-	);
-}

package/extensions/open-tui/header.ts

@@ -1,244 +1,133 @@
-import { VERSION, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { Component, TUI } from "@earendil-works/pi-tui";
-import {
-	center,
-	collectPiCommandNames,
-	formatCwd,
-	formatModelLabel,
-	formatThinkingLabel,
-	headerColumnWidths,
-	padRight,
-	pickSlashCommandTips,
-	truncateToWidth,
-	visibleWidth,
-} from "./utils.ts";
-
-const LOGO_CELL = "███";
-
-type LogoColor = "panel" | "cyan" | "red" | "green" | "orange" | "white" | "flash" | "brand";
-type LogoFrame = { phase: number; active: "left" | "top" | "right" | "none"; ax: number; ay: number; flash: boolean; white: boolean };
-
-const LOGO_FRAMES: LogoFrame[] = [
-	...Array.from({ length: 4 }, (_, ay) => ({ phase: 0, active: "left" as const, ax: 2, ay, flash: false, white: false })),
-	...Array.from({ length: 3 }, (_, ay) => ({ phase: 1, active: "top" as const, ax: 2, ay, flash: false, white: false })),
-	...Array.from({ length: 5 }, (_, ay) => ({ phase: 2, active: "right" as const, ax: 5, ay, flash: false, white: false })),
-	{ phase: 3, active: "none", ax: 0, ay: 0, flash: false, white: false },
-	{ phase: 3, active: "none", ax: 0, ay: 0, flash: true, white: false },
-	{ phase: 3, active: "none", ax: 0, ay: 0, flash: false, white: false },
-	{ phase: 3, active: "none", ax: 0, ay: 0, flash: true, white: false },
-	{ phase: 4, active: "none", ax: 0, ay: 0, flash: false, white: false },
-	{ phase: 5, active: "none", ax: 0, ay: 0, flash: false, white: false },
-	{ phase: 5, active: "none", ax: 0, ay: 0, flash: false, white: true },
-	{ phase: 5, active: "none", ax: 0, ay: 0, flash: false, white: false },
-	{ phase: 5, active: "none", ax: 0, ay: 0, flash: false, white: true },
-	{ phase: 6, active: "none", ax: 0, ay: 0, flash: false, white: false },
-];
-
-function hasCell(y: number, x: number, cells: string): boolean {
-	return cells.split(" ").includes(`${y},${x}`);
-}
-
-function hasPiece(y: number, x: number, py: number, px: number, cells: string): boolean {
-	return cells.split(" ").some((item) => {
-		const [dy, dx] = item.split(",").map(Number);
-		return y === py + dy && x === px + dx;
-	});
-}
-
-function logoCellColor(frame: LogoFrame, y: number, x: number): LogoColor {
-	if (frame.white) {
-		return hasCell(y, x, "3,2 3,3 3,4 4,2 4,4 5,2 5,3 5,5 6,2 6,5") ? "white" : "panel";
-	}
-	if (frame.flash && y === 6 && x >= 1 && x <= 6) return "flash";
-
-	switch (frame.active) {
-		case "left":
-			if (hasPiece(y, x, frame.ay, frame.ax, "0,0 1,0 1,1 2,0")) return "red";
-			break;
-		case "top":
-			if (hasPiece(y, x, frame.ay, frame.ax, "0,0 0,1 0,2 1,2")) return "cyan";
-			break;
-		case "right":
-			if (hasPiece(y, x, frame.ay, frame.ax, "0,0 1,0 2,0 2,1")) return "green";
-			break;
-	}
-
-	if (frame.phase === 6) {
-		return hasCell(y, x, "3,2 3,3 3,4 4,4 4,2 5,2 5,3 5,5 6,2 6,5") ? "brand" : "panel";
-	}
-	if (frame.phase === 4) {
-		if (hasCell(y, x, "2,2 2,3 2,4 3,4")) return "cyan";
-		if (hasCell(y, x, "3,2 4,2 4,3 5,2")) return "red";
-		if (hasCell(y, x, "4,5 5,5")) return "green";
-		return "panel";
-	}
-	if (frame.phase >= 5) {
-		if (hasCell(y, x, "3,2 3,3 3,4 4,4")) return "cyan";
-		if (hasCell(y, x, "4,2 5,2 5,3 6,2")) return "red";
-		if (hasCell(y, x, "5,5 6,5")) return "green";
-		return "panel";
-	}
-	if (frame.phase <= 3 && hasCell(y, x, "6,1 6,2 6,3 6,4")) return "orange";
-	if (frame.phase >= 2 && hasCell(y, x, "2,2 2,3 2,4 3,4")) return "cyan";
-	if (frame.phase >= 1 && hasCell(y, x, "3,2 4,2 4,3 5,2")) return "red";
-	if (frame.phase >= 3 && hasCell(y, x, "4,5 5,5 6,5 6,6")) return "green";
-	return "panel";
-}
-
-function colorCell(color: LogoColor, paintBrand: (text: string) => string): string {
-	switch (color) {
-		case "cyan": return `\x1b[36m${LOGO_CELL}\x1b[39m`;
-		case "red": return `\x1b[31m${LOGO_CELL}\x1b[39m`;
-		case "green": return `\x1b[32m${LOGO_CELL}\x1b[39m`;
-		case "orange":
-		case "flash": return `\x1b[33m${LOGO_CELL}\x1b[39m`;
-		case "white": return `\x1b[39m${LOGO_CELL}`;
-		case "brand": return paintBrand(LOGO_CELL);
-		default: return " ".repeat(LOGO_CELL.length);
-	}
-}
-
-function renderLogo(frameIndex: number, paintBrand: (text: string) => string): string[] {
-	const frame = LOGO_FRAMES[frameIndex % LOGO_FRAMES.length]!;
-	const grid: LogoColor[][] = [];
-	for (let y = 1; y <= 7; y++) {
-		const row: LogoColor[] = [];
-		for (let x = 1; x <= 8; x++) row.push(logoCellColor(frame, y, x));
-		grid.push(row);
-	}
-
-	let minX = 7;
-	let maxX = 0;
-	for (const row of grid) {
-		row.forEach((cell, x) => {
-			if (cell !== "panel") {
-				minX = Math.min(minX, x);
-				maxX = Math.max(maxX, x);
-			}
-		});
-	}
-	if (maxX < minX) { minX = 0; maxX = 7; }
-
-	return grid.map((row) => {
-		let line = "";
-		for (let x = minX; x <= maxX; x++) line += colorCell(row[x]!, paintBrand);
-		return line;
-	});
-}
-
-function borderLine(
-	left: string,
-	label: string,
-	right: string,
-	width: number,
-	paint: (text: string) => string,
-): string {
-	if (width <= 1) return "";
-	if (width < 8 || label.length === 0) {
-		return paint(truncateToWidth(left + "─".repeat(Math.max(0, width - 2)) + right, width, ""));
-	}
-
-	const before = "─── ";
-	const after = " ─────";
-	const fixedWidth = visibleWidth(before) + visibleWidth(label) + visibleWidth(after);
-	const fill = Math.max(0, width - 2 - fixedWidth);
-	return `${paint(left)}${paint(before)}${label}${paint(after)}${paint("─".repeat(fill))}${paint(right)}`;
-}
-
-function boxedLine(content: string, width: number, paint: (text: string) => string): string {
-	if (width <= 2) return truncateToWidth(content, width, "");
-	return `${paint("│")}${padRight(content, width - 2)}${paint("│")}`;
-}
-
-function twoColumn(
-	left: string,
-	right: string,
-	leftWidth: number,
-	rightWidth: number,
-	paint: (text: string) => string,
-): string {
-	return `${padRight(left, leftWidth)} ${paint("│")} ${padRight(right, rightWidth, "…")}`;
-}
-
-export class OpenTuiHeader implements Component {
-	private readonly pi: ExtensionAPI;
-	private readonly ctx: ExtensionContext;
-	private readonly frame = LOGO_FRAMES.length - 1;
-	private readonly tipCommands: string[];
-
-	constructor(pi: ExtensionAPI, ctx: ExtensionContext, _tui: TUI) {
-		this.pi = pi;
-		this.ctx = ctx;
-		const pool = collectPiCommandNames(pi.getCommands());
-		this.tipCommands = pickSlashCommandTips(pool, {
-			fixed: ["open-tui"],
-			count: 3,
-		});
-	}
-
-	render(width: number): string[] {
-		const theme = this.ctx.ui.theme;
-		const paint = (s: string) => theme.fg("accent", s);
-		const muted = (s: string) => theme.fg("muted", s);
-		const dim = (s: string) => theme.fg("dim", s);
-		const bold = (s: string) => theme.bold(s);
-
-		if (width < 24) return [paint(`Pi v${VERSION}`)];
-
-		const innerWidth = width - 2;
-		const { leftWidth, rightWidth, useTips } = headerColumnWidths(innerWidth);
-		const model = formatModelLabel(this.ctx.model);
-		const effort = formatThinkingLabel(this.pi.getThinkingLevel());
-		const cwd = formatCwd(this.ctx.cwd);
-
-		const leftLines = [
-			...renderLogo(this.frame, paint).map((line) => center(line, leftWidth)),
-			center(bold("Let's build something great"), leftWidth),
-			center(muted(`${model} · ${effort}`), leftWidth),
-			center(dim(cwd), leftWidth),
-		];
-
-		const tipDivider = paint("─".repeat(Math.max(8, Math.min(rightWidth, 22))));
-		const [cmd0 = "", cmd1 = "", cmd2 = "", cmd3 = ""] = this.tipCommands;
-		const tipLines = [
-			"",
-			paint(bold("Welcome")),
-			muted("Ask Pi anything"),
-			tipDivider,
-			paint(bold("Commands")),
-			muted(cmd0),
-			muted(cmd1),
-			muted(cmd2),
-			muted(cmd3),
-			"",
-		];
-
-		const lines = [borderLine("╭", `${paint("Pi")} v${VERSION}`, "╮", width, paint)];
-		for (let i = 0; i < leftLines.length; i++) {
-			const content = useTips
-				? twoColumn(leftLines[i] ?? "", tipLines[i] ?? "", leftWidth, rightWidth, paint)
-				: padRight(leftLines[i] ?? "", leftWidth);
-			lines.push(boxedLine(content, width, paint));
-		}
-		lines.push(borderLine("╰", "", "╯", width, paint));
-		return lines.map((line) => truncateToWidth(line, width, ""));
-	}
-
-	invalidate(): void {}
-
-	dispose(): void {}
-}
-
-export function installHeader(pi: ExtensionAPI, ctx: ExtensionContext): () => void {
-	let header: OpenTuiHeader | undefined;
-	ctx.ui.setHeader((tui) => {
-		header?.dispose();
-		header = new OpenTuiHeader(pi, ctx, tui);
-		return header;
-	});
-	return () => {
-		header?.dispose();
-		header = undefined;
-		ctx.ui.setHeader(undefined);
-	};
-}
+import { VERSION, type ExtensionAPI, type ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { Component, TUI } from "@earendil-works/pi-tui";
+import {
+	center,
+	collectPiCommandNames,
+	formatCwd,
+	formatModelLabel,
+	formatThinkingLabel,
+	headerColumnWidths,
+	padRight,
+	pickSlashCommandTips,
+	truncateToWidth,
+	visibleWidth,
+} from "./utils.ts";
+
+const LOGO = [
+	"            ",
+	"            ",
+	"█████████   ",
+	"███   ███   ",
+	"██████   ███",
+	"███      ███",
+	"            ",
+];
+
+function renderLogo(paintBrand: (text: string) => string): string[] {
+	return LOGO.map((line) => line.replace(/███/g, paintBrand));
+}
+
+function borderLine(
+	left: string,
+	label: string,
+	right: string,
+	width: number,
+	paint: (text: string) => string,
+): string {
+	if (width <= 1) return "";
+	if (width < 8 || label.length === 0) {
+		return paint(truncateToWidth(left + "─".repeat(Math.max(0, width - 2)) + right, width, ""));
+	}
+
+	const before = "─── ";
+	const after = " ─────";
+	const fixedWidth = visibleWidth(before) + visibleWidth(label) + visibleWidth(after);
+	const fill = Math.max(0, width - 2 - fixedWidth);
+	return `${paint(left)}${paint(before)}${label}${paint(after)}${paint("─".repeat(fill))}${paint(right)}`;
+}
+
+function boxedLine(content: string, width: number, paint: (text: string) => string): string {
+	if (width <= 2) return truncateToWidth(content, width, "");
+	return `${paint("│")}${padRight(content, width - 2)}${paint("│")}`;
+}
+
+function twoColumn(
+	left: string,
+	right: string,
+	leftWidth: number,
+	rightWidth: number,
+	paint: (text: string) => string,
+): string {
+	return `${padRight(left, leftWidth)} ${paint("│")} ${padRight(right, rightWidth, "…")}`;
+}
+
+export class OpenTuiHeader implements Component {
+	private readonly pi: ExtensionAPI;
+	private readonly ctx: ExtensionContext;
+	private readonly tipCommands: string[];
+
+	constructor(pi: ExtensionAPI, ctx: ExtensionContext, _tui: TUI) {
+		this.pi = pi;
+		this.ctx = ctx;
+		const pool = collectPiCommandNames(pi.getCommands());
+		this.tipCommands = pickSlashCommandTips(pool, {
+			fixed: ["open-tui"],
+			count: 3,
+		});
+	}
+
+	render(width: number): string[] {
+		const theme = this.ctx.ui.theme;
+		const paint = (s: string) => theme.fg("accent", s);
+		const muted = (s: string) => theme.fg("muted", s);
+		const dim = (s: string) => theme.fg("dim", s);
+		const bold = (s: string) => theme.bold(s);
+
+		if (width < 24) return [truncateToWidth(paint(`Pi v${VERSION}`), width, "")];
+
+		const innerWidth = width - 2;
+		const { leftWidth, rightWidth, useTips } = headerColumnWidths(innerWidth);
+		const model = formatModelLabel(this.ctx.model);
+		const effort = formatThinkingLabel(this.pi.getThinkingLevel());
+		const cwd = formatCwd(this.ctx.cwd);
+
+		const leftLines = [
+			...renderLogo(paint).map((line) => center(line, leftWidth)),
+			center(bold("Let's build something great"), leftWidth),
+			center(muted(`${model} · ${effort}`), leftWidth),
+			center(dim(cwd), leftWidth),
+		];
+
+		const tipDivider = paint("─".repeat(Math.max(8, Math.min(rightWidth, 22))));
+		const [cmd0 = "", cmd1 = "", cmd2 = "", cmd3 = ""] = this.tipCommands;
+		const tipLines = [
+			"",
+			paint(bold("Welcome")),
+			muted("Ask Pi anything"),
+			tipDivider,
+			paint(bold("Commands")),
+			muted(cmd0),
+			muted(cmd1),
+			muted(cmd2),
+			muted(cmd3),
+			"",
+		];
+
+		const lines = [borderLine("╭", `${paint("Pi")} v${VERSION}`, "╮", width, paint)];
+		for (let i = 0; i < leftLines.length; i++) {
+			const content = useTips
+				? twoColumn(leftLines[i] ?? "", tipLines[i] ?? "", leftWidth, rightWidth, paint)
+				: padRight(leftLines[i] ?? "", leftWidth);
+			lines.push(boxedLine(content, width, paint));
+		}
+		lines.push(borderLine("╰", "", "╯", width, paint));
+		return lines.map((line) => truncateToWidth(line, width, ""));
+	}
+
+	invalidate(): void {}
+}
+
+export function installHeader(pi: ExtensionAPI, ctx: ExtensionContext): () => void {
+	ctx.ui.setHeader((tui) => new OpenTuiHeader(pi, ctx, tui));
+	return () => ctx.ui.setHeader(undefined);
+}

package/extensions/open-tui/icons.ts

@@ -28,6 +28,9 @@ export interface IconGlyphs {
 	untracked: string;
 	renamed: string;
 	deleted: string;
+	/** Compact tool view: call marker and result gutter. */
+	toolCall: string;
+	toolResult: string;
 }
 
 const NERD_GLYPHS: IconGlyphs = {
@@ -59,6 +62,8 @@ const NERD_GLYPHS: IconGlyphs = {
 	untracked: "?",
 	renamed: "»",
 	deleted: "✘",
+	toolCall: "●",
+	toolResult: "⎿",
 };
 
 // ponytail: ASCII fallback uses compact symbols (not English words) to keep
@@ -92,6 +97,8 @@ const ASCII_GLYPHS: IconGlyphs = {
 	untracked: "?",
 	renamed: "r",
 	deleted: "x",
+	toolCall: "*",
+	toolResult: "`-",
 };
 
 // Portable Unicode icon set for terminals without a Nerd Font. Keeps the
@@ -129,6 +136,8 @@ const UNICODE_GLYPHS: IconGlyphs = {
 	untracked: "?",
 	renamed: "→",
 	deleted: "✗",
+	toolCall: "●",
+	toolResult: "└",
 };
 
 function isSshSession(): boolean {