codex-multi-auth 2.16.0 → 2.17.0

package/dist/lib/codex-manager/commands/resets.d.ts

@@ -0,0 +1,2 @@
+export declare function runResetsCommand(args: string[]): Promise<number>;
+//# sourceMappingURL=resets.d.ts.map

package/dist/lib/codex-manager/commands/resets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resets.d.ts","sourceRoot":"","sources":["../../../../lib/codex-manager/commands/resets.ts"],"names":[],"mappings":"AAMA,wBAAsB,gBAAgB,CAAC,IAAI,EAAC,MAAM,EAAE,GAAE,OAAO,CAAC,MAAM,CAAC,CA8BpE"}

package/dist/lib/codex-manager/commands/resets.js

@@ -0,0 +1,67 @@
+import { AccountManager } from '../../accounts.js';
+import { loadAccounts } from '../../storage.js';
+import { runWithGlobalStoragePath } from '../../storage/path-state.js';
+import { createResetCreditService, resetTargetForStoredAccount, resetAccountLabel } from '../../runtime/account-reset-credits.js';
+import { withCheckProgress } from '../../ui/check-progress.js';
+const usage = 'Usage: codex-multi-auth resets list [--refresh] | redeem <account-number> | auto manual|last-resort';
+export async function runResetsCommand(args) {
+    const [command = 'list', value, ...extra] = args;
+    if (command === '--help' || command === '-h') {
+        console.log(usage);
+        return 0;
+    }
+    if (extra.length || !['list', 'redeem', 'auto'].includes(command) || (command === 'list' && value !== undefined && value !== '--refresh') || (command === 'redeem' && !/^[1-9][0-9]*$/.test(value ?? '')) || (command === 'auto' && value !== 'manual' && value !== 'last-resort')) {
+        console.error(usage);
+        return 1;
+    }
+    return runWithGlobalStoragePath(async () => {
+        const storage = await loadAccounts();
+        const manager = new AccountManager(undefined, storage);
+        const service = createResetCreditService(manager);
+        try {
+            if (command === 'auto') {
+                await service.setPolicy(value);
+                console.log(`Automatic reset redemption: ${value}`);
+                return 0;
+            }
+            if (command === 'redeem') {
+                const index = Number(value) - 1;
+                const account = storage?.accounts[index];
+                const target = account && resetTargetForStoredAccount(account);
+                if (!target) {
+                    console.error('Choose a configured, enabled subscription account/workspace.');
+                    return 1;
+                }
+                const outcome = await withCheckProgress(`Redeeming a reset for account ${index + 1}`, () => service.redeem(target));
+                console.log(`Account ${index + 1}: ${outcome}. Usage was re-read.`);
+                return 0;
+            }
+            const targets = (storage?.accounts ?? []).map(resetTargetForStoredAccount).filter(t => t !== null);
+            const refreshed = value === '--refresh' ? await withCheckProgress('Refreshing reset-credit availability', () => service.refresh(targets)) : null;
+            const state = await service.status();
+            console.log(`Automatic redemption: ${state.policy}`);
+            if (state.lastRedemption) {
+                const index = (storage?.accounts ?? []).findIndex(a => resetTargetForStoredAccount(a)?.key === state.lastRedemption?.key);
+                console.log(`Last confirmed reset: ${index >= 0 ? `account ${index + 1}` : "removed account"}; ${state.lastRedemption.outcome}; ${state.lastRedemption.automatic ? "automatic" : "explicit"}`);
+            }
+            (storage?.accounts ?? []).forEach((a, i) => { const target = resetTargetForStoredAccount(a); const snapshot = target ? (refreshed ?? state.snapshots)[target.key] : undefined; console.log(`${resetAccountLabel(a, i)}: ${snapshot?.availableCount ?? 'unknown'} reset credits${snapshot ? ` (checked ${Math.max(0, Math.floor((Date.now() - snapshot.updatedAt) / 1000))}s ago)` : ''}${target?.key === state.pending?.key ? ' [redemption pending; retry this account]' : ''}`); });
+            return 0;
+        }
+        catch {
+            // Only a consume whose result is unknown leaves a pending record; guard,
+            // pre-read and unknown-availability failures stop before spending anything.
+            const pending = command === 'redeem' ? await service.status().then(s => s.pending ?? null, () => ({ key: undefined })) : null;
+            // The pending record can belong to another account (a redeem is refused while
+            // any result is pending); point at the account that actually needs the retry.
+            const owner = pending?.key ? (storage?.accounts ?? []).findIndex(a => resetTargetForStoredAccount({ ...a, enabled: true, workspaces: undefined })?.key === pending.key) : -1;
+            const pendingAccount = owner >= 0 ? storage?.accounts[owner] : undefined;
+            const disabled = pendingAccount ? resetTargetForStoredAccount(pendingAccount) === null : false;
+            const retry = disabled ? `account ${owner + 1} or its workspace is disabled; re-enable it before retrying the pending result` : pending?.key && owner < 0 ? 'check it there (the pending account was removed)' : owner >= 0 && owner !== Number(value) - 1 ? `retry account ${owner + 1}, which holds the pending result` : 'retry the same account';
+            console.error(command === 'list' ? 'Reset-credit availability could not be refreshed. No credits were redeemed.' : command === 'auto' ? 'Reset-credit settings could not be updated.' : pending ? `Reset operation could not be confirmed. No new automatic redemption will be attempted while a result is pending; use resets list and ${retry}.` : 'No reset credit was redeemed. Availability could not be confirmed or a reset was just redeemed; run resets list --refresh and try again.');
+            return 1;
+        }
+        finally {
+            await manager.flushPendingSave();
+        }
+    });
+}

package/dist/lib/codex-manager/commands/rotation.d.ts

@@ -1,4 +1,4 @@
-import { type AppBindResult, type AppBindStatus } from "../../runtime/app-bind.js";
+import { type AppBindOptions, type AppBindResult, type AppBindStatus } from "../../runtime/app-bind.js";
 import type { QuotaCacheData } from "../../quota-cache.js";
 import { type RuntimeObservabilitySnapshot } from "../../runtime/runtime-observability.js";
 import type { PluginConfig } from "../../types.js";
@@ -13,7 +13,7 @@ export interface RotationCommandDeps {
     resolveActiveIndex: (storage: AccountStorageV3) => number;
     getStoragePath: () => string | null;
     setStoragePath: (path: string | null) => void;
-    bindCodexApp?: () => Promise<AppBindResult>;
+    bindCodexApp?: (options?: AppBindOptions) => Promise<AppBindResult>;
     unbindCodexApp?: () => Promise<AppBindResult>;
     getCodexAppBindStatus?: () => Promise<AppBindStatus>;
     loadRuntimeObservabilitySnapshot?: () => Promise<RuntimeObservabilitySnapshot | null>;

package/dist/lib/codex-manager/commands/rotation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rotation.d.ts","sourceRoot":"","sources":["../../../../lib/codex-manager/commands/rotation.ts"],"names":[],"mappings":"AA2BA,OAAO,EAEN,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,MAAM,2BAA2B,CAAC;AAMnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAEN,KAAK,4BAA4B,EACjC,MAAM,wCAAwC,CAAC;AAahD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAqB,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAG5E,KAAK,aAAa,GAAG,gBAAgB,GAAG,IAAI,CAAC;AAoB7C,MAAM,WAAW,mBAAmB;IACnC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,gBAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,4BAA4B,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC;IAChE,YAAY,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,kBAAkB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,MAAM,CAAC;IAC1D,cAAc,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACpC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC9C,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;IAC5C,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9C,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;IACrD,gCAAgC,CAAC,EAAE,MAAM,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAAC,CAAC;IACtF,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IACtD,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AA4pBD,wBAAsB,kBAAkB,CACvC,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,mBAAmB,GACvB,OAAO,CAAC,MAAM,CAAC,CAkFjB"}
+{"version":3,"file":"rotation.d.ts","sourceRoot":"","sources":["../../../../lib/codex-manager/commands/rotation.ts"],"names":[],"mappings":"AA2BA,OAAO,EAEN,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,MAAM,2BAA2B,CAAC;AAMnC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAEN,KAAK,4BAA4B,EACjC,MAAM,wCAAwC,CAAC;AAahD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAqB,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAG5E,KAAK,aAAa,GAAG,gBAAgB,GAAG,IAAI,CAAC;AAoB7C,MAAM,WAAW,mBAAmB;IACnC,gBAAgB,EAAE,MAAM,YAAY,CAAC;IACrC,gBAAgB,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnE,4BAA4B,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,OAAO,CAAC;IAChE,YAAY,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,kBAAkB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,MAAM,CAAC;IAC1D,cAAc,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACpC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC9C,YAAY,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IACpE,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9C,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;IACrD,gCAAgC,CAAC,EAAE,MAAM,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAAC,CAAC;IACtF,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IACtD,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC;AAkqBD,wBAAsB,kBAAkB,CACvC,IAAI,EAAE,MAAM,EAAE,EACd,IAAI,EAAE,mBAAmB,GACvB,OAAO,CAAC,MAAM,CAAC,CAyHjB"}

package/dist/lib/codex-manager/commands/rotation.js

@@ -30,7 +30,7 @@ function printRotationUsage(logInfo) {
         "  codex-multi-auth rotation enable",
         "  codex-multi-auth rotation disable",
         "  codex-multi-auth rotation status",
-        "  codex-multi-auth rotation bind-app",
+        "  codex-multi-auth rotation bind-app [--native [--catalog-account <idx>] | --custom-provider]",
         "  codex-multi-auth rotation unbind-app",
         "  codex-multi-auth rotation reset-rate-limits [--all | --account <idx>] [--dry-run] [--json]",
         "  codex-multi-auth rotation reset-runtime [--json]",
@@ -64,8 +64,14 @@ async function runResetRuntime(args, deps) {
     let appBindRestarted = false;
     if (deps.unbindCodexApp && deps.bindCodexApp) {
         try {
+            const previous = await deps.getCodexAppBindStatus?.();
             unbind = await deps.unbindCodexApp();
-            bind = await deps.bindCodexApp();
+            bind = previous?.state?.nativeOpenai
+                ? await deps.bindCodexApp({
+                    nativeOpenai: true,
+                    catalogAccount: previous.state.catalogAccount,
+                })
+                : await deps.bindCodexApp(...(previous?.state ? [{ nativeOpenai: false }] : []));
             appBindRestarted = true;
         }
         catch (error) {
@@ -630,6 +636,61 @@ export async function runRotationCommand(args, deps) {
     if (subcommand === "reset-runtime") {
         return runResetRuntime(rest, deps);
     }
+    if (subcommand === "bind-app") {
+        if (!deps.bindCodexApp) {
+            logError("Codex app bind is unavailable in this build.");
+            return 1;
+        }
+        const options = {};
+        let catalogIndex;
+        for (let i = 0; i < rest.length; i += 1) {
+            const arg = rest[i];
+            if (arg === "--native" || arg === "--custom-provider") {
+                if (options.nativeOpenai !== undefined) {
+                    logError("Choose one app bind mode.");
+                    return 1;
+                }
+                options.nativeOpenai = arg === "--native";
+            }
+            else if (arg === "--catalog-account" && catalogIndex === undefined) {
+                const value = rest[++i] ?? "";
+                if (!/^[1-9]\d*$/.test(value) || !Number.isSafeInteger(Number(value))) {
+                    logError("Catalog account must be a positive account index.");
+                    return 1;
+                }
+                catalogIndex = Number(value) - 1;
+            }
+            else {
+                logError(`Unknown app bind option: ${arg}`);
+                return 1;
+            }
+        }
+        if (catalogIndex !== undefined) {
+            if (options.nativeOpenai !== true) {
+                logError("--catalog-account requires --native.");
+                return 1;
+            }
+            const previousStoragePath = deps.getStoragePath();
+            deps.setStoragePath(null);
+            let catalogStorage;
+            try {
+                catalogStorage = await deps.loadAccounts();
+            }
+            finally {
+                deps.setStoragePath(previousStoragePath);
+            }
+            const account = catalogStorage?.accounts[catalogIndex];
+            if (!account?.email || !account.accountId || account.enabled === false) {
+                logError("Catalog account must be an enabled account with an email and account ID.");
+                return 1;
+            }
+            options.catalogAccount = { email: account.email, accountId: account.accountId };
+        }
+        const result = rest.length ? await deps.bindCodexApp(options) : await deps.bindCodexApp();
+        logInfo(result.message);
+        logInfo(formatAppBindStatus(result.status));
+        return 0;
+    }
     if (rest.length > 0) {
         logError(`Unknown rotation option: ${rest[0]}`);
         return 1;
@@ -669,16 +730,6 @@ export async function runRotationCommand(args, deps) {
         }
         return 0;
     }
-    if (subcommand === "bind-app") {
-        if (!deps.bindCodexApp) {
-            logError("Codex app bind is unavailable in this build.");
-            return 1;
-        }
-        const result = await deps.bindCodexApp();
-        logInfo(result.message);
-        logInfo(formatAppBindStatus(result.status));
-        return 0;
-    }
     if (subcommand === "unbind-app") {
         if (!deps.unbindCodexApp) {
             logError("Codex app bind is unavailable in this build.");

package/dist/lib/codex-manager/commands/status.d.ts

@@ -1,3 +1,7 @@
+import { type loadResetCreditState } from "../../runtime/account-reset-credits.js";
+import type { ApiRouteCredential } from "../../api-route-store.js";
+import { loadAccountPolicyStore } from "../../account-policy.js";
+import { type ModelInventory } from "../../runtime/model-discovery-status.js";
 import type { ModelFamily } from "../../prompts/codex.js";
 import type { QuotaCacheData } from "../../quota-cache.js";
 import type { AppBindRouterStatus } from "../../runtime/app-bind.js";
@@ -6,14 +10,21 @@ import type { RuntimeObservabilitySnapshot } from "../../runtime/runtime-observa
 import type { AccountStorageV3, StorageHealthSummary } from "../../storage.js";
 type LoadedStorage = AccountStorageV3 | null;
 export interface StatusCommandDeps {
+    loadResetCreditState?: typeof loadResetCreditState;
     setStoragePath: (path: string | null) => void;
     getStoragePath: () => string | null;
     loadAccounts: () => Promise<LoadedStorage>;
     resolveActiveIndex: (storage: AccountStorageV3, family?: ModelFamily) => number;
     formatRateLimitEntry: (account: AccountStorageV3["accounts"][number], now: number, family: ModelFamily) => string | null;
     loadRuntimeObservabilitySnapshot?: () => Promise<RuntimeObservabilitySnapshot | null>;
-    loadAppBindStatus?: () => Promise<AppBindRouterStatus | null>;
+    loadAppBindStatus?: () => Promise<(AppBindRouterStatus & {
+        nativeOpenai?: boolean;
+    }) | null>;
+    loadAccountPolicies?: typeof loadAccountPolicyStore;
     loadAppHelperStatus?: () => RuntimeAccountSignal | null;
+    loadModelInventory?: () => Promise<ModelInventory | null>;
+    loadApiRoutes?: () => Promise<ApiRouteCredential[]>;
+    loadInferenceRequestTimes?: (keys: string[]) => Promise<Record<string, number>>;
     loadQuotaCache?: () => Promise<QuotaCacheData | null>;
     inspectStorageHealth?: () => Promise<StorageHealthSummary>;
     getNow?: () => number;

package/dist/lib/codex-manager/commands/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../../lib/codex-manager/commands/status.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAGN,KAAK,oBAAoB,EACzB,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,wCAAwC,CAAC;AAC3F,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE/E,KAAK,aAAa,GAAG,gBAAgB,GAAG,IAAI,CAAC;AAG7C,MAAM,WAAW,iBAAiB;IACjC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IAC9C,cAAc,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACpC,YAAY,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3C,kBAAkB,EAAE,CACnB,OAAO,EAAE,gBAAgB,EACzB,MAAM,CAAC,EAAE,WAAW,KAChB,MAAM,CAAC;IACZ,oBAAoB,EAAE,CACrB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,EAC7C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,WAAW,KACf,MAAM,GAAG,IAAI,CAAC;IACnB,gCAAgC,CAAC,EAAE,MAAM,OAAO,CAAC,4BAA4B,GAAG,IAAI,CAAC,CAAC;IACtF,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC;IAC9D,mBAAmB,CAAC,EAAE,MAAM,oBAAoB,GAAG,IAAI,CAAC;IACxD,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IACtD,oBAAoB,CAAC,EAAE,MAAM,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAC3D,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,8FAA8F;IAC9F,IAAI,CAAC,EAAE,OAAO,CAAC;CACf;AA2ED,wBAAsB,gBAAgB,CACrC,IAAI,EAAE,iBAAiB,GACrB,OAAO,CAAC,MAAM,CAAC,CAwOjB;AAED,MAAM,WAAW,mBAAmB;IACnC,mBAAmB,EAAE,aAAa,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACjE,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACpC;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,CAQpE"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../../lib/codex-manager/commands/status.ts"],"names":[],"mappings":"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"}

package/dist/lib/codex-manager/commands/status.js

@@ -1,3 +1,11 @@
+import { resetSnapshotQuota } from "../../runtime/reset-credits.js";
+import { resetTargetForStoredAccount } from "../../runtime/account-reset-credits.js";
+import { subscriptionQuotaPreference, compareSubscriptionQuota, usesSubscriptionReserve, SUBSCRIPTION_RESERVE_PERCENT } from "../../runtime/subscription-quota-order.js";
+import { styleReportText as paint } from "../../ui/format.js";
+import { inferenceAccountKey } from "../../runtime/inference-activity.js";
+import { modelScopeId } from "../../runtime/workspace-model-scopes.js";
+import { loadAccountPolicyStore, getAccountPolicyKey } from "../../account-policy.js";
+import { formatModelInventory } from "../../runtime/model-discovery-status.js";
 import { AUTH_INVALIDATION_MARKER, formatAccountLabel, formatCooldown, formatWaitTime, formatWorkspaceLines, } from "../../accounts.js";
 import { evaluateForecastAccounts, recommendForecastAccount, } from "../../forecast.js";
 import { findQuotaCacheEntryForAccount, isQuotaCacheEntryExhausted, } from "../../quota-readiness.js";
@@ -60,13 +68,30 @@ function formatRuntimeLastAccount(runtimeSnapshot) {
     }
     return null;
 }
+/** Expired observations must not impose pressure after their window has reset. */
+function forecastQuotaWindow(window, updatedAt, now) {
+    const expiresAt = window.resetAtMs ?? (window.windowMinutes && window.windowMinutes > 0 ? updatedAt + window.windowMinutes * 60_000 : null);
+    return expiresAt !== null && now >= expiresAt ? {} : window;
+}
 export async function runStatusCommand(deps) {
     deps.setStoragePath(null);
-    const storage = await deps.loadAccounts();
+    let apiConfigurationUnavailable = false;
+    const apiRoutes = await deps.loadApiRoutes?.().catch(() => { apiConfigurationUnavailable = true; return []; }) ?? [];
+    const loadedStorage = await deps.loadAccounts();
+    const storage = loadedStorage ?? (apiRoutes.length ? { version: 3, activeIndex: 0, accounts: [] } : null);
     const path = deps.getStoragePath();
     const storageHealth = await deps.inspectStorageHealth?.();
     const logInfo = deps.logInfo ?? console.log;
-    if (!storage || storage.accounts.length === 0) {
+    if (apiConfigurationUnavailable && !deps.json)
+        logInfo("API configuration unavailable; subscription status remains available.");
+    const modelInventory = await deps.loadModelInventory?.();
+    const resetCredits = await deps.loadResetCreditState?.().catch(() => null);
+    const resetSnapshot = (account) => { const target = resetTargetForStoredAccount(account); return target ? resetCredits?.snapshots[target.key] : undefined; };
+    const accountPolicies = await (deps.loadAccountPolicies ?? loadAccountPolicyStore)().catch(() => ({ version: 1, accounts: {} }));
+    if (!deps.json && deps.loadModelInventory)
+        for (const line of formatModelInventory(modelInventory ?? null))
+            logInfo(line);
+    if (!storage || (storage.accounts.length === 0 && apiRoutes.length === 0)) {
         const restoreReason = storage ? readRestoreReason(storage) : undefined;
         const effectiveState = restoreReason === "intentional-reset"
             ? "intentional-reset"
@@ -78,8 +103,12 @@ export async function runStatusCommand(deps) {
         if (deps.json) {
             logInfo(JSON.stringify({
                 storagePath: path,
+                ...(apiConfigurationUnavailable ? { warnings: ["api_configuration_unavailable"] } : {}),
                 storageHealth: effectiveState ?? null,
                 accountCount: 0,
+                totalAccountCount: 0,
+                apiAccounts: [],
+                modelInventory: modelInventory ?? null,
                 // Emit the same keys the populated branch does (as null) so a
                 // --json consumer sees one stable shape regardless of account count.
                 activeIndex: null,
@@ -98,37 +127,84 @@ export async function runStatusCommand(deps) {
                 : effectiveState === "corrupt"
                     ? "No accounts configured. Storage appears corrupted."
                     : "No accounts configured.");
-        logInfo(`Storage: ${path}`);
+        logInfo(paint(`Storage: ${path}`, "muted"));
         if (effectiveState) {
             logInfo(`Storage health: ${effectiveState}`);
         }
         return 0;
     }
     const now = deps.getNow?.() ?? Date.now();
-    const activeIndex = deps.resolveActiveIndex(storage, "codex");
+    const activeIndex = storage.accounts.length ? deps.resolveActiveIndex(storage, "codex") : -1;
+    const quotaCache = await deps.loadQuotaCache?.() ?? null;
+    const forecastQuotas = storage.accounts.map(account => {
+        const cached = findQuotaCacheEntryForAccount(quotaCache, account, storage.accounts);
+        const reset = resetSnapshot(account);
+        const entry = reset && reset.updatedAt > (cached?.updatedAt ?? 0) && reset.updatedAt <= now && now - reset.updatedAt <= 60000 ? resetSnapshotQuota(reset) : cached;
+        if (!entry)
+            return null;
+        const primary = forecastQuotaWindow(entry.primary, entry.updatedAt, now);
+        const secondary = forecastQuotaWindow(entry.secondary, entry.updatedAt, now);
+        if (![primary, secondary].some(window => typeof window.usedPercent === "number" && Number.isFinite(window.usedPercent)))
+            return null;
+        return { ...entry, primary, secondary };
+    });
     const forecastResults = evaluateForecastAccounts(storage.accounts.map((account, index) => ({
         index,
         account,
         isCurrent: index === activeIndex,
         now,
+        quotaCache,
+        allAccounts: storage.accounts,
+        liveQuota: forecastQuotas[index] ?? undefined,
     })));
     const recommendation = recommendForecastAccount(forecastResults);
     if (!deps.json) {
-        logInfo(`Accounts (${storage.accounts.length})`);
-        logInfo(`Storage: ${path}`);
+        logInfo(paint(apiRoutes.length ? `Accounts (${storage.accounts.length + apiRoutes.length}: ${storage.accounts.length} subscription, ${apiRoutes.length} API/ZDR)` : `Accounts (${storage.accounts.length})`, "heading"));
+        logInfo(paint(`Storage: ${path}`, "muted"));
         if (recommendation.recommendedIndex !== null) {
-            logInfo(`Selection reason: account ${recommendation.recommendedIndex + 1} (${recommendation.reason})`);
+            logInfo(paint(`Forecast suggestion: account ${recommendation.recommendedIndex + 1} (${recommendation.reason})`, "accent"));
         }
         if (storageHealth) {
-            logInfo(`Storage health: ${storageHealth.state}`);
+            logInfo(paint(`Storage health: ${storageHealth.state}`, storageHealth.state === "healthy" ? "success" : "warning"));
         }
     }
     const appHelperStatus = deps.loadAppHelperStatus?.() ?? null;
-    const [runtimeSnapshot, appBindStatus, quotaCache] = await Promise.all([
+    const [runtimeSnapshot, appBindStatus] = await Promise.all([
         deps.loadRuntimeObservabilitySnapshot?.() ?? Promise.resolve(null),
         deps.loadAppBindStatus?.() ?? Promise.resolve(null),
-        deps.loadQuotaCache?.() ?? Promise.resolve(null),
     ]);
+    const quotaPreferences = forecastQuotas.map(quota => subscriptionQuotaPreference(quota, now));
+    const automaticOrder = new Map();
+    if (appBindStatus?.nativeOpenai) {
+        const candidates = storage.accounts.map((account, index) => ({ account, index, quota: quotaPreferences[index] ?? subscriptionQuotaPreference(null, now), tier: accountPolicies.accounts[getAccountPolicyKey(account, index)]?.priority ?? 1 }))
+            .filter(a => forecastResults[a.index]?.availability === "ready" && !a.quota.exhausted);
+        candidates.sort((a, b) => Number(usesSubscriptionReserve(a.quota)) - Number(usesSubscriptionReserve(b.quota)) ||
+            a.tier - b.tier || compareSubscriptionQuota(a.quota, b.quota) || Number(b.index === activeIndex) - Number(a.index === activeIndex) || a.index - b.index);
+        // A switch pin is strict in native mode too: no other account is tried, so none gets an order.
+        const pinned = typeof storage.pinnedAccountIndex === "number" ? candidates.filter(a => a.index === storage.pinnedAccountIndex) : candidates;
+        pinned.forEach((a, index) => { automaticOrder.set(a.index, index + 1); });
+    }
+    const activityKeys = [...storage.accounts.map(inferenceAccountKey), ...apiRoutes.map(route => `sha256:${modelScopeId(route.kind, route.id)}`)];
+    const persistedActivity = await deps.loadInferenceRequestTimes?.(activityKeys) ?? {};
+    const inferenceTimes = { ...runtimeSnapshot?.lastInferenceRequestAtByAccount };
+    for (const [key, at] of Object.entries(persistedActivity))
+        inferenceTimes[key] = Math.max(inferenceTimes[key] ?? 0, at);
+    const apiAccounts = apiRoutes.map((route, index) => ({
+        index, label: route.label, kind: route.kind, enabled: route.enabled, priority: route.priority,
+        visibleModelCount: route.visibleModels.length,
+        lastInferenceRequestAt: inferenceTimes[`sha256:${modelScopeId(route.kind, route.id)}`] ?? null,
+    }));
+    const printApiAccounts = () => {
+        if (!apiAccounts.length)
+            return;
+        logInfo("");
+        logInfo(paint(`API/ZDR accounts (${apiAccounts.length}; separate privacy pools, lower tier first):`, "heading"));
+        for (const account of apiAccounts) {
+            const last = account.lastInferenceRequestAt === null ? "inference not yet recorded" : `last inference request ${formatWaitTime(Math.max(0, now - account.lastInferenceRequestAt))} ago`;
+            logInfo(`${paint(`${account.kind.toUpperCase()} account ${account.index + 1}: ${account.label}`, "heading")}${account.enabled ? "" : paint(" [disabled]", "warning")} ${paint(last, "muted")}`);
+            logInfo(`   ${paint(`priority tier: ${account.priority}`, "accent")}; visible models: ${account.visibleModelCount}`);
+        }
+    };
     const runtimeCurrent = resolveRuntimeCurrentAccount(storage, {
         runtimeSnapshot,
         appBindStatus,
@@ -141,10 +217,23 @@ export async function runStatusCommand(deps) {
             const markers = buildAccountMarkers(account, i, activeIndex, runtimeCurrent, now, quotaCache, storage.accounts, deps.formatRateLimitEntry);
             return {
                 index: i,
+                resetCreditsAvailable: resetSnapshot(account)?.availableCount ?? null,
+                resetCreditsCheckedAt: resetSnapshot(account)?.updatedAt ?? null,
                 label: formatAccountLabel(account, i),
                 enabled: account.enabled !== false,
                 current: i === activeIndex,
+                priority: accountPolicies.accounts[getAccountPolicyKey(account, i)]?.priority ?? 1,
+                autoPrime: accountPolicies.accounts[getAccountPolicyKey(account, i)]?.autoPrime ?? false,
                 markers,
+                selectionPreference: storage.pinnedAccountIndex === i ? "strict-pin" : null,
+                forecastRiskScore: forecastResults[i]?.riskScore ?? null,
+                forecastRiskLevel: forecastResults[i]?.riskLevel ?? null,
+                forecastQuotaUpdatedAt: forecastQuotas[i]?.updatedAt ?? null,
+                automaticOrder: automaticOrder.get(i) ?? null,
+                subscriptionReserve: usesSubscriptionReserve(quotaPreferences[i]),
+                quotaResetAt: quotaPreferences[i]?.resetAtMs ?? null,
+                quotaDrainPerHour: quotaPreferences[i]?.urgency ?? null,
+                lastInferenceRequestAt: inferenceTimes[inferenceAccountKey(account)] ?? null,
                 lastUsed: typeof account.lastUsed === "number" && account.lastUsed > 0
                     ? account.lastUsed
                     : null,
@@ -153,8 +242,12 @@ export async function runStatusCommand(deps) {
         });
         logInfo(JSON.stringify({
             storagePath: path,
+            ...(apiConfigurationUnavailable ? { warnings: ["api_configuration_unavailable"] } : {}),
             storageHealth: storageHealth?.state ?? null,
             accountCount: storage.accounts.length,
+            apiAccounts,
+            totalAccountCount: storage.accounts.length + apiAccounts.length,
+            selectionMode: appBindStatus?.nativeOpenai ? "model-priority" : "legacy-pin",
             activeIndex,
             pinnedAccountIndex: typeof storage.pinnedAccountIndex === "number"
                 ? storage.pinnedAccountIndex
@@ -162,7 +255,13 @@ export async function runStatusCommand(deps) {
             recommendedIndex: recommendation.recommendedIndex,
             recommendationReason: recommendation.reason,
             runtimeInUseIndex: runtimeCurrent ? runtimeCurrent.index : null,
+            modelInventory: modelInventory ?? null,
             accounts,
+            lastRequestedWorkspace: runtimeSnapshot?.lastRequestedWorkspaceId ? {
+                id: runtimeSnapshot.lastRequestedWorkspaceId,
+                accountIndex: runtimeSnapshot.lastAccountIndex ?? null,
+                requestedAt: runtimeSnapshot.lastAccountUpdatedAt ?? null,
+            } : null,
         }, null, 2));
         return 0;
     }
@@ -179,8 +278,18 @@ export async function runStatusCommand(deps) {
         logInfo(`Runtime: responses=${runtimeSnapshot.responsesRequests}, refresh=${runtimeSnapshot.authRefreshRequests}, probes=${runtimeSnapshot.diagnosticProbeRequests}, budgetExhaustions=${runtimeMetrics.requestAttemptBudgetExhaustions}`);
         const lastRuntimeAccount = formatRuntimeLastAccount(runtimeSnapshot);
         if (lastRuntimeAccount) {
-            logInfo(`Last runtime account: ${lastRuntimeAccount}`);
+            logInfo(paint(`Last runtime account: ${lastRuntimeAccount}`, "accent"));
+            if (typeof runtimeSnapshot.lastAccountUpdatedAt === "number" && runtimeSnapshot.lastAccountUpdatedAt > 0)
+                logInfo(`Last runtime request: ${formatWaitTime(Math.max(0, now - runtimeSnapshot.lastAccountUpdatedAt))} ago`);
         }
+        const requestedId = runtimeSnapshot.lastRequestedWorkspaceId;
+        if (requestedId) {
+            const index = resolveRuntimeCurrentAccount(storage, { runtimeSnapshot }, { now })?.index;
+            const workspace = index === undefined ? undefined : storage.accounts[index]?.workspaces?.find(w => w.id === requestedId);
+            logInfo(`Last requested workspace: ${index === undefined ? "" : `account ${index + 1} / `}${workspace?.name?.trim() || "unlabelled"} (id:${requestedId.slice(-6)}; outgoing scope, billing plan not verified)`);
+        }
+        else
+            logInfo("Last requested workspace: not recorded");
         if (poolCooldown || serverCooldown) {
             logInfo(`Cooldowns: pool=${poolCooldown ?? "none"}, server-burst=${serverCooldown ?? "none"}`);
         }
@@ -189,8 +298,11 @@ export async function runStatusCommand(deps) {
         }
     }
     if (runtimeCurrent) {
-        logInfo(`Runtime in use: account ${runtimeCurrent.index + 1} (${runtimeCurrent.source})`);
+        logInfo(paint(`Runtime in use: account ${runtimeCurrent.index + 1} (${runtimeCurrent.source})`, "accent"));
     }
+    if (appBindStatus?.nativeOpenai)
+        logInfo(paint("Automatic order estimates use the last check; requested model/workspace and live health can change the order.", "muted"));
+    logInfo(paint("Account/workspace labels below describe saved settings, not the last routed workspace.", "muted"));
     const pinnedAccountIndex = storage.pinnedAccountIndex;
     if (typeof pinnedAccountIndex === "number") {
         if (!Number.isInteger(pinnedAccountIndex) ||
@@ -199,8 +311,8 @@ export async function runStatusCommand(deps) {
             logInfo(`Pinned: invalid account index ${pinnedAccountIndex}; run codex-multi-auth unpin`);
         }
         else {
-            logInfo(`Pinned: account ${pinnedAccountIndex + 1} (set by switch)`);
-            if (runtimeCurrent && runtimeCurrent.index !== pinnedAccountIndex) {
+            logInfo(paint(`Pinned: account ${pinnedAccountIndex + 1} (strict; set by switch)`, "accent"));
+            if (!appBindStatus?.nativeOpenai && runtimeCurrent && runtimeCurrent.index !== pinnedAccountIndex) {
                 logInfo(`  warning: runtime currently using account ${runtimeCurrent.index + 1} but pin requests account ${pinnedAccountIndex + 1}; the proxy will pick up the pin on the next request.`);
             }
         }
@@ -212,24 +324,56 @@ export async function runStatusCommand(deps) {
             continue;
         const label = formatAccountLabel(account, i);
         const markers = buildAccountMarkers(account, i, activeIndex, runtimeCurrent, now, quotaCache, storage.accounts, deps.formatRateLimitEntry);
+        if (storage.pinnedAccountIndex === i)
+            markers.push("strict pin");
         const markerLabel = markers.length > 0 ? ` [${markers.join(", ")}]` : "";
-        const lastUsed = typeof account.lastUsed === "number" && account.lastUsed > 0
-            ? `used ${formatWaitTime(now - account.lastUsed)} ago`
-            : "never used";
-        logInfo(`${i + 1}. ${label}${markerLabel} ${lastUsed}`);
+        const lastInferenceAt = inferenceTimes[inferenceAccountKey(account)];
+        const activity = typeof account.lastUsed === "number" && account.lastUsed > 0
+            ? `account activity ${formatWaitTime(Math.max(0, now - account.lastUsed))} ago` : "no account activity recorded";
+        const lastUsed = typeof lastInferenceAt === "number" && lastInferenceAt > 0
+            ? `last inference request ${formatWaitTime(Math.max(0, now - lastInferenceAt))} ago`
+            : `inference not yet recorded; ${activity}`;
+        logInfo(`${paint(`${i + 1}. ${label}`, "heading")}${paint(markerLabel, markers.some(m => /disabled|cooldown|exhausted|limited|invalid/.test(m)) ? "warning" : "success")} ${paint(lastUsed, "muted")}`);
+        logInfo(`   ${paint(`priority tier: ${accountPolicies.accounts[getAccountPolicyKey(account, i)]?.priority ?? 1}`, "accent")}`);
+        if (accountPolicies.accounts[getAccountPolicyKey(account, i)]?.autoPrime)
+            logInfo("   automatic first-use priming: on (router checks every 15 minutes)");
+        if (appBindStatus?.nativeOpenai) {
+            const preference = quotaPreferences[i];
+            const order = automaticOrder.get(i);
+            const reset = preference?.resetAtMs ? `; limiting window resets in ${formatWaitTime(Math.max(0, preference.resetAtMs - now))}` : "; reset ordering unknown; run check";
+            const reserve = usesSubscriptionReserve(preference) ? `; ${SUBSCRIPTION_RESERVE_PERCENT}% reserve (last resort)` : "";
+            const pinnedElsewhere = typeof storage.pinnedAccountIndex === "number" && storage.pinnedAccountIndex !== i;
+            logInfo(paint(`   automatic order: ${order ? `#${order}` : pinnedElsewhere ? `none (account ${(storage.pinnedAccountIndex ?? 0) + 1} is pinned)` : "unavailable"}${reset}${reserve}`, reserve ? "warning" : "accent"));
+        }
+        const quota = forecastQuotas[i];
+        if (quota) {
+            const windows = ["primary", "secondary"].flatMap(key => {
+                const used = quota[key].usedPercent;
+                return typeof used === "number" && Number.isFinite(used) ? [paint(`${key} ${Math.max(0, Math.min(100, Math.round(100 - used)))}% left`, used >= 95 ? "danger" : used >= 80 ? "warning" : "success")] : [];
+            });
+            logInfo(`   quota: ${windows.join("; ")} (${paint(`cached quota ${formatWaitTime(Math.max(0, now - quota.updatedAt))} ago`, "muted")})`);
+        }
+        else
+            logInfo(paint("   quota unknown; run check (risk uses other known signals only)", "warning"));
+        const forecast = forecastResults[i];
+        const resets = resetSnapshot(account);
+        logInfo(`   subscription resets: ${resets?.availableCount ?? "unknown"}${resets ? ` (cached ${formatWaitTime(Math.max(0, now - resets.updatedAt))} ago)` : "; run check"}`);
+        if (forecast)
+            logInfo(`   ${paint(`forecast risk: ${forecast.riskScore}/100 (${forecast.riskLevel}; lower is better)`, forecast.riskLevel === "high" ? "danger" : forecast.riskLevel === "medium" ? "warning" : "success")}`);
         const primaryReason = forecastResults[i]?.reasons[0];
         if (primaryReason) {
-            logInfo(`   reason: ${primaryReason}`);
+            logInfo(paint(`   reason: ${primaryReason}`, "warning"));
         }
         // Surface every workspace a same-email account can rotate between, so
         // personal Plus vs business/team stay visible at once (issue #491).
         if ((account.workspaces?.length ?? 0) > 1) {
-            logInfo("   workspaces:");
-            for (const workspaceLine of formatWorkspaceLines(account, "     ")) {
-                logInfo(workspaceLine);
+            logInfo(paint("   workspaces (saved selection; not live routing):", "muted"));
+            for (const workspaceLine of formatWorkspaceLines(account, "     ", "saved selection")) {
+                logInfo(paint(workspaceLine, workspaceLine.includes("(saved selection)") ? "accent" : "muted"));
             }
         }
     }
+    printApiAccounts();
     return 0;
 }
 export function runFeaturesCommand(deps) {

package/dist/lib/codex-manager/commands/uninstall.js

@@ -44,7 +44,7 @@ function printUninstallUsage() {
         "Options:",
         "  --dry-run          Show what would be removed without making changes",
         "  --json             Print machine-readable JSON output",
-        "  --clear-accounts   Also remove stored account credentials (irreversible)",
+        "  --clear-accounts   Also remove stored account credentials and API keys (irreversible)",
         "",
         "Behavior:",
         "  Reverses all first-run setup changes: unbinds Codex app, removes OS launchers,",

package/dist/lib/codex-manager/formatters/quota-formatters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quota-formatters.d.ts","sourceRoot":"","sources":["../../../../lib/codex-manager/formatters/quota-formatters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EACN,KAAK,kBAAkB,EACvB,uBAAuB,EAGvB,MAAM,sBAAsB,CAAC;AAY9B,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAmCzD;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC9C,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC,EAC7D,QAAQ,EAAE,wBAAwB,EAClC,GAAG,SAAa,GACd,MAAM,CAIR;AAED,wBAAgB,yBAAyB,CACxC,KAAK,EAAE,eAAe,GACpB,kBAAkB,CAgBpB;AA8BD;;;;;;GAMG;AACH,MAAM,WAAW,yBAAyB;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;CACpB;AAgCD,wBAAgB,0BAA0B,CACzC,QAAQ,EAAE,kBAAkB,EAC5B,GAAG,SAAa,EAChB,OAAO,GAAE,yBAA8B,GACrC,MAAM,CA6CR;AAED,wBAAgB,yBAAyB,CACxC,KAAK,EAAE,eAAe,EACtB,GAAG,SAAa,EAChB,OAAO,GAAE,yBAA8B,GACrC,MAAM,CA6CR"}
+{"version":3,"file":"quota-formatters.d.ts","sourceRoot":"","sources":["../../../../lib/codex-manager/formatters/quota-formatters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EACN,KAAK,kBAAkB,EACvB,uBAAuB,EAGvB,MAAM,sBAAsB,CAAC;AAY9B,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAmCzD;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC9C,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC,EAC7D,QAAQ,EAAE,wBAAwB,EAClC,GAAG,SAAa,GACd,MAAM,CAKR;AAED,wBAAgB,yBAAyB,CACxC,KAAK,EAAE,eAAe,GACpB,kBAAkB,CAgBpB;AA8BD;;;;;;GAMG;AACH,MAAM,WAAW,yBAAyB;IACzC,SAAS,CAAC,EAAE,OAAO,CAAC;CACpB;AAgCD,wBAAgB,0BAA0B,CACzC,QAAQ,EAAE,kBAAkB,EAC5B,GAAG,SAAa,EAChB,OAAO,GAAE,yBAA8B,GACrC,MAAM,CA6CR;AAED,wBAAgB,yBAAyB,CACxC,KAAK,EAAE,eAAe,EACtB,GAAG,SAAa,EAChB,OAAO,GAAE,yBAA8B,GACrC,MAAM,CA6CR"}

package/dist/lib/codex-manager/formatters/quota-formatters.js

@@ -41,10 +41,11 @@ export function styleQuotaSummary(summary) {
  * absolute reset clock for each quota window.
  */
 export function formatQuotaSnapshotForDashboard(snapshot, settings, now = Date.now()) {
+    const status = snapshot.primingFailure ? `quota read OK; first-use probe unconfirmed (${snapshot.primingFailure})` : snapshot.primingCompleted ? "live session OK; first-use probe completed" : "live session OK";
     if (!settings.showQuotaDetails)
-        return "live session OK";
+        return status;
     const summary = formatCompactQuotaSnapshot(snapshot, now, { showReset: true });
-    return summary ? `live session OK (${summary})` : "live session OK";
+    return summary ? `${status} (${summary})` : status;
 }
 export function quotaCacheEntryToSnapshot(entry) {
     return {

package/dist/lib/codex-manager/health-check.d.ts

@@ -6,7 +6,10 @@ import { type DashboardDisplaySettings } from "../dashboard-settings.js";
  */
 export interface HealthCheckOptions {
     forceRefresh?: boolean;
+    discoverModels?: boolean;
     liveProbe?: boolean;
+    /** Explicit `check --prime` only: may start an unused subscription's quota windows. */
+    primeUnusedSubscription?: boolean;
     model?: string;
     display?: DashboardDisplaySettings;
 }

package/dist/lib/codex-manager/health-check.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"health-check.d.ts","sourceRoot":"","sources":["../../../lib/codex-manager/health-check.ts"],"names":[],"mappings":"AAQA,OAAO,EACN,KAAK,wBAAwB,EAE7B,MAAM,0BAA0B,CAAC;AA2ClC;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,wBAAwB,CAAC;CACnC;AAED,wBAAsB,cAAc,CACnC,OAAO,GAAE,kBAAuB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA4Uf"}
+{"version":3,"file":"health-check.d.ts","sourceRoot":"","sources":["../../../lib/codex-manager/health-check.ts"],"names":[],"mappings":"AAaA,OAAO,EACN,KAAK,wBAAwB,EAE7B,MAAM,0BAA0B,CAAC;AA2ClC;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IAClC,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,uFAAuF;IACvF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,wBAAwB,CAAC;CACnC;AAED,wBAAsB,cAAc,CACnC,OAAO,GAAE,kBAAuB,GAC9B,OAAO,CAAC,IAAI,CAAC,CA6Wf"}