@narumitw/pi-usage 0.60.11 → 0.61.1

package/README.md

@@ -66,7 +66,7 @@ Read the [query and reset guide](./docs/operations.md) for target selection, can
 
 ## ⚙️ Settings
 
-Choose **Settings** in `/usage` to edit Codex Fast mode and the Codex reset countdown through Pi's settings-list interaction in TUI mode.
+Choose **Settings** in `/usage` to edit Codex Fast mode, percentage display, and the reset countdown through Pi's settings-list interaction in TUI mode.
 RPC mode reports the active manual settings path instead of opening terminal UI.
 
 These preferences live in `pi-usage.json` under Pi's user agent directory, normally `~/.pi/agent/pi-usage.json`.
@@ -87,7 +87,7 @@ Run `/fast` without arguments to toggle Fast for the active supported Codex mode
 Fast is about 1.5× faster and uses more of your plan allowance.
 The `codexFastMode` preference defaults to Off.
 
-Fast currently applies only to official `openai-codex-responses` requests for `gpt-5.5`, `gpt-5.6-sol`, `gpt-5.6-terra`, and `gpt-5.6-luna` at `https://chatgpt.com`.
+Fast currently applies only to official `openai-codex-responses` requests for `gpt-5.5`, `gpt-5.6-sol`, `gpt-5.6-terra`, `gpt-5.6-luna`, and `gpt-6-sol` at `https://chatgpt.com`.
 It sends `service_tier: "priority"` while enabled and explicit `service_tier: "default"` otherwise.
 The statusline adds `fast` only while the preference is effective, for example `codex fast 59% ↻ 2h30m` with the default reset countdown.
 Unsupported models and custom or proxy origins are left unchanged.
@@ -95,6 +95,20 @@ Unsupported models and custom or proxy origins are left unchanged.
 A toggle affects provider requests whose payload hook starts after the save; a request already sent is unchanged.
 Repair or remove an invalid file, then run `/reload` before trying the toggle again.
 
+### Codex statusline percentage
+
+The `codexStatusPercentage` preference accepts `"remaining"` or `"used"` and defaults to `"remaining"` to preserve existing output.
+Choose **Codex percentage** in the TUI Settings screen, or set the field manually and run `/reload`:
+
+```json
+{
+  "codexStatusPercentage": "used"
+}
+```
+
+With `"used"`, a limit with 70% remaining appears as `30%`; its reset countdown or window label stays unchanged.
+This preference changes only Codex statusline formatting, not provider data or the detailed `/usage` report.
+
 ### Codex statusline reset countdown
 
 The `codexStatusResetCountdown` preference defaults to `true`. It replaces the window labels with the time remaining until each returned limit resets.

package/dist/index.ts

@@ -9,7 +9,8 @@ var CODEX_FAST_MODEL_IDS = /* @__PURE__ */ new Set([
   "gpt-5.5",
   "gpt-5.6-luna",
   "gpt-5.6-sol",
-  "gpt-5.6-terra"
+  "gpt-5.6-terra",
+  "gpt-6-sol"
 ]);
 function codexFastAvailability(model, enabled) {
   if (model?.provider !== "openai-codex") return { kind: "not-codex" };
@@ -591,7 +592,7 @@ function deepSeekCurrency(value) {
   return CURRENCIES.find((currency) => currency === value);
 }
 function decimalAmount2(value) {
-  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);
 }
 
 // src/providers/fireworks.ts
@@ -936,11 +937,18 @@ var FIVE_HOUR_WINDOW_MINUTES = 300;
 var DAILY_WINDOW_MINUTES = 1440;
 var WEEKLY_WINDOW_MINUTES = 10080;
 var FIXED_POINT_UNITS_PER_CENT = 1e6;
+var 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" }
+];
 function normalizeKimiCodingUsagePayload(payload, capturedAt) {
   const root = asObject6(payload);
   if (!root) throw new Error("Kimi Coding usage response was not an object.");
   const candidates = [];
+  const explicitWindows = /* @__PURE__ */ new Set();
   let omittedWindow = false;
+  if (root.usage !== void 0) explicitWindows.add(WEEKLY_WINDOW_MINUTES);
   const summary = parseUsageRow(root.usage, WEEKLY_WINDOW_MINUTES, "Weekly window");
   if (summary) candidates.push(summary);
   else if (root.usage !== void 0) omittedWindow = true;
@@ -948,6 +956,7 @@ function normalizeKimiCodingUsagePayload(payload, capturedAt) {
     for (const raw of root.limits) {
       const item = asObject6(raw);
       const windowMinutes = parseWindowMinutes(item?.window);
+      if (windowMinutes !== void 0) explicitWindows.add(windowMinutes);
       const label = sanitizedLabel(item?.name);
       const bucket = windowMinutes === void 0 ? void 0 : parseUsageRow(item?.detail, windowMinutes, label ?? defaultWindowLabel(windowMinutes));
       if (bucket) candidates.push(bucket);
@@ -966,8 +975,23 @@ function normalizeKimiCodingUsagePayload(payload, capturedAt) {
     if (rows.length === 1) buckets.push(rows[0]);
     else omittedWindow = true;
   }
-  buckets.sort((left, right) => (left.windowMinutes ?? 0) - (right.windowMinutes ?? 0));
-  const metrics = parseBoosterWallet(root.boosterWallet);
+  const usages = asObject6(root.usages);
+  if (root.usages !== void 0 && !usages) omittedWindow = true;
+  if (usages) {
+    for (const window of RATIO_WINDOWS) {
+      const raw = usages[window.key];
+      if (raw === void 0 || "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 === void 0 ? root.booster_wallet : root.boosterWallet);
   if (buckets.length === 0 && metrics.length === 0) {
     throw new Error("Kimi Coding usage endpoint returned no displayable usage data.");
   }
@@ -1006,6 +1030,21 @@ function parseUsageRow(value, windowMinutes, label) {
     ...resetsAt !== void 0 ? { resetsAt } : {}
   };
 }
+function parseRatioWindow(value, id, label) {
+  const row = asObject6(value);
+  const ratio = row?.used_ratio;
+  if (typeof ratio !== "number" || !Number.isFinite(ratio) || ratio < 0 || ratio > 1) return void 0;
+  const resetsAt = asIsoEpochSeconds(row?.reset_time);
+  const used = ratio * 100;
+  return {
+    id,
+    label,
+    used,
+    remaining: 100 - used,
+    unit: "percent",
+    ...resetsAt !== void 0 ? { resetsAt } : {}
+  };
+}
 function parseWindowMinutes(value) {
   const window = asObject6(value);
   if (!window) return void 0;
@@ -3189,10 +3228,10 @@ function formatUsageReport(report2, displayState) {
   }
   return lines.join("\n").trimEnd();
 }
-function formatUsageStatusline(report2, model, now = Date.now(), showCodexResetCountdown = true) {
+function formatUsageStatusline(report2, model, now = Date.now(), showCodexResetCountdown = true, codexStatusPercentage = "remaining") {
   if (report2.providerId === "baseten") return formatBasetenStatusline(report2);
   if (report2.providerId === "openai-codex") {
-    return formatCodexStatusline(report2, model, now, showCodexResetCountdown);
+    return formatCodexStatusline(report2, model, now, showCodexResetCountdown, codexStatusPercentage);
   }
   if (report2.providerId === "deepseek") return formatDeepSeekStatusline(report2);
   if (report2.providerId === "fireworks") return formatFireworksStatusline(report2);
@@ -3387,6 +3426,12 @@ function formatOpenCodeZenStatusline(report2) {
 function formatKimiCodingReport(lines, report2) {
   for (const bucket of report2.buckets) {
     const reset = bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : "";
+    if (bucket.unit === "percent") {
+      const remaining = bucket.remaining === void 0 ? void 0 : Math.round(clampPercent4(bucket.remaining));
+      const value = bucket.used === void 0 || remaining === void 0 ? "unavailable" : `${100 - remaining}% used \xB7 ${remaining}% left`;
+      lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${value}${reset}`);
+      continue;
+    }
     if (bucket.used === void 0 || bucket.limit === void 0) {
       lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}unavailable${reset}`);
       continue;
@@ -3415,15 +3460,18 @@ function formatKimiCodingReport(lines, report2) {
 function formatKimiCodingStatusline(report2) {
   const fiveHour = report2.buckets.find((bucket) => bucket.id === "five-hour");
   const weekly = report2.buckets.find((bucket) => bucket.id === "weekly");
-  const subWindow = fiveHour ?? report2.buckets.find((bucket) => bucket.id !== "weekly");
-  const selected = [subWindow, weekly].filter(
+  const monthly = report2.buckets.find((bucket) => bucket.id === "monthly");
+  const subWindow = fiveHour ?? report2.buckets.find((bucket) => bucket.id !== "weekly" && bucket.id !== "monthly");
+  const selected = [subWindow, weekly, monthly].filter(
     (bucket, index, buckets) => bucket !== void 0 && buckets.indexOf(bucket) === index
   );
   const parts = ["kimi"];
   for (const bucket of selected) {
-    if (!bucket.limit || bucket.remaining === void 0) continue;
+    if (bucket.remaining === void 0 || 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(clampPercent4(bucket.remaining)) : percentRemaining(bucket);
+    parts.push(`${remaining}% ${window}`);
   }
   return parts.length > 1 ? parts.join(" ") : void 0;
 }
@@ -3597,7 +3645,7 @@ function formatGenericReport(lines, report2) {
     lines.push(`${`${metric2.label}:`.padEnd(VALUE_COLUMN)}${formatMetricValue(metric2.value, metric2.unit)}`);
   }
 }
-function formatCodexStatusline(report2, model, now = Date.now(), showResetCountdown = true) {
+function formatCodexStatusline(report2, model, now = Date.now(), showResetCountdown = true, percentage = "remaining") {
   const group = selectCodexGroup(report2, model);
   if (!group) return formatCodexCreditsStatus(report2);
   const buckets = report2.buckets.filter((bucket) => (bucket.groupId ?? bucket.id) === group);
@@ -3605,7 +3653,8 @@ function formatCodexStatusline(report2, model, now = Date.now(), showResetCountd
   const parts = [group === "codex" ? "codex" : `codex ${compactLimitLabel(labelBucket?.groupLabel ?? group)}`];
   for (const bucket of buckets) {
     if (bucket.remaining === void 0) continue;
-    const percent = `${clampPercent4(bucket.remaining).toFixed(0)}%`;
+    const displayedPercentage = percentage === "used" ? bucket.used ?? 100 - bucket.remaining : bucket.remaining;
+    const percent = `${clampPercent4(displayedPercentage).toFixed(0)}%`;
     const fallback = bucket.id.endsWith(":secondary") ? "weekly" : "5h";
     const window = formatWindowLabel(bucket.windowMinutes, fallback, true);
     if (!showResetCountdown) {
@@ -3739,6 +3788,7 @@ var MAX_USAGE_SETTINGS_BYTES = 64 * 1024;
 var DEFAULT_USAGE_SETTINGS = Object.freeze({
   codexFastMode: false,
   codexStatusResetCountdown: true,
+  codexStatusPercentage: "remaining",
   selectedTargets: Object.freeze({})
 });
 function usageSettingsPath() {
@@ -3752,6 +3802,9 @@ function normalizeUsageSettings(value) {
   if (Object.hasOwn(value, "codexStatusResetCountdown") && typeof value.codexStatusResetCountdown !== "boolean") {
     return void 0;
   }
+  if (Object.hasOwn(value, "codexStatusPercentage") && value.codexStatusPercentage !== "remaining" && value.codexStatusPercentage !== "used") {
+    return void 0;
+  }
   if (Object.hasOwn(value, "fireworksAccountId") && !isFireworksAccountId(value.fireworksAccountId)) {
     return void 0;
   }
@@ -3764,6 +3817,7 @@ function normalizeUsageSettings(value) {
   return {
     codexFastMode: typeof value.codexFastMode === "boolean" ? value.codexFastMode : DEFAULT_USAGE_SETTINGS.codexFastMode,
     codexStatusResetCountdown: typeof value.codexStatusResetCountdown === "boolean" ? value.codexStatusResetCountdown : DEFAULT_USAGE_SETTINGS.codexStatusResetCountdown,
+    codexStatusPercentage: value.codexStatusPercentage === "used" ? "used" : DEFAULT_USAGE_SETTINGS.codexStatusPercentage,
     selectedTargets: effectiveTargets
   };
 }
@@ -4166,6 +4220,12 @@ import { getSettingsListTheme } from "@earendil-works/pi-coding-agent";
 import { Key, matchesKey, SettingsList, Text } from "@earendil-works/pi-tui";
 var OFF = "Off";
 var ON = "On";
+var REMAINING = "Remaining";
+var USED = "Used";
+function settingValueLabel(id, value) {
+  if (id === "codexStatusPercentage") return value === "used" ? USED : REMAINING;
+  return value === true ? ON : OFF;
+}
 async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent, onApplied) {
   if (ctx.mode !== "tui") {
     if (ctx.hasUI) ctx.ui.notify(`Edit settings manually: ${settingsRuntime.get().path}`, "info");
@@ -4194,6 +4254,13 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
         description: "Show time remaining until each Codex usage limit resets.",
         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) });
@@ -4208,7 +4275,7 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
       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();
@@ -4216,10 +4283,12 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
           return;
         }
         try {
-          await settingsRuntime.update({ [id]: requested }, signal);
+          const patch = {};
+          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;
@@ -4239,7 +4308,11 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
       getSettingsListTheme(),
       (id, value) => {
         if (closing || signal.aborted || !isCurrent()) return;
-        queueUpdate(id, 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
     );
@@ -4368,9 +4441,16 @@ function usageExtension(pi, dependencies = {}) {
       }
       return;
     }
-    const showCodexResetCountdown = outcome.state.report.providerId === "openai-codex" && settingsRuntime.get().settings.codexStatusResetCountdown;
+    const settings = settingsRuntime.get().settings;
+    const showCodexResetCountdown = 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) : void 0;
     if (!safeSetStatus(ctx, value)) return;
     if (shouldSchedule && sessionActive) scheduleStatusRefresh(ctx, model);
@@ -5063,7 +5143,7 @@ function usageExtension(pi, dependencies = {}) {
               controller.signal,
               () => statusGeneration === menuGeneration && !controller.signal.aborted,
               (id) => {
-                if (id === "codexStatusResetCountdown" && stableCurrent && statusGeneration === menuGeneration && !controller.signal.aborted) {
+                if ((id === "codexStatusResetCountdown" || id === "codexStatusPercentage") && stableCurrent && statusGeneration === menuGeneration && !controller.signal.aborted) {
                   publishStableCurrent(ctx, stableCurrent);
                 }
               }