@marckrenn/pi-sub-bar 1.0.1 → 1.0.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @marckrenn/pi-sub-bar
 
+## 1.0.2
+
+### Patch Changes
+
+- [#3](https://github.com/marckrenn/pi-sub/pull/3) [`4ceb5ad`](https://github.com/marckrenn/pi-sub/commit/4ceb5ad133166237652d197ba9296ad1589a813c) Thanks [@marckrenn](https://github.com/marckrenn)! - Bundle sub-core with sub-bar, refresh Antigravity quotas + settings, and update UI copy/controls.
+
+- Updated dependencies [[`4ceb5ad`](https://github.com/marckrenn/pi-sub/commit/4ceb5ad133166237652d197ba9296ad1589a813c)]:
+  - @marckrenn/pi-sub-core@1.0.2
+  - @marckrenn/pi-sub-shared@1.0.2
+
+## 1.0.1
+
+### Patch Changes
+
+- Align repo version with npm publish.
+- Updated dependencies:
+  - @marckrenn/pi-sub-shared@1.0.1
+
 ## 1.0.0
 
 ### Major Changes

package/README.md

@@ -29,10 +29,10 @@ https://github.com/user-attachments/assets/d61d82f6-afd0-45fc-82f3-69910543aa7a
 
 | Provider | Usage Data | Status Page |
 |----------|-----------|-------------|
-| Anthropic (Claude) | 5h/7d windows, extra usage | ✅ |
+| Anthropic (Claude) | 5h/Week windows, extra usage | ✅ |
 | GitHub Copilot | Monthly quota, requests | ✅ |
 | Google Gemini | Pro/Flash quotas | ✅ |
-| Antigravity | Claude/Pro/Flash quotas | ✅ |
+| Antigravity | Model quotas | ✅ |
 | OpenAI Codex | Primary/secondary windows | ✅ |
 | AWS Kiro | Credits | - |
 | z.ai | Tokens/monthly limits | - |
@@ -41,27 +41,25 @@ https://github.com/user-attachments/assets/d61d82f6-afd0-45fc-82f3-69910543aa7a
 
 | Provider | Usage Windows | Extra Info | Status Indicator | Tested | Notes |
 |----------|--------------|------------|------------------|--------|-------|
-| Anthropic (Claude) | 5h, 7d, Extra | Extra usage label | ✅ | ✅ | Extra usage can show on/off state |
+| Anthropic (Claude) | 5h, Week, Extra | Extra usage label | ✅ | ✅ | Extra usage can show on/off state |
 | GitHub Copilot | Month | Model multiplier + requests left | ✅ | ✅ | Requests left uses model multiplier |
 | Google Gemini | Pro, Flash | - | ✅ | - | Quotas aggregated per model family |
-| Antigravity | Claude, Pro, Flash | - | ✅ | - | Sandbox Cloud Code Assist quotas |
+| Antigravity | Models | - | ✅ | ✅ | Sandbox Cloud Code Assist quotas |
 | OpenAI Codex | Primary, Secondary | - | ✅ | ✅ | Credits not yet supported (PRs welcome!) |
 | AWS Kiro | Credits | - | - | - | - |
 | z.ai | Tokens, Monthly | - | - | - | API quota limits |
 
 ## Installation
 
-Install via the pi package manager (recommended). `sub-bar` depends on `sub-core` for data (it will not render without it):
+Install via the pi package manager (recommended). `sub-bar` bundles `sub-core`, so you only need to install `sub-bar`:
 
 ```bash
-pi install npm:@marckrenn/pi-sub-core
 pi install npm:@marckrenn/pi-sub-bar
 ```
 
 Use `-l` to install into project settings instead of global:
 
 ```bash
-pi install -l npm:@marckrenn/pi-sub-core
 pi install -l npm:@marckrenn/pi-sub-bar
 ```
 
@@ -69,17 +67,19 @@ Manual install (local development):
 
 ```bash
 git clone https://github.com/marckrenn/pi-sub.git
+cd pi-sub
+npm install
 
-ln -s /path/to/pi-sub/packages/sub-core ~/.pi/agent/extensions/sub-core
 ln -s /path/to/pi-sub/packages/sub-bar ~/.pi/agent/extensions/sub-bar
 ```
 
-Alternative (no symlink): add both to `~/.pi/agent/settings.json`:
+If you want to develop `sub-core` separately, also symlink `packages/sub-core` into `~/.pi/agent/extensions`.
+
+Alternative (no symlink): add `sub-bar` to `~/.pi/agent/settings.json`:
 
 ```json
 {
   "extensions": [
-    "/path/to/pi-sub/packages/sub-core/index.ts",
     "/path/to/pi-sub/packages/sub-bar/index.ts"
   ]
 }
@@ -142,7 +142,6 @@ Credentials are loaded by sub-core from:
 Pi packages use a `pi` field in `package.json` plus the `pi-package` keyword for discoverability. This repo already declares `pi.extensions`, so you can install via:
 
 ```bash
-pi install npm:@marckrenn/pi-sub-core
 pi install npm:@marckrenn/pi-sub-bar
 ```
 
@@ -186,7 +185,7 @@ npm run check
 
 ## Credits
 
-- Hannes Januschka ([barts](https://github.com/hjanuschka/shitty-extensions?tab=readme-ov-file#usage-barts), [@hjanuschka](https://x.com/hjanuschka))
+- ~Hannes~ Helmut Januschka ([usage-bar.ts](https://github.com/hjanuschka/shitty-extensions?tab=readme-ov-file#usage-barts), [@hjanuschka](https://x.com/hjanuschka))
 - Peter Steinberger ([CodexBar](https://github.com/steipete/CodexBar), [@steipete](https://x.com/steipete))
 
 ## License

package/index.ts

@@ -7,6 +7,8 @@
 import type { ExtensionAPI, ExtensionContext, Theme, ThemeColor } from "@mariozechner/pi-coding-agent";
 import { Container, Input, SelectList, Spacer, Text, truncateToWidth, wrapTextWithAnsi, visibleWidth } from "@mariozechner/pi-tui";
 import * as fs from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
 import type { ProviderName, ProviderUsageEntry, SubCoreAllState, SubCoreState, UsageSnapshot } from "./src/types.js";
 import type { Settings, BaseTextColor } from "./src/settings-types.js";
 import { isBackgroundColor, resolveBaseTextColor, resolveDividerColor } from "./src/settings-types.js";
@@ -58,6 +60,56 @@ function applyBaseTextColor(theme: Theme, color: BaseTextColor, text: string): s
 	return theme.fg(resolveDividerColor(color), text);
 }
 
+type PiSettings = {
+	enabledModels?: unknown;
+};
+
+const AGENT_SETTINGS_ENV = "PI_CODING_AGENT_DIR";
+const DEFAULT_AGENT_DIR = join(homedir(), ".pi", "agent");
+const PROJECT_SETTINGS_DIR = ".pi";
+const SETTINGS_FILE_NAME = "settings.json";
+
+function expandTilde(value: string): string {
+	if (value === "~") return homedir();
+	if (value.startsWith("~/")) return join(homedir(), value.slice(2));
+	return value;
+}
+
+function resolveAgentSettingsPath(): string {
+	const envDir = process.env[AGENT_SETTINGS_ENV];
+	const agentDir = envDir ? expandTilde(envDir) : DEFAULT_AGENT_DIR;
+	return join(agentDir, SETTINGS_FILE_NAME);
+}
+
+function readPiSettings(path: string): PiSettings | null {
+	try {
+		if (!fs.existsSync(path)) return null;
+		const content = fs.readFileSync(path, "utf-8");
+		return JSON.parse(content) as PiSettings;
+	} catch {
+		return null;
+	}
+}
+
+function loadScopedModelPatterns(cwd: string): string[] {
+	const globalSettings = readPiSettings(resolveAgentSettingsPath());
+	const projectSettingsPath = join(cwd, PROJECT_SETTINGS_DIR, SETTINGS_FILE_NAME);
+	const projectSettings = readPiSettings(projectSettingsPath);
+
+	let enabledModels = Array.isArray(globalSettings?.enabledModels)
+		? (globalSettings?.enabledModels as string[])
+		: undefined;
+
+	if (projectSettings && Object.prototype.hasOwnProperty.call(projectSettings, "enabledModels")) {
+		enabledModels = Array.isArray(projectSettings.enabledModels)
+			? (projectSettings.enabledModels as string[])
+			: [];
+	}
+
+	if (!enabledModels || enabledModels.length === 0) return [];
+	return enabledModels.filter((value) => typeof value === "string");
+}
+
 /**
  * Create the extension
  */
@@ -69,6 +121,7 @@ export default function createExtension(pi: ExtensionAPI) {
 	let coreAvailable = false;
 	let coreSettings: CoreSettings = getFallbackCoreSettings(settings);
 	let fetchFailureTimer: NodeJS.Timeout | undefined;
+	const antigravityHiddenModels = new Set(["tab_flash_lite_preview"]);
 	let settingsWatcher: fs.FSWatcher | undefined;
 	let settingsPoll: NodeJS.Timeout | undefined;
 	let settingsDebounce: NodeJS.Timeout | undefined;
@@ -233,11 +286,15 @@ export default function createExtension(pi: ExtensionAPI) {
 					const wantsSplit = alignment === "split";
 					const shouldAlign = !hasFill && !wantsSplit && (alignment === "center" || alignment === "right");
 					const baseTextColor = resolveBaseTextColor(settings.display.baseTextColor);
+					const scopedModelPatterns = loadScopedModelPatterns(ctx.cwd);
+					const modelInfo = ctx.model
+						? { provider: ctx.model.provider, id: ctx.model.id, scopedModelPatterns }
+						: { scopedModelPatterns };
 					const formatted = message
 						? applyBaseTextColor(theme, baseTextColor, message)
 						: (hasFill || wantsSplit)
-							? formatUsageStatusWithWidth(theme, usage!, contentWidth, ctx.model?.id, settings, { labelGapFill: wantsSplit })
-							: formatUsageStatus(theme, usage!, ctx.model?.id, settings);
+							? formatUsageStatusWithWidth(theme, usage!, contentWidth, modelInfo, settings, { labelGapFill: wantsSplit })
+							: formatUsageStatus(theme, usage!, modelInfo, settings);
 
 					const alignLine = (line: string) => {
 						if (!shouldAlign) return line;
@@ -251,7 +308,7 @@ export default function createExtension(pi: ExtensionAPI) {
 					let lines: string[] = [];
 					if (!formatted) {
 						lines = [];
-					} else if (settings.display.widgetWrapping === "wrap") {
+					} else if (settings.display.overflow === "wrap") {
 						lines = wrapTextWithAnsi(formatted, contentWidth).map(alignLine);
 					} else {
 						const trimmed = alignLine(truncateToWidth(formatted, contentWidth, theme.fg("dim", "...")));
@@ -295,6 +352,46 @@ export default function createExtension(pi: ExtensionAPI) {
 		return currentUsage;
 	}
 
+	function syncAntigravityModels(usage?: UsageSnapshot): void {
+		if (!usage || usage.provider !== "antigravity") return;
+		const normalizeModel = (label: string) => label.toLowerCase().replace(/\s+/g, "_");
+		const labels = usage.windows
+			.map((window) => window.label?.trim())
+			.filter((label): label is string => Boolean(label))
+			.filter((label) => !antigravityHiddenModels.has(normalizeModel(label)));
+		const uniqueModels = Array.from(new Set(labels));
+		const antigravitySettings = settings.providers.antigravity;
+		const visibility = { ...(antigravitySettings.modelVisibility ?? {}) };
+		const modelSet = new Set(uniqueModels);
+		let changed = false;
+
+		for (const model of uniqueModels) {
+			if (!(model in visibility)) {
+				visibility[model] = false;
+				changed = true;
+			}
+		}
+
+		for (const existing of Object.keys(visibility)) {
+			if (!modelSet.has(existing)) {
+				delete visibility[existing];
+				changed = true;
+			}
+		}
+
+		const currentOrder = antigravitySettings.modelOrder ?? [];
+		const orderChanged = currentOrder.length !== uniqueModels.length
+			|| currentOrder.some((model, index) => model !== uniqueModels[index]);
+		if (orderChanged) {
+			changed = true;
+		}
+
+		if (!changed) return;
+		antigravitySettings.modelVisibility = visibility;
+		antigravitySettings.modelOrder = uniqueModels;
+		saveSettings(settings);
+	}
+
 	function updateEntries(entries: ProviderUsageEntry[] | undefined): void {
 		if (!entries) return;
 		const next: Partial<Record<ProviderName, UsageSnapshot>> = {};
@@ -303,6 +400,7 @@ export default function createExtension(pi: ExtensionAPI) {
 			next[entry.provider] = entry.usage;
 		}
 		usageEntries = next;
+		syncAntigravityModels(next.antigravity);
 		updateFetchFailureTicker();
 	}
 
@@ -323,7 +421,7 @@ export default function createExtension(pi: ExtensionAPI) {
 
 	function renderCurrent(ctx: ExtensionContext): void {
 		if (!coreAvailable) {
-			renderUsageWidget(ctx, undefined, "sub-core not installed");
+			renderUsageWidget(ctx, undefined, "pi-sub-core required. install with: pi install npm:@marckrenn/pi-sub-core");
 			return;
 		}
 		const usage = resolveDisplayedUsage();
@@ -332,6 +430,7 @@ export default function createExtension(pi: ExtensionAPI) {
 
 	function updateUsage(usage: UsageSnapshot | undefined): void {
 		currentUsage = usage;
+		syncAntigravityModels(usage);
 		updateFetchFailureTicker();
 		if (lastContext) {
 			renderCurrent(lastContext);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marckrenn/pi-sub-bar",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Usage widget extension for pi-coding-agent - shows current provider usage above the editor",
   "keywords": [
     "pi-package"
@@ -13,7 +13,8 @@
   },
   "pi": {
     "extensions": [
-      "./index.ts"
+      "./index.ts",
+      "node_modules/@marckrenn/pi-sub-core/index.ts"
     ]
   },
   "scripts": {
@@ -28,9 +29,16 @@
     "typescript": "^5.8.0"
   },
   "dependencies": {
-    "@marckrenn/pi-sub-shared": "^1.0.0"
+    "@marckrenn/pi-sub-core": "^1.0.2",
+    "@marckrenn/pi-sub-shared": "^1.0.2"
   },
+  "bundledDependencies": [
+    "@marckrenn/pi-sub-core"
+  ],
   "peerDependencies": {
     "@mariozechner/pi-coding-agent": "*"
-  }
+  },
+  "bundleDependencies": [
+    "@marckrenn/pi-sub-core"
+  ]
 }

package/src/formatting.ts

@@ -4,7 +4,7 @@
 
 import type { Theme } from "@mariozechner/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
-import type { RateWindow, UsageSnapshot, ProviderStatus } from "./types.js";
+import type { RateWindow, UsageSnapshot, ProviderStatus, ModelInfo } from "./types.js";
 import type {
 	BaseTextColor,
 	BarStyle,
@@ -29,6 +29,13 @@ export interface UsageWindowParts {
 	reset: string;
 }
 
+type ModelInput = ModelInfo | string | undefined;
+
+function resolveModelInfo(model?: ModelInput): ModelInfo | undefined {
+	if (!model) return undefined;
+	return typeof model === "string" ? { id: model } : model;
+}
+
 /**
  * Get the characters to use for progress bars
  */
@@ -272,7 +279,9 @@ function formatProviderLabel(theme: Theme, usage: UsageSnapshot, settings?: Sett
 	const baseStatus = showStatus ? usage.status : undefined;
 	const lastSuccessAt = usage.lastSuccessAt;
 	const elapsed = lastSuccessAt ? formatElapsedSince(lastSuccessAt) : undefined;
-	const fetchDescription = elapsed ? `Updated: ${elapsed}` : "Fetch failed";
+	const fetchDescription = elapsed
+		? (elapsed === "just now" ? "Last upd.: just now" : `Last upd.: ${elapsed} ago`)
+		: "Fetch failed";
 	const fetchStatus: ProviderStatus | undefined = fetchError
 		? { indicator: "minor", description: fetchDescription }
 		: undefined;
@@ -572,7 +581,7 @@ export function formatUsageWindowParts(
 export function formatUsageStatus(
 	theme: Theme,
 	usage: UsageSnapshot,
-	modelId?: string,
+	model?: ModelInput,
 	settings?: Settings
 ): string | undefined {
 	const baseTextColor = resolveBaseTextColor(settings?.display.baseTextColor);
@@ -593,10 +602,12 @@ export function formatUsageStatus(
 	const parts: string[] = [];
 	const isCodex = usage.provider === "codex";
 	const invertUsage = isCodex && (settings?.providers.codex.invertUsage ?? false);
+	const modelInfo = resolveModelInfo(model);
+	const modelId = modelInfo?.id;
 
 	for (const w of usage.windows) {
 		// Skip windows that are disabled in settings
-		if (!shouldShowWindow(usage, w, settings)) {
+		if (!shouldShowWindow(usage, w, settings, modelInfo)) {
 			continue;
 		}
 		parts.push(formatUsageWindow(theme, w, invertUsage, settings, usage));
@@ -630,7 +641,7 @@ export function formatUsageStatusWithWidth(
 	theme: Theme,
 	usage: UsageSnapshot,
 	width: number,
-	modelId?: string,
+	model?: ModelInput,
 	settings?: Settings,
 	options?: { labelGapFill?: boolean }
 ): string | undefined {
@@ -671,9 +682,11 @@ export function formatUsageStatusWithWidth(
 	const windows: RateWindow[] = [];
 	const isCodex = usage.provider === "codex";
 	const invertUsage = isCodex && (settings?.providers.codex.invertUsage ?? false);
+	const modelInfo = resolveModelInfo(model);
+	const modelId = modelInfo?.id;
 
 	for (const w of usage.windows) {
-		if (!shouldShowWindow(usage, w, settings)) {
+		if (!shouldShowWindow(usage, w, settings, modelInfo)) {
 			continue;
 		}
 		windows.push(w);

package/src/providers/metadata.ts

@@ -2,9 +2,9 @@
  * Provider metadata shared across the extension.
  */
 
-import type { RateWindow, UsageSnapshot, ProviderName } from "../types.js";
+import type { RateWindow, UsageSnapshot, ProviderName, ModelInfo } from "../types.js";
 import type { Settings } from "../settings-types.js";
-import { getModelMultiplier } from "../utils.js";
+import { getModelMultiplier, normalizeTokens } from "../utils.js";
 import { PROVIDER_METADATA as BASE_METADATA, type ProviderMetadata as BaseProviderMetadata } from "@marckrenn/pi-sub-shared";
 
 export { PROVIDERS, PROVIDER_DISPLAY_NAMES } from "@marckrenn/pi-sub-shared";
@@ -15,27 +15,27 @@ export interface UsageExtra {
 }
 
 export interface ProviderMetadata extends BaseProviderMetadata {
-	isWindowVisible?: (usage: UsageSnapshot, window: RateWindow, settings?: Settings) => boolean;
+	isWindowVisible?: (usage: UsageSnapshot, window: RateWindow, settings?: Settings, model?: ModelInfo) => boolean;
 	getExtras?: (usage: UsageSnapshot, settings?: Settings, modelId?: string) => UsageExtra[];
 }
 
-const anthropicWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings) => {
+const anthropicWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings, _model) => {
 	if (!settings) return true;
 	const ps = settings.providers.anthropic;
 	if (window.label === "5h") return ps.windows.show5h;
-	if (window.label === "7d") return ps.windows.show7d;
+	if (window.label === "Week") return ps.windows.show7d;
 	if (window.label.startsWith("Extra [")) return ps.windows.showExtra;
 	return true;
 };
 
-const copilotWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings) => {
+const copilotWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings, _model) => {
 	if (!settings) return true;
 	const ps = settings.providers.copilot;
 	if (window.label === "Month") return ps.windows.showMonth;
 	return true;
 };
 
-const geminiWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings) => {
+const geminiWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings, _model) => {
 	if (!settings) return true;
 	const ps = settings.providers.gemini;
 	if (window.label === "Pro") return ps.windows.showPro;
@@ -43,16 +43,47 @@ const geminiWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window
 	return true;
 };
 
-const antigravityWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings) => {
+const antigravityWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings, model) => {
 	if (!settings) return true;
 	const ps = settings.providers.antigravity;
-	if (window.label === "Claude") return ps.windows.showClaude;
-	if (window.label === "Pro") return ps.windows.showPro;
-	if (window.label === "Flash") return ps.windows.showFlash;
-	return true;
+	const label = window.label.trim();
+	const normalized = label.toLowerCase().replace(/\s+/g, "_");
+	if (normalized === "tab_flash_lite_preview") return false;
+
+	const labelTokens = normalizeTokens(label);
+
+	const modelProvider = model?.provider?.toLowerCase() ?? "";
+	const modelId = model?.id;
+	const providerMatches = modelProvider.includes("antigravity");
+	if (ps.showCurrentModel && providerMatches && modelId) {
+		const modelTokens = normalizeTokens(modelId);
+		const match = modelTokens.length > 0 && modelTokens.every((token) => labelTokens.includes(token));
+		if (match) return true;
+	}
+
+	if (ps.showScopedModels) {
+		const scopedPatterns = model?.scopedModelPatterns ?? [];
+		const matchesScoped = scopedPatterns.some((pattern) => {
+			if (!pattern) return false;
+			const [rawPattern] = pattern.split(":");
+			const trimmed = rawPattern?.trim();
+			if (!trimmed) return false;
+			const hasProvider = trimmed.includes("/");
+			if (!hasProvider) return false;
+			const providerPart = trimmed.slice(0, trimmed.indexOf("/")).trim().toLowerCase();
+			if (!providerPart.includes("antigravity")) return false;
+			const base = trimmed.slice(trimmed.lastIndexOf("/") + 1);
+			const tokens = normalizeTokens(base);
+			return tokens.length > 0 && tokens.every((token) => labelTokens.includes(token));
+		});
+		if (matchesScoped) return true;
+	}
+
+	const visibility = ps.modelVisibility?.[label];
+	return visibility === true;
 };
 
-const codexWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings) => {
+const codexWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings, _model) => {
 	if (!settings) return true;
 	const ps = settings.providers.codex;
 	if (window.label.match(/^\d+h$/)) return ps.windows.showPrimary;
@@ -60,14 +91,14 @@ const codexWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window,
 	return true;
 };
 
-const kiroWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings) => {
+const kiroWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings, _model) => {
 	if (!settings) return true;
 	const ps = settings.providers.kiro;
 	if (window.label === "Credits") return ps.windows.showCredits;
 	return true;
 };
 
-const zaiWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings) => {
+const zaiWindowVisible: ProviderMetadata["isWindowVisible"] = (_usage, window, settings, _model) => {
 	if (!settings) return true;
 	const ps = settings.providers.zai;
 	if (window.label === "Tokens") return ps.windows.showTokens;

package/src/providers/settings.ts

@@ -57,10 +57,10 @@ export function buildProviderSettingsItems(settings: Settings, provider: Provide
 			},
 			{
 				id: "show7d",
-				label: "Show 7d Window",
+				label: "Show Week Window",
 				currentValue: anthroSettings.windows.show7d ? "on" : "off",
 				values: ["on", "off"],
-				description: "Show the 7-day usage window.",
+				description: "Show the weekly usage window.",
 			},
 			{
 				id: "showExtra",
@@ -130,27 +130,41 @@ export function buildProviderSettingsItems(settings: Settings, provider: Provide
 		const antigravitySettings = ps as AntigravityProviderSettings;
 		items.push(
 			{
-				id: "showClaude",
-				label: "Show Claude Window",
-				currentValue: antigravitySettings.windows.showClaude ? "on" : "off",
+				id: "showCurrentModel",
+				label: "Always Show Current Model",
+				currentValue: antigravitySettings.showCurrentModel ? "on" : "off",
 				values: ["on", "off"],
-				description: "Show the Claude quota window.",
+				description: "Show the active Antigravity model even if hidden.",
 			},
 			{
-				id: "showPro",
-				label: "Show Pro Window",
-				currentValue: antigravitySettings.windows.showPro ? "on" : "off",
-				values: ["on", "off"],
-				description: "Show the Gemini Pro quota window.",
-			},
-			{
-				id: "showFlash",
-				label: "Show Flash Window",
-				currentValue: antigravitySettings.windows.showFlash ? "on" : "off",
+				id: "showScopedModels",
+				label: "Show Scoped Models",
+				currentValue: antigravitySettings.showScopedModels ? "on" : "off",
 				values: ["on", "off"],
-				description: "Show the Gemini Flash quota window.",
+				description: "Show Antigravity models that are in the scoped model rotation.",
 			},
 		);
+
+		const modelVisibility = antigravitySettings.modelVisibility ?? {};
+		const modelOrder = antigravitySettings.modelOrder?.length
+			? antigravitySettings.modelOrder
+			: Object.keys(modelVisibility).sort((a, b) => a.localeCompare(b));
+		const seenModels = new Set<string>();
+
+		for (const model of modelOrder) {
+			if (!model || seenModels.has(model)) continue;
+			seenModels.add(model);
+			const normalized = model.toLowerCase().replace(/\s+/g, "_");
+			if (normalized === "tab_flash_lite_preview") continue;
+			const visible = modelVisibility[model] !== false;
+			items.push({
+				id: `model:${model}`,
+				label: model,
+				currentValue: visible ? "on" : "off",
+				values: ["on", "off"],
+				description: "Toggle this model window.",
+			});
+		}
 	}
 
 	if (provider === "codex") {
@@ -276,14 +290,31 @@ export function applyProviderSettingsChange(
 	if (provider === "antigravity") {
 		const antigravitySettings = ps as AntigravityProviderSettings;
 		switch (id) {
-			case "showClaude":
-				antigravitySettings.windows.showClaude = value === "on";
+			case "showModels":
+				antigravitySettings.windows.showModels = value === "on";
 				break;
-			case "showPro":
-				antigravitySettings.windows.showPro = value === "on";
+			case "showCurrentModel":
+				antigravitySettings.showCurrentModel = value === "on";
 				break;
-			case "showFlash":
-				antigravitySettings.windows.showFlash = value === "on";
+			case "showScopedModels":
+				antigravitySettings.showScopedModels = value === "on";
+				break;
+			default:
+				if (id.startsWith("model:")) {
+					const model = id.slice("model:".length);
+					if (model) {
+						if (!antigravitySettings.modelVisibility) {
+							antigravitySettings.modelVisibility = {};
+						}
+						antigravitySettings.modelVisibility[model] = value === "on";
+						if (!antigravitySettings.modelOrder) {
+							antigravitySettings.modelOrder = [];
+						}
+						if (!antigravitySettings.modelOrder.includes(model)) {
+							antigravitySettings.modelOrder.push(model);
+						}
+					}
+				}
 				break;
 		}
 	}

package/src/providers/windows.ts

@@ -2,17 +2,22 @@
  * Provider-specific window visibility rules.
  */
 
-import type { RateWindow, UsageSnapshot } from "../types.js";
+import type { RateWindow, UsageSnapshot, ModelInfo } from "../types.js";
 import type { Settings } from "../settings-types.js";
 import { PROVIDER_METADATA } from "./metadata.js";
 
 /**
  * Check if a window should be shown based on settings.
  */
-export function shouldShowWindow(usage: UsageSnapshot, window: RateWindow, settings?: Settings): boolean {
+export function shouldShowWindow(
+	usage: UsageSnapshot,
+	window: RateWindow,
+	settings?: Settings,
+	model?: ModelInfo
+): boolean {
 	const handler = PROVIDER_METADATA[usage.provider]?.isWindowVisible;
 	if (handler) {
-		return handler(usage, window, settings);
+		return handler(usage, window, settings, model);
 	}
 	return true;
 }

package/src/settings/display.ts

@@ -42,11 +42,11 @@ export function buildDisplayLayoutItems(settings: Settings): SettingItem[] {
 			description: "Align the usage line inside the widget.",
 		},
 		{
-			id: "widgetWrapping",
-			label: "Widget Wrapping",
-			currentValue: settings.display.widgetWrapping,
+			id: "overflow",
+			label: "Overflow",
+			currentValue: settings.display.overflow,
 			values: ["truncate", "wrap"] as WidgetWrapping[],
-			description: "Wrap the usage line or truncate with ellipsis.",
+			description: "Wrap the usage line or truncate with ellipsis (requires bar width ≠ fill and alignment ≠ split).",
 		},
 		{
 			id: "paddingX",
@@ -666,8 +666,11 @@ export function applyDisplayChange(settings: Settings, id: string, value: string
 		case "showBottomDivider":
 			settings.display.showBottomDivider = value === "on";
 			break;
+		case "overflow":
+			settings.display.overflow = value as WidgetWrapping;
+			break;
 		case "widgetWrapping":
-			settings.display.widgetWrapping = value as WidgetWrapping;
+			settings.display.overflow = value as WidgetWrapping;
 			break;
 		case "errorThreshold": {
 			const parsed = parseClampedNumber(value, 0, 100);

package/src/settings/menu.ts

@@ -22,7 +22,7 @@ export function buildMainMenuItems(settings: Settings, pinnedProvider?: Provider
 		{
 			value: "providers",
 			label: "Provider Settings",
-			description: `${Object.keys(settings.providers).length} providers`,
+			description: "provider specific settings",
 			tooltip: "Configure provider display toggles and window visibility.",
 		},
 		{
@@ -134,9 +134,9 @@ export function buildDisplayThemeMenuItems(): TooltipSelectItem[] {
 		},
 		{
 			value: "display-theme-load",
-			label: "Load theme",
-			description: "restore or apply",
-			tooltip: "Load a saved or default theme.",
+			label: "Manage & Load themes",
+			description: "load, share, delete and restore themes",
+			tooltip: "Load, share, delete, and restore saved themes.",
 		},
 		{
 			value: "display-theme-import",
@@ -148,7 +148,13 @@ export function buildDisplayThemeMenuItems(): TooltipSelectItem[] {
 			value: "display-theme-random",
 			label: "Random theme",
 			description: "generate a new theme",
-			tooltip: "Generate a new random display theme.",
+			tooltip: "Generate a random display theme as inspiration or a starting point.",
+		},
+		{
+			value: "display-theme-restore",
+			label: "Restore previous state",
+			description: "restore your last theme",
+			tooltip: "Restore your previous display theme.",
 		},
 	];
 }

package/src/settings/themes.ts

@@ -9,7 +9,7 @@ type BarWidth = DisplaySettings["barWidth"];
 type DividerCharacter = DisplaySettings["dividerCharacter"];
 type DividerBlanks = DisplaySettings["dividerBlanks"];
 type DisplayAlignment = DisplaySettings["alignment"];
-type WidgetWrapping = DisplaySettings["widgetWrapping"];
+type OverflowMode = DisplaySettings["overflow"];
 type BaseTextColor = DisplaySettings["baseTextColor"];
 type DividerColor = DisplaySettings["dividerColor"];
 type ResetTimeFormat = DisplaySettings["resetTimeFormat"];
@@ -34,7 +34,7 @@ const RANDOM_BAR_CHARACTERS: BarCharacter[] = [
 	"🚀_",
 ];
 const RANDOM_ALIGNMENTS: DisplayAlignment[] = ["left", "center", "right", "split"];
-const RANDOM_WRAPPINGS: WidgetWrapping[] = ["truncate", "wrap"];
+const RANDOM_OVERFLOW: OverflowMode[] = ["truncate", "wrap"];
 const RANDOM_RESET_POSITIONS: DisplaySettings["resetTimePosition"][] = ["off", "front", "back", "integrated"];
 const RANDOM_RESET_FORMATS: ResetTimeFormat[] = ["relative", "datetime"];
 const RANDOM_RESET_CONTAINMENTS: ResetTimerContainment[] = ["none", "blank", "()", "[]", "<>"];
@@ -189,7 +189,7 @@ export function resolveDisplayThemeTarget(
 				widgetPlacement: "belowEditor",
 				errorThreshold: 25,
 				warningThreshold: 50,
-				widgetWrapping: "truncate",
+				overflow: "truncate",
 				successThreshold: 75,
 			},
 			deletable: false,
@@ -208,7 +208,7 @@ export function buildRandomDisplay(base: DisplaySettings): DisplaySettings {
 	const display: DisplaySettings = { ...base };
 
 	display.alignment = pickRandom(RANDOM_ALIGNMENTS);
-	display.widgetWrapping = pickRandom(RANDOM_WRAPPINGS);
+	display.overflow = pickRandom(RANDOM_OVERFLOW);
 	display.paddingX = pickRandom(RANDOM_PADDING);
 	display.barStyle = pickRandom(RANDOM_BAR_STYLES);
 	display.barType = pickRandom(RANDOM_BAR_TYPES);

package/src/settings/ui.ts

@@ -62,6 +62,7 @@ type SettingsCategory =
 	| "display-theme-import"
 	| "display-theme-import-action"
 	| "display-theme-random"
+	| "display-theme-restore"
 	| "display-layout"
 	| "display-bar"
 	| "display-provider"
@@ -100,6 +101,7 @@ export async function showSettingsUI(
 			let themeActionTarget: { id?: string; name: string; display: Settings["display"]; deletable: boolean } | null = null;
 			let displayPreviewBackup: Settings["display"] | null = null;
 			let randomThemeBackup: Settings["display"] | null = null;
+			let displayThemeSelection: string | null = null;
 			let pinnedProviderBackup: ProviderName | null | undefined;
 			let importCandidate: DecodedDisplayShare | null = null;
 			let importBackup: Settings["display"] | null = null;
@@ -326,6 +328,7 @@ export async function showSettingsUI(
 					"display-theme-load": "Load Theme",
 					"display-theme-action": "Manage Theme",
 					"display-theme-import": "Import Theme",
+					"display-theme-restore": "Restore Theme",
 					"display-layout": "Layout & Structure",
 					"display-bar": "Bars",
 					"display-provider": "Labels & Text",
@@ -547,8 +550,15 @@ export async function showSettingsUI(
 						scrollInfo: (t: string) => theme.fg("dim", t),
 						noMatch: (t: string) => theme.fg("warning", t),
 					});
+					if (displayThemeSelection) {
+						const index = items.findIndex((item) => item.value === displayThemeSelection);
+						if (index >= 0) {
+							selectList.setSelectedIndex(index);
+						}
+					}
 					attachTooltip(items, selectList);
 					selectList.onSelect = (item) => {
+						displayThemeSelection = item.value;
 						currentCategory = item.value as SettingsCategory;
 						rebuild();
 						tui.requestRender();
@@ -651,6 +661,7 @@ export async function showSettingsUI(
 						randomThemeBackup = { ...settings.display };
 						settings.displayUserTheme = { ...randomThemeBackup };
 					}
+					displayThemeSelection = "display-theme-random";
 					const randomDisplay = buildRandomDisplay(settings.display);
 					settings.display = { ...randomDisplay };
 					saveSettings(settings);
@@ -658,6 +669,23 @@ export async function showSettingsUI(
 					currentCategory = "display-theme";
 					rebuild();
 					tui.requestRender();
+				} else if (currentCategory === "display-theme-restore") {
+					displayThemeSelection = "display-theme-restore";
+					const defaults = getDefaultSettings();
+					const fallbackUser = settings.displayUserTheme ?? settings.display;
+					const target = resolveDisplayThemeTarget("user", settings, defaults, fallbackUser);
+					if (target) {
+						const backup = displayPreviewBackup ?? settings.display;
+						settings.displayUserTheme = { ...backup };
+						settings.display = { ...target.display };
+						saveSettings(settings);
+						if (onSettingsChange) void onSettingsChange(settings);
+						if (onDisplayThemeApplied) void onDisplayThemeApplied(target.name, { source: "manual" });
+						displayPreviewBackup = null;
+					}
+					currentCategory = "display-theme";
+					rebuild();
+					tui.requestRender();
 				} else if (currentCategory === "display-theme-import") {
 					const input = new Input();
 					input.focused = true;
@@ -1018,7 +1046,8 @@ export async function showSettingsUI(
 						currentCategory === "display-theme" ||
 						currentCategory === "display-theme-load" ||
 						currentCategory === "display-theme-action" ||
-						currentCategory === "display-theme-random"
+						currentCategory === "display-theme-random" ||
+						currentCategory === "display-theme-restore"
 					) {
 						helpText = "↑↓ navigate • Enter/Space select • Esc back";
 					} else {

package/src/settings-types.ts

@@ -45,9 +45,10 @@ export type DividerCharacter =
 	| (string & {});
 
 /**
- * Widget line wrapping mode
+ * Widget overflow mode
  */
-export type WidgetWrapping = "truncate" | "wrap";
+export type OverflowMode = "truncate" | "wrap";
+export type WidgetWrapping = OverflowMode;
 
 /**
  * Widget placement
@@ -223,11 +224,13 @@ export interface GeminiProviderSettings extends BaseProviderSettings {
 }
 
 export interface AntigravityProviderSettings extends BaseProviderSettings {
+	showCurrentModel: boolean;
+	showScopedModels: boolean;
 	windows: {
-		showClaude: boolean;
-		showPro: boolean;
-		showFlash: boolean;
+		showModels: boolean;
 	};
+	modelVisibility: Record<string, boolean>;
+	modelOrder: string[];
 }
 
 export interface CodexProviderSettings extends BaseProviderSettings {
@@ -335,8 +338,8 @@ export interface DisplaySettings {
 	showTopDivider: boolean;
 	/** Show divider line below the bar */
 	showBottomDivider: boolean;
-	/** Widget line wrapping */
-	widgetWrapping: WidgetWrapping;
+	/** Widget overflow mode */
+	overflow: OverflowMode;
 	/** Left/right padding inside widget */
 	paddingX: number;
 	/** Widget placement */
@@ -412,12 +415,14 @@ export function getDefaultSettings(): Settings {
 				},
 			},
 			antigravity: {
-				showStatus: false,
+				showStatus: true,
+				showCurrentModel: true,
+				showScopedModels: true,
 				windows: {
-					showClaude: true,
-					showPro: true,
-					showFlash: true,
+					showModels: true,
 				},
+				modelVisibility: {},
+				modelOrder: [],
 			},
 			codex: {
 				showStatus: true,
@@ -486,7 +491,7 @@ export function getDefaultSettings(): Settings {
 			widgetPlacement: "belowEditor",
 			errorThreshold: 25,
 			warningThreshold: 50,
-			widgetWrapping: "truncate",
+			overflow: "truncate",
 			successThreshold: 75,
 		},
 
@@ -538,5 +543,28 @@ function deepMerge<T extends object>(target: T, source: Partial<T>): T {
  * Merge settings with defaults (no legacy migrations).
  */
 export function mergeSettings(loaded: Partial<Settings>): Settings {
-	return deepMerge(getDefaultSettings(), loaded);
+	const migrated = migrateSettings(loaded);
+	return deepMerge(getDefaultSettings(), migrated);
+}
+
+function migrateDisplaySettings(display?: Partial<DisplaySettings> | null): void {
+	if (!display) return;
+	const displayAny = display as Partial<DisplaySettings> & { widgetWrapping?: OverflowMode };
+	if (displayAny.widgetWrapping !== undefined && displayAny.overflow === undefined) {
+		displayAny.overflow = displayAny.widgetWrapping;
+	}
+	if ("widgetWrapping" in displayAny) {
+		delete (displayAny as { widgetWrapping?: unknown }).widgetWrapping;
+	}
+}
+
+function migrateSettings(loaded: Partial<Settings>): Partial<Settings> {
+	migrateDisplaySettings(loaded.display);
+	migrateDisplaySettings(loaded.displayUserTheme);
+	if (Array.isArray(loaded.displayThemes)) {
+		for (const theme of loaded.displayThemes) {
+			migrateDisplaySettings(theme.display as Partial<DisplaySettings> | undefined);
+		}
+	}
+	return loaded;
 }

package/src/types.ts

@@ -17,3 +17,9 @@ export type {
 } from "@marckrenn/pi-sub-shared";
 
 export { PROVIDERS } from "@marckrenn/pi-sub-shared";
+
+export type ModelInfo = {
+	provider?: string;
+	id?: string;
+	scopedModelPatterns?: string[];
+};

package/src/utils.ts

@@ -4,7 +4,7 @@
 
 import { MODEL_MULTIPLIERS } from "@marckrenn/pi-sub-shared";
 
-function normalizeTokens(value: string): string[] {
+export function normalizeTokens(value: string): string[] {
 	return value
 		.toLowerCase()
 		.replace(/[^a-z0-9]+/g, " ")

package/test/formatting.test.ts

@@ -172,7 +172,7 @@ test("fetch errors rely on status text instead of appended warning", () => {
 
 	const output = formatUsageStatus(theme, usage, undefined, settings);
 	assert.ok(output);
-	assert.ok(output.includes("Updated: 5m"));
+	assert.ok(output.includes("Last upd.: 5m ago"));
 	assert.ok(!output.includes("(Fetch failed)"));
 	assert.ok(output.includes("5h"));
 });
@@ -238,7 +238,7 @@ test("extras render even when usage windows are hidden", () => {
 		displayName: "Anthropic (Claude)",
 		windows: [
 			{ label: "5h", usedPercent: 10 },
-			{ label: "7d", usedPercent: 20 },
+			{ label: "Week", usedPercent: 20 },
 		],
 		extraUsageEnabled: false,
 	};
@@ -247,7 +247,7 @@ test("extras render even when usage windows are hidden", () => {
 	assert.ok(output);
 	assert.ok(output.includes("Extra [off]"));
 	assert.ok(!output.includes("5h"));
-	assert.ok(!output.includes("7d"));
+	assert.ok(!output.includes("Week"));
 });
 
 test("percentage labels clamp to bounds", () => {