@narumitw/pi-usage 0.65.0 → 0.65.1

package/README.md

@@ -147,7 +147,7 @@ This preference changes only Codex statusline formatting, not provider data or t
 ### Codex statusline reset countdown
 
 The `codexStatusResetCountdown` preference defaults to `true`. It replaces the window labels with the time remaining until each returned limit resets.
-Turn **Codex reset countdown** Off in the TUI Settings screen, or set it to `false` in `pi-usage.json` and run `/reload`, to restore the legacy `5h` and `wk` labels:
+Turn **Codex reset countdown** Off in the TUI Settings screen, or set it to `false` in `pi-usage.json` and run `/reload`, to show static labels such as `codex 5h:59% · wk:61%`:
 
 ```json
 {
@@ -197,6 +197,16 @@ After the active runtime credential changes, the next command, turn, or schedule
 ## 📊 Statusline behavior
 
 The `usage` status item is active only for selected providers that publish statusline usage.
+Codex, Command Code, Kimi, MiniMax Token Plan, Z.AI, and OpenCode Go separate quota windows with ` · ` and place static labels before values, for example `cmd 5h:100% · wk:97% · mo:98%`.
+Countdown segments retain their spacing without window labels, for example `codex 89% ↻ 2h30m · 97% ↻ 5d17h`; a missing reset time falls back to a static label, such as `codex 89% ↻ 2h30m · wk:97%`.
+Single windows have no separator. These presentation changes do not alter the reported values; consumers parsing the old status text must adapt to the new format. ChatGPT companion formatting is unchanged.
+
+Kimi, MiniMax Token Plan Global/China, Z.AI Global/China, Command Code, OpenCode Go, and finite GitHub Copilot quotas show countdowns automatically when a displayed quota has a valid future reset time.
+For example, `kimi 77% ↻ 2h52m · mo:87%` mixes a countdown with a static fallback; Copilot preserves its counts, percentage, and any overage, such as `copilot 245/300 82% ↻ 6d`.
+These providers fall back to their existing static output when reset times are missing, invalid, or expired; unlimited quotas and balance/spend reports do not show countdowns.
+Their countdowns are not controlled by the Codex-only settings. Codex and ChatGPT companion retain their existing reset behavior, including `↻ 0m` for expired returned resets.
+Countdowns repaint locally every minute while a displayed eligible reset remains in the future, without additional provider requests; hidden windows and unselected model groups do not activate this repaint for the newly supported providers.
+
 It refreshes every five minutes while the session remains on such a provider and is cleared when the model changes to an unsupported or menu-only provider.
 DeepSeek publishes each returned currency as a separate exact balance segment and reports when the API is unavailable.
 Fireworks publishes exact per-currency rated spend totals and reports when no rated usage exists.

package/dist/index.ts

@@ -421,6 +421,14 @@ function formatUsageReport(report, displayState) {
   return lines.join("\n").trimEnd();
 }
 function formatUsageStatusline(report, model, now = Date.now(), showCodexResetCountdown = true, codexStatusPercentage = "remaining") {
+  return formatUsageStatuslineWithCountdown(report, model, now, showCodexResetCountdown, codexStatusPercentage).value;
+}
+function formatUsageStatuslineWithCountdown(report, model, now = Date.now(), showCodexResetCountdown = true, codexStatusPercentage = "remaining") {
+  const countdown = { now, active: false };
+  const value = formatStatusline(report, model, now, showCodexResetCountdown, codexStatusPercentage, countdown);
+  return { value, hasCountdown: countdown.active };
+}
+function formatStatusline(report, model, now, showCodexResetCountdown, codexStatusPercentage, countdown) {
   if (report.providerId === "openai" && report.source === "openai-chatgpt-auth") return "chatgpt usage: web only";
   if (report.source === "openai-chatgpt-companion") {
     const windows = report.buckets.filter((bucket) => bucket.groupId === "chatgpt-plan").map((bucket) => {
@@ -437,24 +445,24 @@ function formatUsageStatusline(report, model, now = Date.now(), showCodexResetCo
   if (report.providerId === "deepseek") return formatDeepSeekStatusline(report);
   if (report.providerId === "fireworks") return formatFireworksStatusline(report);
   if (report.providerId === "vercel-ai-gateway") return formatVercelAIGatewayStatusline(report);
-  if (report.providerId === "github-copilot") return formatGitHubCopilotStatusline(report);
+  if (report.providerId === "github-copilot") return formatGitHubCopilotStatusline(report, countdown);
   if (report.providerId === "openrouter") {
     const limit = report.buckets.find((bucket) => bucket.id === "key-limit");
     if (limit?.remaining !== void 0) return `openrouter ${formatUsd(limit.remaining)} left`;
     const total = report.metrics.find((metric) => metric.id === "usage-total");
     if (typeof total?.value === "number") return `openrouter ${formatUsd(total.value)} used`;
   }
-  if (report.providerId === "opencode-go") return formatOpenCodeZenStatusline(report);
-  if (report.providerId === "command-code") return formatCommandCodeStatusline(report);
-  if (report.providerId === "kimi-coding") return formatKimiCodingStatusline(report);
+  if (report.providerId === "opencode-go") return formatOpenCodeZenStatusline(report, countdown);
+  if (report.providerId === "command-code") return formatCommandCodeStatusline(report, countdown);
+  if (report.providerId === "kimi-coding") return formatKimiCodingStatusline(report, countdown);
   if (report.providerId === "moonshotai" || report.providerId === "moonshotai-cn") {
     return formatMoonshotStatusline(report);
   }
   if (report.providerId === "minimax" || report.providerId === "minimax-cn") {
-    return formatMiniMaxStatusline(report, model);
+    return formatMiniMaxStatusline(report, countdown, model);
   }
   if (report.providerId === "zai" || report.providerId === "zai-coding-cn") {
-    return formatZaiStatusline(report);
+    return formatZaiStatusline(report, countdown);
   }
   return void 0;
 }
@@ -572,7 +580,7 @@ function formatGitHubCopilotReport(lines, report) {
     lines.push(`${"Additional usage:".padEnd(VALUE_COLUMN)}${overage.value} ${quota.label}`);
   }
 }
-function formatGitHubCopilotStatusline(report) {
+function formatGitHubCopilotStatusline(report, countdown) {
   const quota = findGitHubCopilotQuota(report);
   const kind = compactGitHubCopilotQuotaKind(quota);
   if (!quota || quota.limit === void 0 || quota.remaining === void 0) {
@@ -580,7 +588,8 @@ function formatGitHubCopilotStatusline(report) {
   }
   const overage = report.metrics.find((metric) => metric.id === "overage-used");
   const overageSuffix = typeof overage?.value === "number" && overage.value > 0 ? ` +${overage.value} over` : "";
-  return `copilot ${kind === "premium" ? "" : `${kind} `}${quota.remaining}/${quota.limit} ${percentRemaining(quota)}%${overageSuffix}`;
+  const reset = formatQuotaCountdown(quota, countdown);
+  return `copilot ${kind === "premium" ? "" : `${kind} `}${quota.remaining}/${quota.limit} ${percentRemaining(quota)}%${overageSuffix}${reset ? ` \u21BB ${reset}` : ""}`;
 }
 function findGitHubCopilotQuota(report) {
   return report.buckets.find((bucket) => ["ai-credits", "premium-requests", "chat-requests"].includes(bucket.id));
@@ -616,14 +625,14 @@ function formatOpenCodeZenReport(lines, report) {
     lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${used}% used${reset}`);
   }
 }
-function formatOpenCodeZenStatusline(report) {
-  const parts = ["zen"];
+function formatOpenCodeZenStatusline(report, countdown) {
+  const parts = [];
   for (const bucket of report.buckets) {
     if (bucket.used === void 0) continue;
     const compact = bucket.id === "rolling" ? "r" : bucket.id === "weekly" ? "w" : "m";
-    parts.push(`${clampPercent(bucket.used).toFixed(0)}% ${compact}`);
+    parts.push(formatQuotaWindow(bucket, `${clampPercent(bucket.used).toFixed(0)}%`, compact, countdown));
   }
-  return parts.length > 1 ? parts.join(" ") : void 0;
+  return parts.length > 0 ? `zen ${parts.join(" \xB7 ")}` : void 0;
 }
 function formatCommandCodeReport(lines, report) {
   for (const bucket of report.buckets) {
@@ -640,8 +649,8 @@ function formatCommandCodeReport(lines, report) {
     lines.push(`${`${metric.label}:`.padEnd(VALUE_COLUMN)}${formatMetricValue(metric.value, metric.unit)}`);
   }
 }
-function formatCommandCodeStatusline(report) {
-  const parts = ["cmd"];
+function formatCommandCodeStatusline(report, countdown) {
+  const parts = [];
   for (const [id, label] of [
     ["five-hour", "5h"],
     ["weekly", "wk"],
@@ -649,9 +658,9 @@ function formatCommandCodeStatusline(report) {
   ]) {
     const bucket = report.buckets.find((candidate) => candidate.id === id);
     if (bucket?.unit !== "usd" || bucket.limit === void 0 || bucket.remaining === void 0) continue;
-    parts.push(`${percentRemaining(bucket)}% ${label}`);
+    parts.push(formatQuotaWindow(bucket, `${percentRemaining(bucket)}%`, label, countdown));
   }
-  return parts.length > 1 ? parts.join(" ") : void 0;
+  return parts.length > 0 ? `cmd ${parts.join(" \xB7 ")}` : void 0;
 }
 function formatKimiCodingReport(lines, report) {
   for (const bucket of report.buckets) {
@@ -687,7 +696,7 @@ function formatKimiCodingReport(lines, report) {
     lines.push(`${"Monthly limit:".padEnd(VALUE_COLUMN)}${formatCurrencyMetric(monthlyLimit)}`);
   }
 }
-function formatKimiCodingStatusline(report) {
+function formatKimiCodingStatusline(report, countdown) {
   const fiveHour = report.buckets.find((bucket) => bucket.id === "five-hour");
   const weekly = report.buckets.find((bucket) => bucket.id === "weekly");
   const monthly = report.buckets.find((bucket) => bucket.id === "monthly");
@@ -695,15 +704,15 @@ function formatKimiCodingStatusline(report) {
   const selected = [subWindow, weekly, monthly].filter(
     (bucket, index, buckets) => bucket !== void 0 && buckets.indexOf(bucket) === index
   );
-  const parts = ["kimi"];
+  const parts = [];
   for (const bucket of selected) {
     if (bucket.remaining === void 0 || bucket.unit !== "percent" && !bucket.limit) continue;
     const fallback = bucket.id === "weekly" ? "weekly" : "5h";
     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}`);
+    parts.push(formatQuotaWindow(bucket, `${remaining}%`, window, countdown));
   }
-  return parts.length > 1 ? parts.join(" ") : void 0;
+  return parts.length > 0 ? `kimi ${parts.join(" \xB7 ")}` : void 0;
 }
 function formatMoonshotReport(lines, report) {
   for (const metric of report.metrics) {
@@ -731,7 +740,7 @@ function formatMiniMaxReport(lines, report) {
     lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${value}`);
   }
 }
-function formatMiniMaxStatusline(report, model) {
+function formatMiniMaxStatusline(report, countdown, model) {
   const prefix = report.providerId === "minimax-cn" ? "minimax cn" : "minimax";
   if (report.source === "minimax-account-balance") {
     const available = report.metrics.find((metric) => metric.id === "available-balance");
@@ -740,22 +749,22 @@ function formatMiniMaxStatusline(report, model) {
   const selectedGroup = selectMiniMaxGroup(report, model);
   if (!selectedGroup) return void 0;
   const selected = report.buckets.filter((bucket) => bucket.groupId === selectedGroup);
-  const parts = [prefix];
+  const parts = [];
   for (const bucket of selected) {
     const fallback = bucket.id.endsWith(":weekly") ? "weekly" : "5h";
     const window = formatWindowLabel(bucket.windowMinutes, fallback, true);
     if (bucket.period === "unlimited") {
-      parts.push(`unlimited ${window}`);
+      parts.push(`${window}:unlimited`);
       continue;
     }
     if (bucket.unit === "percent" && bucket.remaining !== void 0) {
-      parts.push(`${bucket.remaining}% ${window}`);
+      parts.push(formatQuotaWindow(bucket, `${bucket.remaining}%`, window, countdown));
       continue;
     }
     if (bucket.limit === void 0 || bucket.remaining === void 0) continue;
-    parts.push(`${percentRemaining(bucket)}% ${window}`);
+    parts.push(formatQuotaWindow(bucket, `${percentRemaining(bucket)}%`, window, countdown));
   }
-  return parts.length > 1 ? parts.join(" ") : void 0;
+  return parts.length > 0 ? `${prefix} ${parts.join(" \xB7 ")}` : void 0;
 }
 function selectMiniMaxGroup(report, model) {
   const groups = [
@@ -797,18 +806,25 @@ function wildcardKeyMatches(pattern, value) {
   const last = segments.at(-1);
   return pattern.endsWith("*") || last !== void 0 && value.endsWith(last);
 }
-function formatZaiStatusline(report) {
+function formatZaiStatusline(report, countdown) {
   const selected = [
     report.buckets.find((bucket) => bucket.id === "five-hour"),
     report.buckets.find((bucket) => bucket.id === "weekly")
   ];
-  const parts = ["zai"];
+  const parts = [];
   for (const bucket of selected) {
     if (!bucket?.limit || bucket.remaining === void 0) continue;
     const fallback = bucket.id === "weekly" ? "weekly" : "5h";
-    parts.push(`${percentRemaining(bucket)}% ${formatWindowLabel(bucket.windowMinutes, fallback, true)}`);
+    parts.push(
+      formatQuotaWindow(
+        bucket,
+        `${percentRemaining(bucket)}%`,
+        formatWindowLabel(bucket.windowMinutes, fallback, true),
+        countdown
+      )
+    );
   }
-  return parts.length > 1 ? parts.join(" ") : void 0;
+  return parts.length > 0 ? `zai ${parts.join(" \xB7 ")}` : void 0;
 }
 function formatCurrencyMetric(metric) {
   if (typeof metric.value !== "number") return String(metric.value);
@@ -891,7 +907,8 @@ function formatCodexStatusline(report, model, now = Date.now(), showResetCountdo
   if (!group) return formatCodexCreditsStatus(report);
   const buckets = report.buckets.filter((bucket) => (bucket.groupId ?? bucket.id) === group);
   const labelBucket = buckets[0];
-  const parts = [group === "codex" ? "codex" : `codex ${compactLimitLabel(labelBucket?.groupLabel ?? group)}`];
+  const prefix = group === "codex" ? "codex" : `codex ${compactLimitLabel(labelBucket?.groupLabel ?? group)}`;
+  const parts = [];
   for (const bucket of buckets) {
     if (bucket.remaining === void 0) continue;
     const displayedPercentage = percentage === "used" ? bucket.used ?? 100 - bucket.remaining : bucket.remaining;
@@ -899,13 +916,13 @@ function formatCodexStatusline(report, model, now = Date.now(), showResetCountdo
     const fallback = bucket.id.endsWith(":secondary") ? "weekly" : "5h";
     const window = formatWindowLabel(bucket.windowMinutes, fallback, true);
     if (!showResetCountdown) {
-      parts.push(`${percent} ${window}`);
+      parts.push(`${window}:${percent}`);
       continue;
     }
     const reset = formatResetCountdown(bucket.resetsAt, now);
-    parts.push(`${percent} ${reset ? `\u21BB ${reset}` : window}`);
+    parts.push(reset ? `${percent} \u21BB ${reset}` : `${window}:${percent}`);
   }
-  return parts.length > 1 ? parts.join(" ") : formatCodexCreditsStatus(report);
+  return parts.length > 0 ? `${prefix} ${parts.join(" \xB7 ")}` : formatCodexCreditsStatus(report);
 }
 function formatCodexCreditsStatus(report) {
   const credits = report.metrics.find((metric) => metric.id === "credits");
@@ -984,6 +1001,17 @@ function formatWindowLabel(minutes, fallback, compact) {
   if (minutes % 60 === 0) return `${minutes / 60}h`;
   return `${minutes}m`;
 }
+function formatQuotaWindow(bucket, percent, window, countdown) {
+  const reset = formatQuotaCountdown(bucket, countdown);
+  return reset ? `${percent} \u21BB ${reset}` : `${window}:${percent}`;
+}
+function formatQuotaCountdown(bucket, countdown) {
+  if (bucket.period === "unlimited" || bucket.resetsAt === void 0 || !Number.isFinite(bucket.resetsAt * 1e3) || !Number.isFinite(countdown.now) || bucket.resetsAt * 1e3 <= countdown.now)
+    return void 0;
+  const reset = formatResetCountdown(bucket.resetsAt, countdown.now);
+  if (reset !== void 0) countdown.active = true;
+  return reset;
+}
 function formatResetCountdown(resetsAt, now) {
   if (resetsAt === void 0 || !Number.isFinite(resetsAt) || !Number.isFinite(now)) return void 0;
   const totalMinutes = Math.max(0, Math.ceil((resetsAt * 1e3 - now) / 6e4));
@@ -1942,23 +1970,23 @@ function usageExtension(pi, dependencies = {}) {
     const showCodexResetCountdown = outcome.state.report.providerId === "openai-codex" && settings.codexStatusResetCountdown;
     const isCompanionReport = outcome.state.report.source === "openai-chatgpt-companion";
     const now = Date.now();
-    const rawValue = formatUsageStatusline(
+    const status = formatUsageStatuslineWithCountdown(
       outcome.state.report,
       model,
       now,
       showCodexResetCountdown,
       settings.codexStatusPercentage
     );
-    const value = rawValue ? fastRuntime.decorateStatus(model, rawValue) : void 0;
+    const value = status.value ? fastRuntime.decorateStatus(model, status.value) : void 0;
     if (!safeSetStatus(ctx, value)) return;
     if (shouldSchedule && sessionActive) scheduleStatusRefresh(ctx, model);
-    if (sessionActive && (showCodexResetCountdown || isCompanionReport) && outcome.state.report.buckets.some(
+    if (sessionActive && (status.hasCountdown || (showCodexResetCountdown || isCompanionReport) && outcome.state.report.buckets.some(
       (bucket) => (!isCompanionReport || bucket.groupId === "chatgpt-plan") && bucket.resetsAt !== void 0 && Number.isFinite(bucket.resetsAt) && bucket.resetsAt * 1e3 > now
-    )) {
+    ))) {
       const generation = statusGeneration;
       statusCountdownTimer = setTimeout(() => {
-        statusCountdownTimer = void 0;
         if (!sessionActive || generation !== statusGeneration) return;
+        statusCountdownTimer = void 0;
         publishStatus(ctx, outcome, model, false);
       }, STATUS_COUNTDOWN_REFRESH_MS);
       statusCountdownTimer.unref?.();