codex-team 0.0.2 → 0.0.3

package/README.md

@@ -20,6 +20,7 @@ codexm list [name]
 codexm save <name>
 codexm update
 codexm switch <name>
+codexm switch --auto --dry-run
 codexm remove <name> --yes
 codexm rename <old> <new>
 codexm quota refresh [name]
@@ -33,7 +34,7 @@ Use `--json` on query and mutation commands when you need machine-readable outpu
 1. Log into a target account with the native Codex CLI.
 2. Save the current auth snapshot with `codexm save <name>`.
 3. Repeat for other accounts.
-4. Switch between saved accounts with `codexm switch <name>`.
+4. Switch between saved accounts with `codexm switch <name>` or let the tool choose with `codexm switch --auto`.
 5. Refresh and inspect quota usage with `codexm list` or `codexm quota refresh`.
 
 ## Development

package/dist/cli.cjs

@@ -910,6 +910,7 @@ Usage:
   codexm update [--json]
   codexm quota refresh [name] [--json]
   codexm switch <name> [--json]
+  codexm switch --auto [--dry-run] [--json]
   codexm remove <name> [--yes] [--json]
   codexm rename <old> <new> [--json]
   codexm doctor [--json]
@@ -973,6 +974,69 @@ Account names must match /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/.
                 failures: result.failures
             };
         }
+        function computeRemainingPercent(usedPercent) {
+            if ("number" != typeof usedPercent) return null;
+            return Math.max(0, 100 - usedPercent);
+        }
+        function toAutoSwitchCandidate(account) {
+            if ("ok" !== account.status) return null;
+            const remain5h = computeRemainingPercent(account.five_hour?.used_percent);
+            const remain1w = computeRemainingPercent(account.one_week?.used_percent);
+            if (null === remain5h || null === remain1w) return null;
+            return {
+                name: account.name,
+                account_id: account.account_id,
+                plan_type: account.plan_type,
+                available: computeAvailability(account),
+                refresh_status: "ok",
+                effective_score: Math.min(remain5h, 3 * remain1w),
+                remain_5h: remain5h,
+                remain_1w_eq_5h: 3 * remain1w,
+                five_hour_used: account.five_hour?.used_percent ?? 0,
+                one_week_used: account.one_week?.used_percent ?? 0,
+                five_hour_reset_at: account.five_hour?.reset_at ?? null,
+                one_week_reset_at: account.one_week?.reset_at ?? null
+            };
+        }
+        function compareNullableDateAscending(left, right) {
+            if (left === right) return 0;
+            if (null === left) return 1;
+            if (null === right) return -1;
+            return left.localeCompare(right);
+        }
+        function rankAutoSwitchCandidates(accounts) {
+            return accounts.map(toAutoSwitchCandidate).filter((candidate)=>null !== candidate).sort((left, right)=>{
+                if (right.effective_score !== left.effective_score) return right.effective_score - left.effective_score;
+                if (right.remain_5h !== left.remain_5h) return right.remain_5h - left.remain_5h;
+                if (right.remain_1w_eq_5h !== left.remain_1w_eq_5h) return right.remain_1w_eq_5h - left.remain_1w_eq_5h;
+                const fiveHourResetOrder = compareNullableDateAscending(left.five_hour_reset_at, right.five_hour_reset_at);
+                if (0 !== fiveHourResetOrder) return fiveHourResetOrder;
+                const oneWeekResetOrder = compareNullableDateAscending(left.one_week_reset_at, right.one_week_reset_at);
+                if (0 !== oneWeekResetOrder) return oneWeekResetOrder;
+                return left.name.localeCompare(right.name);
+            });
+        }
+        function describeAutoSwitchSelection(candidate, dryRun, backupPath, warnings) {
+            const lines = [
+                dryRun ? `Best account: "${candidate.name}" (${maskAccountId(candidate.account_id)}).` : `Auto-switched to "${candidate.name}" (${maskAccountId(candidate.account_id)}).`,
+                `Score: ${candidate.effective_score}`,
+                `5H remaining: ${candidate.remain_5h}%`,
+                `1W remaining (5H-equivalent): ${candidate.remain_1w_eq_5h}%`
+            ];
+            if (backupPath) lines.push(`Backup: ${backupPath}`);
+            for (const warning of warnings)lines.push(`Warning: ${warning}`);
+            return lines.join("\n");
+        }
+        function describeAutoSwitchNoop(candidate, warnings) {
+            const lines = [
+                `Current account "${candidate.name}" (${maskAccountId(candidate.account_id)}) is already the best available account.`,
+                `Score: ${candidate.effective_score}`,
+                `5H remaining: ${candidate.remain_5h}%`,
+                `1W remaining (5H-equivalent): ${candidate.remain_1w_eq_5h}%`
+            ];
+            for (const warning of warnings)lines.push(`Warning: ${warning}`);
+            return lines.join("\n");
+        }
         function describeQuotaAccounts(accounts, warnings) {
             if (0 === accounts.length) return 0 === warnings.length ? "No saved accounts." : warnings.map((warning)=>`Warning: ${warning}`).join("\n");
             const table = formatTable(accounts.map((account)=>({
@@ -1145,7 +1209,74 @@ Account names must match /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/.
                         }
                     case "switch":
                         {
+                            const auto = parsed.flags.has("--auto");
+                            const dryRun = parsed.flags.has("--dry-run");
                             const name = parsed.positionals[0];
+                            if (dryRun && !auto) throw new Error("Usage: codexm switch --auto [--dry-run] [--json]");
+                            if (auto) {
+                                if (name) throw new Error("Usage: codexm switch --auto [--dry-run] [--json]");
+                                const refreshResult = await store.refreshAllQuotas();
+                                const candidates = rankAutoSwitchCandidates(refreshResult.successes);
+                                if (0 === candidates.length) throw new Error("No auto-switch candidate has both 5H and 1W quota data available.");
+                                const selected = candidates[0];
+                                const selectedQuota = refreshResult.successes.find((account)=>account.name === selected.name) ?? null;
+                                const warnings = refreshResult.failures.map((failure)=>`${failure.name}: ${failure.error}`);
+                                if (dryRun) {
+                                    const payload = {
+                                        ok: true,
+                                        action: "switch",
+                                        mode: "auto",
+                                        dry_run: true,
+                                        selected,
+                                        candidates,
+                                        warnings
+                                    };
+                                    if (json) writeJson(streams.stdout, payload);
+                                    else streams.stdout.write(`${describeAutoSwitchSelection(selected, true, null, warnings)}\n`);
+                                    return 0 === refreshResult.failures.length ? 0 : 1;
+                                }
+                                const currentStatus = await store.getCurrentStatus();
+                                if ("available" === selected.available && currentStatus.matched_accounts.includes(selected.name)) {
+                                    const payload = {
+                                        ok: true,
+                                        action: "switch",
+                                        mode: "auto",
+                                        skipped: true,
+                                        reason: "already_current_best",
+                                        account: {
+                                            name: selected.name,
+                                            account_id: selected.account_id
+                                        },
+                                        selected,
+                                        candidates,
+                                        quota: selectedQuota ? toCliQuotaSummary(selectedQuota) : null,
+                                        warnings
+                                    };
+                                    if (json) writeJson(streams.stdout, payload);
+                                    else streams.stdout.write(`${describeAutoSwitchNoop(selected, warnings)}\n`);
+                                    return 0 === refreshResult.failures.length ? 0 : 1;
+                                }
+                                const result = await store.switchAccount(selected.name);
+                                for (const warning of warnings)result.warnings.push(warning);
+                                const payload = {
+                                    ok: true,
+                                    action: "switch",
+                                    mode: "auto",
+                                    account: {
+                                        name: result.account.name,
+                                        account_id: result.account.account_id,
+                                        auth_mode: result.account.auth_mode
+                                    },
+                                    selected,
+                                    candidates,
+                                    quota: selectedQuota ? toCliQuotaSummary(selectedQuota) : null,
+                                    backup_path: result.backup_path,
+                                    warnings: result.warnings
+                                };
+                                if (json) writeJson(streams.stdout, payload);
+                                else streams.stdout.write(`${describeAutoSwitchSelection(selected, false, result.backup_path, result.warnings)}\n`);
+                                return 0 === refreshResult.failures.length ? 0 : 1;
+                            }
                             if (!name) throw new Error("Usage: codexm switch <name>");
                             const result = await store.switchAccount(name);
                             let quota = null;

package/dist/main.cjs

@@ -940,6 +940,7 @@ Usage:
   codexm update [--json]
   codexm quota refresh [name] [--json]
   codexm switch <name> [--json]
+  codexm switch --auto [--dry-run] [--json]
   codexm remove <name> [--yes] [--json]
   codexm rename <old> <new> [--json]
   codexm doctor [--json]
@@ -1003,6 +1004,69 @@ function toCliQuotaRefreshResult(result) {
         failures: result.failures
     };
 }
+function computeRemainingPercent(usedPercent) {
+    if ("number" != typeof usedPercent) return null;
+    return Math.max(0, 100 - usedPercent);
+}
+function toAutoSwitchCandidate(account) {
+    if ("ok" !== account.status) return null;
+    const remain5h = computeRemainingPercent(account.five_hour?.used_percent);
+    const remain1w = computeRemainingPercent(account.one_week?.used_percent);
+    if (null === remain5h || null === remain1w) return null;
+    return {
+        name: account.name,
+        account_id: account.account_id,
+        plan_type: account.plan_type,
+        available: computeAvailability(account),
+        refresh_status: "ok",
+        effective_score: Math.min(remain5h, 3 * remain1w),
+        remain_5h: remain5h,
+        remain_1w_eq_5h: 3 * remain1w,
+        five_hour_used: account.five_hour?.used_percent ?? 0,
+        one_week_used: account.one_week?.used_percent ?? 0,
+        five_hour_reset_at: account.five_hour?.reset_at ?? null,
+        one_week_reset_at: account.one_week?.reset_at ?? null
+    };
+}
+function compareNullableDateAscending(left, right) {
+    if (left === right) return 0;
+    if (null === left) return 1;
+    if (null === right) return -1;
+    return left.localeCompare(right);
+}
+function rankAutoSwitchCandidates(accounts) {
+    return accounts.map(toAutoSwitchCandidate).filter((candidate)=>null !== candidate).sort((left, right)=>{
+        if (right.effective_score !== left.effective_score) return right.effective_score - left.effective_score;
+        if (right.remain_5h !== left.remain_5h) return right.remain_5h - left.remain_5h;
+        if (right.remain_1w_eq_5h !== left.remain_1w_eq_5h) return right.remain_1w_eq_5h - left.remain_1w_eq_5h;
+        const fiveHourResetOrder = compareNullableDateAscending(left.five_hour_reset_at, right.five_hour_reset_at);
+        if (0 !== fiveHourResetOrder) return fiveHourResetOrder;
+        const oneWeekResetOrder = compareNullableDateAscending(left.one_week_reset_at, right.one_week_reset_at);
+        if (0 !== oneWeekResetOrder) return oneWeekResetOrder;
+        return left.name.localeCompare(right.name);
+    });
+}
+function describeAutoSwitchSelection(candidate, dryRun, backupPath, warnings) {
+    const lines = [
+        dryRun ? `Best account: "${candidate.name}" (${maskAccountId(candidate.account_id)}).` : `Auto-switched to "${candidate.name}" (${maskAccountId(candidate.account_id)}).`,
+        `Score: ${candidate.effective_score}`,
+        `5H remaining: ${candidate.remain_5h}%`,
+        `1W remaining (5H-equivalent): ${candidate.remain_1w_eq_5h}%`
+    ];
+    if (backupPath) lines.push(`Backup: ${backupPath}`);
+    for (const warning of warnings)lines.push(`Warning: ${warning}`);
+    return lines.join("\n");
+}
+function describeAutoSwitchNoop(candidate, warnings) {
+    const lines = [
+        `Current account "${candidate.name}" (${maskAccountId(candidate.account_id)}) is already the best available account.`,
+        `Score: ${candidate.effective_score}`,
+        `5H remaining: ${candidate.remain_5h}%`,
+        `1W remaining (5H-equivalent): ${candidate.remain_1w_eq_5h}%`
+    ];
+    for (const warning of warnings)lines.push(`Warning: ${warning}`);
+    return lines.join("\n");
+}
 function describeQuotaAccounts(accounts, warnings) {
     if (0 === accounts.length) return 0 === warnings.length ? "No saved accounts." : warnings.map((warning)=>`Warning: ${warning}`).join("\n");
     const table = formatTable(accounts.map((account)=>({
@@ -1175,7 +1239,74 @@ async function runCli(argv, options = {}) {
                 }
             case "switch":
                 {
+                    const auto = parsed.flags.has("--auto");
+                    const dryRun = parsed.flags.has("--dry-run");
                     const name = parsed.positionals[0];
+                    if (dryRun && !auto) throw new Error("Usage: codexm switch --auto [--dry-run] [--json]");
+                    if (auto) {
+                        if (name) throw new Error("Usage: codexm switch --auto [--dry-run] [--json]");
+                        const refreshResult = await store.refreshAllQuotas();
+                        const candidates = rankAutoSwitchCandidates(refreshResult.successes);
+                        if (0 === candidates.length) throw new Error("No auto-switch candidate has both 5H and 1W quota data available.");
+                        const selected = candidates[0];
+                        const selectedQuota = refreshResult.successes.find((account)=>account.name === selected.name) ?? null;
+                        const warnings = refreshResult.failures.map((failure)=>`${failure.name}: ${failure.error}`);
+                        if (dryRun) {
+                            const payload = {
+                                ok: true,
+                                action: "switch",
+                                mode: "auto",
+                                dry_run: true,
+                                selected,
+                                candidates,
+                                warnings
+                            };
+                            if (json) writeJson(streams.stdout, payload);
+                            else streams.stdout.write(`${describeAutoSwitchSelection(selected, true, null, warnings)}\n`);
+                            return 0 === refreshResult.failures.length ? 0 : 1;
+                        }
+                        const currentStatus = await store.getCurrentStatus();
+                        if ("available" === selected.available && currentStatus.matched_accounts.includes(selected.name)) {
+                            const payload = {
+                                ok: true,
+                                action: "switch",
+                                mode: "auto",
+                                skipped: true,
+                                reason: "already_current_best",
+                                account: {
+                                    name: selected.name,
+                                    account_id: selected.account_id
+                                },
+                                selected,
+                                candidates,
+                                quota: selectedQuota ? toCliQuotaSummary(selectedQuota) : null,
+                                warnings
+                            };
+                            if (json) writeJson(streams.stdout, payload);
+                            else streams.stdout.write(`${describeAutoSwitchNoop(selected, warnings)}\n`);
+                            return 0 === refreshResult.failures.length ? 0 : 1;
+                        }
+                        const result = await store.switchAccount(selected.name);
+                        for (const warning of warnings)result.warnings.push(warning);
+                        const payload = {
+                            ok: true,
+                            action: "switch",
+                            mode: "auto",
+                            account: {
+                                name: result.account.name,
+                                account_id: result.account.account_id,
+                                auth_mode: result.account.auth_mode
+                            },
+                            selected,
+                            candidates,
+                            quota: selectedQuota ? toCliQuotaSummary(selectedQuota) : null,
+                            backup_path: result.backup_path,
+                            warnings: result.warnings
+                        };
+                        if (json) writeJson(streams.stdout, payload);
+                        else streams.stdout.write(`${describeAutoSwitchSelection(selected, false, result.backup_path, result.warnings)}\n`);
+                        return 0 === refreshResult.failures.length ? 0 : 1;
+                    }
                     if (!name) throw new Error("Usage: codexm switch <name>");
                     const result = await store.switchAccount(name);
                     let quota = null;

package/dist/main.js

@@ -900,6 +900,7 @@ Usage:
   codexm update [--json]
   codexm quota refresh [name] [--json]
   codexm switch <name> [--json]
+  codexm switch --auto [--dry-run] [--json]
   codexm remove <name> [--yes] [--json]
   codexm rename <old> <new> [--json]
   codexm doctor [--json]
@@ -963,6 +964,69 @@ function toCliQuotaRefreshResult(result) {
         failures: result.failures
     };
 }
+function computeRemainingPercent(usedPercent) {
+    if ("number" != typeof usedPercent) return null;
+    return Math.max(0, 100 - usedPercent);
+}
+function toAutoSwitchCandidate(account) {
+    if ("ok" !== account.status) return null;
+    const remain5h = computeRemainingPercent(account.five_hour?.used_percent);
+    const remain1w = computeRemainingPercent(account.one_week?.used_percent);
+    if (null === remain5h || null === remain1w) return null;
+    return {
+        name: account.name,
+        account_id: account.account_id,
+        plan_type: account.plan_type,
+        available: computeAvailability(account),
+        refresh_status: "ok",
+        effective_score: Math.min(remain5h, 3 * remain1w),
+        remain_5h: remain5h,
+        remain_1w_eq_5h: 3 * remain1w,
+        five_hour_used: account.five_hour?.used_percent ?? 0,
+        one_week_used: account.one_week?.used_percent ?? 0,
+        five_hour_reset_at: account.five_hour?.reset_at ?? null,
+        one_week_reset_at: account.one_week?.reset_at ?? null
+    };
+}
+function compareNullableDateAscending(left, right) {
+    if (left === right) return 0;
+    if (null === left) return 1;
+    if (null === right) return -1;
+    return left.localeCompare(right);
+}
+function rankAutoSwitchCandidates(accounts) {
+    return accounts.map(toAutoSwitchCandidate).filter((candidate)=>null !== candidate).sort((left, right)=>{
+        if (right.effective_score !== left.effective_score) return right.effective_score - left.effective_score;
+        if (right.remain_5h !== left.remain_5h) return right.remain_5h - left.remain_5h;
+        if (right.remain_1w_eq_5h !== left.remain_1w_eq_5h) return right.remain_1w_eq_5h - left.remain_1w_eq_5h;
+        const fiveHourResetOrder = compareNullableDateAscending(left.five_hour_reset_at, right.five_hour_reset_at);
+        if (0 !== fiveHourResetOrder) return fiveHourResetOrder;
+        const oneWeekResetOrder = compareNullableDateAscending(left.one_week_reset_at, right.one_week_reset_at);
+        if (0 !== oneWeekResetOrder) return oneWeekResetOrder;
+        return left.name.localeCompare(right.name);
+    });
+}
+function describeAutoSwitchSelection(candidate, dryRun, backupPath, warnings) {
+    const lines = [
+        dryRun ? `Best account: "${candidate.name}" (${maskAccountId(candidate.account_id)}).` : `Auto-switched to "${candidate.name}" (${maskAccountId(candidate.account_id)}).`,
+        `Score: ${candidate.effective_score}`,
+        `5H remaining: ${candidate.remain_5h}%`,
+        `1W remaining (5H-equivalent): ${candidate.remain_1w_eq_5h}%`
+    ];
+    if (backupPath) lines.push(`Backup: ${backupPath}`);
+    for (const warning of warnings)lines.push(`Warning: ${warning}`);
+    return lines.join("\n");
+}
+function describeAutoSwitchNoop(candidate, warnings) {
+    const lines = [
+        `Current account "${candidate.name}" (${maskAccountId(candidate.account_id)}) is already the best available account.`,
+        `Score: ${candidate.effective_score}`,
+        `5H remaining: ${candidate.remain_5h}%`,
+        `1W remaining (5H-equivalent): ${candidate.remain_1w_eq_5h}%`
+    ];
+    for (const warning of warnings)lines.push(`Warning: ${warning}`);
+    return lines.join("\n");
+}
 function describeQuotaAccounts(accounts, warnings) {
     if (0 === accounts.length) return 0 === warnings.length ? "No saved accounts." : warnings.map((warning)=>`Warning: ${warning}`).join("\n");
     const table = formatTable(accounts.map((account)=>({
@@ -1135,7 +1199,74 @@ async function runCli(argv, options = {}) {
                 }
             case "switch":
                 {
+                    const auto = parsed.flags.has("--auto");
+                    const dryRun = parsed.flags.has("--dry-run");
                     const name = parsed.positionals[0];
+                    if (dryRun && !auto) throw new Error("Usage: codexm switch --auto [--dry-run] [--json]");
+                    if (auto) {
+                        if (name) throw new Error("Usage: codexm switch --auto [--dry-run] [--json]");
+                        const refreshResult = await store.refreshAllQuotas();
+                        const candidates = rankAutoSwitchCandidates(refreshResult.successes);
+                        if (0 === candidates.length) throw new Error("No auto-switch candidate has both 5H and 1W quota data available.");
+                        const selected = candidates[0];
+                        const selectedQuota = refreshResult.successes.find((account)=>account.name === selected.name) ?? null;
+                        const warnings = refreshResult.failures.map((failure)=>`${failure.name}: ${failure.error}`);
+                        if (dryRun) {
+                            const payload = {
+                                ok: true,
+                                action: "switch",
+                                mode: "auto",
+                                dry_run: true,
+                                selected,
+                                candidates,
+                                warnings
+                            };
+                            if (json) writeJson(streams.stdout, payload);
+                            else streams.stdout.write(`${describeAutoSwitchSelection(selected, true, null, warnings)}\n`);
+                            return 0 === refreshResult.failures.length ? 0 : 1;
+                        }
+                        const currentStatus = await store.getCurrentStatus();
+                        if ("available" === selected.available && currentStatus.matched_accounts.includes(selected.name)) {
+                            const payload = {
+                                ok: true,
+                                action: "switch",
+                                mode: "auto",
+                                skipped: true,
+                                reason: "already_current_best",
+                                account: {
+                                    name: selected.name,
+                                    account_id: selected.account_id
+                                },
+                                selected,
+                                candidates,
+                                quota: selectedQuota ? toCliQuotaSummary(selectedQuota) : null,
+                                warnings
+                            };
+                            if (json) writeJson(streams.stdout, payload);
+                            else streams.stdout.write(`${describeAutoSwitchNoop(selected, warnings)}\n`);
+                            return 0 === refreshResult.failures.length ? 0 : 1;
+                        }
+                        const result = await store.switchAccount(selected.name);
+                        for (const warning of warnings)result.warnings.push(warning);
+                        const payload = {
+                            ok: true,
+                            action: "switch",
+                            mode: "auto",
+                            account: {
+                                name: result.account.name,
+                                account_id: result.account.account_id,
+                                auth_mode: result.account.auth_mode
+                            },
+                            selected,
+                            candidates,
+                            quota: selectedQuota ? toCliQuotaSummary(selectedQuota) : null,
+                            backup_path: result.backup_path,
+                            warnings: result.warnings
+                        };
+                        if (json) writeJson(streams.stdout, payload);
+                        else streams.stdout.write(`${describeAutoSwitchSelection(selected, false, result.backup_path, result.warnings)}\n`);
+                        return 0 === refreshResult.failures.length ? 0 : 1;
+                    }
                     if (!name) throw new Error("Usage: codexm switch <name>");
                     const result = await store.switchAccount(name);
                     let quota = null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-team",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Manage multiple Codex ChatGPT auth snapshots and quota usage from the command line.",
   "license": "MIT",
   "type": "module",