pi-provider-qoder-cn 0.2.16 → 0.2.18

package/README.md

@@ -129,6 +129,10 @@ Notes:
   not reserve space for one it does not have.
 - Colour is suppressed automatically for a `NO_COLOR` environment, a dumb
   terminal, and any non-TTY output that is not the interactive UI.
+- The gauge and the `%` column are derived from `used / total`, so they always
+  agree with the numbers on the same row. The API's own `percentage` field is a
+  0-1 fraction (94% arrives as `0.94`) and is only used — scaled by 100 — when a
+  bucket comes back without numbers.
 - `Expires never` means the API reported the year-9999 sentinel, i.e. the
   allowance has no expiry date.
 - `Note  plan quota is prorated` appears after a mid-cycle plan change.

package/dist/index.js

@@ -1785,6 +1785,27 @@ init_oauth();
 
 // src/auth/usage.ts
 init_region();
+function num(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+function round2(value) {
+  return Math.round(value * 100) / 100;
+}
+function hasAllowance(bucket) {
+  if (!bucket) return false;
+  return num(bucket.total ?? bucket.cap) > 0 || num(bucket.used) > 0 || num(bucket.remaining) > 0;
+}
+function resetTimestamp(expiresAt) {
+  const ms = num(expiresAt);
+  if (ms <= 0) return void 0;
+  const timestamp = ms < 1e12 ? ms * 1e3 : ms;
+  if (new Date(timestamp).getUTCFullYear() >= 9999) return void 0;
+  return new Date(timestamp).toISOString();
+}
+function pickBucket(raw, camel) {
+  const snake = camel.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
+  return raw[snake] ?? raw[camel];
+}
 async function fetchQoderUsageForMode(credentials, mode) {
   const region = getQoderRegionConfig(mode);
   const response = await fetch(getQoderUsageURL(mode), {
@@ -1799,35 +1820,27 @@ async function fetchQoderUsageForMode(credentials, mode) {
     throw new Error(`Failed to fetch Qoder usage: ${response.status} ${response.statusText}`);
   }
   const raw = await response.json();
-  const usageBuckets = [];
-  const userQuota = raw.user_quota ?? raw.userQuota;
-  const org = raw.org_resource_package ?? raw.orgResourcePackage ?? raw.shared_quota ?? raw.sharedQuota;
-  if (userQuota) {
-    usageBuckets.push({
-      id: "user-quota",
-      label: "User Quota",
-      usedDisplay: userQuota.used.toFixed(2),
-      limitDisplay: (userQuota.total ?? userQuota.cap ?? 0).toFixed(2),
-      unit: userQuota.unit,
-      resetAt: raw.expiresAt ? new Date(raw.expiresAt).toISOString() : void 0
-    });
-  }
-  const orgLimit = org?.cap ?? org?.total ?? 0;
-  if (org && orgLimit > 0) {
-    usageBuckets.push({
-      id: "org-resource-package",
-      label: "Org Resource Package",
-      usedDisplay: org.used.toFixed(2),
-      limitDisplay: orgLimit.toFixed(2),
-      unit: org.unit,
-      resetAt: raw.expiresAt ? new Date(raw.expiresAt).toISOString() : void 0
-    });
-  }
-  const remainingText = userQuota ? `${userQuota.remaining.toFixed(2)} ${userQuota.unit} remaining` : org ? `${org.remaining.toFixed(2)} ${org.unit} remaining` : "";
+  const org = pickBucket(raw, "orgResourcePackage") ?? pickBucket(raw, "sharedQuota");
+  const resetAt = resetTimestamp(raw.expiresAt);
+  const buckets = [
+    { id: "user-quota", label: "User Quota", quota: pickBucket(raw, "userQuota") },
+    { id: "add-on-quota", label: "Add-on", quota: pickBucket(raw, "addOnQuota") },
+    { id: "org-resource-package", label: "Org Resource Package", quota: org }
+  ].filter((entry) => hasAllowance(entry.quota));
+  const usageBuckets = buckets.map(({ id, label, quota }) => ({
+    id,
+    label,
+    usedDisplay: round2(num(quota?.used)).toFixed(2),
+    limitDisplay: round2(num(quota?.total ?? quota?.cap)).toFixed(2),
+    unit: quota?.unit || "credits",
+    resetAt
+  }));
+  const remaining = buckets.reduce((sum, { quota }) => sum + Math.max(0, num(quota?.remaining)), 0);
+  const unit = buckets[0]?.quota?.unit || "credits";
   return {
-    summary: remainingText,
+    summary: buckets.length > 0 ? `${round2(remaining)} ${unit} remaining` : "",
     subscriptionTitle: region.usageTitle,
-    resetAt: raw.expiresAt ? new Date(raw.expiresAt).toISOString() : void 0,
+    resetAt,
     manageUrl: region.manageUrl,
     usageBuckets,
     raw
@@ -2456,6 +2469,10 @@ function formatPercent(value) {
   if (typeof value !== "number" || !Number.isFinite(value)) return void 0;
   return Math.round(value * 10) / 10;
 }
+function normalizePercent(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return void 0;
+  return value >= 0 && value <= 1 ? value * 100 : value;
+}
 function formatDailyResetCountdown(now = Date.now()) {
   const diffMs = msUntilBeijingMidnight(now);
   const totalMinutes = Math.max(1, Math.round(diffMs / 6e4));
@@ -2512,11 +2529,8 @@ function renderUsageRows(rows, notes, color) {
   return lines.map((line) => line.replace(/ +$/, ""));
 }
 function bucketRow(label, bucket, danger) {
-  const rawPercent = bucket?.percentage;
   const derivedPercent = typeof bucket?.used === "number" && typeof bucket?.total === "number" && bucket.total > 0 ? bucket.used / bucket.total * 100 : void 0;
-  const percent = formatPercent(
-    typeof rawPercent === "number" && Number.isFinite(rawPercent) ? rawPercent : derivedPercent
-  );
+  const percent = formatPercent(derivedPercent ?? normalizePercent(bucket?.percentage));
   return {
     label,
     percent,
@@ -2531,7 +2545,7 @@ function hasBucket(bucket) {
   if (!bucket) return false;
   return (bucket.total ?? 0) > 0 || (bucket.used ?? 0) > 0;
 }
-function pickBucket(raw, camel) {
+function pickBucket2(raw, camel) {
   if (!raw) return void 0;
   const snake = camel.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
   return raw[snake] ?? raw[camel];
@@ -2541,15 +2555,17 @@ function formatQoderUsage(raw, mode, now = Date.now(), options = {}) {
   const region = getQoderRegionConfig(mode);
   const danger = Boolean(raw?.isQuotaExceeded);
   const userType = raw?.userType ? ` (${raw.userType})` : "";
-  const showUserQuota = hasBucket(pickBucket(raw, "userQuota"));
-  const showAddOnQuota = hasBucket(pickBucket(raw, "addOnQuota"));
-  const org = pickBucket(raw, "orgResourcePackage") ?? pickBucket(raw, "sharedQuota");
+  const showUserQuota = hasBucket(pickBucket2(raw, "userQuota"));
+  const showAddOnQuota = hasBucket(pickBucket2(raw, "addOnQuota"));
+  const org = pickBucket2(raw, "orgResourcePackage") ?? pickBucket2(raw, "sharedQuota");
   const showOrg = hasBucket(org);
   const orgPercent = typeof org?.used === "number" && typeof org?.cap === "number" && org.cap > 0 ? formatPercent(org.used / org.cap * 100) : void 0;
-  const overallPercent = formatPercent(showOrg ? raw?.totalUsagePercentage || orgPercent : raw?.totalUsagePercentage);
+  const overallPercent = formatPercent(
+    showOrg ? normalizePercent(raw?.totalUsagePercentage) || orgPercent : normalizePercent(raw?.totalUsagePercentage)
+  );
   const rows = [{ label: "Overall", percent: overallPercent, tail: "used", danger }];
-  if (showUserQuota) rows.push(bucketRow("Plan quota", pickBucket(raw, "userQuota"), danger));
-  if (showAddOnQuota) rows.push(bucketRow("Add-on", pickBucket(raw, "addOnQuota"), danger));
+  if (showUserQuota) rows.push(bucketRow("Plan quota", pickBucket2(raw, "userQuota"), danger));
+  if (showAddOnQuota) rows.push(bucketRow("Add-on", pickBucket2(raw, "addOnQuota"), danger));
   if (showOrg && org)
     rows.push(bucketRow("Enterprise", { ...org, percentage: void 0, total: org.cap ?? org.total }, danger));
   const isPersonalStandard = raw?.userType === "personal_standard" || raw?.userType === "free";
@@ -2589,7 +2605,7 @@ function formatQoderUsage(raw, mode, now = Date.now(), options = {}) {
       });
     }
   }
-  const addOn = pickBucket(raw, "addOnQuota");
+  const addOn = pickBucket2(raw, "addOnQuota");
   if (showAddOnQuota && (addOn?.remaining ?? 0) > 0 && checkin) {
     const latestExpiryMs = checkin.expiresAt ? Date.parse(checkin.expiresAt) : void 0;
     const estimate = estimateRollingAddOnExpiry(addOn, latestExpiryMs, now);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-provider-qoder-cn",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "description": "Pi extension for Qoder CN — PAT/OAuth auth, /qoder-cn.usage quota command, and enterprise VPC endpoint support",
   "type": "module",
   "license": "MIT",