@gajae-code/coding-agent 0.13.2 → 0.14.0

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

@@ -5,6 +5,7 @@ import {
 	Container,
 	Input,
 	matchesKey,
+	resolvePetMode,
 	type SelectItem,
 	SelectList,
 	type SettingItem,
@@ -27,6 +28,7 @@ import { getCurrentThemeName, getSelectListTheme, getSettingsListTheme, theme }
 import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
 import { getTabBarTheme } from "../shared";
 import { DynamicBorder } from "./dynamic-border";
+import { DynamicThemeText } from "./dynamic-theme-text";
 import { GjcBundleSettingsComponent } from "./gjc-bundle-settings";
 import {
 	type NotificationsEditorOperations,
@@ -101,18 +103,18 @@ class SelectSubmenu extends Container {
 		super();
 
 		// Title
-		this.addChild(new Text(theme.bold(theme.fg("accent", title)), 0, 0));
+		this.addChild(new DynamicThemeText(() => theme.bold(theme.fg("accent", title))));
 
 		// Description
 		if (description) {
 			this.addChild(new Spacer(1));
-			this.addChild(new Text(theme.fg("muted", description), 0, 0));
+			this.addChild(new DynamicThemeText(() => theme.fg("muted", description)));
 		}
 
 		// Preview (if provided)
 		if (getPreview) {
 			this.addChild(new Spacer(1));
-			this.addChild(new Text(theme.fg("muted", "Preview:"), 0, 0));
+			this.addChild(new DynamicThemeText(() => theme.fg("muted", "Preview:")));
 			this.#previewText = new Text(getPreview(), 0, 0);
 			this.addChild(this.#previewText);
 		}
@@ -121,7 +123,7 @@ class SelectSubmenu extends Container {
 		this.addChild(new Spacer(1));
 
 		// Select list
-		this.#selectList = new SelectList(options, Math.min(options.length, 10), getSelectListTheme());
+		this.#selectList = new SelectList(options, Math.min(options.length, 10), () => getSelectListTheme());
 
 		// Pre-select current value
 		const currentIndex = options.findIndex(o => o.value === currentValue);
@@ -157,7 +159,7 @@ class SelectSubmenu extends Container {
 
 		// Hint
 		this.addChild(new Spacer(1));
-		this.addChild(new Text(theme.fg("dim", "  Enter to select · Esc to go back"), 0, 0));
+		this.addChild(new DynamicThemeText(() => theme.fg("dim", "  Enter to select · Esc to go back")));
 	}
 
 	#updatePreview(): void {
@@ -708,6 +710,11 @@ export interface SettingsCallbacks {
 	onThemePreview?: (theme: string) => void | Promise<void>;
 	/** Called to restore the rendered theme when theme settings preview is cancelled */
 	onThemePreviewCancel?: (theme: string) => void | Promise<void>;
+	/**
+	 * Atomically apply and persist a theme selection. Returns false when the
+	 * candidate could not be loaded, leaving the submenu open.
+	 */
+	onThemeCommit?: (path: "theme.dark" | "theme.light", theme: string, previousTheme: string) => Promise<boolean>;
 	/** Called to live-preview the gajae pet skin while browsing the pet setting. */
 	onPetPreview?: (mode: string) => void;
 	/**
@@ -971,6 +978,7 @@ export class SettingsSelectorComponent extends Container {
 		}
 		let description = def.description;
 		if (def.path === "pet.mode") {
+			currentValue = resolvePetMode(currentValue);
 			const petAvailable = this.context.petAvailable ?? isPetAvailable();
 			options = createPetSelectItems(options, currentValue, petAvailable);
 			// Unsupported terminals must see the same actionable guidance the
@@ -1072,6 +1080,22 @@ export class SettingsSelectorComponent extends Container {
 					done(value);
 					return;
 				}
+				if (def.path === "theme.dark" || def.path === "theme.light") {
+					// The theme commit persists through the controller, so it must honor
+					// the same invalid-config guard as every other durable write: report
+					// the repair error and leave the submenu open instead of no-oping.
+					if (!settings.canWriteDurableConfig()) {
+						this.callbacks.onError?.(
+							"Cannot change settings while config.yml has invalid YAML syntax. Repair config.yml and reload settings.",
+						);
+						return;
+					}
+					if (!this.callbacks.onThemeCommit) return;
+					void this.callbacks.onThemeCommit(def.path, value, currentValue).then(accepted => {
+						if (accepted) done(value);
+					});
+					return;
+				}
 				if (def.path === "pet.mode") {
 					// The shared pet commit policy rechecks capability immediately
 					// before mutation and persists only on acceptance; the settings

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

@@ -1,7 +1,17 @@
 import { type RunGh, runGhDefault } from "../../../utils/gh";
 
 const STATUS_LINE_GH_TIMEOUT_MS = 5_000;
+const STATUS_LINE_PR_CACHE_TTL_MS = 60_000;
 const C0_C1_CONTROL_CHARACTERS = /[\u0000-\u001f\u007f-\u009f]/;
+type CurrentPr = { number: number; url: string } | null;
+
+interface PrCacheEntry {
+	value: CurrentPr;
+	expiresAt: number;
+}
+
+const prCache = new Map<string, PrCacheEntry>();
+const prLookupsInFlight = new Map<string, Promise<CurrentPr>>();
 
 function canonicalPrUrl(value: unknown, number: number): string | null {
 	if (typeof value !== "string" || C0_C1_CONTROL_CHARACTERS.test(value)) return null;
@@ -22,7 +32,7 @@ function canonicalPrUrl(value: unknown, number: number): string | null {
 	}
 }
 
-export async function lookupCurrentPr(runGh: RunGh = runGhDefault): Promise<{ number: number; url: string } | null> {
+export async function lookupCurrentPr(runGh: RunGh = runGhDefault): Promise<CurrentPr> {
 	try {
 		const result = await runGh(["pr", "view", "--json", "number,url"], { timeoutMs: STATUS_LINE_GH_TIMEOUT_MS });
 		if (result.exitCode !== 0 || result.timedOut) return null;
@@ -35,3 +45,37 @@ export async function lookupCurrentPr(runGh: RunGh = runGhDefault): Promise<{ nu
 		return null;
 	}
 }
+
+export function lookupCurrentPrCached(
+	cacheKey: string,
+	runGh: RunGh = runGhDefault,
+	now: () => number = Date.now,
+): Promise<CurrentPr> {
+	const cached = prCache.get(cacheKey);
+	if (cached && cached.expiresAt > now()) return Promise.resolve(cached.value);
+
+	const inFlight = prLookupsInFlight.get(cacheKey);
+	if (inFlight) return inFlight;
+
+	const lookup = lookupCurrentPr(runGh)
+		.then(value => {
+			// Bound process-lifetime memory: drop every expired entry on insert so
+			// the map holds only keys seen within one TTL window.
+			const timestamp = now();
+			for (const [key, entry] of prCache) {
+				if (entry.expiresAt <= timestamp) prCache.delete(key);
+			}
+			prCache.set(cacheKey, { value, expiresAt: timestamp + STATUS_LINE_PR_CACHE_TTL_MS });
+			return value;
+		})
+		.finally(() => {
+			if (prLookupsInFlight.get(cacheKey) === lookup) prLookupsInFlight.delete(cacheKey);
+		});
+	prLookupsInFlight.set(cacheKey, lookup);
+	return lookup;
+}
+
+export function clearCurrentPrCache(): void {
+	prCache.clear();
+	prLookupsInFlight.clear();
+}

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

@@ -21,7 +21,7 @@ function withIcon(icon: string, text: string): string {
 }
 
 function stripDisplayRoot(pwd: string): string {
-	for (const root of ["/work", path.join(os.homedir(), "Projects")]) {
+	for (const root of displayRoots()) {
 		const relative = relativePathWithinRoot(root, pwd);
 		if (relative) return relative;
 	}
@@ -32,7 +32,15 @@ function normalizePremiumRequests(value: number): number {
 	return Math.round((value + Number.EPSILON) * 100) / 100;
 }
 
-const SCRATCH_ROOTS: readonly string[] = (() => {
+// Display roots take precedence over scratch classification: ~/Projects and
+// /work are deliberate workspaces, never scratch, even when the home directory
+// itself sits under a temp/scratch root (CI harnesses and containers redirect
+// HOME beneath the OS temp dir). Resolved at render time so a preload-rewritten
+// HOME is honored, matching scratchRoots().
+function displayRoots(): readonly string[] {
+	return ["/work", path.join(os.homedir(), "Projects")];
+}
+function scratchRoots(): readonly string[] {
 	const roots = new Set<string>([os.tmpdir(), path.join(os.homedir(), "tmp")]);
 	if (process.platform === "win32") {
 		const { TEMP, TMP, SystemRoot } = process.env;
@@ -48,10 +56,17 @@ const SCRATCH_ROOTS: readonly string[] = (() => {
 		}
 	}
 	return [...roots];
-})();
+}
 
 function classifyProjectDir(pwd: string): { scratch: boolean; relative: string | null } {
-	for (const root of SCRATCH_ROOTS) {
+	// A deliberate display root wins over scratch ancestry: ~/Projects is a
+	// workspace even when HOME itself sits under the OS temp dir (CI and test
+	// harnesses redirect HOME beneath the scratch root). This is more precise
+	// than exempting all of HOME: ~/tmp stays scratch (it is in scratchRoots).
+	for (const root of displayRoots()) {
+		if (pathIsWithin(root, pwd)) return { scratch: false, relative: null };
+	}
+	for (const root of scratchRoots()) {
 		if (pathIsWithin(root, pwd)) {
 			return { scratch: true, relative: relativePathWithinRoot(root, pwd) };
 		}

package/src/modes/components/tool-status-header.ts

@@ -19,7 +19,7 @@ import type { ActionRegistry, FocusDomain } from "../action-registry";
 import { EMPTY_JOBS_SNAPSHOT, type JobsSnapshot } from "../jobs-observer";
 import { sanitizeStatusText } from "../shared";
 import { renderSkillHudBar } from "./skill-hud/render";
-import { lookupCurrentPr } from "./status-line/gh";
+import { lookupCurrentPrCached } from "./status-line/gh";
 import {
 	canReuseCachedPr,
 	createPrCacheContext,
@@ -399,6 +399,10 @@ export class StatusLineComponent implements Component {
 
 		this.#prLookupInFlight = true;
 		const lookupContext = currentContext;
+		if (!lookupContext) {
+			this.#prLookupInFlight = false;
+			return stalePr ?? null;
+		}
 
 		// Fire async lookup, keep stale value visible until resolved
 		(async () => {
@@ -415,7 +419,7 @@ export class StatusLineComponent implements Component {
 			};
 			try {
 				// Requires `gh repo set-default` to be configured; fails gracefully if not
-				const pr = await lookupCurrentPr();
+				const pr = await lookupCurrentPrCached(`${lookupContext.repoId ?? ""}\0${lookupContext.branch}`);
 				setCachedPr(pr);
 			} finally {
 				this.#prLookupInFlight = false;
@@ -579,6 +583,8 @@ export class StatusLineComponent implements Component {
 					pushWindow(`${providerId ?? "provider"}:5h`, "5h", fraction, resetsAt, "m");
 				} else if (windowId === "7d" && !tier) {
 					pushWindow(`${providerId ?? "provider"}:7d`, "7d", fraction, resetsAt, "h");
+				} else if (providerId === "grok-build" && windowId === "weekly" && !tier) {
+					pushWindow("grok-build:weekly", "weekly", fraction, resetsAt, "h");
 				}
 			}
 		}
@@ -620,6 +626,10 @@ export class StatusLineComponent implements Component {
 		const contextPctSegmentActive =
 			effectiveSettings.leftSegments.includes("context_pct") ||
 			effectiveSettings.rightSegments.includes("context_pct");
+		// Never spawn a gh lookup when no pr segment is rendered; the pr segment
+		// treats a null value as hidden, so gating here is behavior-identical.
+		const prSegmentActive =
+			effectiveSettings.leftSegments.includes("pr") || effectiveSettings.rightSegments.includes("pr");
 
 		return {
 			session: this.session,
@@ -638,7 +648,7 @@ export class StatusLineComponent implements Component {
 			git: {
 				branch: this.#getCurrentBranch(),
 				status: this.#getGitStatus(),
-				pr: this.#lookupPr(),
+				pr: prSegmentActive ? this.#lookupPr() : null,
 			},
 			usage: this.#cachedUsage,
 		};

package/src/modes/controllers/command-controller.ts

@@ -1588,20 +1588,20 @@ function formatWindowSuffix(label: string, windowLabel: string, uiTheme: typeof
 	return uiTheme.fg("dim", `(${windowLabel})`);
 }
 
-function formatAccountLabel(limit: UsageLimit, report: UsageReport, index: number): string {
+function formatAccountLabel(limit: UsageLimit, report: UsageReport, reportIndex: number): string {
 	const email = (report.metadata?.email as string | undefined) ?? limit.scope.accountId;
 	if (email) return email;
 	const accountId = (report.metadata?.accountId as string | undefined) ?? limit.scope.accountId;
 	if (accountId) return accountId;
-	return `account ${index + 1}`;
+	return `account ${reportIndex + 1}`;
 }
 
-function formatUnlimitedReportLabel(report: UsageReport, index: number): string {
+function formatUnlimitedReportLabel(report: UsageReport, reportIndex: number): string {
 	const email = report.metadata?.email as string | undefined;
 	if (email) return email;
 	const accountId = report.metadata?.accountId as string | undefined;
 	if (accountId) return accountId;
-	return `account ${index + 1}`;
+	return `account ${reportIndex + 1}`;
 }
 
 function formatResetShort(limit: UsageLimit, nowMs: number): string | undefined {
@@ -1614,6 +1614,7 @@ function formatResetShort(limit: UsageLimit, nowMs: number): string | undefined
 function formatAccountHeaderRow(
 	limits: UsageLimit[],
 	reports: UsageReport[],
+	reportIndexes: ReadonlyMap<UsageReport, number>,
 	nowMs: number,
 	columnWidth: number,
 	uiTheme: typeof theme,
@@ -1621,7 +1622,7 @@ function formatAccountHeaderRow(
 	const parts = limits.map((limit, index) => {
 		const reset = formatResetShort(limit, nowMs);
 		return {
-			label: formatAccountLabel(limit, reports[index], index),
+			label: formatAccountLabel(limit, reports[index], reportIndexes.get(reports[index]) ?? index),
 			suffix: reset ? `(${reset})` : "",
 		};
 	});
@@ -1780,6 +1781,7 @@ export function renderUsageReports(
 	for (const { provider, providerReports } of providerEntries) {
 		lines.push("");
 		const providerName = formatProviderName(provider);
+		const reportIndexes = new Map(providerReports.map((report, index) => [report, index]));
 
 		const limitGroups = new Map<
 			string,
@@ -1811,10 +1813,13 @@ export function renderUsageReports(
 		const rankedAccounts = providerReports
 			.map(report => {
 				const [firstLimit] = report.limits;
+				const reportIndex = reportIndexes.get(report) ?? 0;
 				return {
 					report,
 					total: report.limits.reduce((sum, limit) => sum + (resolveFraction(limit) ?? 0), 0),
-					label: firstLimit ? formatAccountLabel(firstLimit, report, 0) : formatUnlimitedReportLabel(report, 0),
+					label: firstLimit
+						? formatAccountLabel(firstLimit, report, reportIndex)
+						: formatUnlimitedReportLabel(report, reportIndex),
 				};
 			})
 			.sort((a, b) => (a.total !== b.total ? b.total - a.total : a.label.localeCompare(b.label)));
@@ -1850,7 +1855,14 @@ export function renderUsageReports(
 
 			const windowSuffix = formatWindowSuffix(group.label, group.windowLabel, uiTheme);
 			lines.push(`${statusIcon} ${uiTheme.bold(group.label)} ${windowSuffix}`.trim());
-			const accountLabels = formatAccountHeaderRow(sortedLimits, sortedReports, nowMs, sectionColumnWidth, uiTheme);
+			const accountLabels = formatAccountHeaderRow(
+				sortedLimits,
+				sortedReports,
+				reportIndexes,
+				nowMs,
+				sectionColumnWidth,
+				uiTheme,
+			);
 			lines.push(`  ${accountLabels.join(" ")}`.trimEnd());
 			const bars = sortedLimits.map(limit =>
 				padColumn(renderUsageBar(limit, uiTheme, sectionColumnWidth), sectionColumnWidth),
@@ -1869,7 +1881,7 @@ export function renderUsageReports(
 		// Render accounts with no rate limits (e.g. business/enterprise plans).
 		const unlimitedReports = providerReports.filter(report => report.limits.length === 0);
 		for (const report of unlimitedReports) {
-			const label = formatUnlimitedReportLabel(report, 0);
+			const label = formatUnlimitedReportLabel(report, reportIndexes.get(report) ?? 0);
 			const tier = report.metadata?.planType as string | undefined;
 			const tierSuffix = tier ? ` ${uiTheme.fg("dim", `(${tier})`)}` : "";
 			lines.push(