@hank-warren/pi-statusline 0.5.0 → 0.7.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @hank-warren/pi-statusline
 
+## 0.7.0
+
+### Minor Changes
+
+- 70c8ef9: Add an optional provider segment. A new `Provider` toggle in `/statusline` renders the active model's provider id between the model and the directory (`claude-opus-5 | anthropic-team | pi-extensions:main | 0/1.0m`), so a `pi-multi-login` alias names the login actually spending — something a model id never carries. It is off by default, has its own colour role in every theme, and is omitted entirely when the model reports no provider.
+
+## 0.6.0
+
+### Minor Changes
+
+- 01994c7: Show the Codex 5-hour window alongside the weekly one. Codex has restored a 5-hour limit next to the weekly one on some plans, and the parser already received that window and deliberately discarded it — it kept only the largest window spanning at least a day — so a real limit went unshown. Both are now rendered like the Claude meter: 5-hour, dim separator, weekly.
+
+  Which windows exist is a property of the account, so the two slots are filled from each window's span rather than from the plan name: the shortest sub-day window fills the 5-hour slot and the longest multi-day window fills the other. A plan with no 5-hour limit keeps rendering its single weekly number, and a free plan's lone 30-day window keeps rendering in the same place. A payload carrying only a sub-day window now reports it as the 5-hour value instead of mislabelling it as weekly.
+
+  The host-wide usage cache changes additively: an entry written by an earlier version has no 5-hour value and renders weekly-only until the next poll, and an earlier version ignores the extra one.
+
 ## 0.5.0
 
 ### Minor Changes

package/README.md

@@ -10,7 +10,7 @@ gpt-5.6-sol | pi-extensions:main* ⇣1 | 40k/1.0m |  97·54  80
 
 ## What it shows
 
-- **Line 1** — active model ID, current directory basename and Git branch, current context usage/window, and subscription usage headroom (see below). A yellow `*` marks a dirty checkout and `⇣N` shows how many commits it is behind its locally known upstream ref. Unknown context usage is rendered as `?/<window>` until Pi can provide an estimate. Exceptional prompt-cache hits trigger the celebration described below.
+- **Line 1** — active model ID, optionally the provider of that model, current directory basename and Git branch, current context usage/window, and subscription usage headroom (see below). A yellow `*` marks a dirty checkout and `⇣N` shows how many commits it is behind its locally known upstream ref. Unknown context usage is rendered as `?/<window>` until Pi can provide an estimate. Exceptional prompt-cache hits trigger the celebration described below.
 - **Worktree lines** — when the session works in or sends tool calls into linked worktrees, one line shows the same branch/dirty/behind state for each worktree plus its associated PR number.
 - **Final line** — the full Pi session ID.
 
@@ -22,7 +22,7 @@ Colors come from a selectable [theme](#themes), with context warning thresholds.
 
 - **Theme** — the color palette, cycled with Enter or Space. See [Themes](#themes).
 - **Cache celebration** — `off` or one of five badge animations, cycled with Enter or Space and previewed live in the statusline below. See [Animation styles](#animation-styles).
-- **Model**, **Directory & git**, **Context**, **Subscription usage**, **Worktree line**, **Session ID line** — `on`/`off`, cycled with Enter or Space. Disabled segments are dropped from line 1 without leaving a stray ` | ` separator; hiding the worktree line also stops its `git`/`gh` polling, and hiding usage stops the usage poller. With every element off the footer collapses to a single blank row.
+- **Model**, **Provider**, **Directory & git**, **Context**, **Subscription usage**, **Worktree line**, **Session ID line** — `on`/`off`, cycled with Enter or Space. **Provider** is the only one that starts `off`; it shows the provider id exactly as Pi reports it, so a [pi-multi-login](../pi-multi-login) alias renders as `anthropic-team` and names the login actually spending — something a model id like `claude-opus-5` never carries. With no model, or a model reporting no provider, the segment is simply absent. Disabled segments are dropped from line 1 without leaving a stray ` | ` separator; hiding the worktree line also stops its `git`/`gh` polling, and hiding usage stops the usage poller. With every element off the footer collapses to a single blank row.
 - **Worktree root** — the directory whose immediate children are tracked as session worktrees (default `~/repos/worktrees`). `~` and `$HOME` are expanded; a relative path is rejected and the previous value kept.
 - **Repo aliases** — short display names for repositories on the worktree line. Enter edits the selected `repo → alias` pair, `d` deletes it, and `Add alias…` creates one from a `repo=alias` line.
 
@@ -71,7 +71,7 @@ Up to 0.2.x this package hardcoded five alias pairs and stripped a `platform-` p
 When Pi's `~/.pi/agent/auth.json` contains OAuth credentials for Anthropic (Claude subscription) and/or OpenAI Codex, line 1 shows **percent remaining** for each rate-limit window after the context meter:
 
 - ` 97·54` — Claude 5-hour, then weekly remaining percent (Nerd Font `nf-cod-claude` icon). Subscriptions with a model-scoped weekly limit (e.g. Fable) show it as a third number — ` 97·54·24` — and it is omitted when the account has none.
-- ` 80` — Codex weekly remaining percent (`nf-cod-openai` icon)
+- ` 92·99` — Codex 5-hour, then weekly remaining percent (`nf-cod-openai` icon). Which windows exist is a property of the plan, so the slots are filled from the payload's window spans rather than from its plan name: a plan with no 5-hour limit shows the weekly number alone — ` 45` — and a free plan, whose single window is monthly, shows that one number in the same place.
 
 Numbers are colored by remaining headroom: green above 60, yellow 41–60, orange 16–40, red at 15 and below.
 
@@ -87,6 +87,8 @@ When [`@hank-warren/pi-multi-login`](../pi-multi-login/README.md) has registered
 
 Polling is host-wide, not per-session. Usage percentages describe the account rather than the session, and a busy machine runs dozens of pi processes, so every process shares `~/.pi/agent/statusline-usage.json`, written atomically via a temp file and rename. It is keyed by **credential id**, one entry per account, each holding that account's last good values plus the time its last poll was *started*. A session adopts the cached values for its selected accounts on first refresh — so the meters are populated before it has issued a single request, and switching back to an account polled earlier repaints with no request at all — and only polls an account whose timestamp is older than the interval. Keying by account rather than by provider family is what lets two sessions on two different Anthropic logins coexist: keyed by family, each looked like an account switch to the other, so they evicted each other's values and re-polled every cycle.
 
+Cache entries stay compatible in both directions: a Codex entry written by a statusline older than 0.6.0 carries no 5-hour value, so a newer one renders it as a single weekly number until its own next poll fills the second slot, and an older reader ignores the extra value entirely.
+
 An account answering `429` is parked for fifteen minutes (tracked per account, so a rate-limited Anthropic never stops codex from updating) and stops counting as pending, since retrying harder is what earns the rate limit in the first place. Every cache entry is keyed to a fingerprint (a sha256 prefix, never the token itself) of the credential that fetched it: switching accounts — or rotating a token — discards that entry's numbers and backoff and polls immediately, so an exhausted old account's meters never masquerade as the new account's. A logged-out account fails the same check, so the file garbage-collects itself.
 
 Requires a Nerd Font new enough to include the codicon brand glyphs (v3.5.0+); older fonts render them as replacement boxes.

package/index.ts

@@ -40,6 +40,8 @@ import {
 
 export interface StatuslineData {
 	model: string;
+	/** Provider id of the active model; absent when there is no model. */
+	provider?: string;
 	cwd: string;
 	cwdGit: GitRepositoryStatus | null;
 	contextTokens: number | null;
@@ -71,15 +73,21 @@ export function renderUsageSegment(
 	palette: StatuslinePalette = DEFAULT_PALETTE,
 ): string | undefined {
 	const percent = (remaining: number) => styled(bandColor(remaining, palette), `${remaining}`);
+	const dot = styled(palette.dim, "\u00b7");
 	const parts: string[] = [];
 	if (usage.claude) {
-		const dot = styled(palette.dim, "\u00b7");
 		let claude = `${percent(usage.claude.fiveHour)}${dot}${percent(usage.claude.sevenDay)}`;
 		if (usage.claude.scopedWeekly !== undefined) claude += `${dot}${percent(usage.claude.scopedWeekly)}`;
 		parts.push(`${styled(palette.text, CLAUDE_ICON)} ${claude}`);
 	}
 	if (usage.codex) {
-		parts.push(`${styled(palette.text, OPENAI_ICON)} ${percent(usage.codex.weekly)}`);
+		// Shortest window first, mirroring Claude. Plans without a 5-hour limit
+		// leave that slot empty and keep rendering the single long-window number.
+		const codex = [usage.codex.fiveHour, usage.codex.weekly]
+			.filter((remaining): remaining is number => remaining !== undefined)
+			.map(percent)
+			.join(dot);
+		if (codex.length > 0) parts.push(`${styled(palette.text, OPENAI_ICON)} ${codex}`);
 	}
 	return parts.length > 0 ? parts.join(" ") : undefined;
 }
@@ -171,6 +179,9 @@ export function renderStatusline(
 	const usageSegment = settings.showUsage && data.usage ? renderUsageSegment(data.usage, palette) : undefined;
 	const segments = [
 		settings.showModel ? styled(palette.model, data.model) : undefined,
+		// No provider is a missing segment, not a placeholder: the model id already
+		// says "no-model" in that state, and a second one would only add noise.
+		settings.showProvider && data.provider ? styled(palette.provider, data.provider) : undefined,
 		settings.showDirectory
 			? data.cwdGit
 				? renderRepository(data.cwd, data.cwdGit, palette)
@@ -418,6 +429,7 @@ export default function statuslineExtension(pi: ExtensionAPI): void {
 						renderStatusline(
 							{
 								model,
+								provider: ctx.model?.provider,
 								cwd,
 								cwdGit,
 								contextTokens: usage?.tokens ?? null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hank-warren/pi-statusline",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "description": "Compact Pi footer statusline with Git/worktree context, token usage, and neon celebrations for exceptional prompt-cache hits.",
   "type": "module",
   "keywords": [

package/settings-menu.ts

@@ -32,6 +32,7 @@ export interface BooleanRow {
 /** Toggle rows, in statusline render order. */
 export const BOOLEAN_ROWS: readonly BooleanRow[] = [
 	{ id: "showModel", label: "Model", description: "Show the active model id." },
+	{ id: "showProvider", label: "Provider", description: "Show the provider of the active model." },
 	{ id: "showDirectory", label: "Directory & git", description: "Show the working directory and its git branch." },
 	{ id: "showContext", label: "Context", description: "Show context tokens used against the window." },
 	{ id: "showUsage", label: "Subscription usage", description: "Show Claude/Codex remaining-headroom meters." },

package/settings.ts

@@ -12,6 +12,7 @@ import { DEFAULT_THEME, isThemeName, type StatuslineThemeName } from "./themes.t
 /** Toggle keys, in the order the `/statusline` menu lists them. */
 export const BOOLEAN_SETTING_KEYS = [
 	"showModel",
+	"showProvider",
 	"showDirectory",
 	"showContext",
 	"showUsage",
@@ -40,6 +41,8 @@ export function defaultWorktreeRoot(home: string = homedir()): string {
 export function defaultSettings(home: string = homedir()): StatuslineSettings {
 	return {
 		showModel: true,
+		// Opt-in: the provider is redundant for anyone with a single login per family.
+		showProvider: false,
 		showDirectory: true,
 		showContext: true,
 		showUsage: true,

package/themes.ts

@@ -5,6 +5,8 @@
 export interface StatuslinePalette {
 	/** Active model id. */
 	model: string;
+	/** Provider id of the active model. */
+	provider: string;
 	/** Repository and directory names. */
 	path: string;
 	/** Git branch names. */
@@ -35,6 +37,7 @@ const rgb = (hex: string): string => {
 /** The palette this package shipped before themes existed. */
 const DEFAULT: StatuslinePalette = {
 	model: rgb("#0099ff"),
+	provider: rgb("#7aa2c8"),
 	path: rgb("#dcdcdc"),
 	branch: rgb("#56b6c2"),
 	text: rgb("#dcdcdc"),
@@ -50,6 +53,7 @@ const DEFAULT: StatuslinePalette = {
 /** Dracula, with the pink branch colour from Hank's Herdr sidebar config. */
 const DRACULA: StatuslinePalette = {
 	model: rgb("#bd93f9"),
+	provider: rgb("#9580c9"),
 	path: rgb("#f8f8f2"),
 	branch: rgb("#ff79c6"),
 	text: rgb("#f8f8f2"),
@@ -64,6 +68,7 @@ const DRACULA: StatuslinePalette = {
 
 const GITHUB_DARK: StatuslinePalette = {
 	model: rgb("#58a6ff"),
+	provider: rgb("#6e8bb5"),
 	path: rgb("#c9d1d9"),
 	branch: rgb("#39c5cf"),
 	text: rgb("#c9d1d9"),
@@ -78,6 +83,7 @@ const GITHUB_DARK: StatuslinePalette = {
 
 const CATPPUCCIN_MOCHA: StatuslinePalette = {
 	model: rgb("#cba6f7"),
+	provider: rgb("#a58fc4"),
 	path: rgb("#cdd6f4"),
 	branch: rgb("#89dceb"),
 	text: rgb("#cdd6f4"),
@@ -93,6 +99,7 @@ const CATPPUCCIN_MOCHA: StatuslinePalette = {
 /** No colour at all: white text, dimmed punctuation, a grey badge flash. */
 const WHITE: StatuslinePalette = {
 	model: rgb("#ffffff"),
+	provider: rgb("#ffffff"),
 	path: rgb("#ffffff"),
 	branch: rgb("#ffffff"),
 	text: rgb("#ffffff"),

package/usage.ts

@@ -7,7 +7,12 @@ import { pid } from "node:process";
 /** Remaining (not used) integer percents per provider window. */
 export interface UsageSnapshot {
 	claude?: { fiveHour: number; sevenDay: number; scopedWeekly?: number };
-	codex?: { weekly: number };
+	/**
+	 * Codex reports one or two windows depending on the plan: a short (5-hour)
+	 * window, a long one, or both. Every field is optional because which of them
+	 * exists is a property of the account, not of the payload shape.
+	 */
+	codex?: { fiveHour?: number; weekly?: number };
 }
 
 const CLAUDE_USAGE_URL = "https://api.anthropic.com/api/oauth/usage";
@@ -79,7 +84,19 @@ interface CodexWindow {
 	limit_window_seconds?: unknown;
 }
 
-/** Parse the Codex usage payload, selecting the weekly (largest ≥ 1 day) window. */
+/** A window whose span is known, so it can be sorted into a slot. */
+interface SpannedCodexWindow extends CodexWindow {
+	limit_window_seconds: number;
+}
+
+/**
+ * Parse the Codex usage payload into the short (sub-day) and long (≥ 1 day)
+ * windows. Which ones exist depends on the plan — $20 plans report a 5-hour
+ * window alongside the weekly one, larger plans have reported weekly only, and
+ * free plans report a single 30-day window that lands in the long slot. So the
+ * slots are filled from `limit_window_seconds` rather than from `plan_type`,
+ * and an absent window simply leaves its slot empty.
+ */
 export function parseCodexUsage(json: unknown): UsageSnapshot["codex"] | undefined {
 	if (typeof json !== "object" || json === null) return undefined;
 	const rateLimit = (json as { rate_limit?: unknown }).rate_limit;
@@ -88,14 +105,27 @@ export function parseCodexUsage(json: unknown): UsageSnapshot["codex"] | undefin
 		primary_window?: CodexWindow | null;
 		secondary_window?: CodexWindow | null;
 	};
+	// A window without a usable span cannot be placed in either slot.
 	const windows = [primary_window, secondary_window].filter(
-		(window): window is CodexWindow => typeof window === "object" && window !== null,
+		(window): window is SpannedCodexWindow =>
+			typeof window === "object" &&
+			window !== null &&
+			typeof window.limit_window_seconds === "number" &&
+			Number.isFinite(window.limit_window_seconds),
 	);
-	const weekly = windows
-		.filter((window) => typeof window.limit_window_seconds === "number" && window.limit_window_seconds >= ONE_DAY_SECONDS)
-		.sort((a, b) => (b.limit_window_seconds as number) - (a.limit_window_seconds as number))[0];
-	const remaining = toRemaining((weekly ?? windows[0])?.used_percent);
-	return remaining === undefined ? undefined : { weekly: remaining };
+	const shortest = windows
+		.filter((window) => window.limit_window_seconds < ONE_DAY_SECONDS)
+		.sort((a, b) => a.limit_window_seconds - b.limit_window_seconds)[0];
+	const longest = windows
+		.filter((window) => window.limit_window_seconds >= ONE_DAY_SECONDS)
+		.sort((a, b) => b.limit_window_seconds - a.limit_window_seconds)[0];
+	const fiveHour = toRemaining(shortest?.used_percent);
+	const weekly = toRemaining(longest?.used_percent);
+	if (fiveHour === undefined && weekly === undefined) return undefined;
+	const result: UsageSnapshot["codex"] = {};
+	if (fiveHour !== undefined) result.fiveHour = fiveHour;
+	if (weekly !== undefined) result.weekly = weekly;
+	return result;
 }
 
 /** Color band for a remaining percent: >60 green, >40 yellow, >15 orange, else red. */