@kenkaiiii/gg-core 5.13.2 → 5.14.0

package/dist/index.cjs

@@ -2002,6 +2002,23 @@ function currentWindowLabel(seconds, fallbackHours) {
   const hours = Math.max(1, Math.round((duration ?? fallbackHours * 3600) / 3600));
   return `${hours}-hour`;
 }
+function codexWindowKind(window, fallback) {
+  const duration = finiteNumber(window.limit_window_seconds);
+  if (duration === void 0) return fallback;
+  return duration >= 6 * 24 * 60 * 60 ? "weekly" : "current";
+}
+function normalizedCodexWindow(window, fallbackKind, now) {
+  if (!window) return null;
+  const usedPercent = clampPercent(window.used_percent);
+  if (usedPercent === void 0) return null;
+  const kind = codexWindowKind(window, fallbackKind);
+  return {
+    kind,
+    label: kind === "weekly" ? "Weekly" : currentWindowLabel(window.limit_window_seconds, 5),
+    usedPercent,
+    resetsAt: codexResetAt(window, now)
+  };
+}
 async function readUsageResponse(response) {
   const text = await response.text();
   if (!response.ok) {
@@ -2065,27 +2082,14 @@ async function fetchCodexUsage(credentials, fetchFn, signal, now) {
   if (credentials.accountId) headers["ChatGPT-Account-Id"] = credentials.accountId;
   const response = await fetchFn(CODEX_USAGE_URL, { method: "GET", signal, headers });
   const data = await readUsageResponse(response);
-  const windows = [];
-  const current = data.rate_limit?.primary_window;
-  const currentPercent = clampPercent(current?.used_percent);
-  if (current && currentPercent !== void 0) {
-    windows.push({
-      kind: "current",
-      label: currentWindowLabel(current.limit_window_seconds, 5),
-      usedPercent: currentPercent,
-      resetsAt: codexResetAt(current, now())
-    });
-  }
-  const weekly = data.rate_limit?.secondary_window;
-  const weeklyPercent = clampPercent(weekly?.used_percent);
-  if (weekly && weeklyPercent !== void 0) {
-    windows.push({
-      kind: "weekly",
-      label: "Weekly",
-      usedPercent: weeklyPercent,
-      resetsAt: codexResetAt(weekly, now())
-    });
-  }
+  const windows = [
+    normalizedCodexWindow(data.rate_limit?.primary_window, "current", now()),
+    normalizedCodexWindow(data.rate_limit?.secondary_window, "weekly", now())
+  ].filter((window) => window !== null);
+  windows.sort((left, right) => {
+    if (left.kind === right.kind) return 0;
+    return left.kind === "current" ? -1 : 1;
+  });
   return {
     provider: "openai",
     displayName: "Codex",