@gajae-code/coding-agent 0.15.6 → 0.16.1

package/src/modes/components/footer.ts

@@ -9,6 +9,7 @@ import * as git from "../../utils/git";
 import { sanitizeStatusText } from "../shared";
 import { getContextUsageLevel, getContextUsageThemeColor } from "./status-line/context-thresholds";
 import { resolveCurrentBranch } from "./status-line/git-utils";
+import { shortenModelId } from "./status-line/model-name";
 
 /**
  * Footer component that shows pwd, token stats, and context usage
@@ -191,8 +192,9 @@ export class FooterComponent implements Component {
 
 		let statsLeft = statsParts.join(" ");
 
-		// Add model name on the right side, plus thinking level if model supports it
-		const modelName = state.model?.id || "no-model";
+		// Add model name on the right side, plus thinking level if model supports it.
+		// Same shortest-recognizable form the status rail renders.
+		const modelName = shortenModelId(state.model?.id ?? state.model?.name);
 
 		// Add thinking level hint when the current model advertises supported efforts
 		let rightSide = modelName;

package/src/modes/components/frictionless-onboarding-selector.ts

@@ -1,9 +1,55 @@
-import { Container, matchesKey, Spacer, TruncatedText } from "@gajae-code/tui";
+import { Container, matchesKey, type SelectItem, SelectList, Spacer, TruncatedText } from "@gajae-code/tui";
 import type { OnboardingProfile } from "../../setup/frictionless-onboarding";
-import { theme } from "../theme/theme";
+import { getSelectListTheme, theme } from "../theme/theme";
+import { UI_LANGUAGES, type UiLanguage } from "../ui-language";
 import { matchesSelectCancel } from "../utils/keybinding-matchers";
 import { DynamicBorder } from "./dynamic-border";
 
+export const UI_LANGUAGE_CHOICES: readonly { value: UiLanguage; label: string }[] = [
+	{ value: "en", label: "English" },
+	{ value: "ko", label: "한국어" },
+	{ value: "zh", label: "简体中文" },
+	{ value: "ja", label: "日本語" },
+];
+
+export class InterfaceLanguageSelectorComponent extends Container {
+	readonly #selectList: SelectList;
+
+	constructor(onSelect: (language: UiLanguage) => void, onCancel: () => void) {
+		super();
+		this.addChild(new DynamicBorder());
+		this.addChild(new Spacer(1));
+		this.addChild(
+			new TruncatedText(
+				theme.bold(
+					"Choose your interface language / 언어를 선택하세요 / 选择界面语言 / インターフェース言語を選択",
+				),
+			),
+		);
+		this.addChild(new Spacer(1));
+		const items: SelectItem[] = UI_LANGUAGE_CHOICES.map(choice => ({ value: choice.value, label: choice.label }));
+		this.#selectList = new SelectList(items, items.length, getSelectListTheme());
+		this.#selectList.onSelect = item => {
+			if (UI_LANGUAGES.includes(item.value as UiLanguage)) onSelect(item.value as UiLanguage);
+		};
+		this.#selectList.onCancel = onCancel;
+		this.addChild(this.#selectList);
+		this.addChild(new Spacer(1));
+		this.addChild(new TruncatedText(theme.fg("dim", "↑/↓ select · Enter choose · Esc use English")));
+		this.addChild(new DynamicBorder());
+	}
+
+	handleInput(keyData: string): void {
+		// The app.exit action is owned by the parent editor and is not a TUI
+		// selector key id. Ctrl-D is its default byte when the editor is empty.
+		if (keyData === "\x04") {
+			this.#selectList.onCancel?.();
+			return;
+		}
+		this.#selectList.handleInput(keyData);
+	}
+}
+
 export type FrictionlessOnboardingAction =
 	| "analyze"
 	| "apply"

package/src/modes/components/model-selector.ts

@@ -22,6 +22,7 @@ import {
 	normalizeTierMap,
 	validateAutoroutingSetup,
 } from "../../config/autorouting-contract";
+import type { BillingPath } from "../../config/billing-path";
 import {
 	getProxyRoutableProviders,
 	inspectProxyProviderId,
@@ -30,7 +31,6 @@ import {
 	rewriteSelectorForProxy,
 	tryResolveProxyProviderId,
 } from "../../config/model-profile-activation";
-
 import { isModelProfileProviderAvailable } from "../../config/model-profile-contract";
 import {
 	deriveModelProfileMappedProviders,
@@ -429,6 +429,9 @@ export class ModelSelectorComponent extends Container {
 	#imageRoleFilter: boolean = false;
 	#smartRoutingPanel?: SmartRoutingPanelComponent;
 	#smartRoutingPreviewBuilder?: (draft: AutoroutingSetup) => SmartRoutingPreview;
+	#isBillingDismissed?: (key: string) => boolean;
+	#markBillingDismissed?: (key: string) => void;
+	#pendingBillingNoticeKey?: string;
 
 	// Tab state
 	#providers: ProviderTabState[] = STATIC_PROVIDER_TABS;
@@ -455,6 +458,10 @@ export class ModelSelectorComponent extends Container {
 			smartRoutingPreview?: (draft: AutoroutingSetup) => SmartRoutingPreview;
 			/** Open the smart-routing panel directly instead of the preset landing. */
 			smartRoutingOnly?: boolean;
+			/** Test seam: synchronous persisted-dismissal check to avoid async render churn. */
+			isBillingDismissed?: (key: string) => boolean;
+			/** Test seam: record that a billing notice was shown/dismissed. */
+			markBillingDismissed?: (key: string) => void;
 		},
 	) {
 		super();
@@ -468,6 +475,8 @@ export class ModelSelectorComponent extends Container {
 		this.#temporaryOnly = options?.temporaryOnly ?? false;
 		this.#authSessionId = options?.sessionId;
 		this.#smartRoutingPreviewBuilder = options?.smartRoutingPreview;
+		this.#isBillingDismissed = (options as any)?.isBillingDismissed;
+		this.#markBillingDismissed = (options as any)?.markBillingDismissed;
 		this.#currentModel = _currentModel;
 		this.#currentThinkingLevel = options?.currentThinkingLevel;
 		this.#activeModelProfile = options?.activeModelProfile;
@@ -1497,6 +1506,25 @@ export class ModelSelectorComponent extends Container {
 		const availableModels = this.#getProfileAvailableModels();
 		const resolutionRegistry = this.#createProfileResolutionRegistry(availableModels);
 		const providers = new Set<string>();
+		// Preset groups share selectors heavily (role assignments repeat across
+		// profiles), and each `resolveModelRoleValue` call scans the candidate set
+		// while validating lookup contexts and resolving aliases. Resolve identical
+		// selectors once per refresh; the inputs are shared and only the provider is
+		// needed here. This map is deliberately local to the synchronous, pre-await
+		// snapshot below: catalog/config changes and credential-generation changes
+		// start a new refresh with a new map.
+		const resolvedProviderBySelector = new Map<string, string | undefined>();
+		const resolveSelectorProvider = (selector: string): string | undefined => {
+			if (resolvedProviderBySelector.has(selector)) return resolvedProviderBySelector.get(selector);
+			const provider = resolveModelRoleValue(selector, availableModels, {
+				settings: this.#settings,
+				modelRegistry: this.#modelRegistry,
+				aliasIntent: "preset-equivalent",
+				credentialSessionId: this.#authSessionId,
+			}).model?.provider;
+			resolvedProviderBySelector.set(selector, provider);
+			return provider;
+		};
 		for (const profiles of this.#getPresetGroups().values()) {
 			for (const profile of profiles) {
 				for (const provider of profileRequiredProviders(profile)) providers.add(provider);
@@ -1516,13 +1544,8 @@ export class ModelSelectorComponent extends Container {
 				];
 				for (const value of values) {
 					for (const selector of normalizeModelSelectorValue(value)) {
-						const resolved = resolveModelRoleValue(selector, availableModels, {
-							settings: this.#settings,
-							modelRegistry: this.#modelRegistry,
-							aliasIntent: "preset-equivalent",
-							credentialSessionId: this.#authSessionId,
-						}).model;
-						if (resolved) providers.add(resolved.provider);
+						const resolvedProvider = resolveSelectorProvider(selector);
+						if (resolvedProvider !== undefined) providers.add(resolvedProvider);
 					}
 				}
 			}
@@ -1705,12 +1728,24 @@ export class ModelSelectorComponent extends Container {
 		return lines;
 	}
 
+	#billingPathForModel(model: Model): BillingPath | undefined {
+		try {
+			const fn = (
+				this.#modelRegistry as unknown as { getBillingPath?: (m: Model, s?: string) => BillingPath | undefined }
+			).getBillingPath;
+			if (typeof fn === "function") return fn.call(this.#modelRegistry, model, this.#authSessionId);
+		} catch {}
+		return undefined;
+	}
+
 	#formatAssignedModelLabel(model: Model, thinkingLevel: ThinkingLevel | undefined): string {
 		const modelLabel = sanitizeText(`${model.provider}/${model.id}`).replace(/\s+/g, " ").trim();
 		let label = modelLabel;
 		if (thinkingLevel && thinkingLevel !== ThinkingLevel.Inherit) {
 			label += ` (${getThinkingLevelMetadata(thinkingLevel).label})`;
 		}
+		const billing = this.#billingPathForModel(model)?.label;
+		if (billing) label += ` [${billing}]`;
 		return truncateToWidth(label, ROLE_BINDING_MAX_WIDTH);
 	}
 
@@ -1914,6 +1949,27 @@ export class ModelSelectorComponent extends Container {
 			this.#listContainer.addChild(new Spacer(1));
 			this.#listContainer.addChild(new Text(theme.fg("warning", `  ${this.#presetLoginHint}`), 0, 0));
 		}
+		// One-time metered billing notice for the currently selected model (first bind per credential source)
+		try {
+			const sel = this.#getSelectedItem?.() as any;
+			const m = sel?.model as any;
+			if (m && this.#viewMode === "models") {
+				const bp = this.#billingPathForModel(m);
+				if (bp && !(this.#isBillingDismissed?.(bp.dismissKey) ?? false)) {
+					this.#listContainer.addChild(new Spacer(1));
+					this.#listContainer.addChild(
+						new Text(
+							theme.fg("warning", `  Billing: ${bp.label} — charges may apply. Press d to dismiss.`),
+							0,
+							0,
+						),
+					);
+					this.#pendingBillingNoticeKey = bp.dismissKey;
+				} else {
+					this.#pendingBillingNoticeKey = undefined;
+				}
+			}
+		} catch {}
 		const previewProfile = this.#getProfileByName(this.#previewProfileName);
 		if (previewProfile) this.#renderPresetPreview(previewProfile);
 	}
@@ -2075,6 +2131,8 @@ export class ModelSelectorComponent extends Container {
 			) {
 				roleBadgeTokens.push(theme.icon.fast);
 			}
+			const billingLabel = this.#billingPathForModel(item.model)?.label;
+			if (billingLabel) roleBadgeTokens.push(theme.fg("warning", `[${billingLabel}]`));
 			const badgeText = roleBadgeTokens.length > 0 ? ` ${roleBadgeTokens.join(" ")}` : "";
 
 			let line = "";
@@ -2307,6 +2365,16 @@ export class ModelSelectorComponent extends Container {
 			return;
 		}
 
+		if (keyData === "d" || keyData === "D") {
+			if (this.#pendingBillingNoticeKey) {
+				try {
+					this.#markBillingDismissed?.(this.#pendingBillingNoticeKey);
+				} catch {}
+				this.#pendingBillingNoticeKey = undefined;
+				this.#updateList();
+				return;
+			}
+		}
 		// Pass everything else to search input
 		this.#searchInput.handleInput(keyData);
 		this.#filterModels(this.#searchInput.getValue());

package/src/modes/components/oauth-selector.ts

@@ -56,6 +56,7 @@ export class OAuthSelectorComponent extends Container {
 	#onCancelCallback: () => void;
 	#statusMessage: string | undefined;
 	#validateAuthCallback?: (providerId: string) => Promise<boolean>;
+	#onValidationError?: (error: unknown) => boolean;
 	#requestRenderCallback?: () => void;
 	#authState: Map<string, "checking" | "valid" | "invalid"> = new Map();
 	#externalCredentialCandidates: ImportableCredential[] = [];
@@ -76,6 +77,7 @@ export class OAuthSelectorComponent extends Container {
 		onCancel: () => void,
 		options?: {
 			validateAuth?: (providerId: string) => Promise<boolean>;
+			onValidationError?: (error: unknown) => boolean;
 			requestRender?: () => void;
 			externalCredentialCandidates?: ImportableCredential[];
 		} & Partial<OAuthSelectorAccountOptions>,
@@ -86,6 +88,7 @@ export class OAuthSelectorComponent extends Container {
 		this.#onSelectCallback = onSelect;
 		this.#onCancelCallback = onCancel;
 		this.#validateAuthCallback = options?.validateAuth;
+		this.#onValidationError = options?.onValidationError;
 		this.#requestRenderCallback = options?.requestRender;
 		this.#externalCredentialCandidates = options?.externalCredentialCandidates ?? [];
 		this.#accountProviderId = options?.accountProviderId;
@@ -194,7 +197,9 @@ export class OAuthSelectorComponent extends Container {
 		let isValid = false;
 		try {
 			isValid = await this.#validateAuthCallback(providerId);
-		} catch {
+		} catch (error) {
+			if (generation !== this.#validationGeneration) return;
+			if (this.#onValidationError?.(error)) return;
 			isValid = false;
 		}
 		if (generation !== this.#validationGeneration) return;

package/src/modes/components/session-selector.ts

@@ -14,7 +14,12 @@ import {
 import { formatBytes } from "@gajae-code/utils";
 import { theme } from "../../modes/theme/theme";
 import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
-import type { ResumeSessionIdentity, ResumeTailInspection, SessionInfo } from "../../session/session-manager";
+import {
+	prioritizeStarredSessions,
+	type ResumeSessionIdentity,
+	type ResumeTailInspection,
+	type SessionInfo,
+} from "../../session/session-manager";
 import { DynamicBorder } from "./dynamic-border";
 import { HookSelectorComponent } from "./hook-selector";
 
@@ -71,17 +76,19 @@ class SessionList implements Component {
 	}
 
 	#filterSessions(query: string): void {
-		this.#filteredSessions = fuzzyFilter(this.allSessions, query, session =>
-			[
-				session.id,
-				session.title ?? "",
-				session.cwd ?? "",
-				session.firstMessage ?? "",
-				session.allMessagesText,
-				session.path,
-			]
-				.filter(Boolean)
-				.join(" "),
+		this.#filteredSessions = prioritizeStarredSessions(
+			fuzzyFilter(this.allSessions, query, session =>
+				[
+					session.id,
+					session.title ?? "",
+					session.cwd ?? "",
+					session.firstMessage ?? "",
+					session.allMessagesText,
+					session.path,
+				]
+					.filter(Boolean)
+					.join(" "),
+			),
 		);
 		this.#clampSelectedIndex();
 	}
@@ -131,8 +138,9 @@ class SessionList implements Component {
 			const cursorWidth = visibleWidth(cursor);
 			const prefix = selected ? theme.fg("accent", cursor) : padding(cursorWidth);
 			const message = session.firstMessage.replace(/\n/g, " ").trim();
-			const title = truncateToWidth(session.title ?? message, width - cursorWidth);
-			lines.push(prefix + (selected ? theme.bold(title) : title));
+			const star = session.starred ? theme.fg("warning", `${theme.icon.star} `) : "";
+			const title = truncateToWidth(session.title ?? message, width - cursorWidth - visibleWidth(star));
+			lines.push(prefix + star + (selected ? theme.bold(title) : title));
 			if (session.title) lines.push(`  ${theme.fg("dim", truncateToWidth(message, width - cursorWidth))}`);
 			lines.push(
 				theme.fg(
@@ -211,7 +219,7 @@ export class SessionSelectorComponent extends Container {
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
 		this.addChild(this.#messageContainer);
-		this.#sessionList = new SessionList(sessions);
+		this.#sessionList = new SessionList(prioritizeStarredSessions(sessions));
 		this.#sessionList.onSelect = session => {
 			if (this.inspector) void this.#inspect(session);
 			else this.#dispatchSelect(session.path);

package/src/modes/components/sessions-dashboard.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
-import { type Component, Container, matchesKey, truncateToWidth } from "@gajae-code/tui";
-import type { SessionInfo } from "../../session/session-manager";
+import { type Component, Container, matchesKey, truncateToWidth, visibleWidth } from "@gajae-code/tui";
+import { prioritizeStarredSessions, type SessionInfo } from "../../session/session-manager";
 import { theme } from "../theme/theme";
 
 const PRESENCE_MAX_BYTES = 4096;
@@ -41,6 +41,7 @@ export interface DashboardSession {
 	id: string;
 	cwd: string;
 	title: string;
+	starred: boolean;
 	modified: Date;
 	messageCount: number;
 	messageCountIsEstimate?: boolean;
@@ -78,10 +79,11 @@ export function dashboardSessions(
 	sessions: readonly SessionInfo[],
 	options: { readFile?: (filePath: string) => string; now?: number } = {},
 ): DashboardSession[] {
-	return sessions.map(session => ({
+	return prioritizeStarredSessions(sessions).map(session => ({
 		id: session.id,
 		cwd: session.cwd,
 		title: session.title ?? session.firstMessage,
+		starred: session.starred,
 		modified: session.modified,
 		messageCountIsEstimate: session.messageCountIsEstimate,
 		messageCount: session.messageCount,
@@ -169,10 +171,11 @@ class SessionDashboardRow implements Component {
 		const fullMetadata = `· ${count} · ${modified}`;
 		const compactMetadata = `· ${this.session.messageCountIsEstimate ? `~${this.session.messageCount}` : this.session.messageCount} msgs`;
 		const metadata = width >= 48 ? fullMetadata : width >= 24 ? compactMetadata : "";
-		const titleWidth = Math.max(0, width - 2 - metadata.length - (metadata ? 1 : 0));
+		const star = this.session.starred ? theme.fg("warning", `${theme.icon.star} `) : "";
+		const titleWidth = Math.max(0, width - 2 - visibleWidth(star) - metadata.length - (metadata ? 1 : 0));
 		return [
 			fit(
-				` ${status} ${truncateToWidth(title, titleWidth)}${metadata ? ` ${theme.fg("dim", metadata)}` : ""}`,
+				` ${status} ${star}${truncateToWidth(title, titleWidth)}${metadata ? ` ${theme.fg("dim", metadata)}` : ""}`,
 				width,
 			),
 			fit(`   ${theme.fg("dim", cwd)}`, width),

package/src/modes/components/settings-selector.ts

@@ -1009,6 +1009,7 @@ export class SettingsSelectorComponent extends Container {
 			options = [
 				{ value: "en", label: uiString(language, "settings.language.english") },
 				{ value: "ko", label: uiString(language, "settings.language.korean") },
+				{ value: "zh", label: uiString(language, "settings.language.chinese") },
 				{ value: "ja", label: uiString(language, "settings.language.japanese") },
 			];
 		}

package/src/modes/components/status-line/model-name.ts

@@ -0,0 +1,53 @@
+/**
+ * Shortest recognizable model label, derived purely from the model id.
+ *
+ * The rail and the footer both render this form, so a narrow terminal spends
+ * its cells on the part of the id that actually identifies the model:
+ *
+ *   `anthropic/claude-sonnet-4-5-20250929` -> `sonnet-4.5`
+ *   `openai/gpt-4o-2024-05-13`             -> `gpt-4o`
+ *   `google/gemini-3-pro`                  -> `gemini-3-pro`
+ *   `qwen2.5:7b`                           -> `qwen2.5:7b`
+ *
+ * Deliberately a pure heuristic with no curated override table: every provider
+ * in `models.json` must degrade sanely without per-model maintenance. The
+ * function never returns an empty string — an id that the heuristic would
+ * strip to nothing falls back to the previous, longer form.
+ */
+
+/**
+ * Vendor family words that carry no information once the provider prefix is
+ * gone. Deliberately minimal: `gpt` and `gemini` are part of how those models
+ * are named and are kept.
+ */
+const VENDOR_FAMILY_WORDS: ReadonlySet<string> = new Set(["claude"]);
+
+/** Trailing snapshot dates and build stamps: `-20250929`, `-2024-05-13`, `-v2`. */
+const DATE_OR_BUILD_SUFFIX = /-(?:\d{4}-\d{2}-\d{2}|\d{8}|\d{6}|v\d+(?:\.\d+)*)$/;
+
+/** Split version parts read as one number: `sonnet-4-5` -> `sonnet-4.5`. */
+const SPLIT_VERSION = /(\d)-(\d)/g;
+
+export const NO_MODEL_LABEL = "no-model";
+
+export function shortenModelId(rawId: string | undefined | null): string {
+	const raw = (rawId ?? "").trim();
+	if (!raw) return NO_MODEL_LABEL;
+
+	// Provider prefix: `anthropic/claude-…`, `openrouter/anthropic/claude-…`.
+	const afterProvider = raw.slice(raw.lastIndexOf("/") + 1).trim() || raw;
+
+	const withoutDate = afterProvider.replace(DATE_OR_BUILD_SUFFIX, "") || afterProvider;
+
+	let name = withoutDate;
+	const dashIndex = name.indexOf("-");
+	if (dashIndex > 0) {
+		const head = name.slice(0, dashIndex).toLowerCase();
+		const rest = name.slice(dashIndex + 1);
+		if (rest && VENDOR_FAMILY_WORDS.has(head)) name = rest;
+	}
+
+	name = name.replace(SPLIT_VERSION, "$1.$2");
+
+	return name || withoutDate || afterProvider;
+}

package/src/modes/components/status-line/priority-row.ts

@@ -0,0 +1,107 @@
+/**
+ * Narrow-width survival row for the status rail.
+ *
+ * The rail evicts segments continuously as the terminal narrows. Without this
+ * row the last thing left at very small widths is the `…+N` overflow marker —
+ * the three things a user actually needs (how much context is left, whether a
+ * goal is running, which model is answering) are exactly what the generic
+ * eviction throws away first or last by accident.
+ *
+ * This row keeps them, in priority order, by stepping each item down its own
+ * ladder instead of dropping it:
+ *
+ *   full form -> shortened form -> single glyph -> dropped
+ *
+ * Context % is never dropped and is the last survivor; the model name is
+ * dropped first of the three. The row is rendered as bare colored text with no
+ * group padding or end caps, so — like the overflow marker — it can survive at
+ * widths where a normal segment group cannot.
+ */
+
+import { visibleWidth } from "@gajae-code/tui";
+import { formatNumber } from "@gajae-code/utils";
+import { theme } from "../../theme/theme";
+import { getContextUsageLevel, getContextUsageThemeColor } from "./context-thresholds";
+import { shortenModelId } from "./model-name";
+import { goalStatusDisplay } from "./segments";
+import type { SegmentContext } from "./types";
+
+const SEPARATOR = "·";
+
+/** Which priority items the active layout is supposed to be carrying. */
+export interface PriorityItemSet {
+	context: boolean;
+	goal: boolean;
+	model: boolean;
+}
+
+function contextForms(ctx: SegmentContext): { full: string; short: string } | null {
+	const window = ctx.contextWindow;
+	if (!(window > 0)) return null;
+
+	const raw = ctx.contextPercent;
+	const pct = typeof raw === "number" && Number.isFinite(raw) ? raw : null;
+	const color = pct === null ? "statusLineContext" : getContextUsageThemeColor(getContextUsageLevel(pct, window));
+
+	return {
+		full: theme.fg(color, `${pct === null ? "?" : `${pct.toFixed(1)}%`}/${formatNumber(window)}`),
+		short: theme.fg(color, pct === null ? "?" : `${Math.round(pct)}%`),
+	};
+}
+
+function goalForms(ctx: SegmentContext): { label: string; glyph: string } | null {
+	const display = goalStatusDisplay(ctx);
+	if (!display) return null;
+
+	const glyph = display.icon || "G";
+	return {
+		label: theme.fg(display.color, display.icon ? `${display.icon} Goal` : "Goal"),
+		glyph: theme.fg(display.color, glyph),
+	};
+}
+
+function modelForms(ctx: SegmentContext): { short: string; glyph: string } {
+	const model = ctx.session.state.model;
+	const name = shortenModelId(model?.id ?? model?.name);
+	return {
+		short: theme.fg("statusLineModel", name),
+		glyph: theme.fg("statusLineModel", theme.icon.model || name.slice(0, 1)),
+	};
+}
+
+/**
+ * Widest priority row that fits `width`, or null when even the minimal form
+ * cannot fit (callers then fall back to the overflow marker).
+ *
+ * Returns null when neither context nor goal is available: the model name alone
+ * is the lowest-priority item and never justifies replacing the normal rail.
+ */
+export function buildPriorityRow(ctx: SegmentContext, width: number, include: PriorityItemSet): string | null {
+	if (width <= 0) return null;
+
+	const context = include.context ? contextForms(ctx) : null;
+	const goal = include.goal ? goalForms(ctx) : null;
+	const model = include.model ? modelForms(ctx) : null;
+	if (!context && !goal) return null;
+
+	// Ordered widest-first. Every item degrades through its own forms before any
+	// item is dropped, and drops run lowest-priority first (model, then goal).
+	const ladder: readonly (readonly (string | null)[])[] = [
+		[context?.full ?? null, goal?.label ?? null, model?.short ?? null],
+		[context?.full ?? null, goal?.glyph ?? null, model?.short ?? null],
+		[context?.full ?? null, goal?.glyph ?? null, model?.glyph ?? null],
+		[context?.short ?? null, goal?.glyph ?? null, model?.glyph ?? null],
+		[context?.short ?? null, goal?.glyph ?? null, null],
+		[context?.short ?? null, null, null],
+	];
+
+	const separator = theme.fg("dim", SEPARATOR);
+	for (const candidate of ladder) {
+		const parts = candidate.filter((part): part is string => part !== null);
+		if (parts.length === 0) continue;
+		const row = parts.join(separator);
+		if (visibleWidth(row) <= width) return row;
+	}
+
+	return null;
+}

package/src/modes/components/status-line/segments.ts

@@ -8,6 +8,7 @@ import { shortenPath } from "../../../tools/render-utils";
 import { getSessionAccentAnsi, getSessionAccentHex } from "../../../utils/session-color";
 import { sanitizeStatusText } from "../../shared";
 import { getContextUsageLevel, getContextUsageThemeColor } from "./context-thresholds";
+import { shortenModelId } from "./model-name";
 import type { RenderedSegment, SegmentContext, StatusLineSegment, StatusLineSegmentId } from "./types";
 
 export type { SegmentContext } from "./types";
@@ -99,10 +100,10 @@ const modelSegment: StatusLineSegment = {
 		const state = ctx.session.state;
 		const opts = ctx.options.model ?? {};
 
-		let modelName = state.model?.name || state.model?.id || "no-model";
-		if (modelName.startsWith("Claude ")) {
-			modelName = modelName.slice(7);
-		}
+		// Shortest recognizable id-derived form (`sonnet-4.5`), the same label the
+		// footer renders, so a narrow rail never spends cells on a provider prefix
+		// or a snapshot date.
+		const modelName = shortenModelId(state.model?.id ?? state.model?.name);
 
 		let content = withIcon(theme.icon.model, modelName);
 
@@ -148,9 +149,16 @@ function formatGoalUsage(current: number): string {
 	return used;
 }
 
-function renderGoalMode(ctx: SegmentContext, mode: { enabled: boolean; paused: boolean }): RenderedSegment {
-	const goal = ctx.session.getGoalModeState()?.goal;
-	const status = goal?.status ?? (mode.paused ? "paused" : "active");
+/**
+ * Icon and color for the active goal indicator, or null when goal mode is not
+ * showing. Shared with the narrow-width priority row so the compact glyph keeps
+ * the same status color as the full label.
+ */
+export function goalStatusDisplay(ctx: SegmentContext): { icon: string; color: ThemeColor } | null {
+	const mode = ctx.goalMode;
+	if (!mode || (!mode.enabled && !mode.paused)) return null;
+
+	const status = ctx.session.getGoalModeState?.()?.goal?.status ?? (mode.paused ? "paused" : "active");
 
 	let icon: string = theme.icon.goal;
 	let color: ThemeColor = "accent";
@@ -170,13 +178,19 @@ function renderGoalMode(ctx: SegmentContext, mode: { enabled: boolean; paused: b
 		default:
 			break;
 	}
+	return { icon, color };
+}
+
+function renderGoalMode(ctx: SegmentContext, mode: { enabled: boolean; paused: boolean }): RenderedSegment {
+	const display = goalStatusDisplay(ctx) ?? { icon: theme.icon.goal, color: "accent" as ThemeColor };
+	const goal = ctx.session.getGoalModeState?.()?.goal;
 
-	const parts: string[] = [withIcon(icon, "Goal")];
+	const parts: string[] = [withIcon(display.icon, "Goal")];
 	const showUsage = ctx.session.settings.get("goal.statusInFooter") === true;
 	if (showUsage && goal) {
 		parts.push(formatGoalUsage(goal.tokensUsed));
 	}
-	return { content: theme.fg(color, parts.join(" ")), visible: true };
+	return { content: theme.fg(display.color, parts.join(" ")), visible: mode.enabled || mode.paused };
 }
 
 const modeSegment: StatusLineSegment = {