@openxiaobu/codexl 0.1.12 → 0.1.14

package/README.md

@@ -53,9 +53,8 @@ By default, `status` will:
   - A status column with local block reasons and countdowns (for example: `5h_limited(2h27m)`)
 - Enter an interactive mode where you can toggle `enabled` for accounts:
   - Up/Down: move selection
-  - Space: toggle `[x]` enabled / `[ ]` disabled
-  - Enter: confirm and save
-  - `q`: quit
+  - Space: toggle `[x]` enabled / `[ ]` disabled and save immediately
+  - Enter / `q`: exit the interactive mode
 
 If you only want a non-interactive snapshot of the current state:
 

package/dist/cli.js

@@ -12,6 +12,7 @@ const commander_1 = require("commander");
 const account_store_1 = require("./account-store");
 const config_1 = require("./config");
 const login_1 = require("./login");
+const scheduler_1 = require("./scheduler");
 const status_1 = require("./status");
 const usage_sync_1 = require("./usage-sync");
 /**
@@ -43,18 +44,32 @@ function getCliVersion() {
 async function handleStatus(options) {
     await (0, usage_sync_1.refreshAllAccountUsage)();
     const statuses = (0, status_1.collectAccountStatuses)();
-    console.log((0, status_1.renderStatusTable)(statuses));
+    const interactive = options?.interactive ?? true;
+    if (interactive) {
+        await handleInteractiveToggle(statuses);
+        return;
+    }
+    const selected = (0, scheduler_1.pickBestAccount)();
+    const displayStatuses = statuses.map((item) => ({
+        ...item,
+        name: item.id === selected?.account.id ? `${item.name}*` : item.name
+    }));
     const available = statuses.filter((item) => item.isAvailable).length;
     const fiveHourLimited = statuses.filter((item) => item.isFiveHourLimited && !item.isWeeklyLimited).length;
     const weeklyLimited = statuses.filter((item) => item.isWeeklyLimited).length;
+    console.log((0, status_1.renderStatusTable)(displayStatuses));
     console.log("");
     console.log(`available=${available} 5h_limited=${fiveHourLimited} weekly_limited=${weeklyLimited}`);
-    const interactive = options?.interactive ?? true;
-    if (interactive) {
-        await handleInteractiveToggle();
-    }
+    console.log(`selected=${selected ? selected.account.name : "none"}`);
 }
-async function handleInteractiveToggle() {
+/**
+ * 进入账号启用状态的交互式切换界面，并在用户确认退出后恢复终端状态。
+ *
+ * @param initialStatuses 进入交互前刚刷新的账号状态快照，用于首屏复用同一块展示区域。
+ * @returns Promise，在用户按下 `Enter`、`q` 或 `Ctrl+C` 退出交互后完成。
+ * @throws 无显式抛出；终端读写异常将沿调用链透出。
+ */
+async function handleInteractiveToggle(initialStatuses) {
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
         console.log("当前环境不支持交互式操作，请直接编辑配置文件或使用 --no-interactive 选项。");
         return;
@@ -73,79 +88,111 @@ async function handleInteractiveToggle() {
     let cursor = 0;
     let changed = false;
     let renderedLines = 0;
-    const render = () => {
-        const lines = [];
-        lines.push("空格切换选中账号启用状态，回车确认，q 退出：");
-        for (let i = 0; i < accounts.length; i += 1) {
-            const account = accounts[i];
-            const prefix = i === cursor ? ">" : " ";
-            const checkbox = account.enabled ? "[x]" : "[ ]";
-            lines.push(`${prefix} ${checkbox} ${account.name}  (${account.codex_home})`);
-        }
-        // 首次渲染时先换一行，避免粘在上一行输出后面。
-        if (renderedLines === 0) {
+    return await new Promise((resolve) => {
+        let closed = false;
+        const render = () => {
+            const latestStatuses = (0, status_1.collectAccountStatuses)();
+            const selected = (0, scheduler_1.pickBestAccount)();
+            const statusSource = changed ? latestStatuses : (initialStatuses ?? latestStatuses);
+            const displayStatuses = statusSource.map((item) => ({
+                ...item,
+                name: item.id === selected?.account.id ? `${item.name}*` : item.name
+            }));
+            const available = statusSource.filter((item) => item.isAvailable).length;
+            const fiveHourLimited = statusSource.filter((item) => item.isFiveHourLimited && !item.isWeeklyLimited).length;
+            const weeklyLimited = statusSource.filter((item) => item.isWeeklyLimited).length;
+            const autoSelectedId = selected?.account.id ?? null;
+            const lines = [
+                (0, status_1.renderStatusTable)(displayStatuses),
+                "",
+                `available=${available} 5h_limited=${fiveHourLimited} weekly_limited=${weeklyLimited}`,
+                `selected=${selected ? selected.account.name : "none"}`,
+                "",
+                "空格切换选中账号启用状态，Enter / q 退出："
+            ];
+            for (let i = 0; i < accounts.length; i += 1) {
+                const account = accounts[i];
+                const checkbox = account.enabled ? "[x]" : "[ ]";
+                const displayName = account.id === autoSelectedId ? `${account.name}*` : account.name;
+                const cursorSuffix = i === cursor ? "  <" : "";
+                lines.push(`${checkbox} ${displayName}  (${account.codex_home})${cursorSuffix}`);
+            }
+            // 首次渲染时先换一行，避免粘在上一行输出后面。
+            if (renderedLines === 0) {
+                process.stdout.write("\n");
+            }
+            else {
+                // 将光标移动到上一轮渲染块的起始行，保证整块内容原地刷新。
+                process.stdout.write(`\x1b[${renderedLines}A`);
+            }
+            renderedLines = lines.length;
+            process.stdout.write("\x1b[J");
+            process.stdout.write(lines.join("\n"));
             process.stdout.write("\n");
-        }
-        else {
-            // 将光标移动到上一轮渲染块的起始行。
-            process.stdout.write(`\x1b[${renderedLines}A`);
-        }
-        renderedLines = lines.length;
-        process.stdout.write(lines.join("\n"));
-        process.stdout.write("\n");
-    };
-    const applyChanges = () => {
-        if (!changed)
-            return;
-        const latest = (0, config_1.loadConfig)();
-        for (const account of accounts) {
-            const index = latest.accounts.findIndex((item) => item.id === account.id);
-            if (index >= 0) {
-                latest.accounts[index] = account;
+        };
+        const applyChanges = () => {
+            if (!changed) {
+                return;
             }
-        }
-        (0, config_1.saveConfig)(latest);
-        changed = false;
-    };
-    render();
-    const onKeypress = (_str, key) => {
-        if (key.name === "up") {
-            cursor = (cursor - 1 + accounts.length) % accounts.length;
-            render();
-            return;
-        }
-        if (key.name === "down") {
-            cursor = (cursor + 1) % accounts.length;
-            render();
-            return;
-        }
-        if (key.name === "space") {
-            accounts[cursor].enabled = !accounts[cursor].enabled;
-            changed = true;
-            applyChanges();
-            render();
-            return;
-        }
-        if (key.name === "return" || key.name === "enter") {
-            if (changed) {
-                applyChanges();
+            const latest = (0, config_1.loadConfig)();
+            for (const account of accounts) {
+                const index = latest.accounts.findIndex((item) => item.id === account.id);
+                if (index >= 0) {
+                    latest.accounts[index] = account;
+                }
+            }
+            (0, config_1.saveConfig)(latest);
+            changed = false;
+            initialStatuses = (0, status_1.collectAccountStatuses)();
+        };
+        const exitInteractive = () => {
+            if (closed) {
+                return;
             }
+            closed = true;
+            // 退出前先持久化本轮勾选变更，避免用户误以为切换未生效。
+            applyChanges();
             stdin.off("keypress", onKeypress);
             stdin.setRawMode?.(false);
-            console.log("\n已退出账号启用状态编辑。");
-            return;
-        }
-        if (key.name === "q" || (key.ctrl && key.name === "c")) {
-            if (changed) {
+            stdin.pause();
+            // 将光标移回交互块顶部并清空，确保命令行提示符直接回到正常位置。
+            if (renderedLines > 0) {
+                process.stdout.write(`\x1b[${renderedLines}A`);
+                process.stdout.write("\x1b[J");
+            }
+            console.log("已退出账号启用状态编辑。");
+            resolve();
+        };
+        const onKeypress = (_str, key) => {
+            if (key.name === "up") {
+                cursor = (cursor - 1 + accounts.length) % accounts.length;
+                render();
+                return;
+            }
+            if (key.name === "down") {
+                cursor = (cursor + 1) % accounts.length;
+                render();
+                return;
+            }
+            if (key.name === "space") {
+                // 空格直接切换当前选中账号的启用状态，并立即写回配置。
+                accounts[cursor].enabled = !accounts[cursor].enabled;
+                changed = true;
                 applyChanges();
+                render();
+                return;
             }
-            stdin.off("keypress", onKeypress);
-            stdin.setRawMode?.(false);
-            console.log("\n已退出账号启用状态编辑。");
-            return;
-        }
-    };
-    stdin.on("keypress", onKeypress);
+            if (key.name === "return" || key.name === "enter") {
+                exitInteractive();
+                return;
+            }
+            if (key.name === "q" || (key.ctrl && key.name === "c")) {
+                exitInteractive();
+            }
+        };
+        render();
+        stdin.on("keypress", onKeypress);
+    });
 }
 /**
  * 将已有的 Codex HOME 目录中的登录态复制到 codexl 自己的隔离目录并纳入管理。

package/dist/scheduler.js

@@ -11,6 +11,26 @@ function nextResetWeight(resetAt) {
     const diff = resetAt * 1000 - Date.now();
     return diff > 0 ? diff : Number.MAX_SAFE_INTEGER;
 }
+/**
+ * 判断账号当前是否仅命中可忽略的短期本地熔断。
+ *
+ * 这类熔断通常由瞬时网络抖动、上游 5xx 或短暂 token 刷新失败触发，
+ * 当系统只剩一个可调度账号时，不应因此立刻把它排除掉。
+ *
+ * @param status 账号运行时状态。
+ * @returns `true` 表示仅存在可回退的短期本地熔断；否则返回 `false`。
+ */
+function isSoftLocalBlocked(status) {
+    if (!status.localBlockUntil || status.localBlockUntil * 1000 <= Date.now()) {
+        return false;
+    }
+    return [
+        "request_failed",
+        "upstream_5xx",
+        "temporary_5m_limit",
+        "token_refresh_failed"
+    ].includes(status.localBlockReason ?? "");
+}
 /**
  * 选择当前最适合激活的账号。
  *
@@ -33,6 +53,7 @@ function listCandidateAccounts() {
     const config = (0, config_1.loadConfig)();
     const statuses = (0, status_1.collectAccountStatuses)();
     const accountMap = new Map(config.accounts.map((item) => [item.id, item]));
+    const eligible = statuses.filter((item) => item.enabled && item.exists && !item.isFiveHourLimited && !item.isWeeklyLimited);
     const available = statuses
         .filter((item) => item.isAvailable)
         .sort((left, right) => {
@@ -46,7 +67,12 @@ function listCandidateAccounts() {
         }
         return nextResetWeight(left.fiveHourResetsAt) - nextResetWeight(right.fiveHourResetsAt);
     });
-    return available
+    const ranked = available.length > 0 ? available : [];
+    // 当系统只剩一个具备真实凭据且未命中额度限制的账号时，允许忽略短期本地熔断继续兜底尝试。
+    if (ranked.length === 0 && eligible.length === 1 && isSoftLocalBlocked(eligible[0])) {
+        ranked.push(eligible[0]);
+    }
+    return ranked
         .map((winner) => {
         const account = accountMap.get(winner.id);
         if (!account) {
@@ -55,7 +81,9 @@ function listCandidateAccounts() {
         return {
             account,
             status: winner,
-            reason: "优先选择 5 小时窗口剩余额度最高且当前可用的账号"
+            reason: winner.isAvailable
+                ? "优先选择 5 小时窗口剩余额度最高且当前可用的账号"
+                : "当前仅剩一个可调度账号，忽略短期本地熔断后继续兜底尝试"
         };
     })
         .filter((item) => item !== null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openxiaobu/codexl",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "本地 Codex 多账号切换与状态管理工具",
   "type": "commonjs",
   "main": "dist/cli.js",