codex-multi-auth 2.2.0 → 2.2.2

package/dist/lib/codex-manager.js

@@ -46,7 +46,7 @@ import { DEFAULT_DASHBOARD_DISPLAY_SETTINGS, loadDashboardDisplaySettings, } fro
 import { evaluateForecastAccounts, recommendForecastAccount, summarizeForecast, } from "./forecast.js";
 import { createLogger } from "./logger.js";
 import { MODEL_FAMILIES } from "./prompts/codex.js";
-import { getModelCapabilities, getModelProfile, resolveNormalizedModel, } from "./request/helpers/model-map.js";
+import { DEFAULT_MODEL, getModelCapabilities, getModelProfile, resolveNormalizedModel, } from "./request/helpers/model-map.js";
 import { formatRateLimitEntry as formatAccountRateLimitEntry, getRateLimitResetTimeForFamily, resolveActiveIndex, } from "./runtime/account-status.js";
 import { buildQuotaEmailFallbackState, hasSafeQuotaEmailFallback, hasUniqueQuotaAccountId, isQuotaCacheEntryExhausted, normalizeQuotaAccountId, normalizeQuotaEmail, quotaLeftPercentFromUsed, } from "./quota-readiness.js";
 import { loadQuotaCache, saveQuotaCache, } from "./quota-cache.js";
@@ -218,7 +218,7 @@ function styleQuotaSummary(summary) {
             return stylePromptText(segment, "muted");
         }
         const windowLabel = match[1] ?? "";
-        const leftPercent = Number.parseInt(match[2] ?? "", 10);
+        const leftPercent = Math.max(0, Math.min(100, Number.parseInt(match[2] ?? "", 10)));
         if (!Number.isFinite(leftPercent)) {
             return stylePromptText(segment, "muted");
         }
@@ -239,9 +239,14 @@ export function styleAccountDetailText(detail, fallbackTone = "muted") {
         const prefix = (quotaMatch[1] ?? "").trim();
         const quota = (quotaMatch[2] ?? "").trim();
         const suffix = (quotaMatch[3] ?? "").trim();
-        const prefixTone = /failed|error/i.test(prefix)
+        // danger wins across the WHOLE detail: a failure keyword anywhere — even
+        // trapped inside the (…%) quota segment, e.g.
+        // "signed in and working (live check failed: … 0%)" — must keep the prefix
+        // red, never let a "working"/"ok" prefix render green over a real failure.
+        const detailHasFailure = /failed|error|rate-limited/i.test(compact);
+        const prefixTone = detailHasFailure
             ? "danger"
-            : /ok|working|succeeded|valid/i.test(prefix)
+            : /\b(ok|working|succeeded|valid)\b/i.test(prefix)
                 ? "success"
                 : fallbackTone;
         const suffixTone = 
@@ -267,7 +272,7 @@ export function styleAccountDetailText(detail, fallbackTone = "muted") {
         return stylePromptText(compact, "danger");
     if (/re-login|stale|warning|fallback|unavailable|not available/i.test(compact))
         return stylePromptText(compact, "warning");
-    if (/ok|working|succeeded|valid/i.test(compact))
+    if (/\b(ok|working|succeeded|valid)\b/i.test(compact))
         return stylePromptText(compact, "success");
     return stylePromptText(compact, fallbackTone);
 }
@@ -441,7 +446,7 @@ function getPersistedQuotaViewForAccount(cache, account, accounts, now, emailFal
     return {
         updatedAt: cachedEntry?.updatedAt ?? now,
         status: 429,
-        model: cachedEntry?.model ?? "gpt-5.3-codex",
+        model: cachedEntry?.model ?? DEFAULT_MODEL,
         planType: cachedEntry?.planType,
         primary: {
             ...cachedEntry?.primary,
@@ -509,7 +514,8 @@ function pruneUnsafeQuotaEmailCacheEntry(cache, email, accounts, emailFallbackSt
     return true;
 }
 const DEFAULT_MENU_QUOTA_REFRESH_TTL_MS = 5 * 60_000;
-const MENU_QUOTA_REFRESH_MODEL = "gpt-5.3-codex";
+const DEFAULT_LIVE_PROBE_MODEL = DEFAULT_MODEL;
+const MENU_QUOTA_REFRESH_MODEL = DEFAULT_LIVE_PROBE_MODEL;
 function resolveMenuQuotaProbeInput(account, cache, maxAgeMs, now, accounts, emailFallbackState = buildQuotaEmailFallbackState(accounts)) {
     if (account.enabled === false)
         return null;
@@ -1581,7 +1587,7 @@ async function syncSelectionToCodex(tokens) {
 async function runHealthCheck(options = {}) {
     const forceRefresh = options.forceRefresh === true;
     const liveProbe = options.liveProbe === true;
-    const probeModel = options.model?.trim() || "gpt-5.3-codex";
+    const probeModel = options.model?.trim() || DEFAULT_LIVE_PROBE_MODEL;
     const modelInspection = inspectRequestedModel(probeModel);
     const display = options.display ?? DEFAULT_DASHBOARD_DISPLAY_SETTINGS;
     const quotaCache = liveProbe ? await loadQuotaCache() : null;
@@ -1600,6 +1606,8 @@ async function runHealthCheck(options = {}) {
     let ok = 0;
     let failed = 0;
     let warnings = 0;
+    let codexAvailable = 0;
+    let signedInOnly = 0;
     const activeIndex = resolveActiveIndex(storage, "codex");
     let activeAccountRefreshed = false;
     const now = Date.now();
@@ -1625,6 +1633,7 @@ async function runHealthCheck(options = {}) {
                 activeAccountRefreshed = true;
             }
             let healthDetail = "signed in and working";
+            let healthTone = "success";
             if (liveProbe) {
                 const currentAccessToken = account.accessToken;
                 const probeAccountId = currentAccessToken
@@ -1632,8 +1641,10 @@ async function runHealthCheck(options = {}) {
                     : undefined;
                 if (!probeAccountId || !currentAccessToken) {
                     warnings += 1;
+                    signedInOnly += 1;
+                    healthTone = "warning";
                     healthDetail =
-                        "signed in and working (live check skipped: missing account ID)";
+                        "signed in (live check skipped: missing account ID)";
                 }
                 else {
                     try {
@@ -1647,16 +1658,19 @@ async function runHealthCheck(options = {}) {
                                 updateQuotaCacheForAccount(workingQuotaCache, account, snapshot, storage.accounts, quotaEmailFallbackState ?? undefined) || quotaCacheChanged;
                         }
                         healthDetail = formatQuotaSnapshotForDashboard(snapshot, display);
+                        codexAvailable += 1;
                     }
                     catch (error) {
                         warnings += 1;
+                        signedInOnly += 1;
+                        healthTone = "warning";
                         if (isCodexUnavailableError(error)) {
                             healthDetail =
-                                `signed in and working (${CODEX_UNAVAILABLE_PROBE_NOTE})`;
+                                `signed in; ${CODEX_UNAVAILABLE_PROBE_NOTE}`;
                         }
                         else {
                             const message = normalizeFailureDetail(error instanceof Error ? error.message : String(error), undefined);
-                            healthDetail = `signed in and working (live check failed: ${message})`;
+                            healthDetail = `signed in (live check failed: ${message})`;
                         }
                     }
                 }
@@ -1666,7 +1680,8 @@ async function runHealthCheck(options = {}) {
             }
             ok += 1;
             if (display.showPerAccountRows) {
-                console.log(`  ${stylePromptText("✓", "success")} ${labelText} ${stylePromptText("|", "muted")} ${styleAccountDetailText(healthDetail)}`);
+                const healthMarker = healthTone === "success" ? "✓" : "!";
+                console.log(`  ${stylePromptText(healthMarker, healthTone)} ${labelText} ${stylePromptText("|", "muted")} ${styleAccountDetailText(healthDetail, healthTone)}`);
             }
             continue;
         }
@@ -1712,12 +1727,15 @@ async function runHealthCheck(options = {}) {
             }
             ok += 1;
             let healthyMessage = "working now";
+            let healthyTone = "success";
             if (liveProbe) {
                 const probeAccountId = account.accountId ?? tokenAccountId;
                 if (!probeAccountId) {
                     warnings += 1;
+                    signedInOnly += 1;
+                    healthyTone = "warning";
                     healthyMessage =
-                        "working now (live check skipped: missing account ID)";
+                        "signed in (live check skipped: missing account ID)";
                 }
                 else {
                     try {
@@ -1731,28 +1749,35 @@ async function runHealthCheck(options = {}) {
                                 updateQuotaCacheForAccount(workingQuotaCache, account, snapshot, storage.accounts, quotaEmailFallbackState ?? undefined) || quotaCacheChanged;
                         }
                         healthyMessage = formatQuotaSnapshotForDashboard(snapshot, display);
+                        codexAvailable += 1;
                     }
                     catch (error) {
                         warnings += 1;
+                        signedInOnly += 1;
+                        healthyTone = "warning";
                         if (isCodexUnavailableError(error)) {
                             healthyMessage =
-                                `working now (${CODEX_UNAVAILABLE_PROBE_NOTE})`;
+                                `signed in; ${CODEX_UNAVAILABLE_PROBE_NOTE}`;
                         }
                         else {
                             const message = normalizeFailureDetail(error instanceof Error ? error.message : String(error), undefined);
-                            healthyMessage = `working now (live check failed: ${message})`;
+                            healthyMessage = `signed in (live check failed: ${message})`;
                         }
                     }
                 }
             }
             if (display.showPerAccountRows) {
-                console.log(`  ${stylePromptText("✓", "success")} ${labelText} ${stylePromptText("|", "muted")} ${styleAccountDetailText(healthyMessage)}`);
+                const healthyMarker = healthyTone === "success" ? "✓" : "!";
+                console.log(`  ${stylePromptText(healthyMarker, healthyTone)} ${labelText} ${stylePromptText("|", "muted")} ${styleAccountDetailText(healthyMessage, healthyTone)}`);
             }
         }
         else {
             const detail = normalizeFailureDetail(result.message, result.reason);
             if (sessionLikelyValid) {
                 warnings += 1;
+                if (liveProbe) {
+                    signedInOnly += 1;
+                }
                 if (display.showPerAccountRows) {
                     console.log(`  ${stylePromptText("!", "warning")} ${labelText} ${stylePromptText("|", "muted")} ${stylePromptText(`refresh failed (${detail}) but this account still works right now`, "warning")}`);
                 }
@@ -1796,17 +1821,32 @@ async function runHealthCheck(options = {}) {
         }
     }
     console.log("");
-    console.log(formatResultSummary([
-        { text: `${ok} working`, tone: "success" },
-        {
-            text: `${failed} need re-login`,
-            tone: failed > 0 ? "danger" : "muted",
-        },
-        {
-            text: `${warnings} warning${warnings === 1 ? "" : "s"}`,
-            tone: warnings > 0 ? "warning" : "muted",
-        },
-    ]));
+    console.log(formatResultSummary(liveProbe
+        ? [
+            {
+                text: `${codexAvailable} Codex available`,
+                tone: codexAvailable > 0 ? "success" : "muted",
+            },
+            {
+                text: `${signedInOnly} signed in only`,
+                tone: signedInOnly > 0 ? "warning" : "muted",
+            },
+            {
+                text: `${failed} need re-login`,
+                tone: failed > 0 ? "danger" : "muted",
+            },
+        ]
+        : [
+            { text: `${ok} working`, tone: "success" },
+            {
+                text: `${failed} need re-login`,
+                tone: failed > 0 ? "danger" : "muted",
+            },
+            {
+                text: `${warnings} warning${warnings === 1 ? "" : "s"}`,
+                tone: warnings > 0 ? "warning" : "muted",
+            },
+        ]));
 }
 function printBestUsage() {
     console.log([
@@ -1816,7 +1856,7 @@ function printBestUsage() {
         "Options:",
         "  --live, -l         Probe live quota headers via Codex backend before switching",
         "  --json, -j         Print machine-readable JSON output",
-        "  --model, -m        Probe model for live mode (default: gpt-5.3-codex)",
+        `  --model, -m        Probe model for live mode (default: ${DEFAULT_LIVE_PROBE_MODEL})`,
         "",
         "Behavior:",
         "  - Chooses the healthiest account using forecast scoring",
@@ -1827,7 +1867,7 @@ function parseBestArgs(args) {
     const options = {
         live: false,
         json: false,
-        model: "gpt-5.3-codex",
+        model: DEFAULT_LIVE_PROBE_MODEL,
         modelProvided: false,
     };
     for (let i = 0; i < args.length; i += 1) {
@@ -1843,8 +1883,8 @@ function parseBestArgs(args) {
             continue;
         }
         if (arg === "--model" || arg === "-m") {
-            const value = args[i + 1];
-            if (!value) {
+            const value = args[i + 1]?.trim();
+            if (!value || value.startsWith("-")) {
                 return { ok: false, message: "Missing value for --model" };
             }
             options.model = value;
@@ -1854,7 +1894,7 @@ function parseBestArgs(args) {
         }
         if (arg.startsWith("--model=")) {
             const value = arg.slice("--model=".length).trim();
-            if (!value) {
+            if (!value || value.startsWith("-")) {
                 return { ok: false, message: "Missing value for --model" };
             }
             options.model = value;