@byokit/usage 0.1.0 → 0.3.0

package/dist/windows.js

@@ -1,27 +1,55 @@
 export const record = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
 const obj = (v) => record(v) ? v : {};
-function window(provider, kind, used, minutes, resetsAt, limited = false, limit) {
-    if (typeof used !== 'number' || !Number.isFinite(used))
+export function window(provider, kind, used, minutes, resetsAt, limited = false, limit) {
+    if (used !== undefined && (typeof used !== 'number' || !Number.isFinite(used))) {
+        if (!limited)
+            return [];
+        used = undefined;
+    }
+    if (used === undefined && !limited)
         return [];
-    return [{ provider, kind, usedPercent: Math.max(0, Math.min(100, used)),
+    return [{ provider, kind, ...(typeof used === 'number' ? { usedPercent: Math.max(0, Math.min(100, used)) } : {}),
             ...(minutes !== undefined && Number.isFinite(minutes) && minutes > 0 ? { minutes } : {}),
             ...(Number.isFinite(resetsAt) ? { resetsAt } : {}), ...(limited ? { limited: true } : {}), ...(limit ? { limit } : {}) }];
 }
-/** Accepts both the statusline envelope and the provider's usage payload. */
+/** Scope is an allowlisted descriptor, never arbitrary provider data. */
+export function quotaScope(raw) {
+    const value = obj(raw);
+    const scope = {};
+    for (const key of ['model', 'surface']) {
+        if (typeof value[key] === 'string' && value[key].length > 0 && value[key].length <= 80 && !/[\x00-\x1f]/.test(value[key]))
+            scope[key] = value[key];
+    }
+    return Object.keys(scope).length ? scope : undefined;
+}
+/** Normalized rows override legacy aggregates of the same kind, even if incomplete. */
 export function claudeWindows(raw) {
     const source = obj(obj(raw).rate_limits ?? raw);
-    return ['five_hour', 'seven_day'].flatMap((id) => {
+    const normalized = (Array.isArray(source.limits) ? source.limits : []).filter(record)
+        .filter((row) => ['session', 'weekly_all', 'weekly_scoped'].includes(String(row.kind)));
+    const rows = normalized.flatMap((w) => {
+        const used = typeof w.percent === 'number' && Number.isFinite(w.percent) ? Math.max(0, Math.min(100, w.percent)) : undefined;
+        const reset = typeof w.resets_at === 'number' ? w.resets_at * 1000 : Date.parse(String(w.resets_at));
+        const scope = quotaScope(w.scope);
+        return [{ provider: 'claude', kind: w.kind === 'session' ? 'session' : 'weekly',
+                ...(used !== undefined ? { usedPercent: used } : {}), ...(scope ? { scope } : {}),
+                ...(Number.isFinite(reset) ? { resetsAt: reset } : {}), ...(w.limit_reached === true ? { limited: true } : {}) }];
+    });
+    const legacy = ['five_hour', 'seven_day'].flatMap((id) => {
+        if (normalized.some((w) => w.kind === (id === 'five_hour' ? 'session' : 'weekly_all')))
+            return [];
         const w = obj(source[id]);
-        return window('claude', id === 'five_hour' ? 'session' : 'weekly', Number.isFinite(w.utilization) ? w.utilization : w.used_percentage, id === 'five_hour' ? 300 : 10080, typeof w.resets_at === 'number' ? w.resets_at : Date.parse(String(w.resets_at)) / 1000);
+        return window('claude', id === 'five_hour' ? 'session' : 'weekly', Number.isFinite(w.utilization) ? w.utilization : w.used_percentage, id === 'five_hour' ? 300 : 10080, typeof w.resets_at === 'number' ? w.resets_at * 1000 : Date.parse(String(w.resets_at)));
     });
+    return [...rows, ...legacy];
 }
 /** Accepts the `usage` member; monthly length is deliberately absent. */
 export function goWindows(raw) {
     return ['rolling', 'weekly', 'monthly'].flatMap((kind) => {
         const w = obj(obj(raw)[kind]);
-        if (typeof w.percent !== 'number' || w.percent < 0 || !['ok', 'rate-limited'].includes(String(w.status)))
+        if (typeof w.percent === 'number' && w.percent < 0 || !['ok', 'rate-limited'].includes(String(w.status)))
             return [];
-        return window('opencode', kind, w.percent, kind === 'monthly' ? undefined : kind === 'weekly' ? 10080 : 300, Date.parse(String(w.resetsAt)) / 1000, w.status === 'rate-limited');
+        return window('opencode', kind, w.percent, kind === 'monthly' ? undefined : kind === 'weekly' ? 10080 : 300, Date.parse(String(w.resetsAt)), w.status === 'rate-limited');
     });
 }
 /** Accepts the `data.limits` member; unknown bucket sizes are skipped. */
@@ -31,7 +59,7 @@ export function zaiWindows(raw) {
         const key = `${w.unit}:${w.number}`;
         if (key !== '3:5' && key !== '6:1')
             return [];
-        return window('zai', key === '3:5' ? 'session' : 'weekly', w.percentage, key === '3:5' ? 300 : 10080, Number(w.nextResetTime) / 1000);
+        return window('zai', key === '3:5' ? 'session' : 'weekly', w.percentage, key === '3:5' ? 300 : 10080, typeof w.nextResetTime === 'number' ? w.nextResetTime : undefined);
     });
 }
 export function codexWindows(result) {
@@ -43,13 +71,15 @@ export function codexWindows(result) {
             return [];
         const name = String(raw.limitName ?? raw.limitId ?? 'Codex').replace(/[^\x20-\x7e]+/g, ' ').replace(/\s+/g, ' ').trim().slice(0, 80) || 'Codex';
         const rows = ['primary', 'secondary'].flatMap((key) => {
+            if (!record(raw[key]))
+                return [];
             const w = obj(raw[key]);
             const m = typeof w.windowDurationMins === 'number' && w.windowDurationMins > 0 && Number.isFinite(w.windowDurationMins) ? w.windowDurationMins : undefined;
-            return window('codex', m === 300 ? 'session' : m === 10080 ? 'weekly' : m === 43200 ? 'monthly' : 'custom', w.usedPercent, m, typeof w.resetsAt === 'number' ? w.resetsAt : undefined, false, name.toLowerCase() === 'codex' ? undefined : name);
+            return window('codex', m === 300 ? 'session' : m === 10080 ? 'weekly' : m === 43200 ? 'monthly' : 'custom', w.usedPercent, m, typeof w.resetsAt === 'number' ? w.resetsAt * 1000 : undefined, raw.limitReached === true || w.limitReached === true, name.toLowerCase() === 'codex' ? undefined : name);
         }).sort((a, b) => (a.minutes ?? 0) - (b.minutes ?? 0));
         return rows.length ? [rows] : [];
     });
-    const chosen = groups.flat().sort((a, b) => b.usedPercent - a.usedPercent).slice(0, 8);
+    const chosen = groups.flat().sort((a, b) => Number(b.limited === true) - Number(a.limited === true) || (b.usedPercent ?? -1) - (a.usedPercent ?? -1)).slice(0, 8);
     return groups.map((rows, ordinal) => ({ rows: rows.filter((w) => chosen.includes(w)), ordinal }))
-        .filter((g) => g.rows.length).sort((a, b) => Math.max(...b.rows.map((w) => w.usedPercent)) - Math.max(...a.rows.map((w) => w.usedPercent)) || a.ordinal - b.ordinal).flatMap((g) => g.rows);
+        .filter((g) => g.rows.length).sort((a, b) => Math.max(...b.rows.map((w) => w.usedPercent ?? -1)) - Math.max(...a.rows.map((w) => w.usedPercent ?? -1)) || a.ordinal - b.ordinal).flatMap((g) => g.rows);
 }

package/dist/words.json

@@ -5,5 +5,6 @@
     "code.no-plan": "This {name} account has no plan with limits.",
     "code.rate-limited": "{name} asked us to wait. Showing the last reading.",
     "code.unavailable": "{name} didn't answer. Trying again shortly.",
-    "code.incomplete": "{name} answered in a way we can't read yet."
+    "code.incomplete": "{name} answered in a way we can't read yet.",
+    "code.refresh-failed": "This sign-in could not be renewed. Check it in its own app."
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@byokit/usage",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Read subscription usage windows per provider and account.",
   "license": "Apache-2.0",
   "type": "module",