@narumitw/pi-statusline 0.42.0 → 0.46.0

package/README.md

@@ -109,11 +109,16 @@ Retention priority is highest to lowest:
 context model branch tools cwd thinking cost provider cache tokens time turn brand
 ```
 
-Explicit `line_break` entries remain row boundaries. A single segment that is still too wide is
-ANSI-safely truncated.
+Explicit `line_break` entries remain row boundaries. If the last remaining segment is itself wider
+than the row, that row renders empty rather than emitting an over-width line.
 
-### Activity, Git, and PR state
+### Directory, activity, Git, and PR state
 
+- `cwd` uses Starship's directory presentation defaults: contract the home directory to `~`, contract
+  to the Git repository root when available, then retain at most the last three path components. This
+  changes display only; the configured segment list and Pi working directory are untouched.
+- Repository-root discovery is cached with Git status outside footer rendering; a failed root query
+  falls back to home/path-component contraction without hiding the segment.
 - During active work, `tools` shows `💭 thinking` or `⚙ <tool>` with parallel counts.
 - Activity disappears after the agent settles and resets across session replacement or shutdown.
 - Clean repositories show no Git counters.
@@ -334,6 +339,7 @@ extensions/pi-statusline/
 │   ├── index.ts
 │   ├── statusline.ts
 │   ├── render.ts
+│   ├── directory.ts
 │   ├── usage.ts
 │   ├── powerline.ts
 │   ├── information-profiles.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-statusline",
-	"version": "0.42.0",
+	"version": "0.46.0",
 	"description": "Pi extension that replaces the footer with an information-rich statusline.",
 	"type": "module",
 	"license": "MIT",

package/src/directory.ts

@@ -0,0 +1,54 @@
+import { basename, isAbsolute, relative, sep } from "node:path";
+import { sanitizeTerminalText } from "./terminal.js";
+
+const DEFAULT_TRUNCATION_LENGTH = 3;
+const DEFAULT_HOME_SYMBOL = "~";
+
+/** Apply Starship's default directory presentation without exposing a format language. */
+export function formatDirectoryPath(
+	cwd: string,
+	homeDir: string | undefined,
+	gitRoot: string | undefined,
+): string {
+	const contracted =
+		gitRoot && (!homeDir || !samePath(gitRoot, homeDir))
+			? (contractRepositoryPath(cwd, gitRoot) ?? contractPath(cwd, homeDir, DEFAULT_HOME_SYMBOL))
+			: contractPath(cwd, homeDir, DEFAULT_HOME_SYMBOL);
+	const safeContracted = sanitizeTerminalText(contracted);
+	const components = safeContracted.split("/").filter((component) => component.length > 0);
+	const displayed =
+		components.length > DEFAULT_TRUNCATION_LENGTH
+			? components.slice(-DEFAULT_TRUNCATION_LENGTH).join("/")
+			: safeContracted;
+	const native = sep === "/" ? displayed : displayed.replaceAll("/", sep);
+	return sanitizeTerminalText(native || basename(cwd) || cwd);
+}
+
+function toSlashPath(value: string): string {
+	return sep === "\\" ? value.replaceAll("\\", "/") : value;
+}
+
+function contractPath(path: string, root: string | undefined, replacement: string): string {
+	if (!root) return toSlashPath(path);
+	const child = relativeWithin(path, root);
+	if (child === undefined) return toSlashPath(path);
+	return child ? `${replacement}/${child}` : replacement;
+}
+
+function contractRepositoryPath(path: string, root: string): string | undefined {
+	const child = relativeWithin(path, root);
+	if (child === undefined) return undefined;
+	const name = basename(root) || toSlashPath(root);
+	return child ? `${name}/${child}` : name;
+}
+
+function relativeWithin(path: string, root: string): string | undefined {
+	const child = relative(root, path);
+	if (child === "") return "";
+	if (child === ".." || child.startsWith(`..${sep}`) || isAbsolute(child)) return undefined;
+	return toSlashPath(child);
+}
+
+function samePath(left: string, right: string): boolean {
+	return relative(left, right) === "";
+}

package/src/git-status.ts

@@ -1,8 +1,10 @@
+import { isAbsolute } from "node:path";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
 const GIT_STATUS_TIMEOUT_MS = 3_000;
 
 export interface GitStatusSummary {
+	root?: string;
 	ahead: number;
 	behind: number;
 	staged: number;
@@ -14,14 +16,29 @@ export interface GitStatusSummary {
 export async function readGitStatus(
 	pi: ExtensionAPI,
 	cwd: string,
+	signal?: AbortSignal,
 ): Promise<GitStatusSummary | undefined> {
-	const result = await pi.exec(
-		"git",
-		["--no-optional-locks", "status", "--porcelain=v1", "--branch", "--untracked-files=normal"],
-		{ cwd, timeout: GIT_STATUS_TIMEOUT_MS },
-	);
-	if (result.code !== 0 || result.killed) return undefined;
-	return parseGitStatusPorcelain(result.stdout);
+	const [statusResult, rootResult] = await Promise.all([
+		pi.exec(
+			"git",
+			["--no-optional-locks", "status", "--porcelain=v1", "--branch", "--untracked-files=normal"],
+			{ cwd, timeout: GIT_STATUS_TIMEOUT_MS, signal },
+		),
+		pi
+			.exec("git", ["rev-parse", "--path-format=absolute", "--show-toplevel"], {
+				cwd,
+				timeout: GIT_STATUS_TIMEOUT_MS,
+				signal,
+			})
+			.catch(() => undefined),
+	]);
+	if (statusResult.code !== 0 || statusResult.killed) return undefined;
+	const summary = parseGitStatusPorcelain(statusResult.stdout);
+	if (rootResult && rootResult.code === 0 && !rootResult.killed) {
+		const root = parseGitRoot(rootResult.stdout);
+		if (root) summary.root = root;
+	}
+	return summary;
 }
 
 export function parseGitStatusPorcelain(output: string): GitStatusSummary {
@@ -71,6 +88,11 @@ function isChangedStatus(status: string): boolean {
 	return status !== " " && status !== "?" && status !== "!";
 }
 
+export function parseGitRoot(output: string): string | undefined {
+	const root = output.split(/\r?\n/u)[0]?.trim();
+	return root && isAbsolute(root) ? root : undefined;
+}
+
 export function formatGitStatusSummary(summary: GitStatusSummary | undefined): string {
 	if (!summary) return "";
 	const tokens = [
@@ -111,6 +133,7 @@ export function gitStatusSummaryEqual(
 ): boolean {
 	if (!left || !right) return left === right;
 	return (
+		left.root === right.root &&
 		left.ahead === right.ahead &&
 		left.behind === right.behind &&
 		left.staged === right.staged &&

package/src/render.ts

@@ -1,4 +1,3 @@
-import { basename } from "node:path";
 import type {
 	ExtensionAPI,
 	ExtensionContext,
@@ -6,6 +5,7 @@ import type {
 	Theme,
 	ThemeColor,
 } from "@earendil-works/pi-coding-agent";
+import { formatDirectoryPath } from "./directory.js";
 import {
 	type ExtensionStatusRuntime,
 	formatExtensionStatuses,
@@ -13,6 +13,7 @@ import {
 } from "./extension-status.js";
 import { formatGitBranchValue, type GitStatusSummary } from "./git-status.js";
 import { renderPowerlineStatusline } from "./powerline.js";
+import { sanitizeTerminalText } from "./terminal.js";
 import {
 	LINE_BREAK_SEGMENT_NAME,
 	type PowerlineBlockName,
@@ -26,6 +27,7 @@ import { type FooterUsageSummary, summarizeFooterUsage } from "./usage.js";
 
 type ThinkingLevel = ReturnType<ExtensionAPI["getThinkingLevel"]>;
 export interface RuntimeState extends ExtensionStatusRuntime {
+	homeDir?: string;
 	turnCount: number;
 	activeTools: Map<string, number>;
 	isStreaming: boolean;
@@ -138,7 +140,13 @@ function buildSegment(
 			);
 		}
 		case "cwd":
-			return segment(name, basename(ctx.cwd) || ctx.cwd, config, "accent", "directory");
+			return segment(
+				name,
+				formatDirectoryPath(ctx.cwd, runtime.homeDir, runtime.gitStatus?.root),
+				config,
+				"accent",
+				"directory",
+			);
 		case "tools": {
 			const activity = formatToolActivity(runtime);
 			return activity ? segment(name, activity, config, "accent", "runtime") : undefined;
@@ -320,11 +328,11 @@ export function truncateModel(
 	symbol: string,
 	direction: TruncationDirection,
 ): string {
-	const safeModel = sanitizeModelDisplay(model);
+	const safeModel = sanitizeTerminalText(model);
 	if (length === 0) return safeModel;
 	const graphemes = [...graphemeSegmenter.segment(safeModel)].map(({ segment }) => segment);
 	if (graphemes.length <= length) return safeModel;
-	const safeSymbol = sanitizeModelDisplay(symbol);
+	const safeSymbol = sanitizeTerminalText(symbol);
 
 	switch (direction) {
 		case "start":
@@ -340,67 +348,6 @@ export function truncateModel(
 	}
 }
 
-function sanitizeModelDisplay(value: string): string {
-	let result = "";
-	for (let index = 0; index < value.length; ) {
-		const codePoint = value.codePointAt(index) ?? 0;
-		const character = String.fromCodePoint(codePoint);
-		if (codePoint === 0x1b || codePoint === 0x9b || codePoint === 0x9d) {
-			index = skipTerminalEscape(value, index, codePoint);
-			continue;
-		}
-		if (
-			codePoint <= 0x1f ||
-			(codePoint >= 0x7f && codePoint <= 0x9f) ||
-			codePoint === 0x2028 ||
-			codePoint === 0x2029
-		) {
-			if (
-				codePoint === 0x09 ||
-				codePoint === 0x0a ||
-				codePoint === 0x0d ||
-				codePoint === 0x85 ||
-				codePoint === 0x2028 ||
-				codePoint === 0x2029
-			) {
-				result += " ";
-			}
-			index += character.length;
-			continue;
-		}
-		result += character;
-		index += character.length;
-	}
-	return result;
-}
-
-function skipTerminalEscape(value: string, start: number, codePoint: number): number {
-	let index = start + 1;
-	const next = value.charCodeAt(index);
-	const isOsc = codePoint === 0x9d || (codePoint === 0x1b && next === 0x5d);
-	if (isOsc) {
-		if (codePoint === 0x1b) index += 1;
-		while (index < value.length) {
-			const current = value.charCodeAt(index);
-			if (current === 0x07 || current === 0x9c) return index + 1;
-			if (current === 0x1b && value.charCodeAt(index + 1) === 0x5c) return index + 2;
-			index += 1;
-		}
-		return index;
-	}
-	const isCsi = codePoint === 0x9b || (codePoint === 0x1b && next === 0x5b);
-	if (isCsi) {
-		if (codePoint === 0x1b) index += 1;
-		while (index < value.length) {
-			const current = value.charCodeAt(index);
-			index += 1;
-			if (current >= 0x40 && current <= 0x7e) break;
-		}
-		return index;
-	}
-	return Math.min(value.length, start + (codePoint === 0x1b ? 2 : 1));
-}
-
 export function shortenModel(model: string): string {
 	return model
 		.replace(/^claude-/, "")

package/src/statusline.ts

@@ -1,3 +1,4 @@
+import { homedir } from "node:os";
 import {
 	type ExtensionAPI,
 	type ExtensionContext,
@@ -44,6 +45,7 @@ export default function statusline(pi: ExtensionAPI) {
 	let gitStatusRequestId = 0;
 	let activeGitStatusTarget: { cwd: string; generation: number } | undefined;
 	let gitStatusRefreshInFlight = false;
+	let gitStatusAbortController: AbortController | undefined;
 	let gitStatusDebounceTimer: ReturnType<typeof setTimeout> | undefined;
 	let pendingGitStatusRefresh: { cwd: string; generation: number; requestId: number } | undefined;
 
@@ -62,6 +64,10 @@ export default function statusline(pi: ExtensionAPI) {
 		gitStatusDebounceTimer = undefined;
 	};
 
+	const abortGitStatusRefresh = (reason: string) => {
+		gitStatusAbortController?.abort(new DOMException(reason, "AbortError"));
+	};
+
 	const isActiveGitStatusTarget = (cwd: string, generation: number) =>
 		activeGitStatusTarget?.cwd === cwd &&
 		activeGitStatusTarget.generation === generation &&
@@ -78,14 +84,17 @@ export default function statusline(pi: ExtensionAPI) {
 		}
 
 		gitStatusRefreshInFlight = true;
+		const abortController = new AbortController();
+		gitStatusAbortController = abortController;
 		void (async () => {
 			try {
-				const summary = await readGitStatus(pi, cwd);
+				const summary = await readGitStatus(pi, cwd, abortController.signal);
 				if (isCurrentGitStatusRequest(cwd, generation, requestId)) setGitStatus(summary);
 			} catch {
 				if (isCurrentGitStatusRequest(cwd, generation, requestId)) setGitStatus(undefined);
 			} finally {
 				gitStatusRefreshInFlight = false;
+				if (gitStatusAbortController === abortController) gitStatusAbortController = undefined;
 				const pending = pendingGitStatusRefresh;
 				pendingGitStatusRefresh = undefined;
 				if (pending) runGitStatusRefresh(pending.cwd, pending.generation, pending.requestId);
@@ -119,7 +128,9 @@ export default function statusline(pi: ExtensionAPI) {
 		menuController = new AbortController();
 		const cwd = ctx.cwd;
 		activeSessionManager = ctx.sessionManager;
+		runtime.homeDir = homedir();
 		previewPalettePreset = undefined;
+		abortGitStatusRefresh("Statusline session context replaced");
 		clearGitStatusDebounce();
 		activeGitStatusTarget = ctx.mode === "tui" ? { cwd, generation } : undefined;
 		runtime.gitStatus = undefined;
@@ -136,6 +147,7 @@ export default function statusline(pi: ExtensionAPI) {
 			const refreshFooterGitStatus = () => refreshGitStatus(cwd, generation);
 			const branchUnsubscribe = footerData.onBranchChange(() => {
 				runtime.gitStatus = undefined;
+				abortGitStatusRefresh("Statusline Git branch changed");
 				clearGitStatusDebounce();
 				refreshFooterGitStatus();
 				tui.requestRender();
@@ -152,6 +164,7 @@ export default function statusline(pi: ExtensionAPI) {
 					clearInterval(clock);
 					if (isActiveGitStatusTarget(cwd, generation)) {
 						activeGitStatusTarget = undefined;
+						abortGitStatusRefresh("Statusline footer disposed");
 						clearGitStatusDebounce();
 						pendingGitStatusRefresh = undefined;
 						runtime.gitStatus = undefined;
@@ -229,6 +242,7 @@ export default function statusline(pi: ExtensionAPI) {
 		activeSessionManager = undefined;
 		previewPalettePreset = undefined;
 		activeGitStatusTarget = undefined;
+		abortGitStatusRefresh("Statusline session shut down");
 		clearGitStatusDebounce();
 		pendingGitStatusRefresh = undefined;
 		runtime.gitStatus = undefined;
@@ -324,7 +338,9 @@ export {
 	formatGitBranchValue,
 	formatGitStatusSummary,
 	type GitStatusSummary,
+	parseGitRoot,
 	parseGitStatusPorcelain,
+	readGitStatus,
 } from "./git-status.js";
 export {
 	contextColor,

package/src/terminal.ts

@@ -0,0 +1,60 @@
+export function sanitizeTerminalText(value: string): string {
+	let result = "";
+	for (let index = 0; index < value.length; ) {
+		const codePoint = value.codePointAt(index) ?? 0;
+		const character = String.fromCodePoint(codePoint);
+		if (codePoint === 0x1b || codePoint === 0x9b || codePoint === 0x9d) {
+			index = skipTerminalEscape(value, index, codePoint);
+			continue;
+		}
+		if (
+			codePoint <= 0x1f ||
+			(codePoint >= 0x7f && codePoint <= 0x9f) ||
+			codePoint === 0x2028 ||
+			codePoint === 0x2029
+		) {
+			if (
+				codePoint === 0x09 ||
+				codePoint === 0x0a ||
+				codePoint === 0x0d ||
+				codePoint === 0x85 ||
+				codePoint === 0x2028 ||
+				codePoint === 0x2029
+			) {
+				result += " ";
+			}
+			index += character.length;
+			continue;
+		}
+		result += character;
+		index += character.length;
+	}
+	return result;
+}
+
+function skipTerminalEscape(value: string, start: number, codePoint: number): number {
+	let index = start + 1;
+	const next = value.charCodeAt(index);
+	const isOsc = codePoint === 0x9d || (codePoint === 0x1b && next === 0x5d);
+	if (isOsc) {
+		if (codePoint === 0x1b) index += 1;
+		while (index < value.length) {
+			const current = value.charCodeAt(index);
+			if (current === 0x07 || current === 0x9c) return index + 1;
+			if (current === 0x1b && value.charCodeAt(index + 1) === 0x5c) return index + 2;
+			index += 1;
+		}
+		return index;
+	}
+	const isCsi = codePoint === 0x9b || (codePoint === 0x1b && next === 0x5b);
+	if (isCsi) {
+		if (codePoint === 0x1b) index += 1;
+		while (index < value.length) {
+			const current = value.charCodeAt(index);
+			index += 1;
+			if (current >= 0x40 && current <= 0x7e) break;
+		}
+		return index;
+	}
+	return Math.min(value.length, start + (codePoint === 0x1b ? 2 : 1));
+}