pi-zentui 0.12.0 → 0.13.0

package/README.md

@@ -157,8 +157,10 @@ Default config values — copy this and change any value you want:
 {
 	"projectRefreshIntervalMs": 30000,
 	"footerFormat": "",
+	"editorMetadataFormat": "$model  $provider(  $thinking)",
 	"separator": "pipe",
 	"contextStyle": "text",
+	"editorModelLabel": "id",
 	"contextThresholds": {
 		"warning": 70,
 		"error": 90
@@ -278,6 +280,8 @@ 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. 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.
 - `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`.
@@ -298,6 +302,31 @@ Default config values — copy this and change any value you want:
 
 Tip: when using copy-friendly mode, setting Pi's `editorPaddingX` to `1` in `~/.pi/agent/settings.json` keeps a small left gutter without copying a rail glyph.
 
+## Editor Metadata Format
+
+Set `editorMetadataFormat` in `~/.pi/agent/zentui.json` to customize the left side of the editor metadata row:
+
+```json
+{
+	"editorMetadataFormat": "$model_name ($model_id)( · $provider)( · $thinking)( · $session_name)"
+}
+```
+
+The syntax follows the relevant `footerFormat` conventions: `$variable` and `${variable}` references, literal text and spaces, and conditional groups `( ... )` that disappear when all variables inside are empty. Unknown variables and `$fill` render empty; `$fill` never creates an editor layout zone because the right side remains reserved for structural Vim status.
+
+| Token           | Renders                                                                                       |
+| --------------- | --------------------------------------------------------------------------------------------- |
+| `$model`        | label selected by `editorModelLabel` (`id`, or name with ID fallback)                        |
+| `$model_id`     | active Pi model ID                                                                            |
+| `$model_name`   | active Pi model display name; empty when no name is set                                       |
+| `$provider`     | provider label using Zentui's existing formatting                                             |
+| `$thinking`     | current thinking level; empty when thinking is `off`                                          |
+| `$session_name` | current Pi session name; empty when unnamed                                                    |
+
+Model variables use `editorModel`, provider uses `editorProvider`, and thinking uses the matching `editorThinking*` style. Literal text and `$session_name` use the neutral editor border theme style. The template controls spacing. ANSI/VT sequences, control characters, and line-breaking whitespace are sanitized before rendering without collapsing ordinary spaces.
+
+Missing, non-string, or empty values use the default `$model  $provider(  $thinking)`. A non-empty format that resolves to no visible metadata keeps the normal blank spacer and metadata rows so the editor frame height remains stable. This option is configured only through JSON in its first version; `/zentui format` continues to control the footer only.
+
 ## Footer Format Template
 
 For full control, set a Starship-style `footerFormat` template string. It supports `$variable` and `${variable}` tokens, a special `$fill` token that splits the line into left and right zones, and conditional groups `( ... )` that drop entirely when every nested variable is empty. When set, it overrides the built-in `footerSegments` layout; when empty or omitted, the segment layout above is used.

package/extensions/zentui/config.ts

@@ -32,6 +32,7 @@ export type { IconMode } from "./icons";
 
 export type ContextStyle = "text" | "gauge" | "text+gauge";
 export type SeparatorStyle = "pipe" | "dot" | "chevron" | "none";
+export type ModelLabelSource = "id" | "name";
 
 export type ContextThresholds = {
 	warning: number;
@@ -121,12 +122,15 @@ export type ExtensionStatusesConfig = {
 
 const DEFAULT_PROJECT_REFRESH_INTERVAL_MS = 30_000;
 const MIN_PROJECT_REFRESH_INTERVAL_MS = 5_000;
+export const DEFAULT_EDITOR_METADATA_FORMAT = "$model  $provider(  $thinking)";
 
 export type PolishedTuiConfig = {
 	projectRefreshIntervalMs: number;
 	footerFormat: string;
+	editorMetadataFormat: string;
 	separator: SeparatorStyle;
 	contextStyle: ContextStyle;
+	editorModelLabel: ModelLabelSource;
 	contextThresholds: ContextThresholds;
 	pathDisplay: PathDisplayConfig;
 	gitBranch: GitBranchConfig;
@@ -221,8 +225,10 @@ export const configPath = join(getAgentDir(), "zentui.json");
 export const defaultConfig: PolishedTuiConfig = {
 	projectRefreshIntervalMs: DEFAULT_PROJECT_REFRESH_INTERVAL_MS,
 	footerFormat: "",
+	editorMetadataFormat: DEFAULT_EDITOR_METADATA_FORMAT,
 	separator: "pipe",
 	contextStyle: "text",
+	editorModelLabel: "id",
 	contextThresholds: { warning: 70, error: 90 },
 	pathDisplay: { mode: "basename", depth: 0 },
 	gitBranch: { maxLength: "full" },
@@ -327,6 +333,11 @@ function parseContextStyle(value: unknown): ContextStyle {
 	return defaultConfig.contextStyle;
 }
 
+function parseEditorModelLabel(value: unknown): ModelLabelSource {
+	if (value === "id" || value === "name") return value;
+	return defaultConfig.editorModelLabel;
+}
+
 export function isSeparatorStyle(value: unknown): value is SeparatorStyle {
 	return value === "pipe" || value === "dot" || value === "chevron" || value === "none";
 }
@@ -761,11 +772,17 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 	const fixedEditor = isRecord(config.fixedEditor)
 		? normalizeFixedEditorConfig(config.fixedEditor as Record<string, unknown>)
 		: defaultConfig.fixedEditor;
+	const editorMetadataFormat = stringValue(config, "editorMetadataFormat");
 	return {
 		projectRefreshIntervalMs: parseProjectRefreshIntervalMs(config.projectRefreshIntervalMs),
 		footerFormat: stringValue(config, "footerFormat") ?? "",
+		editorMetadataFormat:
+			editorMetadataFormat && editorMetadataFormat.length > 0
+				? editorMetadataFormat
+				: DEFAULT_EDITOR_METADATA_FORMAT,
 		separator: parseSeparatorStyle(config.separator),
 		contextStyle: parseContextStyle(config.contextStyle),
+		editorModelLabel: parseEditorModelLabel(config.editorModelLabel),
 		contextThresholds: parseContextThresholds(config.contextThresholds),
 		pathDisplay: parsePathDisplay(config.pathDisplay),
 		gitBranch,

package/extensions/zentui/editor-metadata-format.ts

@@ -0,0 +1,259 @@
+import type { Theme } from "@earendil-works/pi-coding-agent";
+import type { PolishedTuiConfig } from "./config";
+import { type FormatToken, parseFooterFormat } from "./footer-format";
+import { EDITOR_ACCENT_FALLBACK, renderStyleForSourceOrFallback, safeThemeFg } from "./style";
+
+export type EditorMetadataValues = {
+	model: string;
+	modelId: string;
+	modelName: string;
+	provider: string;
+	thinking: string;
+	sessionName: string;
+};
+
+type RenderedTokens = {
+	styled: string;
+	hasDynamic: boolean;
+	hasNonEmptyDynamic: boolean;
+};
+
+const ESC = 0x1b;
+const BEL = 0x07;
+const CAN = 0x18;
+const SUB = 0x1a;
+const C1_DCS = 0x90;
+const C1_CSI = 0x9b;
+const C1_ST = 0x9c;
+const C1_OSC = 0x9d;
+const C1_SOS = 0x98;
+const C1_PM = 0x9e;
+const C1_APC = 0x9f;
+
+function consumeCsi(value: string, start: number): number {
+	for (let index = start; index < value.length; index++) {
+		const code = value.charCodeAt(index);
+		if (code === CAN || code === SUB) return index + 1;
+		if (code >= 0x40 && code <= 0x7e) return index + 1;
+	}
+	return value.length;
+}
+
+function consumeControlString(value: string, start: number, allowBel: boolean): number {
+	for (let index = start; index < value.length; index++) {
+		const code = value.charCodeAt(index);
+		if (code === CAN || code === SUB) return index + 1;
+		if (allowBel && code === BEL) return index + 1;
+		if (code === C1_ST) return index + 1;
+		if (code === ESC && value.charCodeAt(index + 1) === 0x5c) return index + 2;
+	}
+	return value.length;
+}
+
+function consumeEscape(value: string, start: number): number {
+	if (start + 1 >= value.length) return value.length;
+	const next = value.charCodeAt(start + 1);
+	if (next === 0x5b) return consumeCsi(value, start + 2);
+	if (next === 0x5d) return consumeControlString(value, start + 2, true);
+	if (next === 0x50 || next === 0x58 || next === 0x5e || next === 0x5f) {
+		return consumeControlString(value, start + 2, false);
+	}
+
+	let index = start + 1;
+	while (index < value.length) {
+		const code = value.charCodeAt(index);
+		if (code >= 0x20 && code <= 0x2f) {
+			index += 1;
+			continue;
+		}
+		return code >= 0x30 && code <= 0x7e ? index + 1 : index;
+	}
+	return value.length;
+}
+
+function isNormalizedWhitespace(code: number): boolean {
+	return (
+		code === 0x09 ||
+		code === 0x0a ||
+		code === 0x0b ||
+		code === 0x0c ||
+		code === 0x0d ||
+		code === 0x85 ||
+		code === 0x2028 ||
+		code === 0x2029
+	);
+}
+
+export function sanitizeEditorMetadataText(value: string): string {
+	let sanitized = "";
+	for (let index = 0; index < value.length; ) {
+		const code = value.charCodeAt(index);
+		if (code === ESC) {
+			index = consumeEscape(value, index);
+			continue;
+		}
+		if (code === C1_CSI) {
+			index = consumeCsi(value, index + 1);
+			continue;
+		}
+		if (code === C1_OSC) {
+			index = consumeControlString(value, index + 1, true);
+			continue;
+		}
+		if (code === C1_DCS || code === C1_SOS || code === C1_PM || code === C1_APC) {
+			index = consumeControlString(value, index + 1, false);
+			continue;
+		}
+		if (isNormalizedWhitespace(code)) {
+			sanitized += " ";
+			do index += 1;
+			while (index < value.length && isNormalizedWhitespace(value.charCodeAt(index)));
+			continue;
+		}
+		if (code < 0x20 || (code >= 0x7f && code <= 0x9f)) {
+			index += 1;
+			continue;
+		}
+		sanitized += value[index];
+		index += 1;
+	}
+	return sanitized;
+}
+
+function editorThinkingStyle(config: PolishedTuiConfig, level: string): string | undefined {
+	switch (level.toLowerCase()) {
+		case "minimal":
+			return config.colors.editorThinkingMinimal ?? config.colors.editorThinking;
+		case "low":
+			return config.colors.editorThinkingLow ?? config.colors.editorThinking;
+		case "medium":
+			return config.colors.editorThinkingMedium ?? config.colors.editorThinking;
+		case "high":
+			return config.colors.editorThinkingHigh ?? config.colors.editorThinking;
+		case "xhigh":
+			return config.colors.editorThinkingXhigh ?? config.colors.editorThinking;
+		default:
+			return config.colors.editorThinking;
+	}
+}
+
+function renderVariable(
+	name: string,
+	values: EditorMetadataValues,
+	uiTheme: Theme,
+	config: PolishedTuiConfig,
+): { plain: string; styled: string } {
+	const colorSource = config.colorSources.editor;
+	const thinking = values.thinking.toLowerCase() === "off" ? "" : values.thinking;
+	const raw =
+		name === "model"
+			? values.model
+			: name === "model_id"
+				? values.modelId
+				: name === "model_name"
+					? values.modelName
+					: name === "provider"
+						? values.provider
+						: name === "thinking"
+							? thinking
+							: name === "session_name"
+								? values.sessionName
+								: "";
+	const plain = sanitizeEditorMetadataText(raw);
+	if (!plain) return { plain: "", styled: "" };
+
+	if (name === "model" || name === "model_id" || name === "model_name") {
+		return {
+			plain,
+			styled: renderStyleForSourceOrFallback(
+				uiTheme,
+				colorSource,
+				config.colors.editorModel,
+				EDITOR_ACCENT_FALLBACK,
+				plain,
+			),
+		};
+	}
+	if (name === "provider") {
+		return {
+			plain,
+			styled: renderStyleForSourceOrFallback(
+				uiTheme,
+				colorSource,
+				config.colors.editorProvider,
+				"text",
+				plain,
+			),
+		};
+	}
+	if (name === "thinking") {
+		return {
+			plain,
+			styled: renderStyleForSourceOrFallback(
+				uiTheme,
+				colorSource,
+				editorThinkingStyle(config, plain),
+				"muted",
+				plain,
+			),
+		};
+	}
+	if (name === "session_name") {
+		return { plain, styled: safeThemeFg(uiTheme, "border", plain) };
+	}
+	return { plain: "", styled: "" };
+}
+
+function renderTokens(
+	tokens: FormatToken[],
+	values: EditorMetadataValues,
+	uiTheme: Theme,
+	config: PolishedTuiConfig,
+): RenderedTokens {
+	let styled = "";
+	let hasDynamic = false;
+	let hasNonEmptyDynamic = false;
+
+	for (const token of tokens) {
+		if (token.kind === "text") {
+			const plain = sanitizeEditorMetadataText(token.value);
+			if (plain) styled += safeThemeFg(uiTheme, "border", plain);
+			continue;
+		}
+		if (token.kind === "fill") {
+			hasDynamic = true;
+			continue;
+		}
+		if (token.kind === "var") {
+			hasDynamic = true;
+			const rendered = renderVariable(token.name, values, uiTheme, config);
+			styled += rendered.styled;
+			if (rendered.plain) hasNonEmptyDynamic = true;
+			continue;
+		}
+
+		const rendered = renderTokens(token.tokens, values, uiTheme, config);
+		const visible = !rendered.hasDynamic || rendered.hasNonEmptyDynamic;
+		hasDynamic = true;
+		if (visible) {
+			styled += rendered.styled;
+			hasNonEmptyDynamic = true;
+		}
+	}
+
+	return { styled, hasDynamic, hasNonEmptyDynamic };
+}
+
+export function renderEditorMetadataFormat(
+	format: string,
+	values: EditorMetadataValues,
+	uiTheme: Theme,
+	config: PolishedTuiConfig,
+): string {
+	return renderTokens(
+		parseFooterFormat(sanitizeEditorMetadataText(format)),
+		values,
+		uiTheme,
+		config,
+	).styled;
+}

package/extensions/zentui/index.ts

@@ -120,7 +120,7 @@ export default function (pi: ExtensionAPI) {
 	const getThinkingLevel = () =>
 		sessionLifecycle.isCurrent() ? pi.getThinkingLevel() : ("off" as const);
 	const syncFooterState = (ctx: ExtensionContext) =>
-		syncState(state, ctx, currentConfig.icons.cacheHit);
+		syncState(state, ctx, currentConfig.icons.cacheHit, currentConfig.editorModelLabel);
 
 	type ProjectRefreshTarget = { cwd: string; generation: number };
 	const refreshProjectState = async ({ cwd, generation }: ProjectRefreshTarget) => {
@@ -244,7 +244,10 @@ export default function (pi: ExtensionAPI) {
 				getCurrentConfig,
 				() => ({
 					modelLabel: state.modelLabel,
+					modelId: state.modelId,
+					modelName: state.modelName,
 					providerLabel: state.providerLabel,
+					sessionName: ctx.sessionManager.getSessionName() ?? "",
 				}),
 				getThinkingLevel,
 			)) as ZentuiEditorFactory;
@@ -264,7 +267,10 @@ export default function (pi: ExtensionAPI) {
 				getCurrentConfig,
 				() => ({
 					modelLabel: state.modelLabel,
+					modelId: state.modelId,
+					modelName: state.modelName,
 					providerLabel: state.providerLabel,
+					sessionName: ctx.sessionManager.getSessionName() ?? "",
 				}),
 				getThinkingLevel,
 			)) as ZentuiEditorFactory;

package/extensions/zentui/state.ts

@@ -1,4 +1,5 @@
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { ModelLabelSource } from "./config";
 import {
 	buildContextLabel,
 	buildCostLabel,
@@ -12,6 +13,8 @@ import type { RuntimeInfo } from "./runtime";
 
 export type FooterState = GitStatusSummary & {
 	modelLabel: string;
+	modelId: string;
+	modelName: string;
 	providerLabel: string;
 	contextLabel: string;
 	tokenLabel: string;
@@ -24,6 +27,8 @@ export type FooterState = GitStatusSummary & {
 export function createInitialState(gitDefaults: GitStatusSummary): FooterState {
 	return {
 		modelLabel: "no-model",
+		modelId: "",
+		modelName: "",
 		providerLabel: "Unknown",
 		contextLabel: "--",
 		tokenLabel: "↑0 ↓0",
@@ -35,9 +40,17 @@ export function createInitialState(gitDefaults: GitStatusSummary): FooterState {
 	};
 }
 
-export function syncState(state: FooterState, ctx: ExtensionContext, cacheHitIcon: string): void {
+export function syncState(
+	state: FooterState,
+	ctx: ExtensionContext,
+	cacheHitIcon: string,
+	modelLabelSource: ModelLabelSource,
+): void {
 	const totals = getUsageTotals(ctx);
-	state.modelLabel = ctx.model?.id ?? "no-model";
+	const m = ctx.model;
+	state.modelId = m?.id ?? "";
+	state.modelName = m?.name ?? "";
+	state.modelLabel = (modelLabelSource === "name" ? m?.name || m?.id : m?.id) ?? "no-model";
 	state.providerLabel = formatProviderLabel(ctx.model?.provider);
 	state.contextLabel = buildContextLabel(ctx);
 	state.tokenLabel = buildTokenLabel(totals, cacheHitIcon);

package/extensions/zentui/ui.ts

@@ -9,6 +9,7 @@ import {
 	visibleWidth,
 } from "@earendil-works/pi-tui";
 import type { PolishedTuiConfig } from "./config";
+import { renderEditorMetadataFormat } from "./editor-metadata-format";
 import {
 	EDITOR_ACCENT_FALLBACK,
 	EDITOR_BORDER_FALLBACK,
@@ -16,6 +17,13 @@ import {
 	safeThemeFg,
 } from "./style";
 
+const SPLIT_POLISHED_FRAME: unique symbol = Symbol.for("pi-zentui.polished-frame");
+
+type PolishedFrameSplit = {
+	editorLines: string[];
+	trailingLines: string[];
+};
+
 type AutocompleteEditorInternals = {
 	autocompleteList?: Pick<Component, "render">;
 	isShowingAutocomplete?: () => boolean;
@@ -42,11 +50,15 @@ type WrappedEditor = EditorComponent &
 		setAutocompleteProvider?: (provider: AutocompleteProvider) => void;
 		setPaddingX?: (padding: number) => void;
 		setAutocompleteMaxVisible?: (maxVisible: number) => void;
+		[SPLIT_POLISHED_FRAME]?: (lines: string[]) => PolishedFrameSplit | undefined;
 	};
 
 type EditorMeta = {
 	modelLabel: string;
+	modelId?: string;
+	modelName?: string;
 	providerLabel: string;
+	sessionName?: string;
 };
 
 type PolishedFrameOptions = {
@@ -56,9 +68,9 @@ type PolishedFrameOptions = {
 	uiTheme: Theme;
 	config: PolishedTuiConfig;
 	modelMeta: EditorMeta;
-	previousModelMeta?: EditorMeta;
 	thinkingLevel: string | undefined;
 	rightStatus?: string;
+	splitBaseFrame?: (lines: string[]) => PolishedFrameSplit | undefined;
 };
 
 function clampRenderedLines(lines: string[], width: number): string[] {
@@ -72,23 +84,6 @@ function fillLine(content: string, width: number): string {
 	return `${truncated}${pad}`;
 }
 
-function editorThinkingStyle(config: PolishedTuiConfig, level: string): string | undefined {
-	switch (level.toLowerCase()) {
-		case "minimal":
-			return config.colors.editorThinkingMinimal ?? config.colors.editorThinking;
-		case "low":
-			return config.colors.editorThinkingLow ?? config.colors.editorThinking;
-		case "medium":
-			return config.colors.editorThinkingMedium ?? config.colors.editorThinking;
-		case "high":
-			return config.colors.editorThinkingHigh ?? config.colors.editorThinking;
-		case "xhigh":
-			return config.colors.editorThinkingXhigh ?? config.colors.editorThinking;
-		default:
-			return config.colors.editorThinking;
-	}
-}
-
 function copyFriendlyPrompt(config: PolishedTuiConfig, uiTheme: Theme, reset: string): string {
 	const promptIcon = config.icons.editorPrompt;
 	return promptIcon
@@ -137,7 +132,7 @@ function plainRenderedText(line: string): string {
 	return line
 		.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, "")
 		.replace(/\x1b\][^\x07]*(?:\x07|\x1b\\)/g, "")
-		.replace(/\[[/?][^\]]+\]/g, "");
+		.replace(/\[\/?[^\]]+\]/g, "");
 }
 
 function isHorizontalBorder(line: string): boolean {
@@ -145,70 +140,67 @@ function isHorizontalBorder(line: string): boolean {
 	return plain.length > 0 && /^─+$/.test(plain);
 }
 
-function isRenderedModelMetaLine(line: string, modelMeta: EditorMeta): boolean {
-	const plain = plainRenderedText(line);
-	return plain.includes(modelMeta.modelLabel) && plain.includes(modelMeta.providerLabel);
-}
-
-function matchesAnyModelMeta(
-	line: string,
-	modelMeta: EditorMeta,
-	previousMeta?: EditorMeta,
-): boolean {
-	if (isRenderedModelMetaLine(line, modelMeta)) return true;
-	if (previousMeta && isRenderedModelMetaLine(line, previousMeta)) return true;
-	return false;
-}
-
-function hasRenderedModelMetaLine(
-	lines: string[],
-	modelMeta: EditorMeta,
-	previousMeta?: EditorMeta,
-): boolean {
-	return lines.some((line) => matchesAnyModelMeta(line, modelMeta, previousMeta));
-}
-
-function isAlreadyPolishedFrame(
+function unwrapPolishedFrameOnly(
 	lines: string[],
-	modelMeta: EditorMeta,
-	previousMeta?: EditorMeta,
-): boolean {
-	return (
-		lines.length >= 3 &&
-		isHorizontalBorder(lines[0] ?? "") &&
-		isHorizontalBorder(lines.at(-1) ?? "") &&
-		hasRenderedModelMetaLine(lines.slice(1, -1), modelMeta, previousMeta)
-	);
+	config: PolishedTuiConfig,
+	uiTheme: Theme,
+): string[] | undefined {
+	if (
+		lines.length < 5 ||
+		!isHorizontalBorder(lines[0] ?? "") ||
+		!isHorizontalBorder(lines.at(-1) ?? "")
+	)
+		return undefined;
+
+	const interior = lines.slice(1, -1);
+	if (interior.length < 3) return undefined;
+
+	if (config.features.copyFriendly) {
+		if (
+			plainRenderedText(interior[0] ?? "").trim() !== "" ||
+			plainRenderedText(interior.at(-2) ?? "").trim() !== "" ||
+			!(interior.at(-1) ?? "").startsWith(" ")
+		)
+			return undefined;
+
+		const { prompt, promptWidth } = getEditorChromeWidths(config, uiTheme, "\x1b[0m");
+		const continuation = " ".repeat(promptWidth);
+		const content = interior.slice(1, -2);
+		const unwrapped: string[] = [];
+		for (let index = 0; index < content.length; index++) {
+			const prefix = index === 0 ? prompt : continuation;
+			const line = content[index] ?? "";
+			if (prefix && !line.startsWith(prefix)) return undefined;
+			unwrapped.push(prefix ? line.slice(prefix.length) : line);
+		}
+		return unwrapped;
+	}
+
+	const { rail } = getEditorChromeWidths(config, uiTheme, "\x1b[0m");
+	if (!rail || interior.some((line) => !line.startsWith(rail))) return undefined;
+	const unrailed = interior.map((line) => line.slice(rail.length));
+	if (
+		plainRenderedText(unrailed[0] ?? "").trim() !== "" ||
+		plainRenderedText(unrailed.at(-2) ?? "").trim() !== ""
+	)
+		return undefined;
+	return unrailed.slice(1, -2);
 }
 
-function removeRenderedModelMetaLines(
+function splitPolishedFrame(
 	lines: string[],
-	modelMeta: EditorMeta,
-	previousMeta?: EditorMeta,
-): string[] {
-	const result: string[] = [];
-	for (let index = 0; index < lines.length; index++) {
-		const line = lines[index] ?? "";
-		if (matchesAnyModelMeta(line, modelMeta, previousMeta)) continue;
-
-		const plain = plainRenderedText(line).trim();
-		const previousWasMeta =
-			index > 0 && matchesAnyModelMeta(lines[index - 1] ?? "", modelMeta, previousMeta);
-		const nextIsMeta =
-			index < lines.length - 1 &&
-			matchesAnyModelMeta(lines[index + 1] ?? "", modelMeta, previousMeta);
-		if (!plain && (previousWasMeta || nextIsMeta)) continue;
-
-		result.push(line);
-	}
-	return result;
-}
-
-function removeStalePolishedLeadingSpacer(lines: string[], shouldRemove: boolean): string[] {
-	if (!shouldRemove || lines.length === 0) return lines;
-	const firstLine = lines[0] ?? "";
-	if (plainRenderedText(firstLine).trim()) return lines;
-	return lines.slice(1);
+	config: PolishedTuiConfig,
+	uiTheme: Theme,
+): PolishedFrameSplit | undefined {
+	if (!isHorizontalBorder(lines[0] ?? "")) 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) };
+		}
+	}
+	return undefined;
 }
 
 function vimModeColor(mode: string): string {
@@ -244,9 +236,9 @@ function renderPolishedFrame({
 	uiTheme,
 	config,
 	modelMeta,
-	previousModelMeta,
 	thinkingLevel,
 	rightStatus,
+	splitBaseFrame,
 }: PolishedFrameOptions): string[] {
 	if (width <= 2) return clampRenderedLines(baseRendered, width);
 
@@ -262,56 +254,37 @@ function renderPolishedFrame({
 
 	if (baseRendered.length < 2) return clampRenderedLines(baseRendered, width);
 
+	const ownedFrame = splitBaseFrame?.(baseRendered);
 	const { autocompleteList } = autocompleteSource;
 	const autocompleteCount =
-		isShowingAutocomplete && typeof autocompleteList?.render === "function"
+		!ownedFrame && isShowingAutocomplete && typeof autocompleteList?.render === "function"
 			? autocompleteList.render(innerWidth).length
 			: 0;
 	const editorFrame =
-		autocompleteCount > 0 && autocompleteCount < baseRendered.length
+		!ownedFrame && autocompleteCount > 0 && autocompleteCount < baseRendered.length
 			? baseRendered.slice(0, -autocompleteCount)
 			: baseRendered;
-	const autocompleteLines =
-		autocompleteCount > 0 && autocompleteCount < baseRendered.length
+	const autocompleteLines = ownedFrame
+		? ownedFrame.trailingLines
+		: autocompleteCount > 0 && autocompleteCount < baseRendered.length
 			? baseRendered.slice(-autocompleteCount)
 			: [];
 	if (editorFrame.length < 2) return clampRenderedLines(baseRendered, width);
 
-	const stalePolishedFrame = isAlreadyPolishedFrame(editorFrame, modelMeta, previousModelMeta);
-	const editorLines = removeStalePolishedLeadingSpacer(
-		removeRenderedModelMetaLines(editorFrame.slice(1, -1), modelMeta, previousModelMeta),
-		stalePolishedFrame,
-	);
-	const model = renderStyleForSourceOrFallback(
+	const editorLines = ownedFrame?.editorLines ?? editorFrame.slice(1, -1);
+	const meta = renderEditorMetadataFormat(
+		config.editorMetadataFormat,
+		{
+			model: modelMeta.modelLabel,
+			modelId: modelMeta.modelId ?? "",
+			modelName: modelMeta.modelName ?? "",
+			provider: modelMeta.providerLabel,
+			thinking: thinkingLevel ?? "",
+			sessionName: modelMeta.sessionName ?? "",
+		},
 		uiTheme,
-		colorSource,
-		config.colors.editorModel,
-		EDITOR_ACCENT_FALLBACK,
-		modelMeta.modelLabel,
-	);
-	const provider = renderStyleForSourceOrFallback(
-		uiTheme,
-		colorSource,
-		config.colors.editorProvider,
-		"text",
-		modelMeta.providerLabel,
+		config,
 	);
-	const renderedModelMeta = [model, provider]
-		.filter(Boolean)
-		.join(safeThemeFg(uiTheme, "borderMuted", "  "));
-	const metaParts = [renderedModelMeta];
-	if (thinkingLevel && thinkingLevel !== "off") {
-		metaParts.push(
-			renderStyleForSourceOrFallback(
-				uiTheme,
-				colorSource,
-				editorThinkingStyle(config, thinkingLevel),
-				"muted",
-				thinkingLevel,
-			),
-		);
-	}
-	const meta = metaParts.filter(Boolean).join(safeThemeFg(uiTheme, "border", "  "));
 	const copyFriendlyMeta = composeMetadataLine(meta, rightStatus, Math.max(0, width - 1));
 	const railedMeta = composeMetadataLine(meta, rightStatus, innerWidth);
 
@@ -358,7 +331,6 @@ export class PolishedEditor extends CustomEditor {
 	private readonly getThinkingLevel: () => string | undefined;
 	private readonly getConfig: () => PolishedTuiConfig;
 	private readonly uiTheme: Theme;
-	private previousModelMeta?: EditorMeta;
 
 	constructor(
 		tui: TUI,
@@ -394,17 +366,17 @@ export class PolishedEditor extends CustomEditor {
 			uiTheme: this.uiTheme,
 			config,
 			modelMeta,
-			previousModelMeta: this.previousModelMeta,
 			thinkingLevel: this.getThinkingLevel(),
 		});
-		this.previousModelMeta = modelMeta;
 		return result;
 	}
+
+	[SPLIT_POLISHED_FRAME](lines: string[]): PolishedFrameSplit | undefined {
+		return splitPolishedFrame(lines, this.getConfig(), this.uiTheme);
+	}
 }
 
 export class WrappedPolishedEditor implements EditorComponent {
-	private previousModelMeta?: EditorMeta;
-
 	constructor(
 		private readonly base: WrappedEditor,
 		private readonly uiTheme: Theme,
@@ -499,19 +471,21 @@ export class WrappedPolishedEditor implements EditorComponent {
 		const rendered = this.base.render(innerWidth);
 		const vimStatus = readVimStatus(this.base, this.uiTheme);
 		const modelMeta = this.getModelMeta();
-		const result = renderPolishedFrame({
+		return renderPolishedFrame({
 			width,
 			baseRendered: rendered,
 			autocompleteSource: this.base,
 			uiTheme: this.uiTheme,
 			config,
 			modelMeta,
-			previousModelMeta: this.previousModelMeta,
 			thinkingLevel: this.getThinkingLevel(),
 			rightStatus: vimStatus,
+			splitBaseFrame: this.base[SPLIT_POLISHED_FRAME]?.bind(this.base),
 		});
-		this.previousModelMeta = modelMeta;
-		return result;
+	}
+
+	[SPLIT_POLISHED_FRAME](lines: string[]): PolishedFrameSplit | undefined {
+		return splitPolishedFrame(lines, this.getConfig(), this.uiTheme);
 	}
 
 	invalidate(): void {

package/package.json

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