@narumitw/pi-statusline 0.7.0 → 0.9.0

package/README.md

@@ -14,7 +14,7 @@ Use it to monitor model selection, thinking level, git branch, working directory
 - Owns extension status icons through optional JSON config, including per-extension icon suppression with `""`.
 - Warns when the same extension package is installed from multiple sources.
 - Uses emoji-labeled segments for readability in both classic and Tokyo Night presets.
-- Adapts to terminal width and truncates safely.
+- Adapts to terminal width and wraps long extension status lines safely.
 - Requires no configuration, with optional preset selection through `PI_STATUSLINE_PRESET`.
 
 ## 📦 Install
@@ -59,6 +59,7 @@ Extension statuses use built-in icons by status key. Override or suppress them i
 {
   "extensionStatusIcons": {
     "caffeinate": "☕",
+    "github-pr": "🔎",
     "goal": "🎯",
     "pisync": "☁️",
     "unknown-error-retry": "",
@@ -90,13 +91,14 @@ The default `tokyo-night` statusline uses a Starship-inspired `░▒▓` / `
 - 💸 estimated cost.
 - 🕒 clock.
 
-Statuses from other extensions appear on their own compact line below the main statusline and use each preset's separator.
+Statuses from other extensions appear below the main statusline, use each preset's separator, and wrap onto additional footer lines when they exceed the terminal width.
 
 `pi-statusline` is extension-agnostic: it consumes Pi's generic extension status API and does not import or depend on status-producing extensions.
 
 Examples:
 
 - `🎯 active` for `goal: active` using the built-in `goal` icon.
+- `🔎 PR #123 checks passing` for `github-pr: PR #123 checks passing` using the built-in `github-pr` icon.
 - `☕ display` when JSON config sets `"caffeinate": "☕"`.
 - `receiving` when JSON config sets `"unknown-error-retry": ""`.
 - `🔌 running` for an unknown extension status key with no configured icon.

package/package.json

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

package/src/statusline.ts

@@ -9,7 +9,7 @@ import type {
 	Theme,
 	ThemeColor,
 } from "@earendil-works/pi-coding-agent";
-import { truncateToWidth } from "@earendil-works/pi-tui";
+import { truncateToWidth, wrapTextWithAnsi } from "@earendil-works/pi-tui";
 import { classicExtensionSeparator, renderClassicStatusline } from "../presets/classic.js";
 import { renderTokyoNightStatusline, tokyoNightExtensionSeparator } from "../presets/tokyo-night.js";
 import type {
@@ -41,6 +41,7 @@ interface TokenTotals {
 }
 
 const STATUSLINE_KEY = "statusline";
+const GITHUB_PR_KEY = "github-pr";
 const SETTINGS_FILE = "pi-statusline-settings.json";
 const DEFAULT_PRESET: StatuslinePresetName = "tokyo-night";
 
@@ -49,6 +50,7 @@ const DEFAULT_EXTENSION_STATUS_ICONS: Record<string, string> = {
 	"codex-usage": "📊",
 	caffeinate: "💊",
 	firecrawl: "🔥",
+	"github-pr": "🔎",
 	goal: "🎯",
 	lsp: "🧰",
 	"plan-mode": "📝",
@@ -112,14 +114,7 @@ export default function statusline(pi: ExtensionAPI) {
 				invalidate() {},
 				render(width: number): string[] {
 					const lines = [renderStatusline(width, ctx, footerData, theme, config, runtime)];
-					const extensionStatusLine = renderExtensionStatusline(
-						width,
-						footerData,
-						theme,
-						config,
-						runtime,
-					);
-					if (extensionStatusLine) lines.push(extensionStatusLine);
+					lines.push(...renderExtensionStatusline(width, footerData, theme, config, runtime));
 					return lines;
 				},
 			};
@@ -255,11 +250,9 @@ function renderExtensionStatusline(
 	theme: Theme,
 	config: StatuslineConfig,
 	runtime: RuntimeState,
-): string | undefined {
+): string[] {
 	const status = formatExtensionStatuses(footerData.getExtensionStatuses(), theme, config, runtime);
-	if (!status) return undefined;
-
-	return truncateToWidth(status, width, "");
+	return wrapExtensionStatusline(status, width);
 }
 
 function buildSegment(
@@ -284,8 +277,11 @@ function buildSegment(
 				thinkingColor(runtime.thinkingLevel),
 				"header",
 			);
-		case "branch":
-			return segment(name, `🌿 ${footerData.getGitBranch() ?? "no-git"}`, color, "git");
+		case "branch": {
+			const branch = footerData.getGitBranch();
+			const pr = branch ? prLinkFromStatuses(footerData.getExtensionStatuses()) : undefined;
+			return segment(name, pr ? `🌿 ${branch} (${pr})` : `🌿 ${branch ?? "no-git"}`, color, "git");
+		}
 		case "cwd":
 			return segment(name, `📁 ${basename(ctx.cwd) || ctx.cwd}`, color, "directory");
 		case "tools":
@@ -381,6 +377,19 @@ export function formatToolActivity(runtime: RuntimeState): string {
 	return "💤 idle";
 }
 
+export function prLinkFromStatuses(statuses: ReadonlyMap<string, string>): string | undefined {
+	const value = statuses.get(GITHUB_PR_KEY);
+	if (!value) return undefined;
+	// Extract the OSC 8 hyperlink span (the clickable "#123"); skip non-PR states
+	// like "PR gh missing" that carry no link. github-pr emits exactly one link, so the
+	// first OSC 8 span is the PR number.
+	const open = value.indexOf("\x1b]8;;");
+	if (open === -1) return undefined;
+	const closeMarker = "\x1b]8;;\x07";
+	const close = value.indexOf(closeMarker, open + 1);
+	return close === -1 ? undefined : value.slice(open, close + closeMarker.length);
+}
+
 function formatExtensionStatuses(
 	statuses: ReadonlyMap<string, string>,
 	theme: Theme,
@@ -391,7 +400,11 @@ function formatExtensionStatuses(
 	const visibleStatuses = [
 		...formatDuplicateExtensionStatus(runtime, theme),
 		...[...statuses.entries()]
-			.filter(([key, value]) => key !== STATUSLINE_KEY && value.trim().length > 0)
+			// github-pr is rendered inline in the branch segment, so skip it here to avoid duplication.
+			.filter(
+				([key, value]) =>
+					key !== STATUSLINE_KEY && key !== GITHUB_PR_KEY && value.trim().length > 0,
+			)
 			.map(([key, value]) => formatExtensionStatus(key, value, theme, config)),
 	].slice(0, 5);
 
@@ -405,7 +418,7 @@ export function formatExtensionStatus(
 	config: Pick<StatuslineConfig, "extensionStatusIcons">,
 ): string {
 	const status = splitExtensionStatusIcon(stripExtensionStatusPrefix(key, value));
-	const text = truncateToWidth(simplifyExtensionStatusText(status.text), 22, "…");
+	const text = simplifyExtensionStatusText(status.text);
 	const color = extensionColor(key, value);
 	const textColor = color === "warning" ? "warning" : "muted";
 	const icon = extensionStatusIcon(key, status.icon, config.extensionStatusIcons);
@@ -422,6 +435,11 @@ function extensionStatusIcon(
 	return leadingIcon ?? DEFAULT_EXTENSION_STATUS_ICONS[key] ?? "🔌";
 }
 
+export function wrapExtensionStatusline(status: string, width: number): string[] {
+	if (!status || width <= 0) return [];
+	return wrapTextWithAnsi(status, width);
+}
+
 function formatDuplicateExtensionStatus(runtime: RuntimeState, theme: Theme): string[] {
 	if (runtime.duplicateExtensions.length === 0) return [];
 	const names = runtime.duplicateExtensions.slice(0, 2).join(", ");