opencode-codex-multi-account 0.2.1 → 0.2.3

package/dist/index.js

@@ -698,8 +698,16 @@ function createAccountManagerForProvider(dependencies) {
     }
     async applyUsageCache(uuid, usage) {
       await this.store.mutateAccount(uuid, (account) => {
+        const now = Date.now();
+        const exhaustedTierResetTimes = [usage.five_hour, usage.seven_day].flatMap((tier) => {
+          if (tier == null || tier.utilization < 100 || tier.resets_at == null) {
+            return [];
+          }
+          return [Date.parse(tier.resets_at)];
+        }).filter((resetAt) => Number.isFinite(resetAt) && resetAt > now);
         account.cachedUsage = usage;
         account.cachedUsageAt = Date.now();
+        account.rateLimitResetAt = exhaustedTierResetTimes.length > 0 ? Math.min(...exhaustedTierResetTimes) : void 0;
       });
     }
     async applyProfileCache(uuid, profile) {
@@ -1104,6 +1112,9 @@ var MAX_RESOLVE_ATTEMPTS = 10;
 var SERVER_RETRY_BASE_MS = 1e3;
 var SERVER_RETRY_MAX_MS = 4e3;
 var PERMANENT_AUTH_FAILURE_STATUSES = /* @__PURE__ */ new Set([400, 401, 403]);
+function isAbortError(error) {
+  return error instanceof Error && error.name === "AbortError";
+}
 function createExecutorForProvider(providerName, dependencies) {
   const {
     handleRateLimitResponse: handleRateLimitResponse2,
@@ -1136,6 +1147,7 @@ function createExecutorForProvider(providerName, dependencies) {
         runtime = await runtimeFactory.getRuntime(accountUuid);
         response = await runtime.fetch(input, init);
       } catch (error) {
+        if (isAbortError(error)) throw error;
         if (await handleRuntimeFetchFailure(manager, runtimeFactory, client, account, error)) {
           continue;
         }
@@ -1153,6 +1165,7 @@ function createExecutorForProvider(providerName, dependencies) {
           try {
             serverResponse = await runtime.fetch(input, init);
           } catch (error) {
+            if (isAbortError(error)) throw error;
             if (await handleRuntimeFetchFailure(manager, runtimeFactory, client, account, error)) {
               authFailureDuringServerRetry = true;
               break;
@@ -1181,6 +1194,7 @@ function createExecutorForProvider(providerName, dependencies) {
             return retryResponse;
           }
         } catch (error) {
+          if (isAbortError(error)) throw error;
           if (await handleRuntimeFetchFailure(manager, runtimeFactory, client, account, error)) {
             continue;
           }
@@ -2345,11 +2359,11 @@ function getUsageSummary(account) {
   const parts = [];
   const { five_hour, seven_day } = parsed.output;
   if (five_hour) {
-    const reset = five_hour.utilization >= 100 && five_hour.resets_at ? ` (resets ${formatTimeRemaining(five_hour.resets_at)})` : "";
+    const reset = five_hour.resets_at ? ` (resets ${formatTimeRemaining(five_hour.resets_at)})` : "";
     parts.push(`5h: ${five_hour.utilization.toFixed(0)}%${reset}`);
   }
   if (seven_day) {
-    const reset = seven_day.utilization >= 100 && seven_day.resets_at ? ` (resets ${formatTimeRemaining(seven_day.resets_at)})` : "";
+    const reset = seven_day.resets_at ? ` (resets ${formatTimeRemaining(seven_day.resets_at)})` : "";
     parts.push(`7d: ${seven_day.utilization.toFixed(0)}%${reset}`);
   }
   return parts.length > 0 ? parts.join(", ") : "no usage data";
@@ -2407,17 +2421,21 @@ function formatDate(timestamp) {
 function getAccountStatus(account) {
   if (account.isAuthDisabled) return "auth-disabled";
   if (!account.enabled) return "disabled";
-  if (account.rateLimitResetAt && account.rateLimitResetAt > Date.now()) return "rate-limited";
   if (account.cachedUsage) {
     const now = Date.now();
     const usage = account.cachedUsage;
+    const hasEvaluableUsageTier = [usage.five_hour, usage.seven_day].some((tier) => tier != null);
     const exhaustedTiers = [usage.five_hour, usage.seven_day].filter(
       (tier) => tier && tier.utilization >= 100 && tier.resets_at != null && Date.parse(tier.resets_at) > now
     );
     if (exhaustedTiers.length > 0) {
       return "rate-limited";
     }
+    if (hasEvaluableUsageTier) {
+      return "active";
+    }
   }
+  if (account.rateLimitResetAt && account.rateLimitResetAt > Date.now()) return "rate-limited";
   return "active";
 }
 var STATUS_BADGE = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-codex-multi-account",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "OpenCode plugin for Codex (OpenAI) multi-account management with automatic rate limit switching",
   "main": "./dist/index.js",
   "type": "module",
@@ -40,7 +40,7 @@
     "directory": "packages/codex-multi-account"
   },
   "dependencies": {
-    "opencode-multi-account-core": "^0.2.1",
+    "opencode-multi-account-core": "^0.2.3",
     "valibot": "^1.2.0"
   },
   "devDependencies": {