codex-multi-auth 2.3.0-beta.1 → 2.3.0-beta.2

package/dist/lib/codex-manager/login-menu-actions.js

@@ -0,0 +1,303 @@
+import { stdin as input, stdout as output } from "node:process";
+import { sanitizeEmail } from "../accounts.js";
+import { MODEL_FAMILIES } from "../prompts/codex.js";
+import { findMatchingAccountIndex, loadAccounts, setStoragePath, withAccountStorageTransaction, } from "../storage.js";
+import { UI_COPY } from "../ui/ui-copy.js";
+import { getUiRuntimeOptions } from "../ui/runtime.js";
+import { select } from "../ui/select.js";
+import { runSwitchCommand } from "./commands/switch.js";
+import { formatBackupSavedAt, stylePromptText, } from "./formatters/index.js";
+import { persistAccountPool, resolveAccountSelection, runOAuthFlow, syncSelectionToCodex, } from "./login-oauth.js";
+import { persistAndSyncSelectedAccount } from "./persist-selected-account.js";
+/** @internal */
+export async function promptOAuthSignInMode(backupOption, backupDiscoveryWarning = null) {
+    if (!input.isTTY || !output.isTTY) {
+        return "browser";
+    }
+    const ui = getUiRuntimeOptions();
+    const items = [
+        {
+            label: UI_COPY.oauth.signInHeading,
+            value: "cancel",
+            kind: "heading",
+        },
+        { label: UI_COPY.oauth.openBrowser, value: "browser", color: "green" },
+        { label: UI_COPY.oauth.manualMode, value: "manual", color: "yellow" },
+        ...(backupOption
+            ? [
+                { separator: true, label: "", value: "cancel" },
+                {
+                    label: UI_COPY.oauth.restoreHeading,
+                    value: "cancel",
+                    kind: "heading",
+                },
+                {
+                    label: UI_COPY.oauth.restoreSavedBackup,
+                    value: "restore-backup",
+                    hint: UI_COPY.oauth.loadLastBackupHint(backupOption.fileName, backupOption.accountCount, formatBackupSavedAt(backupOption.mtimeMs)),
+                    color: "cyan",
+                },
+            ]
+            : []),
+        { separator: true, label: "", value: "cancel" },
+        { label: UI_COPY.oauth.back, value: "cancel", color: "red" },
+    ];
+    const selected = await select(items, {
+        message: UI_COPY.oauth.chooseModeTitle,
+        subtitle: backupDiscoveryWarning
+            ? `${UI_COPY.oauth.chooseModeSubtitle} ${backupDiscoveryWarning}`
+            : UI_COPY.oauth.chooseModeSubtitle,
+        help: backupOption
+            ? UI_COPY.oauth.chooseModeHelpWithBackup
+            : UI_COPY.oauth.chooseModeHelp,
+        clearScreen: true,
+        theme: ui.theme,
+        selectedEmphasis: "minimal",
+        allowEscape: false,
+        onInput: (raw) => {
+            const lower = raw.toLowerCase();
+            if (lower === "q")
+                return "cancel";
+            if (lower === "1")
+                return "browser";
+            if (lower === "2")
+                return "manual";
+            if (lower === "3" && backupOption)
+                return "restore-backup";
+            return undefined;
+        },
+    });
+    return selected ?? "cancel";
+}
+/** @internal */
+export async function promptBackupRestoreMode(latestBackup) {
+    if (!input.isTTY || !output.isTTY) {
+        return "latest";
+    }
+    const ui = getUiRuntimeOptions();
+    const items = [
+        {
+            label: UI_COPY.oauth.loadLastBackup,
+            value: "latest",
+            hint: `${UI_COPY.oauth.restoreBackupLatestHint}\n${UI_COPY.oauth.manualBackupHint(latestBackup.accountCount, formatBackupSavedAt(latestBackup.mtimeMs))}`,
+            color: "cyan",
+        },
+        {
+            label: UI_COPY.oauth.chooseBackupManually,
+            value: "manual",
+            color: "yellow",
+        },
+        { label: UI_COPY.oauth.back, value: "back", color: "red" },
+    ];
+    const selected = await select(items, {
+        message: UI_COPY.oauth.restoreBackupTitle,
+        subtitle: UI_COPY.oauth.restoreBackupSubtitle,
+        help: UI_COPY.oauth.restoreBackupHelp,
+        clearScreen: true,
+        theme: ui.theme,
+        selectedEmphasis: "minimal",
+        allowEscape: false,
+        onInput: (raw) => {
+            const lower = raw.toLowerCase();
+            if (lower === "q")
+                return "back";
+            if (lower === "1")
+                return "latest";
+            if (lower === "2")
+                return "manual";
+            return undefined;
+        },
+    });
+    return selected ?? "back";
+}
+/** @internal */
+export async function promptManualBackupSelection(backups) {
+    if (!input.isTTY || !output.isTTY) {
+        return backups[0] ?? null;
+    }
+    const ui = getUiRuntimeOptions();
+    const items = backups.map((backup) => ({
+        label: backup.fileName,
+        value: backup,
+        hint: UI_COPY.oauth.manualBackupHint(backup.accountCount, formatBackupSavedAt(backup.mtimeMs)),
+        color: "cyan",
+    }));
+    items.push({ label: UI_COPY.oauth.back, value: null, color: "red" });
+    const selected = await select(items, {
+        message: UI_COPY.oauth.manualBackupTitle,
+        subtitle: UI_COPY.oauth.manualBackupSubtitle,
+        help: UI_COPY.oauth.manualBackupHelp,
+        clearScreen: true,
+        theme: ui.theme,
+        selectedEmphasis: "minimal",
+        allowEscape: false,
+        onInput: (raw) => {
+            if (raw.toLowerCase() === "q")
+                return null;
+            return undefined;
+        },
+    });
+    return selected;
+}
+function adjustManageActionSelectionIndex(currentIndex, removedIndex, remainingCount) {
+    if (remainingCount <= 0) {
+        return 0;
+    }
+    if (typeof currentIndex !== "number" || currentIndex < 0) {
+        return 0;
+    }
+    if (currentIndex < removedIndex) {
+        return Math.min(currentIndex, remainingCount - 1);
+    }
+    if (currentIndex > removedIndex) {
+        return currentIndex - 1;
+    }
+    return Math.min(removedIndex, remainingCount - 1);
+}
+function resetManageActionSelection(storage, removedIndex) {
+    const remainingCount = storage.accounts.length;
+    if (remainingCount <= 0) {
+        storage.activeIndex = 0;
+        storage.activeIndexByFamily = {};
+        for (const family of MODEL_FAMILIES) {
+            storage.activeIndexByFamily[family] = 0;
+        }
+        return;
+    }
+    const previousActiveIndex = storage.activeIndex;
+    const previousByFamily = { ...storage.activeIndexByFamily };
+    storage.activeIndex = adjustManageActionSelectionIndex(previousActiveIndex, removedIndex, remainingCount);
+    storage.activeIndexByFamily = {};
+    for (const family of MODEL_FAMILIES) {
+        storage.activeIndexByFamily[family] = adjustManageActionSelectionIndex(previousByFamily[family] ?? previousActiveIndex, removedIndex, remainingCount);
+    }
+}
+function replaceManageActionStorage(target, source) {
+    target.version = source.version;
+    target.accounts = structuredClone(source.accounts);
+    target.activeIndex = source.activeIndex;
+    target.activeIndexByFamily = {
+        ...source.activeIndexByFamily,
+    };
+}
+function resolveManageActionAccountIndex(storage, fallbackIndex, account) {
+    if (account) {
+        const matchedIndex = findMatchingAccountIndex(storage.accounts, {
+            accountId: account.accountId,
+            email: account.email,
+            refreshToken: account.refreshToken,
+        }, {
+            allowUniqueAccountIdFallbackWithoutEmail: true,
+        });
+        if (typeof matchedIndex === "number" && matchedIndex >= 0) {
+            return matchedIndex;
+        }
+        return null;
+    }
+    return fallbackIndex >= 0 && fallbackIndex < storage.accounts.length
+        ? fallbackIndex
+        : null;
+}
+function matchesManageActionAccount(account, candidate) {
+    if (!account || !candidate) {
+        return false;
+    }
+    if (account.accountId || candidate.accountId) {
+        return account.accountId === candidate.accountId;
+    }
+    return (account.refreshToken === candidate.refreshToken &&
+        sanitizeEmail(account.email) === sanitizeEmail(candidate.email));
+}
+/** @internal */
+export async function handleManageAction(storage, menuResult) {
+    if (typeof menuResult.switchAccountIndex === "number") {
+        const index = menuResult.switchAccountIndex;
+        await runSwitchCommand([String(index + 1)], {
+            setStoragePath,
+            loadAccounts,
+            persistAndSyncSelectedAccount,
+        });
+        return;
+    }
+    if (typeof menuResult.deleteAccountIndex === "number") {
+        const idx = menuResult.deleteAccountIndex;
+        const selectedAccount = storage.accounts[idx];
+        let deleted = false;
+        if (selectedAccount) {
+            await withAccountStorageTransaction(async (loadedStorage, persist) => {
+                const nextStorage = loadedStorage
+                    ? structuredClone(loadedStorage)
+                    : structuredClone(storage);
+                const nextIndex = resolveManageActionAccountIndex(nextStorage, idx, selectedAccount);
+                if (nextIndex === null) {
+                    return;
+                }
+                const nextAccount = nextStorage.accounts[nextIndex];
+                if (!matchesManageActionAccount(selectedAccount, nextAccount)) {
+                    return;
+                }
+                nextStorage.accounts.splice(nextIndex, 1);
+                resetManageActionSelection(nextStorage, nextIndex);
+                await persist(nextStorage);
+                replaceManageActionStorage(storage, nextStorage);
+                deleted = true;
+            });
+        }
+        if (deleted) {
+            console.log(`Deleted account ${idx + 1}.`);
+        }
+        return;
+    }
+    if (typeof menuResult.toggleAccountIndex === "number") {
+        const idx = menuResult.toggleAccountIndex;
+        const selectedAccount = storage.accounts[idx];
+        let nextEnabledState = null;
+        if (selectedAccount) {
+            await withAccountStorageTransaction(async (loadedStorage, persist) => {
+                const nextStorage = loadedStorage
+                    ? structuredClone(loadedStorage)
+                    : structuredClone(storage);
+                const nextIndex = resolveManageActionAccountIndex(nextStorage, idx, selectedAccount);
+                if (nextIndex === null) {
+                    return;
+                }
+                const nextAccount = nextStorage.accounts[nextIndex];
+                if (!nextAccount ||
+                    !matchesManageActionAccount(selectedAccount, nextAccount)) {
+                    return;
+                }
+                nextAccount.enabled = nextAccount.enabled === false;
+                await persist(nextStorage);
+                replaceManageActionStorage(storage, nextStorage);
+                nextEnabledState = nextAccount.enabled !== false;
+            });
+        }
+        if (nextEnabledState !== null) {
+            console.log(`${nextEnabledState ? "Enabled" : "Disabled"} account ${idx + 1}.`);
+        }
+        return;
+    }
+    if (typeof menuResult.refreshAccountIndex === "number") {
+        const idx = menuResult.refreshAccountIndex;
+        const existing = storage.accounts[idx];
+        if (!existing)
+            return;
+        const signInMode = await promptOAuthSignInMode(null);
+        if (signInMode === "cancel") {
+            console.log(stylePromptText(UI_COPY.oauth.cancelledBackToMenu, "muted"));
+            return;
+        }
+        if (signInMode !== "browser" && signInMode !== "manual") {
+            return;
+        }
+        const tokenResult = await runOAuthFlow(true, signInMode);
+        if (tokenResult.type !== "success") {
+            console.error(`Refresh failed: ${tokenResult.message ?? tokenResult.reason ?? "unknown error"}`);
+            return;
+        }
+        const resolved = resolveAccountSelection(tokenResult);
+        await persistAccountPool([resolved], false);
+        await syncSelectionToCodex(resolved);
+        console.log(`Refreshed account ${idx + 1}.`);
+    }
+}

package/dist/lib/codex-manager/login-menu-data.d.ts

@@ -0,0 +1,19 @@
+import type { ExistingAccountInfo } from "../cli.js";
+import { type DashboardDisplaySettings } from "../dashboard-settings.js";
+import { type QuotaCacheData } from "../quota-cache.js";
+import { type RuntimeCurrentAccountSelection } from "../runtime/runtime-current-account.js";
+import type { AccountStorageV3 } from "../storage.js";
+/**
+ * Data layer for the login dashboard menu: quota auto-refresh targeting, the
+ * account-row view model (`ExistingAccountInfo`), runtime current-account
+ * resolution, and Codex CLI selection drift sync. Moved verbatim out of the
+ * `login` handler body in lib/codex-manager.ts (audit roadmap §4.1.1 phase 3).
+ * The interactive login control loop itself still lives in codex-manager.ts.
+ */
+export declare const DEFAULT_MENU_QUOTA_REFRESH_TTL_MS: number;
+export declare function countMenuQuotaRefreshTargets(storage: AccountStorageV3, cache: QuotaCacheData, maxAgeMs: number, now?: number): number;
+export declare function refreshQuotaCacheForMenu(storage: AccountStorageV3, cache: QuotaCacheData, maxAgeMs: number, onProgress?: (current: number, total: number) => void): Promise<QuotaCacheData>;
+export declare function toExistingAccountInfo(storage: AccountStorageV3, quotaCache: QuotaCacheData | null, displaySettings: DashboardDisplaySettings, runtimeCurrent?: RuntimeCurrentAccountSelection | null): ExistingAccountInfo[];
+export declare function loadRuntimeCurrentSelectionForStorage(storage: AccountStorageV3, now?: number): Promise<RuntimeCurrentAccountSelection | null>;
+export declare function syncCodexCliActiveSelectionIfDrifted(storage: AccountStorageV3): Promise<boolean>;
+//# sourceMappingURL=login-menu-data.d.ts.map

package/dist/lib/codex-manager/login-menu-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"login-menu-data.d.ts","sourceRoot":"","sources":["../../../lib/codex-manager/login-menu-data.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAGrD,OAAO,EAEN,KAAK,wBAAwB,EAE7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAEN,KAAK,cAAc,EAGnB,MAAM,mBAAmB,CAAC;AAe3B,OAAO,EAKN,KAAK,8BAA8B,EACnC,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAqB,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAczE;;;;;;GAMG;AAEH,eAAO,MAAM,iCAAiC,QAAa,CAAC;AA+E5D,wBAAgB,4BAA4B,CAC3C,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,MAAM,EAChB,GAAG,SAAa,GACd,MAAM,CAkBR;AAED,wBAAsB,wBAAwB,CAC7C,OAAO,EAAE,gBAAgB,EACzB,KAAK,EAAE,cAAc,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,GACnD,OAAO,CAAC,cAAc,CAAC,CAiGzB;AA0JD,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,gBAAgB,EACzB,UAAU,EAAE,cAAc,GAAG,IAAI,EACjC,eAAe,EAAE,wBAAwB,EACzC,cAAc,GAAE,8BAA8B,GAAG,IAAW,GAC1D,mBAAmB,EAAE,CA6EvB;AAED,wBAAsB,qCAAqC,CAC1D,OAAO,EAAE,gBAAgB,EACzB,GAAG,SAAa,GACd,OAAO,CAAC,8BAA8B,GAAG,IAAI,CAAC,CAgBhD;AAsBD,wBAAsB,oCAAoC,CACzD,OAAO,EAAE,gBAAgB,GACvB,OAAO,CAAC,OAAO,CAAC,CAyBlB"}