oc-codex-multi-auth 6.17.0 → 6.18.0

package/dist/lib/tools/codex-limits.js

@@ -4,7 +4,7 @@
  */
 import { tool } from "@opencode-ai/plugin/tool";
 import { loadAccounts } from "../storage.js";
-import { deduplicateUsageAccountIndices, ensureCodexUsageAccessToken, fetchCodexUsage, formatUsageLimitSummary, formatUsageLimitTitle, getUsageAccountDedupeKey, hasUsageWindow, parseCodexUsagePayload, resolveCodexUsageAccountId, } from "../codex-usage.js";
+import { deduplicateUsageAccountIndices, ensureCodexUsageAccessToken, fetchCodexUsage, formatUsageLimitSummary, formatUsageLimitTitle, getUsageQuotaExhaustedResetAtMs, getUsageAccountDedupeKey, hasUsageWindow, parseCodexUsagePayload, persistUsageQuotaExhaustion, resolveCodexUsageAccountId, } from "../codex-usage.js";
 import { PLUGIN_NAME } from "../constants.js";
 import { logWarn } from "../logger.js";
 import { formatUiBadge, formatUiHeader, formatUiItem, formatUiKeyValue, } from "../ui/format.js";
@@ -96,6 +96,7 @@ export function createCodexLimitsTool(ctx) {
                 logWarn(`[${PLUGIN_NAME}] active account index ${activeIndex} was deduplicated out of the usage list; matching the active workspace by identity instead.`);
             }
             let storageChanged = false;
+            let quotaExhaustionPersistedOrKnown = false;
             const jsonAccounts = [];
             for (const i of uniqueIndices) {
                 const account = storage.accounts[i];
@@ -149,6 +150,24 @@ export function createCodexLimitsTool(ctx) {
                         organizationId: effectiveAccount.organizationId,
                     });
                     const usage = parseCodexUsagePayload(payload);
+                    const quotaExhaustedResetAtMs = getUsageQuotaExhaustedResetAtMs([usage.primary, usage.secondary]);
+                    if (quotaExhaustedResetAtMs !== undefined) {
+                        try {
+                            storageChanged =
+                                (await persistUsageQuotaExhaustion(account, quotaExhaustedResetAtMs)) || storageChanged;
+                            // The block can already have been persisted by another process.
+                            // Reload this process's AccountManager either way so its next
+                            // rotation observes the on-disk block.
+                            quotaExhaustionPersistedOrKnown = true;
+                            // Do this before fetching usage for another account: a cached
+                            // manager can still have a debounced save with stale rotation
+                            // state that would otherwise overwrite this durable block.
+                            invalidateAccountManagerCache();
+                        }
+                        catch (error) {
+                            logWarn(`[${PLUGIN_NAME}] Failed to persist exhausted usage quota: ${error instanceof Error ? error.message : String(error)}`);
+                        }
+                    }
                     jsonAccounts.push({
                         ...buildJsonAccountIdentity(displayIndex, {
                             includeSensitive: includeSensitiveOutput,
@@ -227,7 +246,7 @@ export function createCodexLimitsTool(ctx) {
                 }
                 lines.push("");
             }
-            if (storageChanged) {
+            if (storageChanged || quotaExhaustionPersistedOrKnown) {
                 invalidateAccountManagerCache();
             }
             if (outputFormat === "json") {

package/dist/lib/tools/codex-limits.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-limits.js","sourceRoot":"","sources":["../../../lib/tools/codex-limits.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-limits.js","sourceRoot":"","sources":["../../../lib/tools/codex-limits.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-codex-multi-auth",
-  "version": "6.17.0",
+  "version": "6.18.0",
   "description": "OpenCode plugin for ChatGPT Plus/Pro OAuth with Codex/GPT-5 routing, multi-account rotation, account switching, health checks, diagnostics, and recovery tools",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/scripts/install-oc-codex-multi-auth-core.js

@@ -609,6 +609,19 @@ export async function runLimitsCommand(parsed, options = {}) {
 					organizationId: account.organizationId,
 				}),
 			);
+			const quotaExhaustedResetAtMs = usageMod.getUsageQuotaExhaustedResetAtMs([
+				usage.primary,
+				usage.secondary,
+			]);
+			if (quotaExhaustedResetAtMs !== undefined) {
+				try {
+					await usageMod.persistUsageQuotaExhaustion(account, quotaExhaustedResetAtMs);
+				} catch (error) {
+					loggerMod.logWarn(
+						`[${PACKAGE_NAME}] Failed to persist exhausted usage quota: ${formatErrorForLog(error)}`,
+					);
+				}
+			}
 			entry.planType = usage.planType;
 			entry.credits = usage.credits;
 			entry.limits = usage.limits;