@sayknow-cli/coding-agent 0.6.4 → 0.6.5

package/src/lsp/render.ts

@@ -186,7 +186,6 @@ export function renderResult(
 						{ label: theme.fg("toolTitle", "Response"), lines: bodyLines },
 					],
 					width,
-					applyBg: false,
 				},
 				theme,
 			);

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

@@ -14,7 +14,12 @@ import {
 import { formatBytes } from "@sayknow-cli/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";
 
@@ -34,6 +39,7 @@ export type SessionInspector = (sessionPath: string) => Promise<ResumeTailInspec
 
 type SelectorState =
 	| { kind: "browsing" }
+	| { kind: "starring"; token: number }
 	| { kind: "checking"; session: SessionInfo; token: number }
 	| { kind: "confirming"; session: SessionInfo; token: number; identity: ResumeSessionIdentity }
 	| { kind: "settled" };
@@ -47,12 +53,13 @@ class SessionList implements Component {
 	onCancel?: () => void;
 	onExit: () => void = () => {};
 	onDeleteRequest?: (session: SessionInfo) => void;
+	onToggleStarRequest?: (session: SessionInfo) => void;
 
 	constructor(
 		private readonly allSessions: SessionInfo[],
 		private readonly showCwd = false,
 	) {
-		this.#filteredSessions = allSessions;
+		this.#filteredSessions = prioritizeStarredSessions(allSessions);
 		this.#searchInput.onSubmit = () => {
 			const selected = this.#filteredSessions[this.#selectedIndex];
 			if (selected) this.onSelect?.(selected);
@@ -71,17 +78,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();
 	}
@@ -93,6 +102,18 @@ class SessionList implements Component {
 		this.#filterSessions(this.#searchInput.getValue());
 	}
 
+	/** Apply a persisted star change and keep the cursor on the same session as it moves. */
+	setSessionStarred(sessionPath: string, starred: boolean): void {
+		const session = this.allSessions.find(candidate => candidate.path === sessionPath);
+		if (!session) return;
+		session.starred = starred;
+		this.#filterSessions(this.#searchInput.getValue());
+		this.#selectedIndex = Math.max(
+			0,
+			this.#filteredSessions.findIndex(candidate => candidate.path === sessionPath),
+		);
+	}
+
 	invalidate(): void {}
 
 	render(width: number): string[] {
@@ -131,8 +152,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(
@@ -147,10 +169,10 @@ class SessionList implements Component {
 		}
 		if (start > 0 || end < this.#filteredSessions.length)
 			lines.push(theme.fg("muted", `  (${this.#selectedIndex + 1}/${this.#filteredSessions.length})`));
-		lines.push(
-			"",
-			theme.fg("muted", "  [Del to delete selected transcript/artifacts, Enter to select, Esc to cancel]"),
-		);
+		lines.push("");
+		if (this.onToggleStarRequest)
+			lines.push(theme.fg("muted", truncateToWidth("  [Ctrl+S to star/unstar the selected session]", width)));
+		lines.push(theme.fg("muted", "  [Del to delete selected transcript/artifacts, Enter to select, Esc to cancel]"));
 		return lines;
 	}
 
@@ -169,7 +191,10 @@ class SessionList implements Component {
 			this.#selectedIndex += delta;
 			this.#clampSelectedIndex();
 		};
-		if (matchesKey(keyData, "delete")) {
+		if (matchesKey(keyData, "ctrl+s")) {
+			const selected = this.#filteredSessions[this.#selectedIndex];
+			if (selected) this.onToggleStarRequest?.(selected);
+		} else if (matchesKey(keyData, "delete")) {
 			const selected = this.#filteredSessions[this.#selectedIndex];
 			if (selected) this.onDeleteRequest?.(selected);
 		} else if (matchesKey(keyData, "up")) move(-1);
@@ -186,7 +211,7 @@ class SessionList implements Component {
 	}
 }
 
-/** A one-shot resume consent selector. It never opens or mutates sessions. */
+/** A one-shot resume consent selector with host-owned deletion and star persistence. It never opens sessions. */
 export class SessionSelectorComponent extends Container {
 	#sessionList: SessionList;
 	#confirmationDialog: HookSelectorComponent | null = null;
@@ -203,6 +228,7 @@ export class SessionSelectorComponent extends Container {
 		private readonly onDelete?: (session: SessionInfo) => Promise<boolean>,
 		private readonly inspector?: SessionInspector,
 		private readonly onSelection?: (selection: SessionSelectionResult) => void,
+		private readonly onSetStarred?: (session: SessionInfo, starred: boolean) => Promise<void>,
 	) {
 		super();
 		this.addChild(new Spacer(1));
@@ -219,6 +245,7 @@ export class SessionSelectorComponent extends Container {
 		this.#sessionList.onCancel = () => this.#cancel();
 		this.#sessionList.onExit = () => this.#exit();
 		this.#sessionList.onDeleteRequest = session => this.#showDeleteConfirmation(session);
+		if (this.onSetStarred) this.#sessionList.onToggleStarRequest = session => void this.#toggleStar(session);
 		this.addChild(this.#sessionList);
 		this.addChild(new Spacer(1));
 		this.addChild(new DynamicBorder());
@@ -263,6 +290,29 @@ export class SessionSelectorComponent extends Container {
 		this.#sessionList.setInputFrozen(true);
 		this.onExit();
 	}
+	async #toggleStar(session: SessionInfo): Promise<void> {
+		if (!this.onSetStarred || this.#state.kind !== "browsing" || this.#confirmationDialog) return;
+		const token = ++this.#nextToken;
+		const starred = !session.starred;
+		this.#state = { kind: "starring", token };
+		this.#sessionList.setInputFrozen(true);
+		this.#clearError();
+		this.#requestRender();
+		try {
+			await this.onSetStarred(session, starred);
+			if (this.#state.kind !== "starring" || this.#state.token !== token) return;
+			this.#sessionList.setSessionStarred(session.path, starred);
+		} catch (error) {
+			if (this.#state.kind !== "starring" || this.#state.token !== token) return;
+			this.#showError(error instanceof Error ? error.message : String(error));
+		} finally {
+			if (this.#state.kind === "starring" && this.#state.token === token) {
+				this.#state = { kind: "browsing" };
+				this.#sessionList.setInputFrozen(false);
+				this.#requestRender();
+			}
+		}
+	}
 	async #inspect(session: SessionInfo): Promise<void> {
 		const inspector = this.inspector;
 		if (!inspector || this.#state.kind !== "browsing") return;

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

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
-import { type Component, Container, matchesKey, truncateToWidth } from "@sayknow-cli/tui";
-import type { SessionInfo } from "../../session/session-manager";
+import { type Component, Container, matchesKey, truncateToWidth, visibleWidth } from "@sayknow-cli/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

@@ -379,6 +379,7 @@ class StatusLineCustomEditor extends Container {
 						"Status Line Separator",
 						"Style of separators between segments.",
 						[
+							{ value: "dot", label: "Dot" },
 							{ value: "powerline", label: "Powerline" },
 							{ value: "powerline-thin", label: "Thin chevron" },
 							{ value: "slash", label: "Slash" },

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

@@ -4,7 +4,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 	default: {
 		leftSegments: ["model", "mode", "git", "pr", "path"],
 		rightSegments: ["session_name", "jobs", "token_rate", "cost"],
-		separator: "slash",
+		separator: "dot",
 		segmentOptions: {
 			model: { showThinkingLevel: true },
 			path: { abbreviate: true, maxLength: 32, stripWorkPrefix: true },
@@ -15,7 +15,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 	"default-usage": {
 		leftSegments: ["model", "mode", "git", "pr", "path"],
 		rightSegments: ["session_name", "jobs", "token_rate", "usage", "cost"],
-		separator: "slash",
+		separator: "dot",
 		segmentOptions: {
 			model: { showThinkingLevel: true },
 			path: { abbreviate: true, maxLength: 32, stripWorkPrefix: true },
@@ -26,7 +26,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 	minimal: {
 		leftSegments: ["path", "git"],
 		rightSegments: ["session_name", "jobs", "mode", "context_pct"],
-		separator: "slash",
+		separator: "dot",
 		segmentOptions: {
 			path: { abbreviate: true, maxLength: 30 },
 			git: { showBranch: true, showStaged: false, showUnstaged: false, showUntracked: false },
@@ -36,7 +36,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 	compact: {
 		leftSegments: ["model", "mode", "git", "pr"],
 		rightSegments: ["session_name", "jobs", "cost"],
-		separator: "slash",
+		separator: "dot",
 		segmentOptions: {
 			model: { showThinkingLevel: false },
 			git: { showBranch: true, showStaged: true, showUnstaged: true, showUntracked: false },
@@ -106,7 +106,7 @@ export const STATUS_LINE_PRESETS: Record<StatusLinePreset, PresetDef> = {
 		// User-defined - these are just defaults that get overridden
 		leftSegments: ["model", "mode", "path", "git", "pr"],
 		rightSegments: ["session_name", "jobs", "token_total", "cost"],
-		separator: "slash",
+		separator: "dot",
 		segmentOptions: {},
 	},
 };

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

@@ -27,6 +27,10 @@ export function getSeparator(style: StatusLineSeparatorStyle, theme: Theme): Sep
 					useBgAsFg: true,
 				},
 			};
+		case "dot": {
+			const dot = trimSep(theme.sep.dot);
+			return { left: dot, right: dot };
+		}
 		case "slash": {
 			const slash = trimSep(theme.sep.slash);
 			return { left: slash, right: slash };

package/src/modes/components/tool-execution.ts

@@ -289,8 +289,10 @@ export class ToolExecutionComponent extends Container {
 		// Always create both - contentBox for custom tools/bash/tools with renderers, contentText for other built-ins.
 		// Vertical padding is 0: block separation comes solely from the leading Spacer
 		// (1 blank line above each block), matching reference TUIs (083.2).
-		this.#contentBox = new Box(1, 0, (text: string) => theme.bg("toolPendingBg", text));
-		this.#contentText = new Text("", 1, 0, (text: string) => theme.bg("toolPendingBg", text));
+		// Tool blocks sit on the transcript background; state is carried by the rail and
+		// status glyph (see renderOutputBlock), never by a filled card.
+		this.#contentBox = new Box(1, 0);
+		this.#contentText = new Text("", 1, 0);
 
 		// Use Box for custom tools or built-in tools that have renderers
 		const hasRenderer = toolName in toolRenderers;
@@ -607,13 +609,6 @@ export class ToolExecutionComponent extends Container {
 	}
 
 	#updateDisplay(): void {
-		// Set background based on state
-		const bgFn = this.#isPartial
-			? (text: string) => theme.bg("toolPendingBg", text)
-			: this.#result?.isError
-				? (text: string) => theme.bg("toolErrorBg", text)
-				: (text: string) => theme.bg("toolSuccessBg", text);
-
 		// Sync shared mutable render state for component closures
 		this.#renderState.expanded = this.#expanded;
 		this.#renderState.isPartial = this.#isPartial;
@@ -624,8 +619,6 @@ export class ToolExecutionComponent extends Container {
 			const tool = this.#tool;
 			const mergeCallAndResult = Boolean((tool as { mergeCallAndResult?: boolean }).mergeCallAndResult);
 			// Custom tools use Box for flexible component rendering
-			const inline = Boolean((tool as { inline?: boolean }).inline);
-			this.#contentBox.setBgFn(inline ? undefined : bgFn);
 			this.#contentBox.clear();
 
 			// Render call component
@@ -699,7 +692,6 @@ export class ToolExecutionComponent extends Container {
 				| undefined;
 			if (perFileResults && perFileResults.length > 1) {
 				// Multi-file: render each file as its own Box (identical to separate tool calls)
-				this.#contentBox.setBgFn(undefined);
 				this.#contentBox.clear();
 
 				const renderContext = this.#buildRenderContext();
@@ -712,10 +704,7 @@ export class ToolExecutionComponent extends Container {
 						this.#multiFileBoxes.push(spacer);
 						this.addChild(spacer);
 					}
-					const fileBgFn = fileResult.isError
-						? (text: string) => theme.bg("toolErrorBg", text)
-						: (text: string) => theme.bg("toolSuccessBg", text);
-					const fileBox = new Box(1, 0, fileBgFn);
+					const fileBox = new Box(1, 0);
 					try {
 						const resultComponent = renderer.renderResult(
 							{ content: [], details: fileResult, isError: fileResult.isError },
@@ -741,7 +730,7 @@ export class ToolExecutionComponent extends Container {
 					const pendingSpacer = new Spacer(1);
 					this.#multiFileBoxes.push(pendingSpacer);
 					this.addChild(pendingSpacer);
-					const pendingBox = new Box(1, 0, (text: string) => theme.bg("toolPendingBg", text));
+					const pendingBox = new Box(1, 0);
 					const pendingText = renderStatusLine(
 						{
 							icon: "pending",
@@ -757,7 +746,6 @@ export class ToolExecutionComponent extends Container {
 			} else {
 				// Single-file or no result: standard rendering
 				// Inline renderers skip background styling
-				this.#contentBox.setBgFn(renderer.inline ? undefined : bgFn);
 				this.#contentBox.clear();
 
 				const renderContext = this.#buildRenderContext();
@@ -806,7 +794,6 @@ export class ToolExecutionComponent extends Container {
 			}
 		} else {
 			// Other built-in tools: use Text directly with caching
-			this.#contentText.setCustomBgFn(bgFn);
 			this.#contentText.setText(this.#formatToolExecution());
 		}
 

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

@@ -1,4 +1,5 @@
 import * as fs from "node:fs";
+import { resolveOAuthStorageProvider } from "@sayknow-cli/ai";
 
 import { type Component, truncateToWidth, visibleWidth } from "@sayknow-cli/tui";
 import { formatCount, getProjectDir } from "@sayknow-cli/utils";
@@ -33,6 +34,33 @@ import { getSeparator } from "./status-line/separators";
 import { calculateTokensPerSecond } from "./status-line/token-rate";
 import type { SeparatorDef } from "./status-line/types";
 
+function usageReportAccountId(report: unknown): string | undefined {
+	if (!report || typeof report !== "object") return undefined;
+	const record = report as {
+		metadata?: unknown;
+		limits?: unknown;
+	};
+	const metadata = record.metadata;
+	const rawMetadataAccountId =
+		metadata && typeof metadata === "object" ? (metadata as { accountId?: unknown }).accountId : undefined;
+	const metadataAccountId =
+		typeof rawMetadataAccountId === "string" && rawMetadataAccountId.trim() ? rawMetadataAccountId.trim() : undefined;
+	if (!Array.isArray(record.limits)) return metadataAccountId;
+
+	const scopeAccountIds = new Set<string>();
+	for (const limit of record.limits) {
+		if (!limit || typeof limit !== "object") continue;
+		const scope = (limit as { scope?: unknown }).scope;
+		if (!scope || typeof scope !== "object") continue;
+		const accountId = (scope as { accountId?: unknown }).accountId;
+		if (typeof accountId === "string" && accountId.trim()) scopeAccountIds.add(accountId.trim());
+	}
+	if (scopeAccountIds.size > 1) return undefined;
+	const [scopeAccountId] = scopeAccountIds;
+	if (metadataAccountId && scopeAccountId && metadataAccountId !== scopeAccountId) return undefined;
+	return metadataAccountId ?? scopeAccountId;
+}
+
 export interface StatusLineSegmentOptions {
 	model?: { showThinkingLevel?: boolean; showContextPercent?: boolean };
 	path?: { abbreviate?: boolean; maxLength?: number; stripWorkPrefix?: boolean };
@@ -192,6 +220,9 @@ export class StatusLineComponent implements Component {
 
 	// Provider usage caching (5-min TTL, OAuth/sub only)
 	#cachedUsage: SegmentContext["usage"] = null;
+	#cachedUsageReports: unknown = null;
+	#cachedUsageProvider: string | undefined;
+	#cachedUsageAccountId: string | undefined;
 	#usageFetchedAt = 0;
 	#usageInFlight = false;
 
@@ -507,7 +538,14 @@ export class StatusLineComponent implements Component {
 		void fetcher
 			.call(this.session)
 			.then(reports => {
-				this.#cachedUsage = this.#normalizeUsageReports(reports);
+				this.#cachedUsageReports = reports;
+				this.#cachedUsageProvider = this.#activeUsageProvider();
+				this.#cachedUsageAccountId = this.#activeCodexAccountId(this.#cachedUsageProvider);
+				this.#cachedUsage = this.#normalizeUsageReports(
+					reports,
+					this.#cachedUsageProvider,
+					this.#cachedUsageAccountId,
+				);
 				this.#usageFetchedAt = Date.now();
 				if (this.#onBranchChange) {
 					this.#onBranchChange();
@@ -525,8 +563,25 @@ export class StatusLineComponent implements Component {
 			});
 	}
 
-	#normalizeUsageReports(reports: unknown): SegmentContext["usage"] {
-		if (!Array.isArray(reports)) return null;
+	#normalizeUsageReports(
+		reports: unknown,
+		activeProvider = this.#activeUsageProvider(),
+		activeCodexAccountId = this.#activeCodexAccountId(activeProvider),
+	): SegmentContext["usage"] {
+		if (!activeProvider || !Array.isArray(reports)) return null;
+		const activeCodexReportCount =
+			activeProvider === "openai-codex" && activeCodexAccountId
+				? reports.filter(report => {
+						if (!report || typeof report !== "object") return false;
+						const provider = (report as { provider?: unknown }).provider;
+						return (
+							typeof provider === "string" &&
+							resolveOAuthStorageProvider(provider) === activeProvider &&
+							usageReportAccountId(report) === activeCodexAccountId
+						);
+					}).length
+				: 0;
+		const ambiguousActiveCodexReports = activeCodexReportCount > 1;
 		const windows: NonNullable<SegmentContext["usage"]>["windows"] = [];
 		const seen = new Set<string>();
 		const now = Date.now();
@@ -560,14 +615,23 @@ export class StatusLineComponent implements Component {
 		for (const report of reports) {
 			if (!report || typeof report !== "object") continue;
 			const provider = (report as { provider?: unknown }).provider;
-			const providerId = typeof provider === "string" ? provider : undefined;
+			const providerId = typeof provider === "string" ? resolveOAuthStorageProvider(provider) : undefined;
+			if (providerId !== activeProvider) continue;
+			// Codex usage fetches cover every OAuth account; fail closed unless this session's account matches uniquely.
+			if (
+				providerId === "openai-codex" &&
+				(!activeCodexAccountId ||
+					ambiguousActiveCodexReports ||
+					usageReportAccountId(report) !== activeCodexAccountId)
+			)
+				continue;
 			const limits = (report as { limits?: unknown }).limits;
 			if (!Array.isArray(limits)) continue;
 			for (const limit of limits) {
 				if (!limit || typeof limit !== "object") continue;
 				const l = limit as {
 					id?: unknown;
-					scope?: { windowId?: string; tier?: string; modelId?: string };
+					scope?: { provider?: unknown; windowId?: string; tier?: string; modelId?: string };
 					window?: { id?: string; resetsAt?: number };
 					amount?: { usedFraction?: number };
 				};
@@ -578,6 +642,10 @@ export class StatusLineComponent implements Component {
 				const tier = l.scope?.tier;
 				const modelId = l.scope?.modelId;
 				const resetsAt = l.window?.resetsAt;
+				// A limit scoped to another provider never describes the active one.
+				const scopeProvider =
+					typeof l.scope?.provider === "string" ? resolveOAuthStorageProvider(l.scope.provider) : undefined;
+				if (scopeProvider !== undefined && scopeProvider !== providerId) continue;
 
 				if (providerId === "openai-codex") {
 					if (id === "openai-codex:primary" || (!id && !!windowId && windowId !== "7d" && !modelId)) {
@@ -589,7 +657,8 @@ export class StatusLineComponent implements Component {
 					}
 				} else if (windowId === "5h" && !tier) {
 					pushWindow(`${providerId ?? "provider"}:5h`, "5h", fraction, resetsAt, "m");
-				} else if (windowId === "7d" && !tier) {
+				} else if (windowId === "7d" && !tier && providerId !== "grok-build" && providerId !== "xai") {
+					// Grok's only report is SuperGrok monthly credits filed under "7d"; a month is not a 7d quota.
 					pushWindow(`${providerId ?? "provider"}:7d`, "7d", fraction, resetsAt, "h");
 				}
 			}
@@ -598,6 +667,28 @@ export class StatusLineComponent implements Component {
 		return windows.length > 0 ? { windows } : null;
 	}
 
+	#activeUsageProvider(): string | undefined {
+		const model = this.session.state.model ?? this.session.model;
+		if (!model || typeof model !== "object") return undefined;
+		const provider = (model as { provider?: unknown }).provider;
+		return typeof provider === "string" && provider.length > 0 ? resolveOAuthStorageProvider(provider) : undefined;
+	}
+
+	#activeCodexAccountId(activeProvider: string | undefined): string | undefined {
+		if (activeProvider !== "openai-codex") return undefined;
+		// Turns resolve their API key with the session id as the sticky key, so the account follows it too.
+		return this.session.modelRegistry.authStorage.getOAuthAccountId(activeProvider, this.session.sessionId);
+	}
+
+	#syncCachedUsageForActiveProvider(): void {
+		const activeProvider = this.#activeUsageProvider();
+		const activeCodexAccountId = this.#activeCodexAccountId(activeProvider);
+		if (this.#cachedUsageProvider === activeProvider && this.#cachedUsageAccountId === activeCodexAccountId) return;
+		this.#cachedUsageProvider = activeProvider;
+		this.#cachedUsageAccountId = activeCodexAccountId;
+		this.#cachedUsage = this.#normalizeUsageReports(this.#cachedUsageReports, activeProvider, activeCodexAccountId);
+	}
+
 	#buildSegmentContext(
 		width: number,
 		effectiveSettings: Required<
@@ -607,7 +698,8 @@ export class StatusLineComponent implements Component {
 	): SegmentContext {
 		const state = this.session.state;
 
-		// Trigger background fetch (5-min TTL); render uses cached value
+		// Reproject cached reports when the model or Codex account changed, then refresh (5-min TTL).
+		this.#syncCachedUsageForActiveProvider();
 		this.refreshUsageInBackground();
 
 		// Get usage statistics
@@ -777,11 +869,10 @@ export class StatusLineComponent implements Component {
 		const ctx = this.#buildSegmentContext(width, effectiveSettings);
 		const separatorDef = getSeparator(effectiveSettings.separator ?? "powerline-thin", theme);
 
-		// Use the subtle surface tone (the same elevated background as user-message
-		// bubbles) instead of the heavy `statusLineBg` block, so the rail layers
-		// just above the base background as a quiet zone rather than a solid bar.
-		// Resolving through a semantic slot keeps it correct across every theme.
-		const bgAnsi = theme.getBgAnsi("userMessageBg");
+		// Powerline separators paint their arrows from a surface tone; every other
+		// separator leaves the rail on the bare terminal so it reads as a ledger line,
+		// not a bar.
+		const bgAnsi = separatorDef.endCaps ? theme.getBgAnsi("statusLineBg") : "";
 		const fgAnsi = theme.getFgAnsi("text");
 		const sepAnsi = theme.getFgAnsi("statusLineSep");