codex-slot 0.1.1 → 0.1.3

package/dist/state.js

@@ -10,11 +10,14 @@ exports.pruneExpiredBlocks = pruneExpiredBlocks;
 exports.getAccountBlock = getAccountBlock;
 exports.setUsageCache = setUsageCache;
 exports.getUsageCache = getUsageCache;
+exports.getManagedCodexConfigState = getManagedCodexConfigState;
+exports.setManagedCodexConfigState = setManagedCodexConfigState;
+exports.clearManagedCodexConfigState = clearManagedCodexConfigState;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const config_1 = require("./config");
 function getStatePath() {
-    return node_path_1.default.join((0, config_1.getCodexSwHome)(), "state.json");
+    return node_path_1.default.join((0, config_1.getCslotHome)(), "state.json");
 }
 /**
  * 读取 cslot 的本地运行状态；文件不存在时返回默认空状态。
@@ -26,7 +29,8 @@ function loadState() {
     if (!node_fs_1.default.existsSync(statePath)) {
         return {
             account_blocks: {},
-            usage_cache: {}
+            usage_cache: {},
+            managed_codex_config: null
         };
     }
     const raw = node_fs_1.default.readFileSync(statePath, "utf8");
@@ -34,11 +38,13 @@ function loadState() {
         ? JSON.parse(raw)
         : {
             account_blocks: {},
-            usage_cache: {}
+            usage_cache: {},
+            managed_codex_config: null
         };
     return {
         account_blocks: parsed.account_blocks ?? {},
-        usage_cache: parsed.usage_cache ?? {}
+        usage_cache: parsed.usage_cache ?? {},
+        managed_codex_config: parsed.managed_codex_config ?? null
     };
 }
 /**
@@ -119,3 +125,33 @@ function getUsageCache(accountId) {
     const state = loadState();
     return state.usage_cache[accountId] ?? null;
 }
+/**
+ * 读取当前记录的 Codex `config.toml` 接管快照。
+ *
+ * @returns 最近一次接管时保存的快照；不存在时返回 `null`。
+ */
+function getManagedCodexConfigState() {
+    const state = loadState();
+    return state.managed_codex_config ?? null;
+}
+/**
+ * 保存 Codex `config.toml` 接管快照，用于后续停止服务时精确恢复。
+ *
+ * @param managedState 接管前保存的原始片段快照。
+ * @returns 无返回值。
+ */
+function setManagedCodexConfigState(managedState) {
+    const state = loadState();
+    state.managed_codex_config = managedState;
+    saveState(state);
+}
+/**
+ * 清理 Codex `config.toml` 接管快照。
+ *
+ * @returns 无返回值。
+ */
+function clearManagedCodexConfigState() {
+    const state = loadState();
+    state.managed_codex_config = null;
+    saveState(state);
+}

package/dist/status-command.js

@@ -0,0 +1,216 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleStatus = handleStatus;
+const node_readline_1 = __importDefault(require("node:readline"));
+const account_service_1 = require("./app/account-service");
+const status_service_1 = require("./app/status-service");
+const scheduler_1 = require("./scheduler");
+const status_1 = require("./status");
+const text_1 = require("./text");
+/**
+ * 进入交互式全屏缓冲区，并隐藏光标，确保后续重绘始终基于固定画布。
+ *
+ * @returns 无返回值。
+ * @throws 无显式抛出。
+ */
+function enterInteractiveScreen() {
+    process.stdout.write("\x1b[?1049h");
+    process.stdout.write("\x1b[?25l");
+}
+/**
+ * 退出交互式全屏缓冲区，并恢复光标显示。
+ *
+ * @returns 无返回值。
+ * @throws 无显式抛出。
+ */
+function leaveInteractiveScreen() {
+    process.stdout.write("\x1b[?25h");
+    process.stdout.write("\x1b[?1049l");
+}
+/**
+ * 在交互式全屏缓冲区中从左上角整块重绘内容。
+ *
+ * @param lines 待输出的文本行数组。
+ * @returns 无返回值。
+ * @throws 无显式抛出。
+ */
+function renderInteractiveScreen(lines) {
+    node_readline_1.default.cursorTo(process.stdout, 0, 0);
+    node_readline_1.default.clearScreenDown(process.stdout);
+    process.stdout.write(lines.join("\n"));
+    process.stdout.write("\n");
+}
+/**
+ * 计算交互式状态面板的初始光标位置。
+ *
+ * 业务规则：
+ * 1. 优先定位到当前自动调度选中的账号。
+ * 2. 若没有自动选中账号，则回退到首个可用账号。
+ * 3. 若所有账号都不可用，则回退到首个已启用账号。
+ *
+ * @param accounts 已按展示顺序排好的账号列表。
+ * @param statuses 当前账号运行时状态快照。
+ * @returns 初始光标所在的数组下标。
+ * @throws 无显式抛出。
+ */
+function resolveInitialCursorIndex(accounts, statuses) {
+    const selected = (0, scheduler_1.pickBestAccount)();
+    if (selected) {
+        const selectedIndex = accounts.findIndex((account) => account.id === selected.account.id);
+        if (selectedIndex >= 0) {
+            return selectedIndex;
+        }
+    }
+    const statusById = new Map(statuses.map((item) => [item.id, item]));
+    const availableIndex = accounts.findIndex((account) => statusById.get(account.id)?.isAvailable);
+    if (availableIndex >= 0) {
+        return availableIndex;
+    }
+    const enabledIndex = accounts.findIndex((account) => account.enabled);
+    if (enabledIndex >= 0) {
+        return enabledIndex;
+    }
+    return 0;
+}
+/**
+ * 进入账号启用状态的交互式切换界面，并在用户确认退出后恢复终端状态。
+ *
+ * @param initialStatuses 进入交互前刚刷新的账号状态快照，用于首屏复用同一块展示区域。
+ * @returns Promise，在用户按下 `Enter`、`q` 或 `Ctrl+C` 退出交互后完成。
+ * @throws 当终端读写异常时透传底层错误。
+ */
+async function handleInteractiveToggle(initialStatuses) {
+    if (!process.stdin.isTTY || !process.stdout.isTTY) {
+        console.log((0, text_1.bi)("当前环境不支持交互式操作，请直接编辑配置文件或使用 --no-interactive 选项。", "Interactive mode is unavailable in the current environment. Edit the config file directly or use --no-interactive."));
+        return;
+    }
+    const stdin = process.stdin;
+    node_readline_1.default.emitKeypressEvents(stdin);
+    stdin.setRawMode?.(true);
+    const accountsFromConfig = (0, account_service_1.listAccounts)();
+    if (accountsFromConfig.length === 0) {
+        console.log((0, text_1.bi)("当前没有已录入账号。", "No managed accounts found."));
+        stdin.setRawMode?.(false);
+        return;
+    }
+    const accounts = [...accountsFromConfig].sort((left, right) => left.name.localeCompare(right.name));
+    let cursor = resolveInitialCursorIndex(accounts, initialStatuses ?? (0, status_1.collectAccountStatuses)());
+    let changed = false;
+    enterInteractiveScreen();
+    return await new Promise((resolve) => {
+        let closed = false;
+        const render = () => {
+            const latestSnapshot = (0, status_service_1.getStatusSnapshot)();
+            const statusSource = changed ? latestSnapshot.statuses : (initialStatuses ?? latestSnapshot.statuses);
+            const statusById = new Map(statusSource.map((item) => [item.id, item]));
+            const autoSelectedId = (0, scheduler_1.pickBestAccount)()?.account.id ?? null;
+            const summary = (0, status_1.summarizeAccountStatuses)(statusSource);
+            const displayStatuses = accounts
+                .map((account) => {
+                const status = statusById.get(account.id);
+                if (!status) {
+                    return null;
+                }
+                return {
+                    ...status,
+                    name: account.id === autoSelectedId ? `${status.name}*` : status.name
+                };
+            })
+                .filter((item) => item !== null);
+            renderInteractiveScreen([
+                (0, status_1.renderStatusTable)(displayStatuses, {
+                    selectorColumn: {
+                        enabledById: Object.fromEntries(accounts.map((account) => [account.id, account.enabled])),
+                        cursorAccountId: accounts[cursor]?.id ?? null
+                    }
+                }),
+                "",
+                `available=${summary.available} 5h_limited=${summary.fiveHourLimited} weekly_limited=${summary.weeklyLimited}`,
+                `selected=${latestSnapshot.selectedName ?? "none"}`,
+                "",
+                (0, text_1.bi)("空格切换当前行启用状态，Enter / q 退出。", "Press Space to toggle the current row, Enter or q to exit.")
+            ]);
+        };
+        const applyChanges = () => {
+            if (!changed) {
+                return;
+            }
+            (0, status_service_1.persistAccountEnabledState)(accounts);
+            changed = false;
+            initialStatuses = (0, status_1.collectAccountStatuses)();
+        };
+        const exitInteractive = () => {
+            if (closed) {
+                return;
+            }
+            closed = true;
+            applyChanges();
+            stdin.off("keypress", onKeypress);
+            stdin.setRawMode?.(false);
+            stdin.pause();
+            leaveInteractiveScreen();
+            console.log((0, text_1.bi)("已退出账号启用状态编辑。", "Exited account toggle mode."));
+            resolve();
+        };
+        const onKeypress = (_input, key) => {
+            if (key.name === "up") {
+                const nextCursor = Math.max(0, cursor - 1);
+                if (nextCursor !== cursor) {
+                    cursor = nextCursor;
+                    render();
+                }
+                return;
+            }
+            if (key.name === "down") {
+                const nextCursor = Math.min(accounts.length - 1, cursor + 1);
+                if (nextCursor !== cursor) {
+                    cursor = nextCursor;
+                    render();
+                }
+                return;
+            }
+            if (key.name === "space") {
+                accounts[cursor].enabled = !accounts[cursor].enabled;
+                changed = true;
+                applyChanges();
+                render();
+                return;
+            }
+            if (key.name === "return" || key.name === "enter") {
+                exitInteractive();
+                return;
+            }
+            if (key.name === "q" || (key.ctrl && key.name === "c")) {
+                exitInteractive();
+            }
+        };
+        render();
+        stdin.on("keypress", onKeypress);
+    });
+}
+/**
+ * 刷新所有已录入账号的远端额度，并输出最新状态表格。
+ *
+ * @param options 状态命令配置；默认进入交互式启用开关界面。
+ * @returns Promise，无返回值。
+ * @throws 当额度刷新或终端交互失败时透传底层异常。
+ */
+async function handleStatus(options) {
+    const snapshot = await (0, status_service_1.refreshStatusSnapshot)();
+    const interactive = options?.interactive ?? true;
+    if (interactive) {
+        await handleInteractiveToggle(snapshot.statuses);
+        return;
+    }
+    const displayStatuses = snapshot.statuses.map((item) => ({
+        ...item,
+        name: item.id === (0, scheduler_1.pickBestAccount)()?.account.id ? `${item.name}*` : item.name
+    }));
+    console.log((0, status_1.renderStatusTable)(displayStatuses));
+    console.log("");
+    console.log(`available=${snapshot.summary.available} 5h_limited=${snapshot.summary.fiveHourLimited} weekly_limited=${snapshot.summary.weeklyLimited}`);
+    console.log(`selected=${snapshot.selectedName ?? "none"}`);
+}

package/dist/status.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectAccountStatuses = collectAccountStatuses;
+exports.summarizeAccountStatuses = summarizeAccountStatuses;
 exports.renderStatusTable = renderStatusTable;
 const config_1 = require("./config");
 const account_store_1 = require("./account-store");
 const state_1 = require("./state");
+const text_1 = require("./text");
 function computeLeftPercent(usedPercent) {
     if (usedPercent === null || usedPercent === undefined || Number.isNaN(usedPercent)) {
         return null;
@@ -24,12 +26,7 @@ function formatPercent(value) {
     return value === null ? "-" : `${value}%`;
 }
 function formatReset(unixSeconds) {
-    if (!unixSeconds) {
-        return "-";
-    }
-    return new Date(unixSeconds * 1000).toLocaleString("zh-CN", {
-        hour12: false
-    });
+    return (0, text_1.formatLocalDateTime)(unixSeconds);
 }
 function formatLimitStatus(label, resetAt) {
     const remaining = formatRemainingDuration(resetAt);
@@ -133,6 +130,19 @@ function collectAccountStatuses() {
         };
     });
 }
+/**
+ * 根据账号运行时状态汇总可用数与额度受限数，供 CLI 统一展示摘要。
+ *
+ * @param statuses 账号运行时状态列表。
+ * @returns 汇总后的数量统计。
+ */
+function summarizeAccountStatuses(statuses) {
+    return {
+        available: statuses.filter((item) => item.isAvailable).length,
+        fiveHourLimited: statuses.filter((item) => item.isFiveHourLimited && !item.isWeeklyLimited).length,
+        weeklyLimited: statuses.filter((item) => item.isWeeklyLimited).length
+    };
+}
 /**
  * 将账号状态渲染为适合终端输出的表格文本。
  *

package/dist/text.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bi = bi;
+exports.formatLocalDateTime = formatLocalDateTime;
+/**
+ * 生成统一的中英双语文案，避免在各处手写不一致的分隔形式。
+ *
+ * @param zh 简体中文文案。
+ * @param en 英文文案。
+ * @returns 统一格式的中英双语字符串。
+ */
+function bi(zh, en) {
+    return `${zh} / ${en}`;
+}
+/**
+ * 将时间格式化为与 locale 无关的本地时间文本，避免输出固定绑定某个语言区域。
+ *
+ * @param unixSeconds Unix 秒时间戳；为空时返回 `-`。
+ * @returns 形如 `2026-03-13 16:46:23` 的本地时间字符串。
+ */
+function formatLocalDateTime(unixSeconds) {
+    if (!unixSeconds) {
+        return "-";
+    }
+    const date = new Date(unixSeconds * 1000);
+    const year = date.getFullYear();
+    const month = `${date.getMonth() + 1}`.padStart(2, "0");
+    const day = `${date.getDate()}`.padStart(2, "0");
+    const hour = `${date.getHours()}`.padStart(2, "0");
+    const minute = `${date.getMinutes()}`.padStart(2, "0");
+    const second = `${date.getSeconds()}`.padStart(2, "0");
+    return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+}

package/dist/usage-sync.js

@@ -9,6 +9,7 @@ const undici_1 = require("undici");
 const account_store_1 = require("./account-store");
 const config_1 = require("./config");
 const state_1 = require("./state");
+const text_1 = require("./text");
 const USAGE_CACHE_TTL_MS = 60 * 1000;
 const inflightUsageRefreshes = new Map();
 function normalizeResetAt(value, resetAfterSeconds) {
@@ -31,12 +32,12 @@ async function refreshAccountTokens(accountId) {
     const config = (0, config_1.loadConfig)();
     const account = (0, account_store_1.findManagedAccount)(accountId);
     if (!account) {
-        throw new Error(`未找到账号 ${accountId}`);
+        throw new Error((0, text_1.bi)(`未找到账号 ${accountId}`, `Account not found: ${accountId}`));
     }
     const auth = (0, account_store_1.readAuthFile)(account.codex_home);
     const refreshToken = auth?.tokens?.refresh_token;
     if (!refreshToken) {
-        throw new Error(`账号 ${accountId} 缺少 refresh_token`);
+        throw new Error((0, text_1.bi)(`账号 ${accountId} 缺少 refresh_token`, `Account ${accountId} is missing refresh_token`));
     }
     const response = await (0, undici_1.request)(`${config.upstream.auth_base_url}/oauth/token`, {
         method: "POST",
@@ -52,7 +53,7 @@ async function refreshAccountTokens(accountId) {
     });
     if (response.statusCode >= 400) {
         const errorText = await response.body.text();
-        throw new Error(`刷新 token 失败: HTTP ${response.statusCode} ${errorText}`);
+        throw new Error((0, text_1.bi)(`刷新 token 失败: HTTP ${response.statusCode} ${errorText}`, `Failed to refresh token: HTTP ${response.statusCode} ${errorText}`));
     }
     const payload = (await response.body.json());
     const nextAuth = {
@@ -81,13 +82,13 @@ async function refreshAccountTokens(accountId) {
 async function refreshAccountUsage(accountId) {
     const account = (0, account_store_1.findManagedAccount)(accountId);
     if (!account) {
-        throw new Error(`未找到账号 ${accountId}`);
+        throw new Error((0, text_1.bi)(`未找到账号 ${accountId}`, `Account not found: ${accountId}`));
     }
     const auth = (0, account_store_1.readAuthFile)(account.codex_home);
     const accessToken = auth?.tokens?.access_token;
     const accountIdHeader = auth?.tokens?.account_id;
     if (!accessToken) {
-        throw new Error(`账号 ${accountId} 缺少 access_token`);
+        throw new Error((0, text_1.bi)(`账号 ${accountId} 缺少 access_token`, `Account ${accountId} is missing access_token`));
     }
     const response = await (0, undici_1.request)("https://chatgpt.com/backend-api/wham/usage", {
         method: "GET",
@@ -104,7 +105,7 @@ async function refreshAccountUsage(accountId) {
     }
     if (response.statusCode >= 400) {
         const errorText = await response.body.text();
-        throw new Error(`刷新额度失败: HTTP ${response.statusCode} ${errorText}`);
+        throw new Error((0, text_1.bi)(`刷新额度失败: HTTP ${response.statusCode} ${errorText}`, `Failed to refresh usage: HTTP ${response.statusCode} ${errorText}`));
     }
     const payload = (await response.body.json());
     const primary = (0, account_store_1.resolvePrimaryRegistryAccount)(account.codex_home);
@@ -182,7 +183,7 @@ async function refreshAllAccountUsage() {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            console.error(`[refresh] ${account.id} 失败: ${message}`);
+            console.error((0, text_1.bi)(`[refresh] ${account.id} 失败: ${message}`, `[refresh] ${account.id} failed: ${message}`));
         }
     }
     return results;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-slot",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "本地 Codex 多账号切换与状态管理工具",
   "type": "commonjs",
   "main": "dist/cli.js",
@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "clean": "rm -rf dist",
-    "build": "tsc -p tsconfig.json && chmod +x dist/cli.js dist/serve.js",
+    "build": "npm run clean && tsc -p tsconfig.json && chmod +x dist/cli.js dist/serve.js",
     "prepublishOnly": "npm run build",
     "dev": "tsx src/cli.ts",
     "check": "tsc --noEmit -p tsconfig.json"