pi-provider-qoder-cn 0.2.17 → 0.2.19

package/README.md

@@ -133,6 +133,14 @@ Notes:
   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.
+- `Add-on expiry` is only printed when a real check-in grant exists. A pool that
+  is a whole stack of daily grant packs (never more packs than the validity
+  window holds) is laid out as `Rolling 30d · earliest of N daily 100-credit
+  packs ~DATE`. A pool that is not one (a purchased top-up, or a leftover
+  remainder) prints only the expiry the campaign actually reported, `DATE ·
+  latest grant`, and an account that has never claimed prints no expiry line at
+  all, because with no grant there is nothing to date from, and inventing one
+  would show dates the API never sent.
 - `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
@@ -2389,30 +2402,39 @@ function isCredentialExpiredError(error) {
 
 // src/commands/usage.ts
 init_region();
-function estimateRollingAddOnExpiry(addOn, latestExpiryMs, now = Date.now()) {
+var DEFAULT_GRANT_CREDITS = 100;
+var DEFAULT_GRANT_VALIDITY_DAYS = 30;
+function positiveOr(value, fallback) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : fallback;
+}
+function estimateRollingAddOnExpiry(addOn, grant, now = Date.now()) {
   if (!addOn || !addOn.total || addOn.total <= 0 || !addOn.remaining || addOn.remaining <= 0) {
     return null;
   }
-  const packSize = 100;
-  const totalPacks = Math.max(1, Math.round(addOn.total / packSize));
-  if (totalPacks > 50) return null;
+  const shape = typeof grant === "number" ? { expiryMs: grant } : grant ?? {};
+  const packSize = positiveOr(shape.amount, DEFAULT_GRANT_CREDITS);
+  const validityDays = positiveOr(shape.validityDays, DEFAULT_GRANT_VALIDITY_DAYS);
+  const anchorMs = shape.expiryMs;
+  if (typeof anchorMs !== "number" || !Number.isFinite(anchorMs) || anchorMs <= now) return null;
+  if (addOn.total % packSize !== 0) return null;
+  const totalPacks = Math.round(addOn.total / packSize);
+  if (totalPacks < 1 || totalPacks > validityDays) return null;
   const used = Math.max(0, addOn.used ?? 0);
   const consumedPacks = Math.min(totalPacks - 1, Math.floor(used / packSize));
-  const earliestActiveIndex = consumedPacks;
-  const daysAgoClaimed = totalPacks - 1 - earliestActiveIndex;
-  const anchorExpiryMs = latestExpiryMs && Number.isFinite(latestExpiryMs) ? latestExpiryMs : now + 30 * 864e5;
-  const earliestMs = anchorExpiryMs - daysAgoClaimed * 864e5;
+  const daysAgoClaimed = totalPacks - 1 - consumedPacks;
+  const earliestMs = anchorMs - daysAgoClaimed * 864e5;
   const daysRemaining = Math.max(0, Math.round((earliestMs - now) / 864e5));
   const earliestRemaining = Math.min(addOn.remaining, packSize - used % packSize);
   const d = new Date(earliestMs);
-  const earliestDate = d.toISOString().slice(0, 10);
   return {
-    earliestDate,
+    earliestDate: d.toISOString().slice(0, 10),
     earliestMs,
     earliestRemaining,
     totalPacks,
     consumedPacks,
-    daysRemaining
+    daysRemaining,
+    packSize,
+    validityDays
   };
 }
 var ANSI2 = {
@@ -2532,7 +2554,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];
@@ -2542,17 +2564,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 ? 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";
@@ -2592,16 +2614,19 @@ 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);
+    const expiryMs = checkin.expiresAt ? Date.parse(checkin.expiresAt) : void 0;
+    const grant = { expiryMs, amount: checkin.amount, validityDays: checkin.validityDays };
+    const estimate = estimateRollingAddOnExpiry(addOn, grant, now);
     if (estimate) {
-      const earliestText = estimate.totalPacks > 1 ? `earliest active pack ~${estimate.earliestDate} \xB7 in ~${estimate.daysRemaining}d (~${formatAmount(estimate.earliestRemaining)} credits)` : `${estimate.earliestDate} (in ${estimate.daysRemaining}d)`;
+      const expiryText = estimate.totalPacks > 1 ? `earliest of ${estimate.totalPacks} daily ${estimate.packSize}-credit packs ~${estimate.earliestDate} (in ~${estimate.daysRemaining}d, ~${formatAmount(estimate.earliestRemaining)} credits)` : `${estimate.earliestDate} (in ${estimate.daysRemaining}d)`;
       notes.push({
         label: "Add-on expiry",
-        value: `Rolling 30d (${earliestText})`
+        value: `Rolling ${estimate.validityDays}d \xB7 ${expiryText}`
       });
+    } else if (typeof expiryMs === "number" && Number.isFinite(expiryMs) && expiryMs > now) {
+      notes.push({ label: "Add-on expiry", value: `${formatResetTime(expiryMs, now)} \xB7 latest grant` });
     }
   }
   notes.push({ label: "Expires", value: formatResetTime(raw?.expiresAt, now) });

package/package.json

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