@xzzpig/pi-starline 0.5.1 → 0.7.1

package/extensions/starline/config.ts

@@ -25,13 +25,7 @@ import {
 	type ResolvedIcons,
 	resolveConfiguredIcons,
 } from "./icons";
-import {
-	DEFAULT_PILL_CONFIG,
-	type FooterStyle,
-	normalizePillConfig,
-	type PillConfig,
-	parseFooterStyle,
-} from "./pill-config";
+import { DEFAULT_PILL_CONFIG, normalizePillConfig, type PillConfig } from "./pill-config";
 import { isSupportedColorSpec } from "./style";
 
 export type ColorSpec = string;
@@ -43,12 +37,14 @@ export type ContextStyle = "text" | "gauge" | "text+gauge";
 export type ContextFormat = "full" | "percent";
 /** What the tokens segment shows for cache activity. */
 export type TokensCacheFormat = "percent" | "tokens" | "off";
+/** What the subagents segment spells out: `2 agents`, or just the count. */
+export type SubagentsFormat = "agents" | "count";
 
 export type SegmentOptionsConfig = {
 	context: { format: ContextFormat };
 	tokens: { cache: TokensCacheFormat };
+	subagents: { format: SubagentsFormat };
 };
-export type SeparatorStyle = "pipe" | "dot" | "chevron" | "none";
 export type ModelLabelSource = "id" | "name";
 
 export type ContextThresholds = {
@@ -82,26 +78,14 @@ export type UiFeaturesConfig = {
 	copyFriendly: boolean;
 };
 
-export type FooterSegmentsConfig = {
-	model: boolean;
-	thinking: boolean;
-	cwd: boolean;
-	sessionName: boolean;
-	gitBranch: boolean;
-	gitStatus: boolean;
-	gitCounts: boolean;
-	gitCommit: boolean;
-	gitMetrics: boolean;
-	runtime: boolean;
-	context: boolean;
-	tokens: boolean;
-	cacheHit: boolean;
-	cost: boolean;
-	sessionDuration: boolean;
-	username: boolean;
-	time: boolean;
-	os: boolean;
-	packageVersion: boolean;
+export type GitConfig = {
+	/** Glyphs carry their number (`!3`) instead of standing alone (`!`). */
+	counts: boolean;
+	/** Use the origin remote's forge logo as the branch icon. */
+	hostIcon: boolean;
+	branch: GitBranchConfig;
+	commit: GitCommitConfig;
+	metrics: GitMetricsConfig;
 };
 
 export type MouseConfig = {
@@ -154,15 +138,16 @@ export function migrateFixedEditorKeys(raw: Record<string, unknown>): {
 }
 
 /**
- * Where a third-party status is drawn.
- *
- * `editor` is the right-hand side of the editor's metadata row, alongside the
- * vim-mode label and the copy/paste hints — not the footer. It needs Starline's
- * own footer installed to have data at all, because the status map only reaches
- * the extension through the footer factory.
+ * Where in the footer a third-party status is drawn, or `off`. Up to 0.8 there
+ * was also `editor`, the editor's metadata row; see `readExtensionStatusPlacement`.
  */
-export type ExtensionStatusPlacement = "off" | "left" | "middle" | "right" | "editor";
+export type ExtensionStatusPlacement = "off" | "left" | "middle" | "right";
 export type ExtensionStatusColorMode = "themed" | "original";
+/**
+ * How much of a status is drawn: its text as published, or just its number.
+ * "value" is for statuses whose words are redundant once the pill has an icon.
+ */
+export type ExtensionStatusFormat = "full" | "value";
 
 /**
  * Starship `git_commit`-style options.
@@ -193,20 +178,20 @@ export type ExtensionStatusesConfig = {
 	colors: Record<string, ColorSpec>;
 	/** Per-status icon, keyed by status key. Prefixed to the status text. */
 	icons: Record<string, string>;
+	/**
+	 * Per-status text shape, keyed by status key. `"value"` keeps only the number
+	 * (`Tavily: 41.1%` → `41.1%`), so an icon plus that number reads as one pill;
+	 * a status with no number keeps its text. Defaults to the published text.
+	 */
+	formats: Record<string, ExtensionStatusFormat>;
 };
 
 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;
-	/** "text" renders footerFormat as before; "pill" renders pill.segments instead. */
-	footerStyle: FooterStyle;
 	pill: PillConfig;
-	footerFormat: string;
-	editorMetadataFormat: string;
-	separator: SeparatorStyle;
 	contextStyle: ContextStyle;
 	segmentOptions: SegmentOptionsConfig;
 	editorModelLabel: ModelLabelSource;
@@ -215,157 +200,103 @@ export type PolishedTuiConfig = {
 	editorClickCursor: boolean;
 	/** Collapse pastes at this many lines. 11 (default) leaves Pi's threshold alone. */
 	pasteCollapseLines: number;
-	/** Blank rows inside the editor box, above the input and above the metadata row. */
+	/** Blank rows inside the editor box, above and below the input. */
 	editorPaddingY: number;
-	/** Blank rows inside the previous-message box, above and below the body. */
+	/** The input area's height floor: a shorter draft is followed by blank rows. */
+	editorMinRows: number;
+	/** Blank rows above and below a Starline user message. */
 	userMessagePaddingY: number;
 	contextThresholds: ContextThresholds;
 	pathDisplay: PathDisplayConfig;
-	gitBranch: GitBranchConfig;
-	/** Replace the branch icon with the origin remote's forge logo. */
-	gitHostIcon: boolean;
+	git: GitConfig;
 	icons: ResolvedIcons;
 	colors: {
 		model: ColorSpec;
 		/** Unset derives the colour from the level via the theme's thinking* keys. */
 		thinking?: ColorSpec;
+		/** The queued-messages pill, which only exists while something is queued. */
+		queue: ColorSpec;
+		/** The running-subagents pill, which only exists while pi-subagents runs something. */
+		subagents: ColorSpec;
 		cwd: ColorSpec;
 		sessionName: ColorSpec;
 		gitBranch: ColorSpec;
-		gitStatus: ColorSpec;
 		contextNormal: ColorSpec;
 		contextWarning: ColorSpec;
 		contextError: ColorSpec;
-		tokens: ColorSpec;
-		cacheHit: ColorSpec;
 		cost: ColorSpec;
-		separator: ColorSpec;
+		/** Decode throughput of the latest assistant message. */
+		tps: ColorSpec;
 		runtimePrefix: ColorSpec;
 		extensionStatus: ColorSpec;
 		sessionDuration: ColorSpec;
 		packageVersion: ColorSpec;
 		gitCommit: ColorSpec;
 		gitMetricsAdded: ColorSpec;
-		gitMetricsDeleted: ColorSpec;
 		username: ColorSpec;
 		time: ColorSpec;
 		os: ColorSpec;
 		editorAccent?: ColorSpec;
 		editorPrompt?: ColorSpec;
 		editorBorder?: ColorSpec;
-		/** Unset falls back to editorBorder, which is upstream's behaviour. */
 		userMessageBorder?: ColorSpec;
-		/** Unset follows the theme's userMessageText colour. */
 		userMessageText?: ColorSpec;
-		editorModel?: ColorSpec;
-		editorProvider?: ColorSpec;
-		editorThinking?: ColorSpec;
-		editorThinkingMinimal?: ColorSpec;
-		editorThinkingLow?: ColorSpec;
-		editorThinkingMedium?: ColorSpec;
-		editorThinkingHigh?: ColorSpec;
-		editorThinkingXhigh?: ColorSpec;
 	};
 	colorSources: ColorSourcesConfig;
 	features: UiFeaturesConfig;
-	footerSegments: FooterSegmentsConfig;
-	gitCommit: GitCommitConfig;
-	gitMetrics: GitMetricsConfig;
 	extensionStatuses: ExtensionStatusesConfig;
 	mouse: MouseConfig;
 };
 
-/**
- * Canonical footer format variable names. In a `footerFormat` string these
- * are written as `$name` or `${name}`.
- */
-export const FOOTER_FORMAT_VARIABLES = [
-	"model",
-	"thinking",
-	"cwd",
-	"session_name",
-	"git_branch",
-	"git_status",
-	"git_state",
-	"runtime",
-	"session_duration",
-	"username",
-	"os",
-	"time",
-	"context",
-	"tokens",
-	"cache_hit",
-	"cost",
-	"package",
-	"package_version",
-	"git_commit",
-	"git_tag",
-	"git_metrics",
-	"git_added",
-	"git_deleted",
-	"sep",
-] as const;
-
-/**
- * Alias → canonical variable name mapping for `footerFormat`.
- * `$fill` is special (not a variable) and handled by the parser.
- */
-export const FOOTER_FORMAT_ALIASES: Record<string, string> = {
-	directory: "cwd",
-	branch: "git_branch",
-	status: "git_status",
-	state: "git_state",
-	commit: "git_commit",
-	tag: "git_tag",
-	duration: "session_duration",
-	separator: "sep",
-};
-
 export const configPath = join(getAgentDir(), "starline.json");
 
 export const defaultConfig: PolishedTuiConfig = {
 	projectRefreshIntervalMs: DEFAULT_PROJECT_REFRESH_INTERVAL_MS,
-	footerStyle: "text",
 	pill: DEFAULT_PILL_CONFIG,
-	footerFormat: "",
-	editorMetadataFormat: DEFAULT_EDITOR_METADATA_FORMAT,
-	separator: "pipe",
 	contextStyle: "text",
-	segmentOptions: { context: { format: "full" }, tokens: { cache: "percent" } },
+	segmentOptions: {
+		context: { format: "full" },
+		tokens: { cache: "percent" },
+		subagents: { format: "agents" },
+	},
 	editorModelLabel: "id",
 	editorCursor: "block",
 	editorClickCursor: true,
 	pasteCollapseLines: 11,
 	editorPaddingY: 1,
+	editorMinRows: 1,
 	userMessagePaddingY: 1,
 	contextThresholds: { warning: 70, error: 90 },
 	pathDisplay: { mode: "basename", depth: 0 },
-	gitBranch: { maxLength: "full" },
-	gitHostIcon: false,
+	git: {
+		counts: false,
+		hostIcon: false,
+		branch: { maxLength: "full" },
+		commit: { hashLength: 7, onlyDetached: true, showTag: true },
+		metrics: { onlyNonzero: true, ignoreSubmodules: false },
+	},
 	icons: {
 		mode: "auto",
 		...NERD_DEFAULT_ICONS,
 	},
 	colors: {
 		model: "bold blue",
+		queue: "bold yellow",
+		subagents: "bold green",
 		cwd: "bold cyan",
 		sessionName: "bold green",
 		gitBranch: "bold purple",
-		gitStatus: "bold red",
 		contextNormal: "bright-black",
 		contextWarning: "bold yellow",
 		contextError: "bold red",
-		tokens: "bright-black",
-		cacheHit: "bright-black",
 		cost: "bold green",
-		separator: "bright-black",
+		tps: "bright-black",
 		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",
@@ -380,42 +311,13 @@ export const defaultConfig: PolishedTuiConfig = {
 		statusLine: true,
 		copyFriendly: false,
 	},
-	footerSegments: {
-		model: false,
-		thinking: false,
-		cwd: true,
-		sessionName: true,
-		gitBranch: true,
-		gitStatus: true,
-		gitCounts: false,
-		runtime: true,
-		context: true,
-		tokens: true,
-		cacheHit: false,
-		cost: true,
-		sessionDuration: false,
-		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",
 		colors: {},
 		icons: {},
 		placements: {},
 		colorModes: {},
+		formats: {},
 	},
 	mouse: {
 		enabled: true,
@@ -457,14 +359,6 @@ function parseEditorModelLabel(value: unknown): ModelLabelSource {
 	return defaultConfig.editorModelLabel;
 }
 
-export function isSeparatorStyle(value: unknown): value is SeparatorStyle {
-	return value === "pipe" || value === "dot" || value === "chevron" || value === "none";
-}
-
-function parseSeparatorStyle(value: unknown): SeparatorStyle {
-	return isSeparatorStyle(value) ? value : defaultConfig.separator;
-}
-
 function parseContextThresholds(value: unknown): ContextThresholds {
 	const defaults = defaultConfig.contextThresholds;
 	if (!isRecord(value)) return { ...defaults };
@@ -502,14 +396,21 @@ function parsePathDisplay(value: unknown): PathDisplayConfig {
 function normalizeGitBranchMaxLength(value: unknown): GitBranchMaxLength {
 	if (value === "full") return value;
 	if (typeof value === "number" && Number.isInteger(value) && value > 0) return value;
-	return defaultConfig.gitBranch.maxLength;
+	return defaultConfig.git.branch.maxLength;
 }
 
-function parseGitBranchConfig(value: unknown): GitBranchConfig {
-	const defaults = defaultConfig.gitBranch;
-	if (!isRecord(value)) return { ...defaults };
+function parseGitConfig(value: unknown): GitConfig {
+	const defaults = defaultConfig.git;
+	if (!isRecord(value)) return structuredClone(defaults);
+	const branch = isRecord(value.branch) ? value.branch : {};
+	const commit = isRecord(value.commit) ? value.commit : {};
+	const metrics = isRecord(value.metrics) ? value.metrics : {};
 	return {
-		maxLength: normalizeGitBranchMaxLength(value.maxLength),
+		counts: typeof value.counts === "boolean" ? value.counts : defaults.counts,
+		hostIcon: typeof value.hostIcon === "boolean" ? value.hostIcon : defaults.hostIcon,
+		branch: { maxLength: normalizeGitBranchMaxLength(branch.maxLength) },
+		commit: normalizeGitCommitConfig(commit),
+		metrics: normalizeGitMetricsConfig(metrics),
 	};
 }
 
@@ -536,14 +437,6 @@ function booleanValue(record: Record<string, unknown>, key: keyof UiFeaturesConf
 	return typeof value === "boolean" ? value : defaultConfig.features[key];
 }
 
-function footerSegmentValue(
-	record: Record<string, unknown>,
-	key: keyof FooterSegmentsConfig,
-): boolean {
-	const value = record[key];
-	return typeof value === "boolean" ? value : defaultConfig.footerSegments[key];
-}
-
 function definedColors(
 	colors: Partial<Record<keyof PolishedTuiConfig["colors"], string | undefined>>,
 ): Partial<PolishedTuiConfig["colors"]> {
@@ -567,9 +460,8 @@ function normalizeIconOverrides(record: Record<string, unknown>): Partial<IconGl
  * A named colour palette, so a whole scheme can be restated in one place
  * instead of repeating hex values across every segment.
  *
- * Expansion is scoped to colour records only — `footerFormat` and
- * `editorMetadataFormat` use `$name` for their own format variables and must
- * never be touched by it.
+ * Expansion is scoped to colour records only — keys and other strings are
+ * never touched by it.
  */
 export type Palette = Record<string, string>;
 
@@ -630,40 +522,30 @@ function normalizeColors(record: Record<string, unknown>): Partial<PolishedTuiCo
 	return definedColors({
 		model: colorValue(record, "model"),
 		thinking: colorValue(record, "thinking"),
+		queue: colorValue(record, "queue"),
+		subagents: colorValue(record, "subagents"),
 		cwd: colorValue(record, "cwd") ?? colorValue(record, "cwdText"),
 		sessionName: colorValue(record, "sessionName"),
 		gitBranch: colorValue(record, "gitBranch") ?? colorValue(record, "git"),
-		gitStatus: colorValue(record, "gitStatus"),
 		contextNormal: colorValue(record, "contextNormal"),
 		contextWarning: colorValue(record, "contextWarning"),
 		contextError: colorValue(record, "contextError"),
-		tokens: colorValue(record, "tokens"),
-		cacheHit: colorValue(record, "cacheHit"),
 		cost: colorValue(record, "cost"),
-		separator: colorValue(record, "separator"),
+		tps: colorValue(record, "tps"),
 		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"),
-		userMessageBorder: colorValue(record, "userMessageBorder"),
-		userMessageText: colorValue(record, "userMessageText"),
 		editorAccent: colorValue(record, "editorAccent"),
 		editorPrompt: colorValue(record, "editorPrompt"),
 		editorBorder: colorValue(record, "editorBorder"),
-		editorModel: colorValue(record, "editorModel"),
-		editorProvider: colorValue(record, "editorProvider"),
-		editorThinking: colorValue(record, "editorThinking"),
-		editorThinkingMinimal: colorValue(record, "editorThinkingMinimal"),
-		editorThinkingLow: colorValue(record, "editorThinkingLow"),
-		editorThinkingMedium: colorValue(record, "editorThinkingMedium"),
-		editorThinkingHigh: colorValue(record, "editorThinkingHigh"),
-		editorThinkingXhigh: colorValue(record, "editorThinkingXhigh"),
+		userMessageBorder: colorValue(record, "userMessageBorder"),
+		userMessageText: colorValue(record, "userMessageText"),
 	});
 }
 
@@ -697,47 +579,34 @@ function parseBoxPadding(value: unknown, fallback: number): number {
 	return value === 0 || value === 1 ? value : fallback;
 }
 
+const MAX_EDITOR_MIN_ROWS = 10;
+
+function parseEditorMinRows(value: unknown): number {
+	if (typeof value !== "number" || !Number.isInteger(value) || value < 1) {
+		return defaultConfig.editorMinRows;
+	}
+	return Math.min(MAX_EDITOR_MIN_ROWS, value);
+}
+
 function normalizeSegmentOptions(value: unknown): SegmentOptionsConfig {
 	const record = isRecord(value) ? value : {};
 	const context = isRecord(record.context) ? record.context : {};
 	const tokens = isRecord(record.tokens) ? record.tokens : {};
+	const subagents = isRecord(record.subagents) ? record.subagents : {};
 	const cache = tokens.cache;
 	return {
 		context: { format: context.format === "percent" ? "percent" : "full" },
 		tokens: {
 			cache: cache === "tokens" || cache === "off" || cache === "percent" ? cache : "percent",
 		},
-	};
-}
-
-function normalizeFooterSegments(record: Record<string, unknown>): FooterSegmentsConfig {
-	return {
-		model: footerSegmentValue(record, "model"),
-		thinking: footerSegmentValue(record, "thinking"),
-		cwd: footerSegmentValue(record, "cwd"),
-		sessionName: footerSegmentValue(record, "sessionName"),
-		gitBranch: footerSegmentValue(record, "gitBranch"),
-		gitStatus: footerSegmentValue(record, "gitStatus"),
-		gitCounts: footerSegmentValue(record, "gitCounts"),
-		runtime: footerSegmentValue(record, "runtime"),
-		context: footerSegmentValue(record, "context"),
-		tokens: footerSegmentValue(record, "tokens"),
-		cacheHit: footerSegmentValue(record, "cacheHit"),
-		cost: footerSegmentValue(record, "cost"),
-		sessionDuration: footerSegmentValue(record, "sessionDuration"),
-		username: footerSegmentValue(record, "username"),
-		time: footerSegmentValue(record, "time"),
-		os: footerSegmentValue(record, "os"),
-		packageVersion: footerSegmentValue(record, "packageVersion"),
-		gitCommit: footerSegmentValue(record, "gitCommit"),
-		gitMetrics: footerSegmentValue(record, "gitMetrics"),
+		subagents: { format: subagents.format === "count" ? "count" : "agents" },
 	};
 }
 
 /** 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;
+	if (!Number.isFinite(parsed)) return defaultConfig.git.commit.hashLength;
 	const rounded = Math.round(parsed);
 	return Math.min(40, Math.max(4, rounded));
 }
@@ -748,8 +617,9 @@ function normalizeGitCommitConfig(record: Record<string, unknown>): GitCommitCon
 		onlyDetached:
 			typeof record.onlyDetached === "boolean"
 				? record.onlyDetached
-				: defaultConfig.gitCommit.onlyDetached,
-		showTag: typeof record.showTag === "boolean" ? record.showTag : defaultConfig.gitCommit.showTag,
+				: defaultConfig.git.commit.onlyDetached,
+		showTag:
+			typeof record.showTag === "boolean" ? record.showTag : defaultConfig.git.commit.showTag,
 	};
 }
 
@@ -758,22 +628,26 @@ function normalizeGitMetricsConfig(record: Record<string, unknown>): GitMetricsC
 		onlyNonzero:
 			typeof record.onlyNonzero === "boolean"
 				? record.onlyNonzero
-				: defaultConfig.gitMetrics.onlyNonzero,
+				: defaultConfig.git.metrics.onlyNonzero,
 		ignoreSubmodules:
 			typeof record.ignoreSubmodules === "boolean"
 				? record.ignoreSubmodules
-				: defaultConfig.gitMetrics.ignoreSubmodules,
+				: defaultConfig.git.metrics.ignoreSubmodules,
 	};
 }
 
 export function isExtensionStatusPlacement(value: unknown): value is ExtensionStatusPlacement {
-	return (
-		value === "off" ||
-		value === "left" ||
-		value === "middle" ||
-		value === "right" ||
-		value === "editor"
-	);
+	return value === "off" || value === "left" || value === "middle" || value === "right";
+}
+
+/**
+ * A stored placement, read leniently: `editor` named the editor's metadata row,
+ * which 0.9 removed, so those statuses move to the right of the footer rather
+ * than disappearing.
+ */
+function readExtensionStatusPlacement(value: unknown): ExtensionStatusPlacement | undefined {
+	if (value === "editor") return "right";
+	return isExtensionStatusPlacement(value) ? value : undefined;
 }
 
 export function isExtensionStatusColorMode(value: unknown): value is ExtensionStatusColorMode {
@@ -784,15 +658,15 @@ function normalizeExtensionStatuses(
 	record: Record<string, unknown>,
 	palette: Palette = {},
 ): ExtensionStatusesConfig {
-	const defaultPlacement = isExtensionStatusPlacement(record.defaultPlacement)
-		? record.defaultPlacement
-		: defaultConfig.extensionStatuses.defaultPlacement;
+	const defaultPlacement =
+		readExtensionStatusPlacement(record.defaultPlacement) ??
+		defaultConfig.extensionStatuses.defaultPlacement;
 	const placements = isRecord(record.placements)
 		? Object.fromEntries(
-				Object.entries(record.placements).filter(
-					(entry): entry is [string, ExtensionStatusPlacement] =>
-						isExtensionStatusPlacement(entry[1]),
-				),
+				Object.entries(record.placements).flatMap(([key, value]) => {
+					const placement = readExtensionStatusPlacement(value);
+					return placement ? [[key, placement]] : [];
+				}),
 			)
 		: {};
 	const colorModes = isRecord(record.colorModes)
@@ -823,12 +697,22 @@ function normalizeExtensionStatuses(
 			)
 		: {};
 
+	const formats = isRecord(record.formats)
+		? Object.fromEntries(
+				Object.entries(record.formats).filter(
+					(entry): entry is [string, ExtensionStatusFormat] =>
+						entry[1] === "full" || entry[1] === "value",
+				),
+			)
+		: {};
+
 	return {
 		defaultPlacement,
 		placements,
 		colorModes,
 		colors,
 		icons,
+		formats,
 	};
 }
 
@@ -864,27 +748,6 @@ function isUiFeatureKey(value: string): value is keyof UiFeaturesConfig {
 	return value === "editor" || value === "statusLine" || value === "copyFriendly";
 }
 
-function isFooterSegmentKey(value: string): value is keyof FooterSegmentsConfig {
-	return (
-		value === "cwd" ||
-		value === "sessionName" ||
-		value === "gitBranch" ||
-		value === "gitStatus" ||
-		value === "gitCounts" ||
-		value === "runtime" ||
-		value === "context" ||
-		value === "tokens" ||
-		value === "cost" ||
-		value === "sessionDuration" ||
-		value === "username" ||
-		value === "time" ||
-		value === "os" ||
-		value === "packageVersion" ||
-		value === "gitCommit" ||
-		value === "gitMetrics"
-	);
-}
-
 function validColorSourceEntries(record: Record<string, unknown>): Partial<ColorSourcesConfig> {
 	return Object.fromEntries(
 		Object.entries(record).filter((entry): entry is [keyof ColorSourcesConfig, ColorSource] => {
@@ -903,15 +766,6 @@ function validUiFeatureEntries(record: Record<string, unknown>): Partial<UiFeatu
 	) as Partial<UiFeaturesConfig>;
 }
 
-function validFooterSegmentEntries(record: Record<string, unknown>): Partial<FooterSegmentsConfig> {
-	return Object.fromEntries(
-		Object.entries(record).filter((entry): entry is [keyof FooterSegmentsConfig, boolean] => {
-			const [key, value] = entry;
-			return isFooterSegmentKey(key) && typeof value === "boolean";
-		}),
-	) as Partial<FooterSegmentsConfig>;
-}
-
 type ConfigFileState =
 	| { kind: "missing"; record: ConfigRecord; writePath: string }
 	| { kind: "valid"; record: ConfigRecord; writePath: string; mode: number }
@@ -1016,33 +870,16 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 	const features = isRecord(config.features)
 		? normalizeUiFeatures(config.features as Record<string, unknown>)
 		: defaultConfig.features;
-	const footerSegments = isRecord(config.footerSegments)
-		? normalizeFooterSegments(config.footerSegments as Record<string, unknown>)
-		: defaultConfig.footerSegments;
 	const extensionStatuses = isRecord(config.extensionStatuses)
 		? normalizeExtensionStatuses(config.extensionStatuses as Record<string, unknown>, palette)
 		: 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;
-	const gitBranch = parseGitBranchConfig(config.gitBranch);
+	const git = parseGitConfig(config.git);
 	const mouse = isRecord(config.mouse)
 		? normalizeMouseConfig(config.mouse as Record<string, unknown>)
 		: defaultConfig.mouse;
-	const editorMetadataFormat = stringValue(config, "editorMetadataFormat");
 	return {
 		projectRefreshIntervalMs: parseProjectRefreshIntervalMs(config.projectRefreshIntervalMs),
-		footerStyle: parseFooterStyle(config.footerStyle),
 		pill: normalizePillConfig(config.pill),
-		footerFormat: stringValue(config, "footerFormat") ?? "",
-		// An explicit "" means "show nothing", which is how the model/thinking
-		// segments get moved down to the footer without leaving an empty row.
-		// Only a missing or non-string value falls back to the default.
-		editorMetadataFormat: editorMetadataFormat ?? DEFAULT_EDITOR_METADATA_FORMAT,
-		separator: parseSeparatorStyle(config.separator),
 		contextStyle: parseContextStyle(config.contextStyle),
 		segmentOptions: normalizeSegmentOptions(config.segmentOptions),
 		editorModelLabel: parseEditorModelLabel(config.editorModelLabel),
@@ -1050,14 +887,14 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 		editorClickCursor: config.editorClickCursor !== false,
 		pasteCollapseLines: parsePasteCollapseLines(config.pasteCollapseLines),
 		editorPaddingY: parseBoxPadding(config.editorPaddingY, defaultConfig.editorPaddingY),
+		editorMinRows: parseEditorMinRows(config.editorMinRows),
 		userMessagePaddingY: parseBoxPadding(
 			config.userMessagePaddingY,
 			defaultConfig.userMessagePaddingY,
 		),
 		contextThresholds: parseContextThresholds(config.contextThresholds),
 		pathDisplay: parsePathDisplay(config.pathDisplay),
-		gitBranch,
-		gitHostIcon: config.gitHostIcon === true,
+		git,
 		icons: resolveConfiguredIcons(iconMode, iconOverrides),
 		colors: {
 			...defaultConfig.colors,
@@ -1065,15 +902,13 @@ export function mergeConfig(parsed: unknown): PolishedTuiConfig {
 		},
 		colorSources: { ...colorSources },
 		features: { ...features },
-		footerSegments: { ...footerSegments },
-		gitCommit,
-		gitMetrics,
 		extensionStatuses: {
 			defaultPlacement: extensionStatuses.defaultPlacement,
 			placements: { ...extensionStatuses.placements },
 			colorModes: { ...extensionStatuses.colorModes },
 			colors: { ...extensionStatuses.colors },
 			icons: { ...extensionStatuses.icons },
+			formats: { ...extensionStatuses.formats },
 		},
 		mouse,
 	};
@@ -1101,6 +936,14 @@ export function getExtensionStatusIcon(config: PolishedTuiConfig, key: string):
 	return config.extensionStatuses.icons[key] ?? "";
 }
 
+/** Text shape for one status. Unset means the text the extension published. */
+export function getExtensionStatusFormat(
+	config: PolishedTuiConfig,
+	key: string,
+): ExtensionStatusFormat {
+	return config.extensionStatuses.formats[key] ?? "full";
+}
+
 export function getExtensionStatusColorMode(
 	config: PolishedTuiConfig,
 	key: string,
@@ -1108,16 +951,16 @@ export function getExtensionStatusColorMode(
 	return config.extensionStatuses.colorModes[key] ?? DEFAULT_EXTENSION_STATUS_COLOR_MODE;
 }
 
-export function loadConfig(): PolishedTuiConfig {
+export function loadConfig(path = configPath): PolishedTuiConfig {
 	try {
-		if (!existsSync(configPath)) return mergeConfig({});
-		const parsed = JSON.parse(readFileSync(configPath, "utf8"));
+		if (!existsSync(path)) return mergeConfig({});
+		const parsed = JSON.parse(readFileSync(path, "utf8"));
 		if (!isRecord(parsed)) return mergeConfig(parsed);
 
 		const { config, migrated } = migrateFixedEditorKeys(parsed);
 		if (migrated) {
 			try {
-				writeConfigAtomically(configPath, config);
+				writeConfigAtomically(path, config);
 			} catch {
 				// Best effort: still use the migrated config for this run even if
 				// the write-back fails (e.g. read-only filesystem).
@@ -1127,7 +970,13 @@ export function loadConfig(): PolishedTuiConfig {
 			);
 		}
 		return mergeConfig(config);
-	} catch {
+	} catch (error) {
+		// Falling back to defaults is right — a broken config must not block a
+		// session — but silently forgetting every setting is not. `mutateConfig`
+		// refuses loudly on the same file, so say which file was given up on.
+		console.warn(
+			`[starline] Could not read ${path}; using defaults for this session. ${error instanceof Error ? error.message : String(error)}`,
+		);
 		return mergeConfig({});
 	}
 }
@@ -1162,27 +1011,6 @@ export function saveUiFeaturesPatch(
 	});
 }
 
-export function saveFooterSegmentsPatch(
-	patch: Partial<FooterSegmentsConfig>,
-	path = configPath,
-): PolishedTuiConfig {
-	return mutateConfig(path, (record) => {
-		const existing = isRecord(record.footerSegments)
-			? { ...(record.footerSegments as Record<string, unknown>) }
-			: {};
-		record.footerSegments = {
-			...existing,
-			...validFooterSegmentEntries(patch),
-		};
-	});
-}
-
-export function saveFooterFormatPatch(value: string, path = configPath): PolishedTuiConfig {
-	return mutateConfig(path, (record) => {
-		record.footerFormat = typeof value === "string" ? value : "";
-	});
-}
-
 export function saveIconsModePatch(mode: IconMode, path = configPath): PolishedTuiConfig {
 	return mutateConfig(path, (record) => {
 		const existing = isRecord(record.icons) ? { ...(record.icons as Record<string, unknown>) } : {};
@@ -1199,15 +1027,6 @@ export function saveContextStylePatch(style: ContextStyle, path = configPath): P
 	});
 }
 
-export function saveSeparatorPatch(
-	separator: SeparatorStyle,
-	path = configPath,
-): PolishedTuiConfig {
-	return mutateConfig(path, (record) => {
-		record.separator = parseSeparatorStyle(separator);
-	});
-}
-
 export function saveContextThresholdsPatch(
 	thresholds: Partial<ContextThresholds>,
 	path = configPath,
@@ -1237,17 +1056,28 @@ export function savePathDisplayPatch(
 	});
 }
 
+export function savePillSegmentsPatch(
+	segments: readonly string[],
+	path = configPath,
+): PolishedTuiConfig {
+	return mutateConfig(path, (record) => {
+		const existing = isRecord(record.pill) ? { ...(record.pill as Record<string, unknown>) } : {};
+		record.pill = { ...existing, segments: [...segments] };
+	});
+}
+
 export function saveGitBranchPatch(
 	patch: Partial<GitBranchConfig>,
 	path = configPath,
 ): PolishedTuiConfig {
 	return mutateConfig(path, (record) => {
-		const existing = isRecord(record.gitBranch)
-			? { ...(record.gitBranch as Record<string, unknown>) }
+		const existingGit = isRecord(record.git) ? { ...(record.git as Record<string, unknown>) } : {};
+		const existingBranch = isRecord(existingGit.branch)
+			? { ...(existingGit.branch as Record<string, unknown>) }
 			: {};
 		if (patch.maxLength !== undefined)
-			existing.maxLength = normalizeGitBranchMaxLength(patch.maxLength);
-		record.gitBranch = existing;
+			existingBranch.maxLength = normalizeGitBranchMaxLength(patch.maxLength);
+		record.git = { ...existingGit, branch: existingBranch };
 	});
 }