pi-zentui 0.5.0 → 0.7.0

package/README.md

@@ -17,11 +17,11 @@ Zentui brings two popular aesthetics to Pi:
 
 ### Footer (Starship-inspired)
 
-- `󰝰 dirname` — current directory with icon
+- `dirname` — current directory (`basename` by default; optional `full` path with directory depth via `pathDisplay`)
 - `on  branch` — git branch with icon
 - `[!?↑]` — git status indicators (modified, untracked, ahead/behind, stashed, etc.)
 - `via  v5.5.0` — runtime detection with version and Starship-style Nerd Font runtime/language modules
-- Optional segments (off by default): `user@host`, current time, OS icon, and session duration
+- Optional segments (off by default): `user@host`, current time, OS icon, session duration, and the **project package version** (e.g. `package.json` → `0.6.0`) — distinct from the runtime segment, which shows the installed toolchain
 - Right side shows context usage, token counts, and cost
 - Built-in footer segments can be shown or hidden individually from `/zentui`
 - Fully custom Starship-style layout via a `footerFormat` template string — see [Footer Format Template](#footer-format-template)
@@ -158,9 +158,13 @@ Default config values — copy this and change any value you want:
 		"warning": 70,
 		"error": 90
 	},
+	"pathDisplay": {
+		"mode": "basename",
+		"depth": 0
+	},
 	"icons": {
 		"mode": "auto",
-		"cwd": "󰝰",
+		"cwd": "",
 		"git": "",
 		"ahead": "↑",
 		"behind": "↓",
@@ -193,6 +197,10 @@ Default config values — copy this and change any value you want:
 		"separator": "bright-black",
 		"runtimePrefix": "",
 		"sessionDuration": "yellow",
+		"packageVersion": "208",
+		"gitCommit": "bold green",
+		"gitMetricsAdded": "bold green",
+		"gitMetricsDeleted": "bold red",
 		"username": "bold yellow",
 		"time": "bold yellow",
 		"os": "bold white",
@@ -230,7 +238,19 @@ Default config values — copy this and change any value you want:
 		"sessionDuration": false,
 		"username": false,
 		"time": false,
-		"os": false
+		"os": false,
+		"packageVersion": false,
+		"gitCommit": false,
+		"gitMetrics": false
+	},
+	"gitCommit": {
+		"hashLength": 7,
+		"onlyDetached": true,
+		"showTag": true
+	},
+	"gitMetrics": {
+		"onlyNonzero": true,
+		"ignoreSubmodules": false
 	},
 	"extensionStatuses": {
 		"defaultPlacement": "right",
@@ -244,11 +264,14 @@ Default config values — copy this and change any value you want:
 - `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.
 - `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`.
 - `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`, `runtime`, `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 and icon mode; set or clear custom formats with `/zentui format`.
+- `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`.
+- `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.
 - The shown `editor*` values match the default `theme` source. Omit those keys to keep Zentui's source-aware defaults when switching between `theme` and `terminal`.
 - `editorAccent` styles the active editor rail and previous user-message rail when `features.copyFriendly` is disabled.
@@ -280,22 +303,29 @@ Center the branch between directory and cost:
 
 ### Variables
 
-| Token               | Aliases      | Renders                                          |
-| ------------------- | ------------ | ------------------------------------------------ |
-| `$cwd`              | `$directory` | current directory                                |
-| `$git_branch`       | `$branch`    | git branch with icon                             |
-| `$git_status`       | `$status`    | `[!?↑]` status block                             |
-| `$git_state`        | `$state`     | `REBASING` / `MERGING` / … (optional `n/m`)      |
-| `$runtime`          |              | runtime icon + version                           |
-| `$session_duration` | `$duration`  | session running time                             |
-| `$username`         |              | `user@host`                                      |
-| `$os`               |              | operating-system icon                            |
-| `$time`             |              | current time `HH:MM`                             |
-| `$context`          |              | context usage (text and/or gauge via config)     |
-| `$tokens`           |              | input/output token counts                        |
-| `$cost`             |              | session cost                                     |
-| `$sep`              | `$separator` | themed ` | ` using `colors.separator`            |
-| `$fill`             | —            | special: splits zones                            |
+| Token               | Aliases      | Renders                                                             |
+| ------------------- | ------------ | ------------------------------------------------------------------- |
+| `$cwd`              | `$directory` | current directory                                                   |
+| `$git_branch`       | `$branch`    | git branch with icon                                                |
+| `$git_status`       | `$status`    | `[!?↑]` status block                                                |
+| `$git_state`        | `$state`     | `REBASING` / `MERGING` / … (optional `n/m`)                         |
+| `$git_commit`       | `$commit`    | short commit hash (+ exact-match tag when present)                  |
+| `$git_tag`          | `$tag`       | exact-match tag at HEAD                                             |
+| `$git_metrics`      |              | aggregate line changes `+added −deleted`                            |
+| `$git_added`        |              | added line count (`+N`)                                             |
+| `$git_deleted`      |              | deleted line count (`−N`)                                           |
+| `$runtime`          |              | runtime icon + version                                              |
+| `$package`          |              | project package version, `is <glyph> <version>` (manifest-derived)  |
+| `$package_version`  |              | raw project package version (no icon)                               |
+| `$session_duration` | `$duration`  | session running time                                                |
+| `$username`         |              | `user@host`                                                         |
+| `$os`               |              | operating-system icon                                               |
+| `$time`             |              | current time `HH:MM`                                                |
+| `$context`          |              | context usage (text and/or gauge via config)                        |
+| `$tokens`           |              | input/output token counts                                           |
+| `$cost`             |              | session cost                                                        |
+| `$sep`              | `$separator` | themed `\|` using `colors.separator`            |
+| `$fill`             | —            | special: splits zones                                               |
 
 ### `$fill` behavior
 

package/extensions/zentui/config.ts

@@ -23,6 +23,14 @@ export type ContextThresholds = {
 	error: number;
 };
 
+export type PathDisplayMode = "basename" | "full";
+
+export type PathDisplayConfig = {
+	mode: PathDisplayMode;
+	/** Trailing directories to show in full mode. 0 = unlimited; clamped to 0..5. */
+	depth: number;
+};
+
 export type ColorSourcesConfig = {
 	starship: ColorSource;
 	editor: ColorSource;
@@ -40,6 +48,8 @@ export type FooterSegmentsConfig = {
 	gitBranch: boolean;
 	gitStatus: boolean;
 	gitCounts: boolean;
+	gitCommit: boolean;
+	gitMetrics: boolean;
 	runtime: boolean;
 	context: boolean;
 	tokens: boolean;
@@ -48,11 +58,31 @@ export type FooterSegmentsConfig = {
 	username: boolean;
 	time: boolean;
 	os: boolean;
+	packageVersion: boolean;
 };
 
 export type ExtensionStatusPlacement = "off" | "left" | "middle" | "right";
 export type ExtensionStatusColorMode = "zentui" | "original";
 
+/**
+ * Starship `git_commit`-style options.
+ * See https://starship.rs/config/#git-commit
+ */
+export type GitCommitConfig = {
+	hashLength: number;
+	onlyDetached: boolean;
+	showTag: boolean;
+};
+
+/**
+ * Starship `git_metrics`-style options.
+ * See https://starship.rs/config/#git-metrics
+ */
+export type GitMetricsConfig = {
+	onlyNonzero: boolean;
+	ignoreSubmodules: boolean;
+};
+
 const DEFAULT_EXTENSION_STATUS_COLOR_MODE: ExtensionStatusColorMode = "zentui";
 
 export type ExtensionStatusesConfig = {
@@ -69,6 +99,7 @@ export type PolishedTuiConfig = {
 	footerFormat: string;
 	contextStyle: ContextStyle;
 	contextThresholds: ContextThresholds;
+	pathDisplay: PathDisplayConfig;
 	icons: ResolvedIcons;
 	colors: {
 		cwd: ColorSpec;
@@ -83,6 +114,10 @@ export type PolishedTuiConfig = {
 		runtimePrefix: ColorSpec;
 		extensionStatus: ColorSpec;
 		sessionDuration: ColorSpec;
+		packageVersion: ColorSpec;
+		gitCommit: ColorSpec;
+		gitMetricsAdded: ColorSpec;
+		gitMetricsDeleted: ColorSpec;
 		username: ColorSpec;
 		time: ColorSpec;
 		os: ColorSpec;
@@ -101,6 +136,8 @@ export type PolishedTuiConfig = {
 	colorSources: ColorSourcesConfig;
 	features: UiFeaturesConfig;
 	footerSegments: FooterSegmentsConfig;
+	gitCommit: GitCommitConfig;
+	gitMetrics: GitMetricsConfig;
 	extensionStatuses: ExtensionStatusesConfig;
 };
 
@@ -121,6 +158,13 @@ export const FOOTER_FORMAT_VARIABLES = [
 	"context",
 	"tokens",
 	"cost",
+	"package",
+	"package_version",
+	"git_commit",
+	"git_tag",
+	"git_metrics",
+	"git_added",
+	"git_deleted",
 	"sep",
 ] as const;
 
@@ -133,6 +177,8 @@ export const FOOTER_FORMAT_ALIASES: Record<string, string> = {
 	branch: "git_branch",
 	status: "git_status",
 	state: "git_state",
+	commit: "git_commit",
+	tag: "git_tag",
 	duration: "session_duration",
 	separator: "sep",
 };
@@ -144,6 +190,7 @@ export const defaultConfig: PolishedTuiConfig = {
 	footerFormat: "",
 	contextStyle: "text",
 	contextThresholds: { warning: 70, error: 90 },
+	pathDisplay: { mode: "basename", depth: 0 },
 	icons: {
 		mode: "auto",
 		...NERD_DEFAULT_ICONS,
@@ -161,6 +208,10 @@ export const defaultConfig: PolishedTuiConfig = {
 		runtimePrefix: "",
 		extensionStatus: "bright-black",
 		sessionDuration: "yellow",
+		packageVersion: "208",
+		gitCommit: "bold green",
+		gitMetricsAdded: "bold green",
+		gitMetricsDeleted: "bold red",
 		username: "bold yellow",
 		time: "bold yellow",
 		os: "bold white",
@@ -188,6 +239,18 @@ export const defaultConfig: PolishedTuiConfig = {
 		username: false,
 		time: false,
 		os: false,
+		packageVersion: false,
+		gitCommit: false,
+		gitMetrics: false,
+	},
+	gitCommit: {
+		hashLength: 7,
+		onlyDetached: true,
+		showTag: true,
+	},
+	gitMetrics: {
+		onlyNonzero: true,
+		ignoreSubmodules: false,
 	},
 	extensionStatuses: {
 		defaultPlacement: "right",
@@ -244,6 +307,18 @@ function parseContextThresholds(value: unknown): ContextThresholds {
 	return { warning, error };
 }
 
+function parsePathDisplay(value: unknown): PathDisplayConfig {
+	const defaults = defaultConfig.pathDisplay;
+	if (!isRecord(value)) return { ...defaults };
+	const mode = value.mode === "full" || value.mode === "basename" ? value.mode : defaults.mode;
+	const rawDepth = value.depth;
+	const depth =
+		typeof rawDepth === "number" && Number.isFinite(rawDepth) && rawDepth >= 0
+			? Math.min(5, Math.floor(rawDepth))
+			: defaults.depth;
+	return { mode, depth };
+}
+
 function stringValue(record: Record<string, unknown>, key: string): string | undefined {
 	const value = record[key];
 	return typeof value === "string" ? value : undefined;
@@ -308,6 +383,10 @@ function normalizeColors(record: Record<string, unknown>): Partial<PolishedTuiCo
 		runtimePrefix: colorValue(record, "runtimePrefix"),
 		extensionStatus: colorValue(record, "extensionStatus"),
 		sessionDuration: colorValue(record, "sessionDuration"),
+		packageVersion: colorValue(record, "packageVersion"),
+		gitCommit: colorValue(record, "gitCommit"),
+		gitMetricsAdded: colorValue(record, "gitMetricsAdded"),
+		gitMetricsDeleted: colorValue(record, "gitMetricsDeleted"),
 		username: colorValue(record, "username"),
 		time: colorValue(record, "time"),
 		os: colorValue(record, "os"),
@@ -355,6 +434,41 @@ function normalizeFooterSegments(record: Record<string, unknown>): FooterSegment
 		username: footerSegmentValue(record, "username"),
 		time: footerSegmentValue(record, "time"),
 		os: footerSegmentValue(record, "os"),
+		packageVersion: footerSegmentValue(record, "packageVersion"),
+		gitCommit: footerSegmentValue(record, "gitCommit"),
+		gitMetrics: footerSegmentValue(record, "gitMetrics"),
+	};
+}
+
+/** Clamp hashLength to Git's valid abbreviation range [4, 40]. */
+function normalizeGitHashLength(value: unknown): number {
+	const parsed = typeof value === "number" ? value : Number(value);
+	if (!Number.isFinite(parsed)) return defaultConfig.gitCommit.hashLength;
+	const rounded = Math.round(parsed);
+	return Math.min(40, Math.max(4, rounded));
+}
+
+function normalizeGitCommitConfig(record: Record<string, unknown>): GitCommitConfig {
+	return {
+		hashLength: normalizeGitHashLength(record.hashLength),
+		onlyDetached:
+			typeof record.onlyDetached === "boolean"
+				? record.onlyDetached
+				: defaultConfig.gitCommit.onlyDetached,
+		showTag: typeof record.showTag === "boolean" ? record.showTag : defaultConfig.gitCommit.showTag,
+	};
+}
+
+function normalizeGitMetricsConfig(record: Record<string, unknown>): GitMetricsConfig {
+	return {
+		onlyNonzero:
+			typeof record.onlyNonzero === "boolean"
+				? record.onlyNonzero
+				: defaultConfig.gitMetrics.onlyNonzero,
+		ignoreSubmodules:
+			typeof record.ignoreSubmodules === "boolean"
+				? record.ignoreSubmodules
+				: defaultConfig.gitMetrics.ignoreSubmodules,
 	};
 }
 
@@ -415,7 +529,10 @@ function isFooterSegmentKey(value: string): value is keyof FooterSegmentsConfig
 		value === "sessionDuration" ||
 		value === "username" ||
 		value === "time" ||
-		value === "os"
+		value === "os" ||
+		value === "packageVersion" ||
+		value === "gitCommit" ||
+		value === "gitMetrics"
 	);
 }
 
@@ -483,11 +600,18 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 	const extensionStatuses = isRecord(config.extensionStatuses)
 		? normalizeExtensionStatuses(config.extensionStatuses as Record<string, unknown>)
 		: defaultConfig.extensionStatuses;
+	const gitCommit = isRecord(config.gitCommit)
+		? normalizeGitCommitConfig(config.gitCommit as Record<string, unknown>)
+		: defaultConfig.gitCommit;
+	const gitMetrics = isRecord(config.gitMetrics)
+		? normalizeGitMetricsConfig(config.gitMetrics as Record<string, unknown>)
+		: defaultConfig.gitMetrics;
 	return {
 		projectRefreshIntervalMs: parseProjectRefreshIntervalMs(config.projectRefreshIntervalMs),
 		footerFormat: stringValue(config, "footerFormat") ?? "",
 		contextStyle: parseContextStyle(config.contextStyle),
 		contextThresholds: parseContextThresholds(config.contextThresholds),
+		pathDisplay: parsePathDisplay(config.pathDisplay),
 		icons: resolveConfiguredIcons(iconMode, iconOverrides),
 		colors: {
 			...defaultConfig.colors,
@@ -496,6 +620,8 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 		colorSources: { ...colorSources },
 		features: { ...features },
 		footerSegments: { ...footerSegments },
+		gitCommit,
+		gitMetrics,
 		extensionStatuses: {
 			defaultPlacement: extensionStatuses.defaultPlacement,
 			placements: { ...extensionStatuses.placements },
@@ -616,6 +742,21 @@ export function saveContextThresholdsPatch(
 	return mergeConfig(record);
 }
 
+export function savePathDisplayPatch(
+	patch: Partial<PathDisplayConfig>,
+	path = configPath,
+): PolishedTuiConfig {
+	const record = readConfigRecord(path);
+	const existing = isRecord(record.pathDisplay)
+		? { ...(record.pathDisplay as Record<string, unknown>) }
+		: {};
+	if (patch.mode !== undefined) existing.mode = patch.mode;
+	if (patch.depth !== undefined) existing.depth = patch.depth;
+	record.pathDisplay = 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

@@ -9,7 +9,10 @@ import {
 	buildSessionDurationLabel,
 	contextColorTier,
 	formatCwdLabel,
+	formatGitCommitSegment,
+	formatGitMetricsSegment,
 	formatOsLabel,
+	formatPackageVersionSegment,
 	formatRuntimeSegment,
 	formatTimeLabel,
 	formatUsernameHostLabel,
@@ -172,7 +175,10 @@ export function installFooter(
 					theme,
 					colorSource,
 					config.colors.cwd,
-					formatCwdLabel(ctx.cwd, config.icons.cwd),
+					formatCwdLabel(ctx.cwd, config.icons.cwd, {
+						mode: config.pathDisplay.mode,
+						depth: config.pathDisplay.depth,
+					}),
 				);
 				const branch = state.branch;
 				const contextUsage = ctx.getContextUsage();
@@ -290,16 +296,92 @@ export function installFooter(
 							);
 						case "cost":
 							return renderStyleForSource(theme, colorSource, config.colors.cost, state.costLabel);
+						case "package":
+							return formatPackageVersionSegment(
+								theme,
+								state.packageVersion,
+								colorSource,
+								iconMode,
+								config.icons.package,
+								config.colors.packageVersion,
+							);
+						case "package_version":
+							return state.packageVersion?.version
+								? renderStyleForSource(
+										theme,
+										colorSource,
+										config.colors.packageVersion,
+										state.packageVersion.version,
+									)
+								: "";
 						case "sep":
 							return renderStyleForSource(theme, colorSource, config.colors.separator, " | ");
+						case "git_commit":
+							return formatGitCommitSegment(
+								theme,
+								state.commit,
+								config.gitCommit,
+								colorSource,
+								config.colors.gitCommit,
+							);
+						case "git_tag":
+							return config.gitCommit.showTag && state.commit?.tag
+								? renderStyleForSource(
+										theme,
+										colorSource,
+										config.colors.gitCommit,
+										state.commit.tag,
+									)
+								: "";
+						case "git_metrics":
+							return formatGitMetricsSegment(
+								theme,
+								state.metrics,
+								config.gitMetrics,
+								colorSource,
+								config.colors.gitMetricsAdded,
+								config.colors.gitMetricsDeleted,
+							);
+						case "git_added":
+							return state.metrics
+								? renderStyleForSource(
+										theme,
+										colorSource,
+										config.colors.gitMetricsAdded,
+										`+${state.metrics.added}`,
+									)
+								: "";
+						case "git_deleted":
+							return state.metrics
+								? renderStyleForSource(
+										theme,
+										colorSource,
+										config.colors.gitMetricsDeleted,
+										`−${state.metrics.deleted}`,
+									)
+								: "";
 						default:
 							return "";
 					}
 				};
-				const branchParts =
-					config.footerSegments.gitBranch && branch
-						? ["on", gitIcon, gitColor(branch)].filter(Boolean)
-						: [];
+				const branchParts: string[] = [];
+				if (config.footerSegments.gitBranch) {
+					if (branch) {
+						branchParts.push("on", gitIcon, gitColor(branch));
+					} else if (state.commit?.detached) {
+						// `HEAD` uses git-branch style; `(hash)` uses git-commit style
+						// (bold green) per Starship `git_commit` format.
+						branchParts.push("on", gitIcon, gitColor("HEAD"));
+						if (config.footerSegments.gitCommit && state.commit.oid) {
+							const shortHash = state.commit.oid.slice(0, config.gitCommit.hashLength);
+							const tag = config.gitCommit.showTag && state.commit.tag ? state.commit.tag : "";
+							const inner = [shortHash, tag].filter(Boolean).join(" ");
+							branchParts.push(
+								renderStyleForSource(theme, colorSource, config.colors.gitCommit, `(${inner})`),
+							);
+						}
+					}
+				}
 				const gitStatusParts = config.footerSegments.gitStatus && statusBlock ? [statusBlock] : [];
 				const showGitState = config.footerSegments.gitBranch || config.footerSegments.gitStatus;
 				const gitStateParts = showGitState && gitStateBlock ? [gitStateBlock] : [];
@@ -315,6 +397,39 @@ export function installFooter(
 							iconMode,
 						)
 					: "";
+				const packageVersionLabel = config.footerSegments.packageVersion
+					? formatPackageVersionSegment(
+							theme,
+							state.packageVersion,
+							colorSource,
+							iconMode,
+							config.icons.package,
+							config.colors.packageVersion,
+						)
+					: "";
+				// Skip standalone gitCommit when hash is already folded into the
+				// branch display on detached HEAD.
+				const hashFoldedIntoBranch = state.commit?.detached && config.footerSegments.gitBranch;
+				const gitCommitLabel =
+					config.footerSegments.gitCommit && !hashFoldedIntoBranch
+						? formatGitCommitSegment(
+								theme,
+								state.commit,
+								config.gitCommit,
+								colorSource,
+								config.colors.gitCommit,
+							)
+						: "";
+				const gitMetricsLabel = config.footerSegments.gitMetrics
+					? formatGitMetricsSegment(
+							theme,
+							state.metrics,
+							config.gitMetrics,
+							colorSource,
+							config.colors.gitMetricsAdded,
+							config.colors.gitMetricsDeleted,
+						)
+					: "";
 
 				const sessionDurationSegment = (() => {
 					if (!config.footerSegments.sessionDuration || !state.sessionStartEpoch) return "";
@@ -349,6 +464,9 @@ export function installFooter(
 					usernameSegment,
 					config.footerSegments.cwd ? cwdLabel : "",
 					branchLabel,
+					gitCommitLabel,
+					gitMetricsLabel,
+					packageVersionLabel,
 					runtimeLabel,
 					sessionDurationSegment,
 				]