pi-zentui 0.14.0 → 0.15.0

package/README.md

@@ -130,7 +130,16 @@ pi install git:github.com/lmilojevicc/pi-zentui
 
 User config lives at `~/.pi/agent/zentui.json`. The file is optional: missing or invalid known values fall back to Zentui defaults, unknown keys are ignored at runtime, and `/zentui` can patch color-source settings, UI feature toggles, built-in footer segment visibility, and active third-party status placements.
 
-The interactive `/zentui` menu is split into five sections. Use `Tab` and `Shift+Tab` to switch between `Coloring`, `Features`, `Layout`, `Built-in segments`, and `Extension segments`.
+The interactive `/zentui` menu is split into exactly six sections, in this order. Use `Tab` and `Shift+Tab` to switch sections. Every listed control patches the shown JSON equivalent:
+
+1. **Appearance** — Starship/footer colors (`colorSources.starship`); editor + previous-message colors (`colorSources.editor` and `colorSources.userMessages`); separator (`separator`); icon mode (`icons.mode`).
+2. **Editor** — editor enabled (`features.editor`); editor model label (`editorModelLabel`); copy-friendly mode (`features.copyFriendly`); viewport indicators (`features.viewportIndicators`); fixed editor (`fixedEditor.enabled`); and, while fixed editor is enabled, mouse scroll (`fixedEditor.mouseScroll`) and copy notice (`fixedEditor.copyNotice`).
+3. **Footer** — status line enabled (`features.statusLine`); responsive footer (`responsiveFooter`); compact footer rows (`compactFooterMaxLines`); context style (`contextStyle`); path display (`pathDisplay.mode`); path depth (`pathDisplay.depth`).
+4. **Segments** — visibility toggles for every non-Git built-in segment under `footerSegments`: `cwd`, `sessionName`, `runtime`, `context`, `tokens`, `cost`, `sessionDuration`, `username`, `time`, `os`, and `packageVersion`.
+5. **Git** — Git branch visibility (`footerSegments.gitBranch`); branch length (`gitBranch.maxLength`); Git status visibility (`footerSegments.gitStatus`); Git counts visibility (`footerSegments.gitCounts`); Git commit visibility (`footerSegments.gitCommit`); commit-only-detached (`gitCommit.onlyDetached`); exact-match tag (`gitCommit.showTag`); Git metrics visibility (`footerSegments.gitMetrics`); hide zero metrics (`gitMetrics.onlyNonzero`); ignore submodules (`gitMetrics.ignoreSubmodules`).
+6. **Extensions** — default placement (`extensionStatuses.defaultPlacement`) first, followed by placement (`extensionStatuses.placements[key]`) and color (`extensionStatuses.colorModes[key]`) controls for currently active status keys.
+
+Free-form values such as custom formats, raw colors/styles, numeric values outside the shown presets, and inactive extension keys remain JSON-only.
 
 Useful slash-command shortcuts:
 
@@ -144,6 +153,9 @@ Useful slash-command shortcuts:
 /zentui copy-friendly enable
 /zentui copy-friendly disable
 /zentui copy-friendly toggle
+/zentui viewport-indicators enable
+/zentui viewport-indicators disable
+/zentui viewport-indicators toggle
 /zentui fixed-editor enable
 /zentui fixed-editor disable
 /zentui fixed-editor toggle
@@ -238,7 +250,8 @@ Default config values — copy this and change any value you want:
 	"features": {
 		"editor": true,
 		"statusLine": true,
-		"copyFriendly": false
+		"copyFriendly": false,
+		"viewportIndicators": true
 	},
 	"footerSegments": {
 		"cwd": true,
@@ -285,21 +298,21 @@ Default config values — copy this and change any value you want:
 - `contextStyle`: `text` (default), `gauge`, or `text+gauge` for the context segment. Context usage refreshes during assistant streaming; token and cost totals remain canonical and finalize at turn boundaries.
 - `editorModelLabel`: controls the model shown in the editor frame. `id` (default) shows the model id; `name` shows the model's display name (including custom `name` values set in `models.json`), falling back to the id when no name is set.
 - `editorMetadataFormat`: JSON-only template for the left side of the editor metadata row. Missing, non-string, or empty values restore the default `$model  $provider(  $thinking)` layout; non-empty strings, including whitespace-only strings, are preserved. See [Editor Metadata Format](#editor-metadata-format) below.
-- `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.
+- `separator`: controls the default footer layout and extension-status connectors: `pipe` (default, ` | `), `dot` (` · `), `chevron` (` › `), or `none` (one space). Cycle it from the `/zentui` **Appearance** 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.
+- `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` **Footer** 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` **Git** 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`, `sessionName`, `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 responsive behavior, compact rows, context style, separator, path display mode/depth, branch length, and icon mode; set or clear custom formats with `/zentui format`.
+- `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. `viewportIndicators` preserves Pi's native `↑ N more` / `↓ N more` wrapped-row counts in Zentui's editor borders (default `true`). All four can be changed from `/zentui` or direct slash-command arguments.
+- `footerSegments`: show or hide individual built-in footer segments (`cwd`, `sessionName`, `gitBranch`, `gitStatus`, `gitCounts`, `gitCommit`, `gitMetrics`, `runtime`, `packageVersion`, `sessionDuration`, `username`, `time`, `os`, `context`, `tokens`, `cost`). Toggle non-Git segments from **Segments** and Git segments from **Git** 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` **Footer** tab configures responsive behavior, compact rows, context style, and path display mode/depth; **Appearance** configures separator and icon mode; **Git** configures branch length; set or clear custom formats with `/zentui format`.
 - `responsiveFooter`: enabled by default. Zentui keeps the current aligned one-row footer while every settings-resolved left/middle/right zone fits without layout truncation. Otherwise it tries two complete left-aligned rows, preferring `left` / `middle right` and then `left middle` / `right`. Only when neither split fits does it use `compactFooterFormat`. Set `false` to restore the legacy one-row fitting behavior. Selection uses measured terminal-cell width, not fixed device breakpoints.
 - `compactFooterFormat`: JSON-only template used by the compact stage. The default keeps cwd, session name, git branch/status, context, and abbreviated token/cache metrics. A top-level `$wrap` is an automatic wrap opportunity: one space on the same row or no space at a row break. `$wrap_sep` is the same kind of boundary but renders the styled ` | ` divider only when its adjacent chunks share a row. Nested uses of either boundary remain empty variables. `$fill` is ignored. A standalone `$extensions` chunk inserts active non-`off` extension statuses in left/middle/right placement order; embedded uses render empty. Custom `footerFormat` values use this built-in compact fallback unless this key is also customized.
 - `compactFooterMaxLines`: `1`, `2`, `3`, or `"unlimited"` (default `2`). Finite limits crop remaining chunks with exactly one trailing `…`. Compact cwd always uses basename mode; cwd/session/branch chunks target half the available row width before final ANSI-aware clamping. `/zentui` exposes the responsive toggle and row limit, while compact format editing remains JSON-only. Pi supplies footer width but no supported viewport-height budget, so `"unlimited"` is explicit.
 - `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.
+- `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 **Extensions** tab in `/zentui` lists only statuses that are currently active. `defaultPlacement` applies only when a status key has no entry in `placements`; keyed overrides always win.
 - 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.
 - `editorPrompt` styles the copy-friendly editor prompt glyph. Omit it to use `editorAccent`, then the default accent fallback.

package/extensions/zentui/config.ts

@@ -67,6 +67,7 @@ export type UiFeaturesConfig = {
 	editor: boolean;
 	statusLine: boolean;
 	copyFriendly: boolean;
+	viewportIndicators: boolean;
 };
 
 export type FooterSegmentsConfig = {
@@ -277,6 +278,7 @@ export const defaultConfig: PolishedTuiConfig = {
 		editor: true,
 		statusLine: true,
 		copyFriendly: false,
+		viewportIndicators: true,
 	},
 	footerSegments: {
 		cwd: true,
@@ -507,6 +509,7 @@ function normalizeUiFeatures(record: Record<string, unknown>): UiFeaturesConfig
 		editor: booleanValue(record, "editor"),
 		statusLine: booleanValue(record, "statusLine"),
 		copyFriendly: booleanValue(record, "copyFriendly"),
+		viewportIndicators: booleanValue(record, "viewportIndicators"),
 	};
 }
 
@@ -619,7 +622,12 @@ function isColorSourceKey(value: string): value is keyof ColorSourcesConfig {
 }
 
 function isUiFeatureKey(value: string): value is keyof UiFeaturesConfig {
-	return value === "editor" || value === "statusLine" || value === "copyFriendly";
+	return (
+		value === "editor" ||
+		value === "statusLine" ||
+		value === "copyFriendly" ||
+		value === "viewportIndicators"
+	);
 }
 
 function isFooterSegmentKey(value: string): value is keyof FooterSegmentsConfig {
@@ -990,6 +998,62 @@ export function saveGitBranchPatch(
 	});
 }
 
+export function saveEditorModelLabel(
+	value: ModelLabelSource,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		record.editorModelLabel = parseEditorModelLabel(value);
+	});
+}
+
+export function saveGitCommitPatch(
+	patch: Partial<Pick<GitCommitConfig, "onlyDetached" | "showTag">>,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.gitCommit)
+			? { ...(record.gitCommit as Record<string, unknown>) }
+			: {};
+		if (typeof patch.onlyDetached === "boolean") existing.onlyDetached = patch.onlyDetached;
+		if (typeof patch.showTag === "boolean") existing.showTag = patch.showTag;
+		record.gitCommit = existing;
+	});
+}
+
+export function saveGitMetricsPatch(
+	patch: Partial<GitMetricsConfig>,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.gitMetrics)
+			? { ...(record.gitMetrics as Record<string, unknown>) }
+			: {};
+		if (typeof patch.onlyNonzero === "boolean") existing.onlyNonzero = patch.onlyNonzero;
+		if (typeof patch.ignoreSubmodules === "boolean") {
+			existing.ignoreSubmodules = patch.ignoreSubmodules;
+		}
+		record.gitMetrics = existing;
+	});
+}
+
+export function saveExtensionStatusDefaultPlacement(
+	placement: ExtensionStatusPlacement,
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.extensionStatuses)
+			? { ...(record.extensionStatuses as Record<string, unknown>) }
+			: {};
+		record.extensionStatuses = {
+			...existing,
+			defaultPlacement: isExtensionStatusPlacement(placement)
+				? placement
+				: defaultConfig.extensionStatuses.defaultPlacement,
+		};
+	});
+}
+
 export function saveExtensionStatusPlacement(
 	key: string,
 	placement: ExtensionStatusPlacement,

package/extensions/zentui/index.ts

@@ -15,19 +15,26 @@ import {
 	FOOTER_FORMAT_ALIASES,
 	type FooterSegmentsConfig,
 	type GitBranchConfig,
+	type GitCommitConfig,
+	type GitMetricsConfig,
 	type IconMode,
 	loadConfig,
+	type ModelLabelSource,
 	type PathDisplayConfig,
 	type PolishedTuiConfig,
 	type SeparatorStyle,
 	saveColorSourcesPatch,
 	saveContextStylePatch,
+	saveEditorModelLabel,
 	saveExtensionStatusColorMode,
+	saveExtensionStatusDefaultPlacement,
 	saveExtensionStatusPlacement,
 	saveFixedEditorPatch,
 	saveFooterFormatPatch,
 	saveFooterSegmentsPatch,
 	saveGitBranchPatch,
+	saveGitCommitPatch,
+	saveGitMetricsPatch,
 	saveIconsModePatch,
 	savePathDisplayPatch,
 	saveResponsiveFooterPatch,
@@ -545,9 +552,31 @@ export default function (pi: ExtensionAPI) {
 		setGitBranch(patch: Partial<GitBranchConfig>) {
 			currentConfig = saveGitBranchPatch(patch);
 		},
+		setEditorModelLabel(value: ModelLabelSource, ctx: ExtensionContext) {
+			currentConfig = saveEditorModelLabel(value);
+			syncFooterState(ctx);
+		},
+		setGitCommit(
+			patch: Partial<Pick<GitCommitConfig, "onlyDetached" | "showTag">>,
+			ctx: ExtensionContext,
+		) {
+			currentConfig = saveGitCommitPatch(patch);
+			if (patch.showTag !== undefined && footerInstalled) {
+				scheduleProjectRefresh(ctx, { force: true });
+			}
+		},
+		setGitMetrics(patch: Partial<GitMetricsConfig>, ctx: ExtensionContext) {
+			currentConfig = saveGitMetricsPatch(patch);
+			if (patch.ignoreSubmodules !== undefined && footerInstalled) {
+				scheduleProjectRefresh(ctx, { force: true });
+			}
+		},
 		getActiveExtensionStatuses() {
 			return getActiveExtensionStatuses();
 		},
+		setExtensionStatusDefaultPlacement(placement: ExtensionStatusPlacement) {
+			currentConfig = saveExtensionStatusDefaultPlacement(placement);
+		},
 		setExtensionStatusPlacement(key: string, placement: ExtensionStatusPlacement) {
 			currentConfig = saveExtensionStatusPlacement(key, placement);
 		},

package/extensions/zentui/settings-command.ts

@@ -8,6 +8,7 @@ import {
 	SettingsList,
 	type SettingsListTheme,
 	truncateToWidth,
+	visibleWidth,
 } from "@earendil-works/pi-tui";
 import {
 	type ColorSource,
@@ -20,12 +21,15 @@ import {
 	type FooterSegmentsConfig,
 	type GitBranchConfig,
 	type GitBranchMaxLength,
+	type GitCommitConfig,
+	type GitMetricsConfig,
 	getExtensionStatusColorMode,
 	getExtensionStatusPlacement,
 	type IconMode,
 	isExtensionStatusColorMode,
 	isExtensionStatusPlacement,
 	isSeparatorStyle,
+	type ModelLabelSource,
 	type PathDisplayConfig,
 	type PathDisplayMode,
 	type PolishedTuiConfig,
@@ -51,23 +55,25 @@ 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"];
+const modelLabelValues: ModelLabelSource[] = ["id", "name"];
 const compactFooterMaxLineValues = ["1", "2", "3", "unlimited"] as const;
 type FeatureState = "enabled" | "disabled";
 
 const featureStateValues: FeatureState[] = ["enabled", "disabled"];
 const settingsSections = [
-	"coloring",
-	"features",
-	"layout",
-	"builtinSegments",
-	"extensionSegments",
+	"appearance",
+	"editor",
+	"footer",
+	"segments",
+	"git",
+	"extensions",
 ] as const;
 
 type ColorSettingId = "starship" | "editorMessages";
 type FeatureSettingId = keyof UiFeaturesConfig;
 type FooterSegmentSettingId = keyof FooterSegmentsConfig;
 type SettingsSection = (typeof settingsSections)[number];
-type LayoutSettingId =
+type BoundedSettingId =
 	| "responsiveFooter"
 	| "compactFooterMaxLines"
 	| "contextStyle"
@@ -75,7 +81,13 @@ type LayoutSettingId =
 	| "pathDisplay"
 	| "pathDepth"
 	| "branchLength"
-	| "iconMode";
+	| "iconMode"
+	| "editorModelLabel"
+	| "gitCommitOnlyDetached"
+	| "gitCommitShowTag"
+	| "gitMetricsOnlyNonzero"
+	| "gitMetricsIgnoreSubmodules"
+	| "extensionStatusDefaultPlacement";
 
 type SettingsCommandDeps = {
 	sessionLifecycle: SessionLifecycle;
@@ -96,7 +108,14 @@ type SettingsCommandDeps = {
 	setSeparator: (separator: SeparatorStyle) => void;
 	setPathDisplay: (patch: Partial<PathDisplayConfig>) => void;
 	setGitBranch: (patch: Partial<GitBranchConfig>) => void;
+	setEditorModelLabel?: (value: ModelLabelSource, ctx: ExtensionContext) => void;
+	setGitCommit?: (
+		patch: Partial<Pick<GitCommitConfig, "onlyDetached" | "showTag">>,
+		ctx: ExtensionContext,
+	) => void;
+	setGitMetrics?: (patch: Partial<GitMetricsConfig>, ctx: ExtensionContext) => void;
 	getActiveExtensionStatuses: () => ReadonlyMap<string, string>;
+	setExtensionStatusDefaultPlacement?: (placement: ExtensionStatusPlacement) => void;
 	setExtensionStatusPlacement: (key: string, placement: ExtensionStatusPlacement) => void;
 	setExtensionStatusColorMode: (key: string, colorMode: ExtensionStatusColorMode) => void;
 	setFixedEditor: (patch: Partial<FixedEditorConfig>, ctx: ExtensionContext) => void;
@@ -120,6 +139,7 @@ const featureSettingLabels: Record<FeatureSettingId, string> = {
 	editor: "Editor",
 	statusLine: "Status line",
 	copyFriendly: "Copy-friendly mode",
+	viewportIndicators: "Editor viewport indicators",
 };
 
 const featureSettingDescriptions: Record<FeatureSettingId, string> = {
@@ -128,6 +148,7 @@ const featureSettingDescriptions: Record<FeatureSettingId, string> = {
 	statusLine: "Enable or disable Zentui's custom footer/status line.",
 	copyFriendly:
 		"Hide editor and previous-message rail glyphs for cleaner native terminal selection.",
+	viewportIndicators: "Show Pi's native wrapped-row counts in the editor's top and bottom borders.",
 };
 
 const footerSegmentSettingLabels: Record<FooterSegmentSettingId, string> = {
@@ -182,6 +203,9 @@ const directCommandSuggestions = [
 	"copy-friendly enable",
 	"copy-friendly disable",
 	"copy-friendly toggle",
+	"viewport-indicators enable",
+	"viewport-indicators disable",
+	"viewport-indicators toggle",
 	"fixed-editor enable",
 	"fixed-editor disable",
 	"fixed-editor toggle",
@@ -191,11 +215,12 @@ const directCommandSuggestions = [
 ];
 
 const sectionLabels: Record<SettingsSection, string> = {
-	coloring: "Coloring",
-	features: "Features",
-	layout: "Layout",
-	builtinSegments: "Built-in segments",
-	extensionSegments: "Extension segments",
+	appearance: "Appearance",
+	editor: "Editor",
+	footer: "Footer",
+	segments: "Segments",
+	git: "Git",
+	extensions: "Extensions",
 };
 
 const thirdPartyStatusSettingPrefix = "thirdPartyStatus:";
@@ -211,7 +236,12 @@ function isColorSettingId(value: string): value is ColorSettingId {
 }
 
 function isFeatureSettingId(value: string): value is FeatureSettingId {
-	return value === "editor" || value === "statusLine" || value === "copyFriendly";
+	return (
+		value === "editor" ||
+		value === "statusLine" ||
+		value === "copyFriendly" ||
+		value === "viewportIndicators"
+	);
 }
 
 function isFooterSegmentSettingId(value: string): value is FooterSegmentSettingId {
@@ -273,7 +303,7 @@ function parseCompactFooterMaxLines(value: string): CompactFooterMaxLines | unde
 	return value === "unlimited" ? value : (Number(value) as 1 | 2 | 3);
 }
 
-function isLayoutSettingId(value: string): value is LayoutSettingId {
+function isBoundedSettingId(value: string): value is BoundedSettingId {
 	return (
 		value === "responsiveFooter" ||
 		value === "compactFooterMaxLines" ||
@@ -282,7 +312,13 @@ function isLayoutSettingId(value: string): value is LayoutSettingId {
 		value === "pathDisplay" ||
 		value === "pathDepth" ||
 		value === "branchLength" ||
-		value === "iconMode"
+		value === "iconMode" ||
+		value === "editorModelLabel" ||
+		value === "gitCommitOnlyDetached" ||
+		value === "gitCommitShowTag" ||
+		value === "gitMetricsOnlyNonzero" ||
+		value === "gitMetricsIgnoreSubmodules" ||
+		value === "extensionStatusDefaultPlacement"
 	);
 }
 
@@ -322,7 +358,7 @@ function footerSegmentPatch(
 }
 
 function usageText(): string {
-	return 'Usage: /zentui [editor|statusline|copy-friendly] [enable|disable|toggle] or /zentui format "<template>"';
+	return 'Usage: /zentui [editor|statusline|copy-friendly|viewport-indicators] [enable|disable|toggle] or /zentui format "<template>"';
 }
 
 function featureNotification(
@@ -343,13 +379,16 @@ function parseDirectFeatureCommand(
 
 	const words = normalized.split(/\s+/g).filter(Boolean);
 	const hasWord = (value: string) => words.includes(value);
-	const feature = hasWord("editor")
-		? "editor"
-		: hasWord("footer") || hasWord("statusline") || hasWord("status")
-			? "statusLine"
-			: hasWord("copyfriendly") || hasWord("copy")
-				? "copyFriendly"
-				: undefined;
+	const feature =
+		hasWord("viewportindicators") || (hasWord("viewport") && hasWord("indicators"))
+			? "viewportIndicators"
+			: hasWord("editor")
+				? "editor"
+				: hasWord("footer") || hasWord("statusline") || hasWord("status")
+					? "statusLine"
+					: hasWord("copyfriendly") || hasWord("copy")
+						? "copyFriendly"
+						: undefined;
 	const action = hasWord("toggle")
 		? "toggle"
 		: hasWord("enable") || hasWord("enabled") || hasWord("on")
@@ -433,26 +472,49 @@ function buildItems(
 	config: PolishedTuiConfig,
 	activeStatuses: ReadonlyMap<string, string>,
 ): SettingItem[] {
-	if (section === "coloring") {
-		return (Object.keys(colorSettingLabels) as ColorSettingId[]).map((key) => ({
+	if (section === "appearance") {
+		const items = (Object.keys(colorSettingLabels) as ColorSettingId[]).map((key) => ({
 			id: key,
 			label: colorSettingLabels[key],
 			description: colorSettingDescriptions[key],
 			currentValue: key === "starship" ? config.colorSources.starship : editorMessageValue(config),
 			values: colorSourceValues,
 		}));
+		return [
+			...items,
+			{
+				id: "separator",
+				label: "Separator",
+				description: "Choose the separator between default footer segments.",
+				currentValue: config.separator,
+				values: separatorStyleValues,
+			},
+			{
+				id: "iconMode",
+				label: "Icon mode",
+				description: "auto/nerd use Nerd Font glyphs; ascii uses plain fallbacks.",
+				currentValue: config.icons.mode,
+				values: iconModeValues,
+			},
+		];
 	}
 
-	if (section === "features") {
-		const items: SettingItem[] = (Object.keys(featureSettingLabels) as FeatureSettingId[]).map(
-			(key) => ({
-				id: key,
-				label: featureSettingLabels[key],
-				description: featureSettingDescriptions[key],
-				currentValue: featureValue(config.features[key]),
-				values: featureStateValues,
-			}),
-		);
+	if (section === "editor") {
+		const editorFeatures: FeatureSettingId[] = ["editor", "copyFriendly", "viewportIndicators"];
+		const items: SettingItem[] = editorFeatures.map((key) => ({
+			id: key,
+			label: featureSettingLabels[key],
+			description: featureSettingDescriptions[key],
+			currentValue: featureValue(config.features[key]),
+			values: featureStateValues,
+		}));
+		items.splice(1, 0, {
+			id: "editorModelLabel",
+			label: "Editor model label",
+			description: "Show the model id or display name in the editor frame.",
+			currentValue: config.editorModelLabel,
+			values: modelLabelValues,
+		});
 		items.push({
 			id: "fixedEditor",
 			label: "Fixed editor (experimental)",
@@ -481,8 +543,15 @@ function buildItems(
 		return items;
 	}
 
-	if (section === "layout") {
+	if (section === "footer") {
 		return [
+			{
+				id: "statusLine",
+				label: featureSettingLabels.statusLine,
+				description: featureSettingDescriptions.statusLine,
+				currentValue: featureValue(config.features.statusLine),
+				values: featureStateValues,
+			},
 			{
 				id: "responsiveFooter",
 				label: "Responsive footer",
@@ -505,13 +574,6 @@ 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",
@@ -527,6 +589,42 @@ function buildItems(
 				currentValue: String(config.pathDisplay.depth),
 				values: [...pathDepthValues],
 			},
+		];
+	}
+
+	const nonGitSegmentKeys: FooterSegmentSettingId[] = [
+		"cwd",
+		"sessionName",
+		"runtime",
+		"context",
+		"tokens",
+		"cost",
+		"sessionDuration",
+		"username",
+		"time",
+		"os",
+		"packageVersion",
+	];
+	if (section === "segments") {
+		return nonGitSegmentKeys.map((key) => ({
+			id: footerSegmentSettingId(key),
+			label: footerSegmentSettingLabels[key],
+			description: footerSegmentSettingDescriptions[key],
+			currentValue: featureValue(config.footerSegments[key]),
+			values: featureStateValues,
+		}));
+	}
+
+	if (section === "git") {
+		const segmentItem = (key: FooterSegmentSettingId): SettingItem => ({
+			id: footerSegmentSettingId(key),
+			label: footerSegmentSettingLabels[key],
+			description: footerSegmentSettingDescriptions[key],
+			currentValue: featureValue(config.footerSegments[key]),
+			values: featureStateValues,
+		});
+		return [
+			segmentItem("gitBranch"),
 			{
 				id: "branchLength",
 				label: "Branch length",
@@ -534,31 +632,54 @@ function buildItems(
 				currentValue: String(config.gitBranch.maxLength),
 				values: branchLengthValues(config.gitBranch.maxLength),
 			},
+			segmentItem("gitStatus"),
+			segmentItem("gitCounts"),
+			segmentItem("gitCommit"),
 			{
-				id: "iconMode",
-				label: "Icon mode",
-				description: "auto/nerd use Nerd Font glyphs; ascii uses plain fallbacks.",
-				currentValue: config.icons.mode,
-				values: iconModeValues,
+				id: "gitCommitOnlyDetached",
+				label: "Commit only on detached HEAD",
+				description: "Show the commit segment only when HEAD is detached.",
+				currentValue: featureValue(config.gitCommit.onlyDetached),
+				values: featureStateValues,
+			},
+			{
+				id: "gitCommitShowTag",
+				label: "Show exact-match tag",
+				description: "Append an exact-match tag to the commit hash.",
+				currentValue: featureValue(config.gitCommit.showTag),
+				values: featureStateValues,
+			},
+			segmentItem("gitMetrics"),
+			{
+				id: "gitMetricsOnlyNonzero",
+				label: "Hide zero metrics",
+				description: "Hide zero added/deleted components and an all-zero metrics segment.",
+				currentValue: featureValue(config.gitMetrics.onlyNonzero),
+				values: featureStateValues,
+			},
+			{
+				id: "gitMetricsIgnoreSubmodules",
+				label: "Ignore submodules",
+				description: "Exclude submodule changes from Git line metrics.",
+				currentValue: featureValue(config.gitMetrics.ignoreSubmodules),
+				values: featureStateValues,
 			},
 		];
 	}
 
-	if (section === "builtinSegments") {
-		return (Object.keys(footerSegmentSettingLabels) as FooterSegmentSettingId[]).map((key) => ({
-			id: footerSegmentSettingId(key),
-			label: footerSegmentSettingLabels[key],
-			description: footerSegmentSettingDescriptions[key],
-			currentValue: featureValue(config.footerSegments[key]),
-			values: featureStateValues,
-		}));
-	}
-
+	const defaultPlacementItem: SettingItem = {
+		id: "extensionStatusDefaultPlacement",
+		label: "Default placement",
+		description: "Placement used for active statuses without a keyed override.",
+		currentValue: config.extensionStatuses.defaultPlacement,
+		values: extensionStatusPlacementValues,
+	};
 	const statuses = Array.from(activeStatuses.entries()).sort(([a], [b]) =>
 		a < b ? -1 : a > b ? 1 : 0,
 	);
 	if (statuses.length === 0) {
 		return [
+			defaultPlacementItem,
 			{
 				id: "noThirdPartyStatuses",
 				label: "No active statuses",
@@ -568,50 +689,58 @@ function buildItems(
 		];
 	}
 
-	return statuses.flatMap(([key, value]) => {
-		const sanitizedText = sanitizeExtensionStatusText(value);
-		const description = sanitizedText ? `Current status: ${sanitizedText}` : undefined;
-		return [
-			{
-				id: thirdPartyStatusSettingId(key, "placement"),
-				label: `${key} placement`,
-				description,
-				currentValue: getExtensionStatusPlacement(config, key),
-				values: extensionStatusPlacementValues,
-			},
-			{
-				id: thirdPartyStatusSettingId(key, "colorMode"),
-				label: `${key} color`,
-				description,
-				currentValue: getExtensionStatusColorMode(config, key),
-				values: extensionStatusColorModeValues,
-			},
-		];
-	});
+	return [
+		defaultPlacementItem,
+		...statuses.flatMap(([key, value]) => {
+			const sanitizedText = sanitizeExtensionStatusText(value);
+			const description = sanitizedText ? `Current status: ${sanitizedText}` : undefined;
+			return [
+				{
+					id: thirdPartyStatusSettingId(key, "placement"),
+					label: `${key} placement`,
+					description,
+					currentValue: getExtensionStatusPlacement(config, key),
+					values: extensionStatusPlacementValues,
+				},
+				{
+					id: thirdPartyStatusSettingId(key, "colorMode"),
+					label: `${key} color`,
+					description,
+					currentValue: getExtensionStatusColorMode(config, key),
+					values: extensionStatusColorModeValues,
+				},
+			];
+		}),
+	];
 }
 
 function nextSection(section: SettingsSection): SettingsSection {
 	const currentIndex = settingsSections.indexOf(section);
-	return settingsSections[(currentIndex + 1) % settingsSections.length] ?? "coloring";
+	return settingsSections[(currentIndex + 1) % settingsSections.length] ?? "appearance";
 }
 
 function previousSection(section: SettingsSection): SettingsSection {
 	const currentIndex = settingsSections.indexOf(section);
 	return (
 		settingsSections[(currentIndex - 1 + settingsSections.length) % settingsSections.length] ??
-		"coloring"
+		"appearance"
 	);
 }
 
 function formatSectionTabs(
 	activeSection: SettingsSection,
 	theme: ExtensionContext["ui"]["theme"],
+	width: number,
 ): string {
 	const rendered = settingsSections.map((section) => {
 		const label = sectionLabels[section];
 		return section === activeSection ? theme.bold(label) : safeThemeFg(theme, "muted", label);
 	});
-	return `  ${rendered.join(safeThemeFg(theme, "muted", " / "))}`;
+	const full = `  ${rendered.join(safeThemeFg(theme, "muted", " / "))}`;
+	if (visibleWidth(full) <= width) return full;
+
+	const activeIndex = settingsSections.indexOf(activeSection);
+	return `  ${theme.bold(sectionLabels[activeSection])} (${activeIndex + 1}/${settingsSections.length})`;
 }
 
 function withSectionFooter(lines: string[], theme: ExtensionContext["ui"]["theme"]): string[] {
@@ -705,7 +834,7 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 
 			await ctx.ui.custom<void>((tui, theme, _keybindings, done) => {
 				const settingsListTheme = deps.settingsListTheme ?? getSettingsListTheme();
-				let activeSection: SettingsSection = "coloring";
+				let activeSection: SettingsSection = "appearance";
 				const applyFeatureChange = (id: FeatureSettingId, newValue: FeatureState) => {
 					const result = deps.setUiFeatures(featurePatch(id, newValue), ctx);
 					deps.requestRender();
@@ -752,7 +881,17 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 									return;
 								}
 
-								if (isLayoutSettingId(id)) {
+								if (isBoundedSettingId(id)) {
+									if (id === "editorModelLabel" && (newValue === "id" || newValue === "name")) {
+										if (!deps.setEditorModelLabel) return;
+										deps.setEditorModelLabel(newValue, ctx);
+										settingsList.updateValue(id, newValue);
+										deps.requestRender();
+										ctx.ui.notify(`Editor model label: ${newValue}`, "info");
+										tui.requestRender();
+										return;
+									}
+
 									if (id === "responsiveFooter" && isFeatureState(newValue)) {
 										deps.setResponsiveFooter?.({ responsiveFooter: newValue === "enabled" }, ctx);
 										settingsList.updateValue(id, newValue);
@@ -826,6 +965,59 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 										deps.requestRender();
 										ctx.ui.notify(`Icon mode: ${newValue}`, "info");
 										tui.requestRender();
+										return;
+									}
+
+									if (id === "gitCommitOnlyDetached" && isFeatureState(newValue)) {
+										if (!deps.setGitCommit) return;
+										deps.setGitCommit({ onlyDetached: newValue === "enabled" }, ctx);
+										settingsList.updateValue(id, newValue);
+										deps.requestRender();
+										ctx.ui.notify(`Commit only on detached HEAD: ${newValue}`, "info");
+										tui.requestRender();
+										return;
+									}
+
+									if (id === "gitCommitShowTag" && isFeatureState(newValue)) {
+										if (!deps.setGitCommit) return;
+										deps.setGitCommit({ showTag: newValue === "enabled" }, ctx);
+										settingsList.updateValue(id, newValue);
+										deps.requestRender();
+										ctx.ui.notify(`Show exact-match tag: ${newValue}`, "info");
+										tui.requestRender();
+										return;
+									}
+
+									if (id === "gitMetricsOnlyNonzero" && isFeatureState(newValue)) {
+										if (!deps.setGitMetrics) return;
+										deps.setGitMetrics({ onlyNonzero: newValue === "enabled" }, ctx);
+										settingsList.updateValue(id, newValue);
+										deps.requestRender();
+										ctx.ui.notify(`Hide zero metrics: ${newValue}`, "info");
+										tui.requestRender();
+										return;
+									}
+
+									if (id === "gitMetricsIgnoreSubmodules" && isFeatureState(newValue)) {
+										if (!deps.setGitMetrics) return;
+										deps.setGitMetrics({ ignoreSubmodules: newValue === "enabled" }, ctx);
+										settingsList.updateValue(id, newValue);
+										deps.requestRender();
+										ctx.ui.notify(`Ignore submodules: ${newValue}`, "info");
+										tui.requestRender();
+										return;
+									}
+
+									if (
+										id === "extensionStatusDefaultPlacement" &&
+										isExtensionStatusPlacement(newValue)
+									) {
+										if (!deps.setExtensionStatusDefaultPlacement) return;
+										deps.setExtensionStatusDefaultPlacement(newValue);
+										settingsList = makeSettingsList();
+										deps.requestRender();
+										ctx.ui.notify(`Default extension status placement: ${newValue}`, "info");
+										tui.requestRender();
 									}
 									return;
 								}
@@ -925,7 +1117,7 @@ export function registerZentuiSettingsCommand(pi: ExtensionAPI, deps: SettingsCo
 						);
 						return [
 							truncateToWidth(border, width, ""),
-							truncateToWidth(formatSectionTabs(activeSection, theme), width, ""),
+							truncateToWidth(formatSectionTabs(activeSection, theme, width), width, ""),
 							truncateToWidth(border, width, ""),
 							...withSectionFooter(settingsList.render(width), theme).map((line) =>
 								truncateToWidth(line, width, ""),

package/extensions/zentui/ui.ts

@@ -19,11 +19,19 @@ import {
 
 const SPLIT_POLISHED_FRAME: unique symbol = Symbol.for("pi-zentui.polished-frame");
 
+type ViewportCounts = {
+	above?: string;
+	below?: string;
+};
+
 type PolishedFrameSplit = {
 	editorLines: string[];
 	trailingLines: string[];
+	viewport: ViewportCounts;
 };
 
+const POLISHED_FRAME_SPLITS = new WeakMap<string[], PolishedFrameSplit>();
+
 type AutocompleteEditorInternals = {
 	autocompleteList?: Pick<Component, "render">;
 	isShowingAutocomplete?: () => boolean;
@@ -128,30 +136,48 @@ function composeMetadataLine(left: string, right: string | undefined, width: num
 	return `${leftText}${gap}${right}`;
 }
 
+function ansiStrippedText(line: string): string {
+	return line.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "").replace(/\x1b\][^\x07]*(?:\x07|\x1b\\)/g, "");
+}
+
 function plainRenderedText(line: string): string {
-	return line
-		.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "")
-		.replace(/\x1b\][^\x07]*(?:\x07|\x1b\\)/g, "")
-		.replace(/\[\/?[^\]]+\]/g, "");
+	return ansiStrippedText(line).replace(/\[\/?[^\]]+\]/g, "");
+}
+
+function parseEditorBorder(
+	line: string,
+	direction: keyof ViewportCounts,
+): { count?: string } | undefined {
+	const plain = ansiStrippedText(line);
+	if (/^─+$/.test(plain)) return {};
+
+	const arrow = direction === "above" ? "↑" : "↓";
+	const match = new RegExp(`^─── ${arrow} ([1-9]\\d*) more ─*$`).exec(plain);
+	return match?.[1] ? { count: match[1] } : undefined;
 }
 
-function isHorizontalBorder(line: string): boolean {
-	const plain = plainRenderedText(line).trim();
-	return plain.length > 0 && /^─+$/.test(plain);
+function renderEditorBorder(
+	width: number,
+	direction: keyof ViewportCounts,
+	count: string | undefined,
+): string {
+	if (!count) return "─".repeat(width);
+	const arrow = direction === "above" ? "↑" : "↓";
+	const indicator = `─── ${arrow} ${count} more `;
+	return `${indicator}${"─".repeat(Math.max(0, width - visibleWidth(indicator)))}`;
 }
 
 function unwrapPolishedFrameOnly(
 	lines: string[],
 	config: PolishedTuiConfig,
 	uiTheme: Theme,
-): string[] | undefined {
-	if (
-		lines.length < 5 ||
-		!isHorizontalBorder(lines[0] ?? "") ||
-		!isHorizontalBorder(lines.at(-1) ?? "")
-	)
-		return undefined;
+): { editorLines: string[]; viewport: ViewportCounts } | undefined {
+	if (lines.length < 5) return undefined;
+	const top = parseEditorBorder(lines[0] ?? "", "above");
+	const bottom = parseEditorBorder(lines.at(-1) ?? "", "below");
+	if (!top || !bottom) return undefined;
 
+	const viewport = { above: top.count, below: bottom.count };
 	const interior = lines.slice(1, -1);
 	if (interior.length < 3) return undefined;
 
@@ -173,7 +199,7 @@ function unwrapPolishedFrameOnly(
 			if (prefix && !line.startsWith(prefix)) return undefined;
 			unwrapped.push(prefix ? line.slice(prefix.length) : line);
 		}
-		return unwrapped;
+		return { editorLines: unwrapped, viewport };
 	}
 
 	const { rail } = getEditorChromeWidths(config, uiTheme, "\x1b[0m");
@@ -184,7 +210,7 @@ function unwrapPolishedFrameOnly(
 		plainRenderedText(unrailed.at(-2) ?? "").trim() !== ""
 	)
 		return undefined;
-	return unrailed.slice(1, -2);
+	return { editorLines: unrailed.slice(1, -2), viewport };
 }
 
 function splitPolishedFrame(
@@ -192,12 +218,12 @@ function splitPolishedFrame(
 	config: PolishedTuiConfig,
 	uiTheme: Theme,
 ): PolishedFrameSplit | undefined {
-	if (!isHorizontalBorder(lines[0] ?? "")) return undefined;
+	if (!parseEditorBorder(lines[0] ?? "", "above")) return undefined;
 	for (let bottomIndex = lines.length - 1; bottomIndex >= 4; bottomIndex--) {
-		if (!isHorizontalBorder(lines[bottomIndex] ?? "")) continue;
-		const editorLines = unwrapPolishedFrameOnly(lines.slice(0, bottomIndex + 1), config, uiTheme);
-		if (editorLines) {
-			return { editorLines, trailingLines: lines.slice(bottomIndex + 1) };
+		if (!parseEditorBorder(lines[bottomIndex] ?? "", "below")) continue;
+		const frame = unwrapPolishedFrameOnly(lines.slice(0, bottomIndex + 1), config, uiTheme);
+		if (frame) {
+			return { ...frame, trailingLines: lines.slice(bottomIndex + 1) };
 		}
 	}
 	return undefined;
@@ -272,6 +298,12 @@ function renderPolishedFrame({
 	if (editorFrame.length < 2) return clampRenderedLines(baseRendered, width);
 
 	const editorLines = ownedFrame?.editorLines ?? editorFrame.slice(1, -1);
+	const parsedTop = parseEditorBorder(editorFrame[0] ?? "", "above");
+	const parsedBottom = parseEditorBorder(editorFrame.at(-1) ?? "", "below");
+	const viewport = ownedFrame?.viewport ?? {
+		above: parsedTop?.count,
+		below: parsedBottom?.count,
+	};
 	const meta = renderEditorMetadataFormat(
 		config.editorMetadataFormat,
 		{
@@ -293,14 +325,22 @@ function renderPolishedFrame({
 		colorSource,
 		config.colors.editorBorder,
 		EDITOR_BORDER_FALLBACK,
-		"─".repeat(width),
+		renderEditorBorder(
+			width,
+			"above",
+			config.features.viewportIndicators ? viewport.above : undefined,
+		),
 	);
 	const bottom = renderStyleForSourceOrFallback(
 		uiTheme,
 		colorSource,
 		config.colors.editorBorder,
 		EDITOR_BORDER_FALLBACK,
-		"─".repeat(width),
+		renderEditorBorder(
+			width,
+			"below",
+			config.features.viewportIndicators ? viewport.below : undefined,
+		),
 	);
 	const lines = ["", ...editorLines, "", railedMeta];
 	const renderedLines = config.features.copyFriendly
@@ -323,7 +363,13 @@ function renderPolishedFrame({
 				...autocompleteLines,
 			];
 
-	return clampRenderedLines(renderedLines, width);
+	const clamped = clampRenderedLines(renderedLines, width);
+	POLISHED_FRAME_SPLITS.set(clamped, {
+		editorLines,
+		trailingLines: autocompleteLines.length > 0 ? clamped.slice(-autocompleteLines.length) : [],
+		viewport,
+	});
+	return clamped;
 }
 
 export class PolishedEditor extends CustomEditor {
@@ -372,7 +418,9 @@ export class PolishedEditor extends CustomEditor {
 	}
 
 	[SPLIT_POLISHED_FRAME](lines: string[]): PolishedFrameSplit | undefined {
-		return splitPolishedFrame(lines, this.getConfig(), this.uiTheme);
+		return (
+			POLISHED_FRAME_SPLITS.get(lines) ?? splitPolishedFrame(lines, this.getConfig(), this.uiTheme)
+		);
 	}
 }
 
@@ -485,7 +533,9 @@ export class WrappedPolishedEditor implements EditorComponent {
 	}
 
 	[SPLIT_POLISHED_FRAME](lines: string[]): PolishedFrameSplit | undefined {
-		return splitPolishedFrame(lines, this.getConfig(), this.uiTheme);
+		return (
+			POLISHED_FRAME_SPLITS.get(lines) ?? splitPolishedFrame(lines, this.getConfig(), this.uiTheme)
+		);
 	}
 
 	invalidate(): void {

package/package.json

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