@narumitw/pi-usage 0.60.11 → 0.61.1

package/docs/providers.md

@@ -28,9 +28,10 @@ The README contains the capability overview and shared security requirements.
 - Source: the Codex usage and earned-reset endpoints using Pi's resolved runtime authorization
 - Displayed data: returned duration-based windows, resets, credits, earned usage-limit resets, and additional model buckets
 - Reset mutation: `POST /wham/rate-limit-reset-credits/consume` with a unique redemption request ID and, when available, the selected opaque credit ID
-- Statusline examples: `codex 59% ↻ 2h30m 61% ↻ 2d15m`, `codex fast 59% ↻ 2h30m`, or `codex spark 100% ↻ 2h30m`. Set `codexStatusResetCountdown` to `false` for the legacy `5h` and `wk` labels.
+- Statusline examples: `codex 59% ↻ 2h30m 61% ↻ 2d15m`, `codex fast 59% ↻ 2h30m`, or `codex spark 100% ↻ 2h30m`. Set `codexStatusPercentage` to `"used"` to show consumed percentages, or set `codexStatusResetCountdown` to `false` for the legacy `5h` and `wk` labels.
 
 The statusline selects a returned bucket that matches the current Codex model when one is available.
+The percentage preference affects only this compact status and defaults to remaining quota; it does not change the detailed report or returned usage data.
 Unlike `pi-codex-usage`, this successor intentionally has no Codex CLI fallback because the CLI may be logged into a different account than Pi's active runtime account.
 
 Reset redemption is available only when Codex is the current provider.
@@ -45,17 +46,21 @@ Opaque credit and account IDs are never shown or persisted by the extension.
 - Provider ID: `kimi-coding`
 - Semantics: Kimi Coding Plan request windows plus a separate Extra Usage booster wallet
 - Source: `GET https://api.kimi.com/coding/v1/usages` using Pi's freshly resolved runtime Bearer credential
-- Displayed plan data: the weekly summary, returned sub-windows, used and remaining request percentages, and valid reset times
-- Displayed wallet data: balance, monthly spend, and monthly charge limit
-- Statusline examples: `kimi 99% 5h 96% wk` or `kimi 95% 1d`
+- Displayed plan data: count-based weekly summaries and returned sub-windows, plus reported ratio-based five-hour, weekly, or monthly quotas and valid reset times
+- Displayed wallet data: balance, monthly spend, and monthly charge limit when the wallet supplies consistent currency and amounts
+- Statusline examples: `kimi 99% 5h 96% wk`, `kimi 56% 5h 21% mo`, or `kimi 95% 1d`
 
 Both Pi API-key credentials and Pi OAuth credentials are accepted because current Pi resolves each form as Bearer authorization for the same official Kimi inference origin.
 The extension queries the fixed usage endpoint only when both the selected model origin and the effective resolved-auth origin are `https://api.kimi.com`.
 Custom and proxy origins fail before network access, redirects are rejected, and the credential is never sent to an override from Kimi Code's environment-specific development path.
 
-Plan buckets remain integer request counts and are rendered with their source-defined windows.
+Count-based plan buckets remain integer request counts and are rendered with their source-defined windows.
 Live responses omit both `used` and `remaining` on untouched rows and may report only `remaining` once usage starts, so a row with a positive `limit` and no counters means zero usage, and when only one counter is present the other is derived from `limit`.
-Counters that are present but malformed, unknown units, duplicate windows, invalid timestamps, and malformed rows remain unavailable rather than receiving guessed semantics.
+A monthly-plan response reported in [issue #1390](https://github.com/narumiruna/pi-extensions/issues/1390) supplies `usages.limit_month_total.used_ratio` without a count-based monthly row; the extension shows its remaining percentage and `reset_time` as a monthly bucket without inventing a fixed month duration.
+The same map can supply `limit_5h` and `limit_week` when those windows are not present in `limits` or `usage`; `limit_month_code` is not a second total quota.
+Explicit count-based windows with identifiable durations take precedence, including duplicate or malformed count rows, so ratio rows cannot mask their unavailable state.
+Ratios must be finite numbers between zero and one; unknown map keys, malformed rows, invalid timestamps, and unknown count-based units do not receive guessed semantics.
+The top-level wallet may be `boosterWallet` or `booster_wallet` (the former takes precedence when both are present); its nested fields retain their existing camelCase validation.
 Booster-wallet `amount` and `amountLeft` values use Kimi's first-party conversion of 1,000,000 fixed-point units per cent, while monthly values already arrive in cents.
 Wallet values retain their currency and stay separate from plan requests and percentages in reports and the statusline.
 Wallet fields remain unavailable unless the response supplies one consistent currency; missing monthly values are omitted, and an enabled zero cap is shown as zero.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@narumitw/pi-usage",
-  "version": "0.60.11",
+  "version": "0.61.1",
   "description": "Pi extension that shows current-account usage and DeepSeek API balance for supported providers.",
   "type": "module",
   "license": "MIT",

package/src/codex-fast.ts

@@ -9,6 +9,7 @@ export const CODEX_FAST_MODEL_IDS: ReadonlySet<string> = new Set([
   "gpt-5.6-luna",
   "gpt-5.6-sol",
   "gpt-5.6-terra",
+  "gpt-6-sol",
 ]);
 
 export type CodexFastAvailability =

package/src/format.ts

@@ -1,3 +1,4 @@
+import type { CodexStatusPercentage } from "./settings.js";
 import type { ProviderUsageState, UsageBucket, UsageDisplayState, UsageModel, UsageReport } from "./types.js";
 
 const BAR_SEGMENTS = 20;
@@ -54,10 +55,11 @@ export function formatUsageStatusline(
   model?: UsageModel,
   now = Date.now(),
   showCodexResetCountdown = true,
+  codexStatusPercentage: CodexStatusPercentage = "remaining",
 ): string | undefined {
   if (report.providerId === "baseten") return formatBasetenStatusline(report);
   if (report.providerId === "openai-codex") {
-    return formatCodexStatusline(report, model, now, showCodexResetCountdown);
+    return formatCodexStatusline(report, model, now, showCodexResetCountdown, codexStatusPercentage);
   }
   if (report.providerId === "deepseek") return formatDeepSeekStatusline(report);
   if (report.providerId === "fireworks") return formatFireworksStatusline(report);
@@ -280,6 +282,15 @@ function formatOpenCodeZenStatusline(report: UsageReport): string | undefined {
 function formatKimiCodingReport(lines: string[], report: UsageReport): void {
   for (const bucket of report.buckets) {
     const reset = bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : "";
+    if (bucket.unit === "percent") {
+      const remaining = bucket.remaining === undefined ? undefined : Math.round(clampPercent(bucket.remaining));
+      const value =
+        bucket.used === undefined || remaining === undefined
+          ? "unavailable"
+          : `${100 - remaining}% used · ${remaining}% left`;
+      lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${value}${reset}`);
+      continue;
+    }
     if (bucket.used === undefined || bucket.limit === undefined) {
       lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}unavailable${reset}`);
       continue;
@@ -309,15 +320,18 @@ function formatKimiCodingReport(lines: string[], report: UsageReport): void {
 function formatKimiCodingStatusline(report: UsageReport): string | undefined {
   const fiveHour = report.buckets.find((bucket) => bucket.id === "five-hour");
   const weekly = report.buckets.find((bucket) => bucket.id === "weekly");
-  const subWindow = fiveHour ?? report.buckets.find((bucket) => bucket.id !== "weekly");
-  const selected = [subWindow, weekly].filter(
+  const monthly = report.buckets.find((bucket) => bucket.id === "monthly");
+  const subWindow = fiveHour ?? report.buckets.find((bucket) => bucket.id !== "weekly" && bucket.id !== "monthly");
+  const selected = [subWindow, weekly, monthly].filter(
     (bucket, index, buckets): bucket is UsageBucket => bucket !== undefined && buckets.indexOf(bucket) === index,
   );
   const parts = ["kimi"];
   for (const bucket of selected) {
-    if (!bucket.limit || bucket.remaining === undefined) continue;
+    if (bucket.remaining === undefined || (bucket.unit !== "percent" && !bucket.limit)) continue;
     const fallback = bucket.id === "weekly" ? "weekly" : "5h";
-    parts.push(`${percentRemaining(bucket)}% ${formatWindowLabel(bucket.windowMinutes, fallback, true)}`);
+    const window = bucket.id === "monthly" ? "mo" : formatWindowLabel(bucket.windowMinutes, fallback, true);
+    const remaining = bucket.unit === "percent" ? Math.round(clampPercent(bucket.remaining)) : percentRemaining(bucket);
+    parts.push(`${remaining}% ${window}`);
   }
   return parts.length > 1 ? parts.join(" ") : undefined;
 }
@@ -521,6 +535,7 @@ function formatCodexStatusline(
   model?: UsageModel,
   now = Date.now(),
   showResetCountdown = true,
+  percentage: CodexStatusPercentage = "remaining",
 ): string | undefined {
   const group = selectCodexGroup(report, model);
   if (!group) return formatCodexCreditsStatus(report);
@@ -529,7 +544,8 @@ function formatCodexStatusline(
   const parts = [group === "codex" ? "codex" : `codex ${compactLimitLabel(labelBucket?.groupLabel ?? group)}`];
   for (const bucket of buckets) {
     if (bucket.remaining === undefined) continue;
-    const percent = `${clampPercent(bucket.remaining).toFixed(0)}%`;
+    const displayedPercentage = percentage === "used" ? (bucket.used ?? 100 - bucket.remaining) : bucket.remaining;
+    const percent = `${clampPercent(displayedPercentage).toFixed(0)}%`;
     const fallback = bucket.id.endsWith(":secondary") ? "weekly" : "5h";
     const window = formatWindowLabel(bucket.windowMinutes, fallback, true);
     if (!showResetCountdown) {

package/src/index.ts

@@ -65,6 +65,7 @@ export {
   XAI_ADAPTER,
 } from "./query.js";
 export type {
+  CodexStatusPercentage,
   UsageSettings,
   UsageSettingsRuntime,
   UsageSettingsState,

package/src/providers/deepseek.ts

@@ -76,5 +76,5 @@ function deepSeekCurrency(value: unknown): DeepSeekCurrency | undefined {
 }
 
 function decimalAmount(value: unknown): value is string {
-  return typeof value === "string" && value.length <= 64 && /^(?:0|[1-9]\d*)(?:\.\d+)?$/u.test(value);
+  return typeof value === "string" && value.length <= 64 && /^-?(?:0|[1-9]\d*)(?:\.\d+)?$/u.test(value);
 }

package/src/providers/kimi-coding.ts

@@ -5,6 +5,11 @@ const FIVE_HOUR_WINDOW_MINUTES = 300;
 const DAILY_WINDOW_MINUTES = 1_440;
 const WEEKLY_WINDOW_MINUTES = 10_080;
 const FIXED_POINT_UNITS_PER_CENT = 1_000_000;
+const RATIO_WINDOWS = [
+  { key: "limit_5h", id: "five-hour", label: "Five-hour window", windowMinutes: FIVE_HOUR_WINDOW_MINUTES },
+  { key: "limit_week", id: "weekly", label: "Weekly window", windowMinutes: WEEKLY_WINDOW_MINUTES },
+  { key: "limit_month_total", id: "monthly", label: "Monthly window" },
+] as const;
 
 /**
  * Source contract revalidated on 2026-08-27.
@@ -24,7 +29,9 @@ export function normalizeKimiCodingUsagePayload(payload: KimiCodingUsagePayload,
   if (!root) throw new Error("Kimi Coding usage response was not an object.");
 
   const candidates: UsageBucket[] = [];
+  const explicitWindows = new Set<number>();
   let omittedWindow = false;
+  if (root.usage !== undefined) explicitWindows.add(WEEKLY_WINDOW_MINUTES);
   const summary = parseUsageRow(root.usage, WEEKLY_WINDOW_MINUTES, "Weekly window");
   if (summary) candidates.push(summary);
   else if (root.usage !== undefined) omittedWindow = true;
@@ -33,6 +40,7 @@ export function normalizeKimiCodingUsagePayload(payload: KimiCodingUsagePayload,
     for (const raw of root.limits) {
       const item = asObject(raw);
       const windowMinutes = parseWindowMinutes(item?.window);
+      if (windowMinutes !== undefined) explicitWindows.add(windowMinutes);
       const label = sanitizedLabel(item?.name);
       const bucket =
         windowMinutes === undefined
@@ -55,9 +63,24 @@ export function normalizeKimiCodingUsagePayload(payload: KimiCodingUsagePayload,
     if (rows.length === 1) buckets.push(rows[0] as UsageBucket);
     else omittedWindow = true;
   }
-  buckets.sort((left, right) => (left.windowMinutes ?? 0) - (right.windowMinutes ?? 0));
+  const usages = asObject(root.usages);
+  if (root.usages !== undefined && !usages) omittedWindow = true;
+  if (usages) {
+    for (const window of RATIO_WINDOWS) {
+      const raw = usages[window.key];
+      if (raw === undefined || ("windowMinutes" in window && explicitWindows.has(window.windowMinutes))) continue;
+      const bucket = parseRatioWindow(raw, window.id, window.label);
+      if (bucket) {
+        buckets.push({
+          ...bucket,
+          ...("windowMinutes" in window ? { windowMinutes: window.windowMinutes } : {}),
+        });
+      } else omittedWindow = true;
+    }
+  }
+  buckets.sort((left, right) => (left.windowMinutes ?? Infinity) - (right.windowMinutes ?? Infinity));
 
-  const metrics = parseBoosterWallet(root.boosterWallet);
+  const metrics = parseBoosterWallet(root.boosterWallet === undefined ? root.booster_wallet : root.boosterWallet);
   if (buckets.length === 0 && metrics.length === 0) {
     throw new Error("Kimi Coding usage endpoint returned no displayable usage data.");
   }
@@ -104,6 +127,22 @@ function parseUsageRow(value: unknown, windowMinutes: number, label: string): Us
   };
 }
 
+function parseRatioWindow(value: unknown, id: string, label: string): UsageBucket | undefined {
+  const row = asObject(value);
+  const ratio = row?.used_ratio;
+  if (typeof ratio !== "number" || !Number.isFinite(ratio) || ratio < 0 || ratio > 1) return undefined;
+  const resetsAt = asIsoEpochSeconds(row?.reset_time);
+  const used = ratio * 100;
+  return {
+    id,
+    label,
+    used,
+    remaining: 100 - used,
+    unit: "percent",
+    ...(resetsAt !== undefined ? { resetsAt } : {}),
+  };
+}
+
 function parseWindowMinutes(value: unknown): number | undefined {
   const window = asObject(value);
   if (!window) return undefined;

package/src/settings.ts

@@ -9,15 +9,19 @@ import { isBoundedTargetId } from "./usage-targets.js";
 export const USAGE_SETTINGS_FILE = "pi-usage.json";
 export const MAX_USAGE_SETTINGS_BYTES = 64 * 1024;
 
+export type CodexStatusPercentage = "remaining" | "used";
+
 export interface UsageSettings {
   codexFastMode: boolean;
   codexStatusResetCountdown: boolean;
+  codexStatusPercentage: CodexStatusPercentage;
   selectedTargets: Record<string, string>;
 }
 
 export const DEFAULT_USAGE_SETTINGS: Readonly<UsageSettings> = Object.freeze({
   codexFastMode: false,
   codexStatusResetCountdown: true,
+  codexStatusPercentage: "remaining",
   selectedTargets: Object.freeze({}),
 });
 
@@ -66,6 +70,13 @@ export function normalizeUsageSettings(value: unknown): UsageSettings | undefine
   if (Object.hasOwn(value, "codexStatusResetCountdown") && typeof value.codexStatusResetCountdown !== "boolean") {
     return undefined;
   }
+  if (
+    Object.hasOwn(value, "codexStatusPercentage") &&
+    value.codexStatusPercentage !== "remaining" &&
+    value.codexStatusPercentage !== "used"
+  ) {
+    return undefined;
+  }
   if (Object.hasOwn(value, "fireworksAccountId") && !isFireworksAccountId(value.fireworksAccountId)) {
     return undefined;
   }
@@ -82,6 +93,8 @@ export function normalizeUsageSettings(value: unknown): UsageSettings | undefine
       typeof value.codexStatusResetCountdown === "boolean"
         ? value.codexStatusResetCountdown
         : DEFAULT_USAGE_SETTINGS.codexStatusResetCountdown,
+    codexStatusPercentage:
+      value.codexStatusPercentage === "used" ? "used" : DEFAULT_USAGE_SETTINGS.codexStatusPercentage,
     selectedTargets: effectiveTargets,
   };
 }

package/src/types.ts

@@ -214,7 +214,9 @@ export interface ZaiPlanInfo {
 export type KimiCodingUsagePayload = {
   usage?: unknown;
   limits?: unknown;
+  usages?: unknown;
   boosterWallet?: unknown;
+  booster_wallet?: unknown;
 };
 
 export type XaiUserPayload = {

package/src/usage-settings-ui.ts

@@ -2,12 +2,19 @@ import { stripVTControlCharacters } from "node:util";
 import { type ExtensionCommandContext, getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, type SettingItem, SettingsList, Text } from "@earendil-works/pi-tui";
 import { errorMessage } from "./core.js";
-import type { UsageSettingsRuntime } from "./settings.js";
+import type { UsageSettings, UsageSettingsRuntime } from "./settings.js";
 
 const OFF = "Off";
 const ON = "On";
+const REMAINING = "Remaining";
+const USED = "Used";
 
-type UsageSettingId = "codexFastMode" | "codexStatusResetCountdown";
+type UsageSettingId = "codexFastMode" | "codexStatusResetCountdown" | "codexStatusPercentage";
+
+function settingValueLabel(id: UsageSettingId, value: UsageSettings[UsageSettingId]): string {
+  if (id === "codexStatusPercentage") return value === "used" ? USED : REMAINING;
+  return value === true ? ON : OFF;
+}
 
 export async function showUsageSettings(
   ctx: ExtensionCommandContext,
@@ -45,6 +52,13 @@ export async function showUsageSettings(
           currentValue: state.settings.codexStatusResetCountdown ? ON : OFF,
           values: [OFF, ON],
         },
+        {
+          id: "codexStatusPercentage",
+          label: "Codex percentage",
+          description: "Show remaining or used Codex quota in the statusline.",
+          currentValue: settingValueLabel("codexStatusPercentage", state.settings.codexStatusPercentage),
+          values: [REMAINING, USED],
+        },
       ];
       const rule = new HorizontalRule({ ruleStyle: (text) => theme.fg("border", text) });
 
@@ -55,11 +69,11 @@ export async function showUsageSettings(
         localController.abort();
         done(changed);
       };
-      const queueUpdate = (id: UsageSettingId, requested: boolean, display: string) => {
+      const queueUpdate = <Id extends UsageSettingId>(id: Id, requested: UsageSettings[Id], display: string) => {
         saveQueue = saveQueue.then(async () => {
           const previous = settingsRuntime.get().settings[id];
           if (settingsRuntime.get().kind === "invalid") {
-            settingsList.updateValue(id, previous ? ON : OFF);
+            settingsList.updateValue(id, settingValueLabel(id, previous));
             if (!signal.aborted && isCurrent()) {
               ctx.ui.notify("Repair pi-usage.json and reload before changing settings.", "error");
               tui.requestRender();
@@ -67,10 +81,12 @@ export async function showUsageSettings(
             return;
           }
           try {
-            await settingsRuntime.update({ [id]: requested }, signal);
+            const patch: Partial<UsageSettings> = {};
+            patch[id] = requested;
+            await settingsRuntime.update(patch, signal);
           } catch (error) {
             if (signal.aborted || !isCurrent()) return;
-            settingsList.updateValue(id, previous ? ON : OFF);
+            settingsList.updateValue(id, settingValueLabel(id, previous));
             ctx.ui.notify(`Could not save pi-usage.json: ${errorMessage(error)}`, "error");
             tui.requestRender();
             return;
@@ -90,7 +106,11 @@ export async function showUsageSettings(
         getSettingsListTheme(),
         (id, value) => {
           if (closing || signal.aborted || !isCurrent()) return;
-          queueUpdate(id as UsageSettingId, value !== OFF, value);
+          if (id === "codexStatusPercentage") {
+            queueUpdate(id, value === USED ? "used" : "remaining", value);
+          } else if (id === "codexFastMode" || id === "codexStatusResetCountdown") {
+            queueUpdate(id, value === ON, value);
+          }
         },
         cancel,
       );

package/src/usage.ts

@@ -166,10 +166,17 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
       }
       return;
     }
+    const settings = settingsRuntime.get().settings;
     const showCodexResetCountdown =
-      outcome.state.report.providerId === "openai-codex" && settingsRuntime.get().settings.codexStatusResetCountdown;
+      outcome.state.report.providerId === "openai-codex" && settings.codexStatusResetCountdown;
     const now = Date.now();
-    const rawValue = formatUsageStatusline(outcome.state.report, model, now, showCodexResetCountdown);
+    const rawValue = formatUsageStatusline(
+      outcome.state.report,
+      model,
+      now,
+      showCodexResetCountdown,
+      settings.codexStatusPercentage,
+    );
     const value = rawValue ? fastRuntime.decorateStatus(model, rawValue) : undefined;
     if (!safeSetStatus(ctx, value)) return;
     if (shouldSchedule && sessionActive) scheduleStatusRefresh(ctx, model);
@@ -998,7 +1005,7 @@ export default function usageExtension(pi: ExtensionAPI, dependencies: UsageExte
               () => statusGeneration === menuGeneration && !controller.signal.aborted,
               (id) => {
                 if (
-                  id === "codexStatusResetCountdown" &&
+                  (id === "codexStatusResetCountdown" || id === "codexStatusPercentage") &&
                   stableCurrent &&
                   statusGeneration === menuGeneration &&
                   !controller.signal.aborted