pi-open-tui 0.2.9 → 0.2.11

package/extensions/open-tui/editor.ts

@@ -1,100 +1,100 @@
-import {
-	CustomEditor,
-	type ExtensionAPI,
-	type ExtensionContext,
-	type KeybindingsManager,
-} from "@earendil-works/pi-coding-agent";
-import type { EditorTheme, TUI } from "@earendil-works/pi-tui";
-import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import { findBottomBorderIndex, isEditorBorderLine, stripAnsi } from "./utils.ts";
-
-function fillLine(content: string, width: number): string {
-	const truncated = truncateToWidth(content, Math.max(0, width), "");
-	const pad = " ".repeat(Math.max(0, width - visibleWidth(truncated)));
-	return `${truncated}${pad}`;
-}
-
-function roundedBorder(
-	width: number,
-	kind: "top" | "bottom",
-	paint: (s: string) => string,
-	sourceLine?: string,
-): string {
-	if (width < 2) return paint(truncateToWidth(kind === "top" ? "╭╮" : "╰╯", width, ""));
-	const corners = kind === "top" ? (["╭", "╮"] as const) : (["╰", "╯"] as const);
-
-	if (sourceLine) {
-		const plain = stripAnsi(sourceLine);
-		const scrollMatch = plain.match(/([↑↓]\s+\d+\s+more)/);
-		if (scrollMatch) {
-			const label = `─── ${scrollMatch[1]} `;
-			const fill = Math.max(0, width - 2 - visibleWidth(label));
-			return paint(`${corners[0]}${label}${"─".repeat(fill)}${corners[1]}`);
-		}
-	}
-
-	return paint(`${corners[0]}${"─".repeat(Math.max(0, width - 2))}${corners[1]}`);
-}
-
-export class OpenTuiEditor extends CustomEditor {
-	private readonly getRail: () => string;
-	private readonly getBorder: (s: string) => string;
-
-	constructor(
-		tui: TUI,
-		editorTheme: EditorTheme,
-		keybindings: KeybindingsManager,
-	) {
-		super(tui, editorTheme, keybindings, { paddingX: 0 });
-		// ponytail: route the frame through this.borderColor so Pi can recolor it
-		// via updateEditorBorderColor() — bash mode ("! " prefix → green) and
-		// thinking-level borders both flow through this one property.
-		this.getRail = () => this.borderColor("│");
-		this.getBorder = (s: string) => this.borderColor(s);
-	}
-
-	override setPaddingX(_padding: number): void {
-		// The custom rail owns the horizontal inset and keeps one stable text gap.
-		super.setPaddingX(0);
-	}
-
-	render(width: number): string[] {
-		if (width < 4) return super.render(width);
-
-		const rail = this.getRail();
-		const borderPaint = this.getBorder;
-		// ponytail: 1-char rail + 1-char gap on each side = 4 chars of chrome.
-		const innerWidth = Math.max(0, width - 4);
-		const baseLines = super.render(innerWidth);
-		const bottomIdx = findBottomBorderIndex(baseLines);
-
-		const result: string[] = [];
-		result.push(roundedBorder(width, "top", borderPaint, baseLines[0]));
-
-		for (let i = 1; i < bottomIdx; i++) {
-			const line = baseLines[i] ?? "";
-			if (isEditorBorderLine(line)) {
-				result.push(`${rail} ${fillLine("", innerWidth)} ${rail}`);
-			} else {
-				result.push(`${rail} ${fillLine(line, innerWidth)} ${rail}`);
-			}
-		}
-
-		result.push(roundedBorder(width, "bottom", borderPaint, baseLines[bottomIdx]));
-
-		for (let i = bottomIdx + 1; i < baseLines.length; i++) {
-			result.push(baseLines[i]!);
-		}
-
-		return result.map((line) => truncateToWidth(line, width, ""));
-	}
-}
-
-export function installEditor(_pi: ExtensionAPI, ctx: ExtensionContext): () => void {
-	ctx.ui.setEditorComponent((tui, editorTheme, keybindings) =>
-		new OpenTuiEditor(tui, editorTheme, keybindings),
-	);
-	return () => {
-		ctx.ui.setEditorComponent(undefined);
-	};
-}
+import {
+	CustomEditor,
+	type ExtensionAPI,
+	type ExtensionContext,
+	type KeybindingsManager,
+} from "@earendil-works/pi-coding-agent";
+import type { EditorTheme, TUI } from "@earendil-works/pi-tui";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { findBottomBorderIndex, isEditorBorderLine, stripAnsi } from "./utils.ts";
+
+function fillLine(content: string, width: number): string {
+	const truncated = truncateToWidth(content, Math.max(0, width), "");
+	const pad = " ".repeat(Math.max(0, width - visibleWidth(truncated)));
+	return `${truncated}${pad}`;
+}
+
+function roundedBorder(
+	width: number,
+	kind: "top" | "bottom",
+	paint: (s: string) => string,
+	sourceLine?: string,
+): string {
+	if (width < 2) return paint(truncateToWidth(kind === "top" ? "╭╮" : "╰╯", width, ""));
+	const corners = kind === "top" ? (["╭", "╮"] as const) : (["╰", "╯"] as const);
+
+	if (sourceLine) {
+		const plain = stripAnsi(sourceLine);
+		const scrollMatch = plain.match(/([↑↓]\s+\d+\s+more)/);
+		if (scrollMatch) {
+			const label = `─── ${scrollMatch[1]} `;
+			const fill = Math.max(0, width - 2 - visibleWidth(label));
+			return paint(`${corners[0]}${label}${"─".repeat(fill)}${corners[1]}`);
+		}
+	}
+
+	return paint(`${corners[0]}${"─".repeat(Math.max(0, width - 2))}${corners[1]}`);
+}
+
+export class OpenTuiEditor extends CustomEditor {
+	private readonly getRail: () => string;
+	private readonly getBorder: (s: string) => string;
+
+	constructor(
+		tui: TUI,
+		editorTheme: EditorTheme,
+		keybindings: KeybindingsManager,
+	) {
+		super(tui, editorTheme, keybindings, { paddingX: 0 });
+		// ponytail: route the frame through this.borderColor so Pi can recolor it
+		// via updateEditorBorderColor() — bash mode ("! " prefix → green) and
+		// thinking-level borders both flow through this one property.
+		this.getRail = () => this.borderColor("│");
+		this.getBorder = (s: string) => this.borderColor(s);
+	}
+
+	override setPaddingX(_padding: number): void {
+		// The custom rail owns the horizontal inset and keeps one stable text gap.
+		super.setPaddingX(0);
+	}
+
+	render(width: number): string[] {
+		if (width < 4) return super.render(width);
+
+		const rail = this.getRail();
+		const borderPaint = this.getBorder;
+		// ponytail: 1-char rail + 1-char gap on each side = 4 chars of chrome.
+		const innerWidth = Math.max(0, width - 4);
+		const baseLines = super.render(innerWidth);
+		const bottomIdx = findBottomBorderIndex(baseLines);
+
+		const result: string[] = [];
+		result.push(roundedBorder(width, "top", borderPaint, baseLines[0]));
+
+		for (let i = 1; i < bottomIdx; i++) {
+			const line = baseLines[i] ?? "";
+			if (isEditorBorderLine(line)) {
+				result.push(`${rail} ${fillLine("", innerWidth)} ${rail}`);
+			} else {
+				result.push(`${rail} ${fillLine(line, innerWidth)} ${rail}`);
+			}
+		}
+
+		result.push(roundedBorder(width, "bottom", borderPaint, baseLines[bottomIdx]));
+
+		for (let i = bottomIdx + 1; i < baseLines.length; i++) {
+			result.push(baseLines[i]!);
+		}
+
+		return result.map((line) => truncateToWidth(line, width, ""));
+	}
+}
+
+export function installEditor(_pi: ExtensionAPI, ctx: ExtensionContext): () => void {
+	ctx.ui.setEditorComponent((tui, editorTheme, keybindings) =>
+		new OpenTuiEditor(tui, editorTheme, keybindings),
+	);
+	return () => {
+		ctx.ui.setEditorComponent(undefined);
+	};
+}

package/extensions/open-tui/footer.ts

@@ -7,6 +7,7 @@ import type { GitStatus } from "./git.ts";
 import type { RuntimeInfo } from "./runtime.ts";
 import {
 	alignRight,
+	basenamePath,
 	cacheHitColor,
 	effortColor,
 	fitSegmentsByPriority,
@@ -17,7 +18,9 @@ import {
 	providerColor,
 	sanitizeStatus,
 	stressColor,
+	truncateBranch,
 	truncatePath,
+	type PrioritizedSegment,
 } from "./utils.ts";
 import type { FooterState, ModelMeta, UsageTotals } from "./state.ts";
 import { getUsageTotals } from "./state.ts";
@@ -36,6 +39,15 @@ function renderBar(theme: Theme, pct: number, barWidth: number, ascii: boolean):
 	);
 }
 
+/** Compact context form: icon + percentage, no bar or token counts. */
+function renderContextCompact(theme: Theme, ctx: ExtensionContext, glyphs: IconGlyphs): string {
+	const contextUsage = ctx.getContextUsage();
+	const contextWindow = contextUsage?.contextWindow ?? ctx.model?.contextWindow ?? 0;
+	if (contextWindow <= 0) return "";
+	const contextPct = contextUsage?.percent ?? 0;
+	return `${theme.fg(stressColor(contextPct), glyphs.context)} ${theme.fg(stressColor(contextPct), `${contextPct.toFixed(1)}%`)}`;
+}
+
 function renderGitSegment(
 	theme: Theme,
 	git: GitStatus,
@@ -47,7 +59,7 @@ function renderGitSegment(
 	if (segments.gitBranch) {
 		if (git.branch) {
 			parts.push(theme.fg("mdLink", glyphs.git));
-			parts.push(theme.fg("mdLink", truncatePath(git.branch, maxBranchLen)));
+			parts.push(theme.fg("mdLink", truncateBranch(git.branch, maxBranchLen)));
 		} else if (git.commit?.detached) {
 			parts.push(theme.fg("warning", glyphs.git));
 			parts.push(theme.fg("warning", "HEAD"));
@@ -131,6 +143,8 @@ function renderContextBar(
 	const pctText = theme.fg(stressColor(contextPct), `${contextPct.toFixed(1)}%`);
 	const ctxText = `${theme.fg("text", fmtTokens(contextTokens))}${theme.fg("dim", "/")}${theme.fg("text", fmtTokens(contextWindow))}`;
 	const contextIcon = theme.fg(stressColor(contextPct), glyphs.context);
+	// Cap the bar at `width - reserved` (with a floor of 4) so the full form
+	// never forces the left segments out before compact/drop logic kicks in.
 	const reserved = visibleWidth(contextIcon) + visibleWidth(pctText) + visibleWidth(ctxText) + 5 + 2;
 	const barWidth = Math.max(4, Math.min(12, width - reserved));
 	return `${contextIcon} ${renderBar(theme, contextPct, barWidth, resolveIconMode(iconMode) === "ascii")} ${pctText} ${theme.fg("dim", "·")} ${ctxText}`;
@@ -213,32 +227,63 @@ export function installFooter(
 
 				const totals = getUsageTotals(ctx);
 
-				const leftParts: { text: string; priority: number }[] = [];
+				const leftParts: PrioritizedSegment[] = [];
 				if (segments.cwd) {
 					const maxCwd = Math.min(30, Math.max(10, Math.floor(width * 0.4)));
+					const cwd = formatCwd(ctx.sessionManager.getCwd());
+					const cwdPrefix = `${theme.fg("mdLink", glyphs.cwd)} `;
+					const accent = (text: string) => theme.fg("accent", text);
 					leftParts.push({
-						text: `${theme.fg("mdLink", glyphs.cwd)} ${theme.fg("accent", truncatePath(formatCwd(ctx.sessionManager.getCwd()), maxCwd))}`,
+						text: `${cwdPrefix}${accent(truncatePath(cwd, maxCwd))}`,
+						compactText: `${cwdPrefix}${accent(truncatePath(basenamePath(cwd), maxCwd))}`,
 						priority: 0,
+						truncate: (_text, maxWidth, ellipsis) => {
+							const pathWidth = maxWidth - visibleWidth(cwdPrefix);
+							if (pathWidth <= visibleWidth(ellipsis)) {
+								return truncateToWidth(`${cwdPrefix}${accent(basenamePath(cwd))}`, maxWidth, ellipsis);
+							}
+							return `${cwdPrefix}${accent(truncatePath(basenamePath(cwd), pathWidth))}`;
+						},
 					});
 				}
+				if (segments.sessionName) {
+					const sessionName = ctx.sessionManager.getSessionName();
+					if (sessionName) {
+						leftParts.push({
+							text: `${theme.fg("dim", glyphs.session)} ${theme.fg("text", truncateToWidth(sessionName, 24, theme.fg("dim", "...")))}`,
+							priority: 2,
+						});
+					}
+				}
 				const gitSeg = renderGitSegment(theme, state.git, glyphs, segments);
 				if (gitSeg) leftParts.push({ text: gitSeg, priority: 3 });
 				if (segments.runtime) {
 					const runtimeSeg = renderRuntimeSegment(theme, state.runtime, config.icons.mode);
-					if (runtimeSeg) leftParts.push({ text: runtimeSeg, priority: 1 });
+					if (runtimeSeg) leftParts.push({ text: runtimeSeg, priority: 4 });
 				}
 				const timerSeg = renderTimerSegment(theme, state, glyphs);
-				if (timerSeg) leftParts.push({ text: timerSeg, priority: 2 });
+				if (timerSeg) leftParts.push({ text: timerSeg, priority: 1 });
 
-				let rightBlock = "";
+				// The context bar competes with the left segments for the same row:
+				// full bar first, then the compact icon+pct form, then dropped.
+				let contextText = "";
+				let contextCompact: string | undefined;
 				if (segments.context) {
-					rightBlock = renderContextBar(theme, ctx, width, glyphs, config.icons.mode);
+					contextText = renderContextBar(theme, ctx, width, glyphs, config.icons.mode);
+					const compact = renderContextCompact(theme, ctx, glyphs);
+					if (compact && visibleWidth(compact) < visibleWidth(contextText)) {
+						contextCompact = compact;
+					}
+				}
+				const allParts: PrioritizedSegment[] = [...leftParts];
+				if (contextText) {
+					// ponytail: priority 4 = sheds with runtime, before git/timer/cwd.
+					allParts.push({ text: contextText, compactText: contextCompact, priority: 4 });
 				}
 
-				const rightW = visibleWidth(rightBlock);
-				const availLeft = Math.max(0, width - rightW - (rightBlock ? 1 : 0));
-				const fittedLeft = fitSegmentsByPriority(leftParts, availLeft, theme.fg("dim", "..."));
-				const line1 = alignRight(fittedLeft.join(" "), rightBlock, width, theme);
+				const fitted = fitSegmentsByPriority(allParts, width, theme.fg("dim", "..."));
+				const fittedContext = contextText ? fitted.pop() ?? "" : "";
+				const line1 = alignRight(fitted.join(" "), fittedContext, width, theme);
 
 				const modelParts: string[] = [];
 				modelParts.push(theme.fg("mdLink", glyphs.model));
@@ -262,15 +307,17 @@ export function installFooter(
 
 				const mainLines = [line1, line2]
 					.map((line) => truncateToWidth(line, width, theme.fg("dim", "...")));
-				return [
-					...mainLines,
-					...renderExtensionStatusLines(
-						theme,
-						footerData.getExtensionStatuses(),
-						glyphs,
-						width,
-					),
-				];
+				return segments.extensionStatuses
+					? [
+						...mainLines,
+						...renderExtensionStatusLines(
+							theme,
+							footerData.getExtensionStatuses(),
+							glyphs,
+							width,
+						),
+					]
+					: mainLines;
 			},
 		};
 	});

package/extensions/open-tui/git.ts

@@ -57,7 +57,7 @@ async function gitExec(args: string[], cwd: string): Promise<string | null> {
 
 export async function readGitStatus(
 	cwd: string,
-	options: { readCommit?: boolean; readTag?: boolean } = {},
+	options: { readCommit?: boolean; readTag?: boolean; readCounts?: boolean } = {},
 ): Promise<GitStatus> {
 	if (!existsSync(join(cwd, ".git"))) {
 		return emptyGitStatus();
@@ -102,6 +102,9 @@ export async function readGitStatus(
 			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.
+		if (options.readCounts === false) continue;
 		if (line.length < 3) continue;
 		const x = line[0]!;
 		const y = line[1]!;
@@ -116,7 +119,7 @@ export async function readGitStatus(
 		}
 	}
 
-	if (stashSupported && status.stashed === 0 && !stdout.includes("# stash")) {
+	if (options.readCounts !== false && stashSupported && status.stashed === 0 && !stdout.includes("# stash")) {
 		const stashOut = await gitExec(["stash", "list", "--count"], cwd);
 		if (stashOut !== null) {
 			const count = parseInt(stashOut.trim(), 10);

package/extensions/open-tui/icons.ts

@@ -2,6 +2,7 @@ export type IconMode = "auto" | "nerd" | "ascii";
 
 export interface IconGlyphs {
 	cwd: string;
+	session: string;
 	git: string;
 	working: string;
 	done: string;
@@ -30,6 +31,7 @@ export interface IconGlyphs {
 
 const NERD_GLYPHS: IconGlyphs = {
 	cwd: "",
+	session: "",
 	git: "",
 	working: "",
 	done: "",
@@ -62,10 +64,11 @@ const NERD_GLYPHS: IconGlyphs = {
 // avoid collisions with the git-status set {= S ! A ? r x ^ v}.
 const ASCII_GLYPHS: IconGlyphs = {
 	cwd: "@",
+	session: "s",
 	git: "*",
 	working: "o",
 	done: "+",
-	context: "%",
+	context: "#",
 	model: "M",
 	thinking: "~",
 	input: "↑",