@howaboua/opencode-usage-plugin 0.1.5 → 0.1.6

package/dist/providers/proxy/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/proxy/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,KAAK,EAAgF,WAAW,EAAE,MAAM,aAAa,CAAA;AAK5H,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AA4B5C;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,WAAW,GAAG,IAAI,GACzB,MAAM,GAAG,IAAI,CAoBf;AAqLD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,IAAI,CAwB7C,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/providers/proxy/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,KAAK,EAAgF,WAAW,EAAE,MAAM,aAAa,CAAA;AAK5H,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAA;AA4B5C;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,WAAW,GAAG,IAAI,GACzB,MAAM,GAAG,IAAI,CAoBf;AAyND,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,IAAI,CAwB7C,CAAA"}

package/dist/providers/proxy/index.js

@@ -63,6 +63,25 @@ function normalizeTier(tier) {
         return "paid";
     return "free";
 }
+function pickPreferredResetTime(current, incoming) {
+    if (!incoming)
+        return current ?? null;
+    if (!current)
+        return incoming;
+    const now = Date.now();
+    const currentTs = new Date(current).getTime();
+    const incomingTs = new Date(incoming).getTime();
+    const currentFuture = currentTs > now;
+    const incomingFuture = incomingTs > now;
+    if (currentFuture && incomingFuture) {
+        return incomingTs < currentTs ? incoming : current;
+    }
+    if (incomingFuture)
+        return incoming;
+    if (currentFuture)
+        return current;
+    return incomingTs > currentTs ? incoming : current;
+}
 function parseQuotaGroupsFromAggregation(quotaGroups, config) {
     if (!quotaGroups)
         return [];
@@ -147,10 +166,9 @@ function parseQuotaGroupsFromCredential(groupUsage, config) {
     return Array.from(result.values());
 }
 function aggregateByProvider(provider, config) {
-    // Try aggregated quota groups first
-    if (provider.quota_groups && Object.keys(provider.quota_groups).length > 0) {
-        return parseQuotaGroupsFromAggregation(provider.quota_groups, config);
-    }
+    const aggregated = provider.quota_groups && Object.keys(provider.quota_groups).length > 0
+        ? parseQuotaGroupsFromAggregation(provider.quota_groups, config)
+        : [];
     // Fallback to manual aggregation of credentials
     const tiers = {
         paid: new Map(),
@@ -165,9 +183,7 @@ function aggregateByProvider(provider, config) {
                 if (existing) {
                     existing.remaining += group.remaining;
                     existing.max += group.max;
-                    if (group.resetTime && (!existing.resetTime || new Date(group.resetTime) > new Date(existing.resetTime))) {
-                        existing.resetTime = group.resetTime;
-                    }
+                    existing.resetTime = pickPreferredResetTime(existing.resetTime, group.resetTime);
                 }
                 else {
                     tiers[tier].set(group.name, { ...group });
@@ -175,6 +191,20 @@ function aggregateByProvider(provider, config) {
             }
         }
     }
+    if (aggregated.length > 0) {
+        const resetLookup = new Map();
+        for (const tierInfo of Object.values(tiers)) {
+            for (const group of tierInfo.values()) {
+                resetLookup.set(group.name, pickPreferredResetTime(resetLookup.get(group.name), group.resetTime));
+            }
+        }
+        for (const tier of aggregated) {
+            for (const group of tier.quotaGroups) {
+                group.resetTime = pickPreferredResetTime(group.resetTime, resetLookup.get(group.name));
+            }
+        }
+        return aggregated;
+    }
     for (const tierGroups of Object.values(tiers)) {
         for (const group of tierGroups.values()) {
             group.remainingPct = group.max > 0 ? Math.round((group.remaining / group.max) * 100) : 0;

package/dist/ui/formatters/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/ui/formatters/proxy.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAGhD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE,CAcrE"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/ui/formatters/proxy.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAOhD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE,CAcrE"}

package/dist/ui/formatters/proxy.js

@@ -22,10 +22,16 @@ function formatProxyProvider(provider) {
         if (!tier.quotaGroups?.length)
             continue;
         lines.push(`    ${tier.tier === "paid" ? "Paid" : "Free"}:`);
-        for (const group of tier.quotaGroups) {
-            const reset = group.resetTime ? formatResetSuffixISO(group.resetTime) : "";
-            lines.push(`      ${group.name.padEnd(9)} ${formatBar(group.remainingPct)} ${group.remaining}/${group.max}${reset}`);
-        }
+        lines.push(...formatTierGroups(tier.quotaGroups));
     }
     return lines;
 }
+function formatTierGroups(groups) {
+    const nameWidth = Math.max(...groups.map(group => group.name.length), 9);
+    const quotaWidth = Math.max(...groups.map(group => `${group.remaining}/${group.max}`.length), 7);
+    return groups.map(group => {
+        const reset = group.resetTime ? formatResetSuffixISO(group.resetTime) : "";
+        const quota = `${group.remaining}/${group.max}`.padStart(quotaWidth);
+        return `      ${group.name.padEnd(nameWidth)} ${formatBar(group.remainingPct)} ${quota}${reset}`;
+    });
+}

package/dist/ui/formatters/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/ui/formatters/shared.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAK7C;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAGhE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKxD;AAaD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE,CAgBvE"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../src/ui/formatters/shared.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAEhD,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAK7C;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAIhE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAMxD;AAwBD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE,CAgBvE"}

package/dist/ui/formatters/shared.js

@@ -13,12 +13,14 @@ export function formatBar(pct) {
 export function formatResetSuffix(resetAt) {
     if (!resetAt)
         return "";
-    return ` (resets in ${formatTimeDelta(resetAt)})`;
+    const delta = formatTimeDelta(resetAt);
+    return delta === "just refreshed" ? ` (${delta})` : ` (resets in ${delta})`;
 }
 export function formatResetSuffixISO(iso) {
     try {
         const at = Math.floor(new Date(iso).getTime() / 1000);
-        return ` (resets in ${formatTimeDelta(at)})`;
+        const delta = formatTimeDelta(at);
+        return delta === "just refreshed" ? ` (${delta})` : ` (resets in ${delta})`;
     }
     catch {
         return "";
@@ -28,14 +30,19 @@ function formatTimeDelta(at) {
     const atSeconds = at > 1e11 ? Math.floor(at / 1000) : at;
     const diff = atSeconds - Math.floor(Date.now() / 1000);
     if (diff <= 0)
-        return "now";
-    if (diff < 60)
-        return `${diff}s`;
-    if (diff < 3600)
-        return `${Math.ceil(diff / 60)}m`;
-    if (diff < 86400)
-        return `${Math.round(diff / 3600)}h`;
-    return `${Math.round(diff / 86400)}d`;
+        return "just refreshed";
+    const days = Math.floor(diff / 86400);
+    const hours = Math.floor((diff % 86400) / 3600);
+    const minutes = Math.floor((diff % 3600) / 60);
+    if (days > 0) {
+        return hours > 0 ? `${days}d${hours}hrs` : `${days}d`;
+    }
+    if (hours > 0) {
+        return minutes > 0 ? `${hours}hrs${minutes}m` : `${hours}hrs`;
+    }
+    if (minutes > 0)
+        return `${minutes}m`;
+    return `${diff}s`;
 }
 export function formatMissingSnapshot(snapshot) {
     const { provider } = snapshot;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howaboua/opencode-usage-plugin",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "opencode plugin for tracking AI provider usage, rate limits, and quotas",
   "type": "module",
   "main": "dist/index.js",