opencode-copilot-account-switcher 0.12.3 → 0.12.4

package/dist/codex-status-command.js

@@ -44,6 +44,12 @@ function ratio(remaining, entitlement) {
 function value(value) {
     return value === undefined ? "n/a" : String(value);
 }
+function renderWindow(label, window) {
+    if (window.entitlement === 100 && window.remaining !== undefined) {
+        return `${label}: ${window.remaining}% left`;
+    }
+    return `${label}: ${ratio(window.remaining, window.entitlement)}`;
+}
 function renderStatus(status) {
     return [
         "Codex status updated.",
@@ -52,8 +58,8 @@ function renderStatus(status) {
         `email: ${value(status.identity.email)}`,
         `plan: ${value(status.identity.plan)}`,
         "[usage]",
-        `primary: ${ratio(status.windows.primary.remaining, status.windows.primary.entitlement)}`,
-        `secondary: ${ratio(status.windows.secondary.remaining, status.windows.secondary.entitlement)}`,
+        renderWindow("5h", status.windows.primary),
+        renderWindow("week", status.windows.secondary),
         `credits: ${ratio(status.credits.remaining, status.credits.total)}`,
     ].join("\n");
 }
@@ -64,8 +70,8 @@ function renderCachedStatus(store) {
         `email: ${value(store.account?.email ?? store.activeEmail)}`,
         `plan: ${value(store.account?.plan)}`,
         "[usage]",
-        `primary: ${ratio(store.status?.premium?.remaining, store.status?.premium?.entitlement)}`,
-        "secondary: n/a",
+        renderWindow("5h", store.status?.premium ?? {}),
+        "week: n/a",
         "credits: n/a",
     ].join("\n");
 }

package/dist/codex-status-fetcher.js

@@ -10,6 +10,12 @@ function readString(input) {
 function readNumber(input) {
     return typeof input === "number" && Number.isFinite(input) ? input : undefined;
 }
+function readTimestamp(input) {
+    const value = readNumber(input);
+    if (value === undefined)
+        return undefined;
+    return value >= 1e12 ? value : value * 1000;
+}
 function pickRecord(source, keys) {
     for (const key of keys) {
         const value = asRecord(source[key]);
@@ -19,10 +25,13 @@ function pickRecord(source, keys) {
     return undefined;
 }
 function pickWindow(source, key) {
+    const rateLimit = pickRecord(source, ["rate_limit", "rateLimit"]);
+    const rateLimitKey = key === "primary" ? "primary_window" : "secondary_window";
+    const rateLimitWindow = rateLimit ? asRecord(rateLimit[rateLimitKey]) : undefined;
     const windows = pickRecord(source, ["windows", "usage_windows", "quota_windows"]);
     const block = windows ? asRecord(windows[key]) : undefined;
     const fallback = asRecord(source[key]);
-    const raw = block ?? fallback;
+    const raw = rateLimitWindow ?? block ?? fallback;
     if (!raw) {
         return {
             entitlement: undefined,
@@ -31,11 +40,17 @@ function pickWindow(source, key) {
             resetAt: undefined,
         };
     }
+    const entitlement = readNumber(raw.entitlement);
+    const remainingPercent = readNumber(raw.remaining_percent);
+    const usedPercent = readNumber(raw.used_percent);
+    const remaining = readNumber(raw.remaining) ?? remainingPercent;
+    const used = readNumber(raw.used) ?? usedPercent;
+    const percentBased = remainingPercent !== undefined || usedPercent !== undefined;
     return {
-        entitlement: readNumber(raw.entitlement),
-        remaining: readNumber(raw.remaining),
-        used: readNumber(raw.used),
-        resetAt: readNumber(raw.resetAt ?? raw.reset_at),
+        entitlement: entitlement ?? (percentBased ? 100 : undefined),
+        remaining: remaining ?? (used !== undefined ? Math.max(0, 100 - used) : undefined),
+        used,
+        resetAt: readTimestamp(raw.resetAt ?? raw.reset_at),
     };
 }
 function normalizeUsageStatus(payload, now) {
@@ -46,7 +61,7 @@ function normalizeUsageStatus(payload, now) {
         identity: {
             accountId: readString(account.id) ?? readString(source.account_id) ?? readString(source.accountId),
             email: readString(account.email) ?? readString(source.email),
-            plan: readString(account.plan) ?? readString(source.plan),
+            plan: readString(account.plan) ?? readString(source.plan) ?? readString(source.plan_type),
         },
         windows: {
             primary: pickWindow(source, "primary"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-copilot-account-switcher",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "description": "GitHub Copilot account switcher plugin for OpenCode",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",