@llblab/pi-codex-usage 0.8.2 → 0.9.1

package/AGENTS.md

@@ -8,10 +8,10 @@
   - Trigger: Updating quota polling or error handling.
   - Action: Do not collapse the bar while a request is in flight; only show `n/a` or `error` after repeated failures or no usable quota.
 
-- `Compact dual bar`: Encode the 5-hour and weekly quota windows in the ten-character separated-sextant bar.
+- `Adaptive compact status`: Match the status representation to the server-provided quota windows.
   - Trigger: Changing statusline formatting.
-  - Action: Keep a fixed-width `xxxxxxxxxx` bar where top sextants represent the 5-hour window and bottom sextants represent the weekly window, with 20 steps per window.
+  - Action: When both windows exist, keep the classic dual bar with 20 top steps for the 5-hour window and 20 bottom steps for the weekly window. When only one weekly window exists, show its rounded remaining percentage directly instead of using a bar.
 
-- `Weekly reset countdown`: Append the weekly reset countdown only when the secondary window exposes a reset time.
+- `Weekly reset countdown`: Append the weekly reset countdown whenever the available weekly window exposes a reset time.
   - Trigger: Changing reset-time normalization or statusline refresh cadence.
-  - Action: Keep `d` labels rounded upward in 144-minute day-tenth steps above 24h, show 24h..1h labels in upward-rounded 6-minute hour-tenth steps, keep `m`/`s` labels floored, and hold `0s` until a successful quota refresh reports the next window.
+  - Action: Treat the secondary window as weekly in dual-window responses and the sole window as weekly in single-window responses. Keep `d` labels rounded upward in 144-minute day-tenth steps above 24h, show 24h..1h labels in upward-rounded 6-minute hour-tenth steps, keep `m`/`s` labels floored, and hold `0s` until a successful quota refresh reports the next window.

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+## 0.9.1: Clear Weekly Quota Status
+
+- Replaced the unified single-window bar with an explicit remaining-quota percentage. Impact: weekly-only OpenAI responses now render as compact text such as `codex 67% 7d`, making both the remaining quota and reset time immediately readable without decoding a bar.
+- Preserved the classic dual-tier bar for responses that still expose both 5-hour and weekly windows. Impact: older or account-specific server response shapes retain the dense two-limit display while the status adapts directly to available information.
+
+## 0.9.0: Adaptive Weekly Quota Bar
+
+- Added server-driven quota-window display selection. Impact: responses containing both 5-hour and weekly windows keep the classic dual-tier bar, while responses containing only the new weekly window use all 40 bar steps as one unified quota scale instead of leaving one tier empty.
+- Added single-window reset countdown and redraw scheduling. Impact: the weekly reset time remains visible and updates at the correct countdown boundaries regardless of whether OpenAI returns the weekly limit as the primary or secondary window.
+- Extended provisional full-quota stabilization to single-window responses. Impact: transient 0%-used weekly reports remain behind the loading indicator until confirmed, matching the existing dual-window safety behavior.
+
 ## 0.8.2: Quota Loading Hotfix
 
 - Replaced the static empty request placeholder with fixed-width upper and lower markers that move in opposite directions through their respective quota bars, reverse at the ends, and randomly start from either mirrored endpoint phase, using the normal themed bar background. Impact: motion distinguishes startup and model-bucket loading from 100% available quota while preserving the dual-window visual language.

package/README.md

@@ -4,7 +4,7 @@
 
 ![Codex Usage](./banner.jpg)
 
-This repository is a minimal fork of [`narumiruna/pi-extensions/extensions/pi-codex-usage`](https://github.com/narumiruna/pi-extensions/tree/main/extensions/pi-codex-usage). It keeps the auth and quota-fetching path, but intentionally narrows the interface to the primary Codex 5-hour and weekly limits.
+This repository is a minimal fork of [`narumiruna/pi-extensions/extensions/pi-codex-usage`](https://github.com/narumiruna/pi-extensions/tree/main/extensions/pi-codex-usage). It keeps the auth and quota-fetching path, but intentionally narrows the interface to the Codex quota windows returned by OpenAI.
 
 ## Start Here
 
@@ -16,7 +16,7 @@ This repository is a minimal fork of [`narumiruna/pi-extensions/extensions/pi-co
 
 - Shows two counter-moving half-height markers in the statusline bar while the active Codex/Spark quota bucket is loading, then refreshes every 30 seconds
 - Keeps the last usable active-bucket bar visible during ordinary refreshes instead of replacing known quota with a loading state
-- Statusline output stays compact, with the active usage label accented and the quota bar plus weekly reset countdown drawn on a themed background
+- Statusline output adapts to the response: weekly-only limits show an explicit remaining percentage and reset countdown, while dual-window limits keep the compact themed bar
 - Regular Codex subscription models show the primary `codex` quota bucket
 - `GPT-5.3-Codex-Spark` shows the parallel Spark quota bucket with the `spark` label
 - When `pi-telegram` is available, the same compact value appears as `codex: <value>` or `spark: <value>` in the `/start` menu status text for active OpenAI Codex subscription models
@@ -56,11 +56,17 @@ Spark model usage:
 spark ██████████ 7d
 ```
 
-The ten-character bar encodes two twenty-step limits at once: 40 total bits of quota state in 10 terminal cells. Each step is 5%: the top quadrants are the 5-hour limit, and the bottom quadrants are the weekly limit. If either quota window is exhausted, the bar keeps the same shape but switches to the error background color.
+When OpenAI returns only the weekly window, the status shows the exact rounded remaining percentage and reset countdown directly:
+
+```text
+codex 67% 7d
+```
+
+When both windows exist, the ten-character bar encodes two twenty-step limits at once: the top quadrants show the 5-hour limit and the bottom quadrants show the weekly limit, with each step representing 5%. If either quota window is exhausted, the bar keeps its shape but switches to the error background color.
 
 Before the first usable report for the active quota bucket arrives, two half-height markers move through the same fixed-width themed bar. The upper 5-hour marker travels opposite the lower weekly marker; both reverse smoothly at the ends, and each loader run randomly starts from one of the two mirrored endpoint phases. Their motion distinguishes loading from 100% remaining quota while preserving the normal bar background. A first report claiming both windows are completely unused is treated as provisional for 15 seconds and retried every second, because providers can briefly emit zeroed windows while initializing. Once a usable report exists, refresh requests preserve that last good bar.
 
-When the weekly reset time is available, the bar is followed by a countdown. More than a day remains is shown in 144-minute day-tenth steps such as `7d`, `6.9d`, `6.6d`, `5.1d`, `5d`, `3.7d`, `3d`, `2d`, `1.9d`, `1.5d`, and `1.1d`, rounded upward to the next tenth. At 24 hours and below it switches to upward-rounded 6-minute hour-tenth steps such as `24h`, `23.7h`, `20.1h`, `20h`, `19.9h`, `1.4h`, `1.3h`, `1.2h`, `1.1h`, and `1h`. Under an hour it switches to floored minutes, and under a minute to seconds. After the reset timestamp passes, `0s` is held until the next successful quota refresh reports the new weekly window.
+When the weekly reset time is available, it follows either the single-window percentage or the dual-window bar. More than a day remains is shown in 144-minute day-tenth steps such as `7d`, `6.9d`, `6.6d`, `5.1d`, `5d`, `3.7d`, `3d`, `2d`, `1.9d`, `1.5d`, and `1.1d`, rounded upward to the next tenth. At 24 hours and below it switches to upward-rounded 6-minute hour-tenth steps such as `24h`, `23.7h`, `20.1h`, `20h`, `19.9h`, `1.4h`, `1.3h`, `1.2h`, `1.1h`, and `1h`. Under an hour it switches to floored minutes, and under a minute to seconds. After the reset timestamp passes, `0s` is held until the next successful quota refresh reports the new weekly window.
 
 When the 5-hour window is exhausted and exposes its own reset time, the statusline adds the 5-hour reset before the weekly reset:
 

package/index.ts

@@ -1071,6 +1071,9 @@ export function formatCodexUsageStatusline(
 ): string {
   const value = formatCodexUsageStatusValue(report, model);
   if (!value) return formatStatuslineText(ctx, "n/a", model);
+  const snapshot = selectActiveUsageSnapshot(report, model);
+  if (!snapshot?.primary || !snapshot.secondary)
+    return formatStatuslineText(ctx, value, model);
   const [bar, countdown] = value.split(" ", 2);
   const barText = formatStatuslineBarText(
     ctx,
@@ -1098,6 +1101,15 @@ export function formatCodexUsageStatusValue(
   const capturedNow = typeof modelOrNow === "number" ? modelOrNow : now;
   const snapshot = selectActiveUsageSnapshot(report, model);
   if (!snapshot || (!snapshot.primary && !snapshot.secondary)) return undefined;
+  if (!snapshot.primary || !snapshot.secondary) {
+    const window = snapshot.primary ?? snapshot.secondary;
+    if (!window) return undefined;
+    const percentage = `${Math.round(remainingPercent(window))}%`;
+    const countdown = window.resetAt
+      ? formatResetCountdown(window.resetAt, capturedNow)
+      : undefined;
+    return countdown ? `${percentage} ${countdown}` : percentage;
+  }
   const bar = formatDualLimitBar(snapshot.primary, snapshot.secondary);
   if (isQuotaWindowExhausted(snapshot.primary) && snapshot.primary?.resetAt) {
     const primaryCountdown = formatResetCountdown(
@@ -1122,7 +1134,8 @@ export function formatWeeklyResetCountdown(
 ): string | undefined {
   const model = typeof modelOrNow === "number" ? undefined : modelOrNow;
   const capturedNow = typeof modelOrNow === "number" ? modelOrNow : now;
-  const resetAt = selectActiveUsageSnapshot(report, model)?.secondary?.resetAt;
+  const snapshot = selectActiveUsageSnapshot(report, model);
+  const resetAt = weeklyWindow(snapshot)?.resetAt;
   if (resetAt === undefined) return undefined;
   return formatResetCountdown(resetAt, capturedNow);
 }
@@ -1151,9 +1164,9 @@ export function nextResetCountdownDelayMs(
   model?: CodexUsageModel,
 ): number | undefined {
   const snapshot = selectActiveUsageSnapshot(report, model);
-  const resetTimes = [snapshot?.secondary?.resetAt];
-  if (isQuotaWindowExhausted(snapshot?.primary)) {
-    resetTimes.push(snapshot?.primary?.resetAt);
+  const resetTimes = [weeklyWindow(snapshot)?.resetAt];
+  if (snapshot?.secondary && isQuotaWindowExhausted(snapshot.primary)) {
+    resetTimes.push(snapshot.primary?.resetAt);
   }
   const delays = resetTimes
     .filter((resetAt): resetAt is number => resetAt !== undefined)
@@ -1197,7 +1210,7 @@ function formatReportBar(
 ): string | undefined {
   const snapshot = selectActiveUsageSnapshot(report, model);
   if (!snapshot || (!snapshot.primary && !snapshot.secondary)) return undefined;
-  return formatDualLimitBar(snapshot.primary, snapshot.secondary);
+  return formatAdaptiveLimitBar(snapshot.primary, snapshot.secondary);
 }
 
 function formatStatuslineText(
@@ -1291,9 +1304,32 @@ function normalizedUsageKey(value: string | undefined): string | undefined {
   return key || undefined;
 }
 
-function formatDualLimitBar(
+function formatAdaptiveLimitBar(
   primary: NormalizedRateLimitWindow | undefined,
   secondary: NormalizedRateLimitWindow | undefined,
+): string {
+  if (!primary || !secondary) return formatSingleLimitBar(primary ?? secondary);
+  return formatDualLimitBar(primary, secondary);
+}
+
+function formatSingleLimitBar(
+  window: NormalizedRateLimitWindow | undefined,
+): string {
+  const filled = filledParts(window, DUAL_BAR_WIDTH * 4);
+  const partMasks = [1, 4, 2, 8];
+  let value = "";
+  for (let index = 0; index < DUAL_BAR_WIDTH; index++) {
+    const cellParts = Math.min(4, Math.max(0, filled - index * 4));
+    let mask = 0;
+    for (let part = 0; part < cellParts; part++) mask |= partMasks[part] ?? 0;
+    value += DUAL_BAR_CHARS[mask];
+  }
+  return value;
+}
+
+function formatDualLimitBar(
+  primary: NormalizedRateLimitWindow,
+  secondary: NormalizedRateLimitWindow,
 ): string {
   const primaryParts = filledTwentieths(primary);
   const secondaryParts = filledTwentieths(secondary);
@@ -1360,14 +1396,21 @@ export function isFullyAvailableReport(
   model?: CodexUsageModel,
 ): boolean {
   const snapshot = selectActiveUsageSnapshot(report, model);
+  const windows = [snapshot?.primary, snapshot?.secondary].filter(
+    (window): window is NormalizedRateLimitWindow => window !== undefined,
+  );
   return (
-    snapshot?.primary !== undefined &&
-    snapshot.secondary !== undefined &&
-    clampPercent(snapshot.primary.usedPercent) === 0 &&
-    clampPercent(snapshot.secondary.usedPercent) === 0
+    windows.length > 0 &&
+    windows.every((window) => clampPercent(window.usedPercent) === 0)
   );
 }
 
+function weeklyWindow(
+  snapshot: NormalizedRateLimitSnapshot | undefined,
+): NormalizedRateLimitWindow | undefined {
+  return snapshot?.secondary ?? snapshot?.primary;
+}
+
 function selectActiveUsageSnapshot(
   report: CodexUsageReport,
   model: CodexUsageModel | undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llblab/pi-codex-usage",
-  "version": "0.8.2",
+  "version": "0.9.1",
   "private": false,
   "description": "Minimal Pi extension that shows primary Codex ChatGPT subscription usage limits.",
   "keywords": [