pi-zentui 0.8.0 → 0.10.0

package/README.md

@@ -157,6 +157,7 @@ Default config values — copy this and change any value you want:
 {
 	"projectRefreshIntervalMs": 30000,
 	"footerFormat": "",
+	"separator": "pipe",
 	"contextStyle": "text",
 	"contextThresholds": {
 		"warning": 70,
@@ -166,6 +167,9 @@ Default config values — copy this and change any value you want:
 		"mode": "basename",
 		"depth": 0
 	},
+	"gitBranch": {
+		"maxLength": "full"
+	},
 	"icons": {
 		"mode": "auto",
 		"cwd": "",
@@ -272,13 +276,15 @@ Default config values — copy this and change any value you want:
 - Style values can be Starship/terminal strings (`bold purple`, `fg:202`, `#89b` / `#89b4fa`, `bg:blue fg:bright-green`) or Pi theme tokens (`accent`, `borderMuted`, `thinkingHigh`). Short `#rgb` hex values expand to `#rrggbb`.
 - `projectRefreshIntervalMs`: project status polling interval; `0` disables polling. Values `1..4999` clamp up to `5000` (minimum 5s); invalid/non-finite values fall back to `30000`.
 - `contextStyle`: `text` (default), `gauge`, or `text+gauge` for the context segment.
+- `separator`: controls the default footer layout and extension-status connectors: `pipe` (default, ` | `), `dot` (` · `), `chevron` (` › `), or `none` (one space). Cycle it from the `/zentui` **Layout** tab. This selects the separator glyph; `colors.separator` controls its color. Custom `footerFormat` literals and `$sep` keep their existing behavior.
 - `contextThresholds`: `{ warning, error }` percentages (default `70` / `90`) that select contextNormal / contextWarning / contextError colors.
 - `pathDisplay`: controls how the cwd/`$cwd` path is shown. `mode` is `basename` (default, last segment only) or `full` (path with home contracted to `~`). In `full` mode, `depth` keeps only the last N trailing directories (`0` = entire path after `~`, max `5`); when parents are dropped the path is prefixed with `…/` (Starship-style). The `/zentui` **Layout** tab cycles path mode and path depth (`0`–`5`; depth is ignored for basename). Example: `~/Projects/foo/bar` with `depth: 2` → `…/foo/bar`.
+- `gitBranch.maxLength`: visible width of the built-in branch name and `$git_branch` / `$branch`. The default `full` preserves the complete name; any positive integer uses that width including the trailing `…`. `/zentui` **Layout** cycles `full`, `10`, `20`, `30`, `40`, and `50`; custom positive integers can be set in JSON.
 - `icons`: every shown icon key is configurable; omit any key to use the Zentui default. `icons.mode` is `auto` | `nerd` | `ascii` (default `auto`, same glyphs as nerd). ASCII mode swaps in plain fallbacks for statusline icons and runtime symbols — useful without a Nerd Font. Custom per-icon strings always win over mode defaults. Custom `icons.os` always wins; when left at the mode default, Zentui maps the OS icon by platform. `rail` sets the vertical glyph drawn as the left rail of the active editor frame and previous user messages when `copyFriendly` is disabled (default `│`; any single Unicode vertical or block glyph). `editorPrompt` controls an optional copy-friendly editor prompt glyph; the default is `""` so copy-friendly mode stays rail-free.
 - `colorSources`: `theme` maps styles through Pi theme tokens; `terminal` emits terminal colors. `/zentui` switches these sources; manual JSON controls specific style values.
 - `features`: `editor` enables Zentui's custom editor, selector borders, and previous-message chrome. `statusLine` enables Zentui's custom footer/status line. `copyFriendly` hides editor and previous-message rail glyphs so native terminal selection copies less chrome. All three can be changed from `/zentui` or direct slash-command arguments.
 - `footerSegments`: show or hide individual built-in footer segments (`cwd`, `gitBranch`, `gitStatus`, `gitCounts`, `gitCommit`, `gitMetrics`, `runtime`, `packageVersion`, `sessionDuration`, `username`, `time`, `os`, `context`, `tokens`, `cost`). Toggle them from the `Built-in segments` tab in `/zentui`.
-- `footerFormat`: optional Starship-style template string that fully controls the footer layout. When set, it overrides `footerSegments`. See [Footer Format Template](#footer-format-template) below. The `/zentui` **Layout** tab configures context style, path display mode/depth, and icon mode; set or clear custom formats with `/zentui format`.
+- `footerFormat`: optional Starship-style template string that fully controls the footer layout. When set, it overrides `footerSegments`. See [Footer Format Template](#footer-format-template) below. The `/zentui` **Layout** tab configures context style, separator, path display mode/depth, branch length, and icon mode; set or clear custom formats with `/zentui format`.
 - `gitCommit`: Starship [`git_commit`](https://starship.rs/config/#git-commit)-style options for the `gitCommit` footer segment. `hashLength` (default `7`, clamped to `4`–`40`) controls the short-hash display length. `onlyDetached` (default `true`) shows the hash mainly on detached HEAD. `showTag` (default `true`) appends an exact-match tag (`git describe --tags --exact-match HEAD`). The tag probe piggybacks on the existing git refresh — it only runs when both the segment and `showTag` are on, and misses/failures degrade silently.
 - `gitMetrics`: Starship [`git_metrics`](https://starship.rs/config/#git-metrics)-style options for the `gitMetrics` footer segment. Uses `git diff HEAD --numstat` (staged + unstaged combined — the Starship “total dirty” view) to show aggregate `+added −deleted` line counts. `onlyNonzero` (default `true`) omits each zero component independently and hides the segment entirely at `0/0`. `ignoreSubmodules` (default `false`) adds `--ignore-submodules=all`. The numstat diff piggybacks on the existing git refresh and uses a hard 2s timeout; a metrics-only failure degrades silently without discarding fresh branch/status data. On very large monorepos the diff may lag or be omitted on timeout.
 - `extensionStatuses`: controls third-party statuses published by other Pi extensions through `ctx.ui.setStatus()`. `defaultPlacement` and each `placements` value can be `off`, `left`, `middle`, or `right`. The `Extension segments` tab in `/zentui` lists only statuses that are currently active.

package/extensions/zentui/config.ts

@@ -17,6 +17,7 @@ export type ColorSource = "theme" | "terminal";
 export type { IconMode } from "./icons";
 
 export type ContextStyle = "text" | "gauge" | "text+gauge";
+export type SeparatorStyle = "pipe" | "dot" | "chevron" | "none";
 
 export type ContextThresholds = {
 	warning: number;
@@ -31,6 +32,12 @@ export type PathDisplayConfig = {
 	depth: number;
 };
 
+export type GitBranchMaxLength = "full" | number;
+
+export type GitBranchConfig = {
+	maxLength: GitBranchMaxLength;
+};
+
 export type ColorSourcesConfig = {
 	starship: ColorSource;
 	editor: ColorSource;
@@ -103,9 +110,11 @@ const MIN_PROJECT_REFRESH_INTERVAL_MS = 5_000;
 export type PolishedTuiConfig = {
 	projectRefreshIntervalMs: number;
 	footerFormat: string;
+	separator: SeparatorStyle;
 	contextStyle: ContextStyle;
 	contextThresholds: ContextThresholds;
 	pathDisplay: PathDisplayConfig;
+	gitBranch: GitBranchConfig;
 	icons: ResolvedIcons;
 	colors: {
 		cwd: ColorSpec;
@@ -195,9 +204,11 @@ export const configPath = join(getAgentDir(), "zentui.json");
 export const defaultConfig: PolishedTuiConfig = {
 	projectRefreshIntervalMs: DEFAULT_PROJECT_REFRESH_INTERVAL_MS,
 	footerFormat: "",
+	separator: "pipe",
 	contextStyle: "text",
 	contextThresholds: { warning: 70, error: 90 },
 	pathDisplay: { mode: "basename", depth: 0 },
+	gitBranch: { maxLength: "full" },
 	icons: {
 		mode: "auto",
 		...NERD_DEFAULT_ICONS,
@@ -297,6 +308,14 @@ function parseContextStyle(value: unknown): ContextStyle {
 	return defaultConfig.contextStyle;
 }
 
+export function isSeparatorStyle(value: unknown): value is SeparatorStyle {
+	return value === "pipe" || value === "dot" || value === "chevron" || value === "none";
+}
+
+function parseSeparatorStyle(value: unknown): SeparatorStyle {
+	return isSeparatorStyle(value) ? value : defaultConfig.separator;
+}
+
 function parseContextThresholds(value: unknown): ContextThresholds {
 	const defaults = defaultConfig.contextThresholds;
 	if (!isRecord(value)) return { ...defaults };
@@ -331,6 +350,20 @@ function parsePathDisplay(value: unknown): PathDisplayConfig {
 	return { mode, depth };
 }
 
+function normalizeGitBranchMaxLength(value: unknown): GitBranchMaxLength {
+	if (value === "full") return value;
+	if (typeof value === "number" && Number.isInteger(value) && value > 0) return value;
+	return defaultConfig.gitBranch.maxLength;
+}
+
+function parseGitBranchConfig(value: unknown): GitBranchConfig {
+	const defaults = defaultConfig.gitBranch;
+	if (!isRecord(value)) return { ...defaults };
+	return {
+		maxLength: normalizeGitBranchMaxLength(value.maxLength),
+	};
+}
+
 function stringValue(record: Record<string, unknown>, key: string): string | undefined {
 	const value = record[key];
 	return typeof value === "string" ? value : undefined;
@@ -633,15 +666,18 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 	const gitMetrics = isRecord(config.gitMetrics)
 		? normalizeGitMetricsConfig(config.gitMetrics as Record<string, unknown>)
 		: defaultConfig.gitMetrics;
+	const gitBranch = parseGitBranchConfig(config.gitBranch);
 	const fixedEditor = isRecord(config.fixedEditor)
 		? normalizeFixedEditorConfig(config.fixedEditor as Record<string, unknown>)
 		: defaultConfig.fixedEditor;
 	return {
 		projectRefreshIntervalMs: parseProjectRefreshIntervalMs(config.projectRefreshIntervalMs),
 		footerFormat: stringValue(config, "footerFormat") ?? "",
+		separator: parseSeparatorStyle(config.separator),
 		contextStyle: parseContextStyle(config.contextStyle),
 		contextThresholds: parseContextThresholds(config.contextThresholds),
 		pathDisplay: parsePathDisplay(config.pathDisplay),
+		gitBranch,
 		icons: resolveConfiguredIcons(iconMode, iconOverrides),
 		colors: {
 			...defaultConfig.colors,
@@ -757,6 +793,16 @@ export function saveContextStylePatch(style: ContextStyle, path = configPath): P
 	return mergeConfig(record);
 }
 
+export function saveSeparatorPatch(
+	separator: SeparatorStyle,
+	path = configPath,
+): PolishedTuiConfig {
+	const record = readConfigRecord(path);
+	record.separator = parseSeparatorStyle(separator);
+	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
+	return mergeConfig(record);
+}
+
 export function saveContextThresholdsPatch(
 	thresholds: Partial<ContextThresholds>,
 	path = configPath,
@@ -788,6 +834,21 @@ export function savePathDisplayPatch(
 	return mergeConfig(record);
 }
 
+export function saveGitBranchPatch(
+	patch: Partial<GitBranchConfig>,
+	path = configPath,
+): PolishedTuiConfig {
+	const record = readConfigRecord(path);
+	const existing = isRecord(record.gitBranch)
+		? { ...(record.gitBranch as Record<string, unknown>) }
+		: {};
+	if (patch.maxLength !== undefined)
+		existing.maxLength = normalizeGitBranchMaxLength(patch.maxLength);
+	record.gitBranch = existing;
+	writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`, "utf8");
+	return mergeConfig(record);
+}
+
 export function saveExtensionStatusPlacement(
 	key: string,
 	placement: ExtensionStatusPlacement,

package/extensions/zentui/footer.ts

@@ -1,6 +1,6 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
-import type { PolishedTuiConfig } from "./config";
+import type { PolishedTuiConfig, SeparatorStyle } from "./config";
 import { FOOTER_FORMAT_ALIASES } from "./config";
 import { collectExtensionStatusSegments, type ExtensionStatusSegment } from "./extension-status";
 import { parseFooterFormat, renderFormatSplit, stripOrphanSeparators } from "./footer-format";
@@ -9,6 +9,7 @@ import {
 	buildSessionDurationLabel,
 	contextColorTier,
 	formatCwdLabel,
+	formatGitBranchText,
 	formatGitCommitSegment,
 	formatGitMetricsSegment,
 	formatOsLabel,
@@ -21,6 +22,13 @@ import { resolveRuntimeSymbol } from "./icons";
 import type { FooterState } from "./state";
 import { renderStyleForSource } from "./style";
 
+const separatorText: Record<SeparatorStyle, string> = {
+	pipe: " | ",
+	dot: " · ",
+	chevron: " › ",
+	none: " ",
+};
+
 function joinStatusTexts(statusTexts: string[], separator: string): string {
 	return statusTexts.filter(Boolean).join(separator);
 }
@@ -169,7 +177,12 @@ export function installFooter(
 				const config = getConfig();
 				const colorSource = config.colorSources.starship;
 				const iconMode = config.icons.mode;
-				const separator = renderStyleForSource(theme, colorSource, config.colors.separator, " | ");
+				const separator = renderStyleForSource(
+					theme,
+					colorSource,
+					config.colors.separator,
+					separatorText[config.separator],
+				);
 				const innerWidth = Math.max(1, width - 2);
 				const cwdLabel = renderStyleForSource(
 					theme,
@@ -181,6 +194,9 @@ export function installFooter(
 					}),
 				);
 				const branch = state.branch;
+				const branchText = branch
+					? formatGitBranchText(branch, config.gitBranch.maxLength)
+					: undefined;
 				const contextUsage = ctx.getContextUsage();
 				const contextWindow = ctx.model?.contextWindow ?? contextUsage?.contextWindow;
 				const contextLabel = buildContextDisplayLabel({
@@ -240,7 +256,11 @@ export function installFooter(
 						case "cwd":
 							return cwdLabel;
 						case "git_branch":
-							return branch ? (gitIcon ? `${gitIcon} ${gitColor(branch)}` : gitColor(branch)) : "";
+							return branchText
+								? gitIcon
+									? `${gitIcon} ${gitColor(branchText)}`
+									: gitColor(branchText)
+								: "";
 						case "git_status":
 							return statusBlock;
 						case "git_state":
@@ -366,8 +386,8 @@ export function installFooter(
 				};
 				const branchParts: string[] = [];
 				if (config.footerSegments.gitBranch) {
-					if (branch) {
-						branchParts.push("on", gitIcon, gitColor(branch));
+					if (branchText) {
+						branchParts.push("on", gitIcon, gitColor(branchText));
 					} else if (state.commit?.detached) {
 						// `HEAD` uses git-branch style; `(hash)` uses git-commit style
 						// (bold green) per Starship `git_commit` format.

package/extensions/zentui/format.ts

@@ -1,11 +1,13 @@
 import { homedir, hostname, userInfo } from "node:os";
 import type { AssistantMessage } from "@earendil-works/pi-ai";
 import type { ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import type {
 	ColorSource,
 	ColorSpec,
 	ContextStyle,
 	ContextThresholds,
+	GitBranchMaxLength,
 	PathDisplayMode,
 } from "./config";
 import type { GitCommitInfo, GitMetricsInfo } from "./git";
@@ -391,6 +393,18 @@ export function formatCwdLabel(cwd: string, cwdIcon: string, options?: FormatCwd
 	return cwdIcon ? `${cwdIcon} ${pathText}` : pathText;
 }
 
+function stripAnsi(text: string): string {
+	return text.replace(/\u001B\[[0-9;]*m/g, "");
+}
+
+export function formatGitBranchText(
+	branch: string,
+	maxLength: GitBranchMaxLength = "full",
+): string {
+	if (maxLength === "full" || visibleWidth(branch) <= maxLength) return branch;
+	return stripAnsi(truncateToWidth(branch, maxLength, "…"));
+}
+
 export function formatUsernameHostLabel(icon: string): string {
 	try {
 		const user = userInfo().username;

package/extensions/zentui/index.ts

@@ -13,10 +13,12 @@ import {
 	ensureConfigExists,
 	type FixedEditorConfig,
 	type FooterSegmentsConfig,
+	type GitBranchConfig,
 	type IconMode,
 	loadConfig,
 	type PathDisplayConfig,
 	type PolishedTuiConfig,
+	type SeparatorStyle,
 	saveColorSourcesPatch,
 	saveContextStylePatch,
 	saveExtensionStatusColorMode,
@@ -24,8 +26,10 @@ import {
 	saveFixedEditorPatch,
 	saveFooterFormatPatch,
 	saveFooterSegmentsPatch,
+	saveGitBranchPatch,
 	saveIconsModePatch,
 	savePathDisplayPatch,
+	saveSeparatorPatch,
 	saveUiFeaturesPatch,
 	type UiFeaturesConfig,
 } from "./config";
@@ -449,9 +453,15 @@ export default function (pi: ExtensionAPI) {
 		setContextStyle(style: ContextStyle) {
 			currentConfig = saveContextStylePatch(style);
 		},
+		setSeparator(separator: SeparatorStyle) {
+			currentConfig = saveSeparatorPatch(separator);
+		},
 		setPathDisplay(patch: Partial<PathDisplayConfig>) {
 			currentConfig = savePathDisplayPatch(patch);
 		},
+		setGitBranch(patch: Partial<GitBranchConfig>) {
+			currentConfig = saveGitBranchPatch(patch);
+		},
 		getActiveExtensionStatuses() {
 			return getActiveExtensionStatuses();
 		},

package/extensions/zentui/settings-command.ts

@@ -17,14 +17,18 @@ import {
 	type ExtensionStatusPlacement,
 	type FixedEditorConfig,
 	type FooterSegmentsConfig,
+	type GitBranchConfig,
+	type GitBranchMaxLength,
 	getExtensionStatusColorMode,
 	getExtensionStatusPlacement,
 	type IconMode,
 	isExtensionStatusColorMode,
 	isExtensionStatusPlacement,
+	isSeparatorStyle,
 	type PathDisplayConfig,
 	type PathDisplayMode,
 	type PolishedTuiConfig,
+	type SeparatorStyle,
 	type UiFeaturesConfig,
 } from "./config";
 import { sanitizeExtensionStatusText } from "./extension-status";
@@ -40,8 +44,10 @@ const extensionStatusPlacementValues: ExtensionStatusPlacement[] = [
 ];
 const extensionStatusColorModeValues: ExtensionStatusColorMode[] = ["zentui", "original"];
 const contextStyleValues: ContextStyle[] = ["text", "gauge", "text+gauge"];
+const separatorStyleValues: SeparatorStyle[] = ["pipe", "dot", "chevron", "none"];
 const pathDisplayModeValues: PathDisplayMode[] = ["basename", "full"];
 const pathDepthValues = ["0", "1", "2", "3", "4", "5"] as const;
+const branchLengthPresetValues = ["full", "10", "20", "30", "40", "50"] as const;
 const iconModeValues: IconMode[] = ["auto", "nerd", "ascii"];
 type FeatureState = "enabled" | "disabled";
 
@@ -58,7 +64,13 @@ type ColorSettingId = "starship" | "editorMessages";
 type FeatureSettingId = keyof UiFeaturesConfig;
 type FooterSegmentSettingId = keyof FooterSegmentsConfig;
 type SettingsSection = (typeof settingsSections)[number];
-type LayoutSettingId = "contextStyle" | "pathDisplay" | "pathDepth" | "iconMode";
+type LayoutSettingId =
+	| "contextStyle"
+	| "separator"
+	| "pathDisplay"
+	| "pathDepth"
+	| "branchLength"
+	| "iconMode";
 
 type SettingsCommandDeps = {
 	getConfig: () => PolishedTuiConfig;
@@ -71,7 +83,9 @@ type SettingsCommandDeps = {
 	setFooterFormat: (value: string) => void;
 	setIconMode: (mode: IconMode) => void;
 	setContextStyle: (style: ContextStyle) => void;
+	setSeparator: (separator: SeparatorStyle) => void;
 	setPathDisplay: (patch: Partial<PathDisplayConfig>) => void;
+	setGitBranch: (patch: Partial<GitBranchConfig>) => void;
 	getActiveExtensionStatuses: () => ReadonlyMap<string, string>;
 	setExtensionStatusPlacement: (key: string, placement: ExtensionStatusPlacement) => void;
 	setExtensionStatusColorMode: (key: string, colorMode: ExtensionStatusColorMode) => void;
@@ -224,11 +238,26 @@ function isPathDepthValue(value: string): boolean {
 	return (pathDepthValues as readonly string[]).includes(value);
 }
 
+function parseGitBranchLengthValue(value: string): GitBranchMaxLength | undefined {
+	if (value === "full") return value;
+	const parsed = Number(value);
+	return Number.isInteger(parsed) && parsed > 0 ? parsed : undefined;
+}
+
+function branchLengthValues(maxLength: GitBranchMaxLength): string[] {
+	const current = String(maxLength);
+	return (branchLengthPresetValues as readonly string[]).includes(current)
+		? [...branchLengthPresetValues]
+		: [current, ...branchLengthPresetValues];
+}
+
 function isLayoutSettingId(value: string): value is LayoutSettingId {
 	return (
 		value === "contextStyle" ||
+		value === "separator" ||
 		value === "pathDisplay" ||
 		value === "pathDepth" ||
+		value === "branchLength" ||
 		value === "iconMode"
 	);
 }
@@ -437,6 +466,13 @@ function buildItems(
 				currentValue: config.contextStyle,
 				values: contextStyleValues,
 			},
+			{
+				id: "separator",
+				label: "Separator",
+				description: "Choose the separator between default footer segments.",
+				currentValue: config.separator,
+				values: separatorStyleValues,
+			},
 			{
 				id: "pathDisplay",
 				label: "Path display",
@@ -452,6 +488,13 @@ function buildItems(
 				currentValue: String(config.pathDisplay.depth),
 				values: [...pathDepthValues],
 			},
+			{
+				id: "branchLength",
+				label: "Branch length",
+				description: "Show the full branch name or truncate it to a preset visible width.",
+				currentValue: String(config.gitBranch.maxLength),
+				values: branchLengthValues(config.gitBranch.maxLength),
+			},
 			{
 				id: "iconMode",
 				label: "Icon mode",
@@ -679,6 +722,15 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 										return;
 									}
 
+									if (id === "separator" && isSeparatorStyle(newValue)) {
+										deps.setSeparator(newValue);
+										settingsList.updateValue(id, newValue);
+										deps.requestRender();
+										ctx.ui.notify(`Separator: ${newValue}`, "info");
+										tui.requestRender();
+										return;
+									}
+
 									if (id === "pathDisplay" && isPathDisplayMode(newValue)) {
 										deps.setPathDisplay({ mode: newValue });
 										settingsList.updateValue(id, newValue);
@@ -697,6 +749,17 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 										return;
 									}
 
+									if (id === "branchLength") {
+										const maxLength = parseGitBranchLengthValue(newValue);
+										if (maxLength === undefined) return;
+										deps.setGitBranch({ maxLength });
+										settingsList.updateValue(id, newValue);
+										deps.requestRender();
+										ctx.ui.notify(`Branch length: ${newValue}`, "info");
+										tui.requestRender();
+										return;
+									}
+
 									if (id === "iconMode" && isIconMode(newValue)) {
 										deps.setIconMode(newValue);
 										settingsList.updateValue(id, newValue);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-zentui",
-	"version": "0.8.0",
+	"version": "0.10.0",
 	"description": "A Starship-inspired statusline and Opencode-style TUI for Pi.",
 	"type": "module",
 	"license": "MIT",