codex-slot 0.1.23 → 0.1.25

package/README.md

@@ -133,6 +133,7 @@ Instead it:
 name = "cslot"
 base_url = "http://127.0.0.1:4399/v1"
 wire_api = "responses"
+requires_openai_auth = true
 ```
 
 Behavior:
@@ -142,6 +143,7 @@ Behavior:
 - Other providers and settings in `config.toml` are left untouched
 - If you start with `--port`, the port is saved to `~/.cslot/config.yaml`
 - If you start without `--port`, `4399` is preferred first and the next free port is chosen automatically on conflict, and the actual chosen port is written back to `~/.cslot/config.yaml` and the managed provider block
+- `requires_openai_auth = true` keeps Codex App treating the local cslot provider as a ChatGPT-authenticated provider, so plugin navigation and trusted plugin runtimes are not disabled as API-key/custom-provider mode
 - `/backend-api/*` requests are forwarded to ChatGPT backend with the current selected account's upstream token; client `Authorization` headers are not forwarded upstream
 
 ## Codex App Plugins

package/dist/app/service-lifecycle-service.js

@@ -13,11 +13,11 @@ const node_child_process_1 = require("node:child_process");
 const undici_1 = require("undici");
 const account_service_1 = require("./account-service");
 const account_store_1 = require("../account-store");
+const state_1 = require("../state");
 const codex_config_1 = require("../codex-config");
 const codex_auth_1 = require("../codex-auth");
 const cli_helpers_1 = require("../cli-helpers");
 const config_1 = require("../config");
-const scheduler_1 = require("../scheduler");
 const STARTUP_POLL_INTERVAL_MS = 100;
 const STARTUP_TIMEOUT_MS = 5000;
 /**
@@ -173,19 +173,28 @@ function rollbackFailedStart(pid, previousConfig) {
  * 选择一个可用于接管主 `~/.codex` 登录态的账号。
  *
  * 业务规则：
- * 1. 优先复用当前调度器已经选中的最佳账号，保证 CLI 与代理请求走同一身份。
- * 2. 若当前没有可调度账号，则回退到首个启用且本地工作空间仍存在的账号。
- * 3. 若仍无可用账号，则返回 `null`，此时仅接管 provider 配置，不强行覆盖主登录态。
+ * 1. 优先使用状态面板中手动选择的 Codex App 登录态账号。
+ * 2. 手动选择存在但账号缺失或登录态不完整时直接报错，避免静默切到其他账号。
+ * 3. 未手动选择时，回退到首个启用且本地工作空间仍存在的账号。
+ * 4. 若仍无可用账号，则返回 `null`，此时仅接管 provider 配置，不强行覆盖主登录态。
  *
  * @returns 选中的受管账号；若不存在可接管账号则返回 `null`。
- * @throws 无显式抛出。
+ * @throws 当手动选择的账号不存在或登录态不完整时抛出错误。
  */
 function resolveManagedAuthAccount() {
-    const selected = (0, scheduler_1.pickBestAccount)()?.account;
-    if (selected && (0, account_store_1.hasCompleteCodexAuthState)(selected.codex_home)) {
+    const accounts = (0, account_service_1.listAccounts)();
+    const selectedAuthAccountId = (0, state_1.getSelectedCodexAuthAccountId)();
+    if (selectedAuthAccountId) {
+        const selected = accounts.find((account) => account.id === selectedAuthAccountId);
+        if (!selected) {
+            throw new Error(`手动选择的 Codex App 登录态账号不存在: ${selectedAuthAccountId}`);
+        }
+        if (!node_fs_1.default.existsSync(selected.codex_home) || !(0, account_store_1.hasCompleteCodexAuthState)(selected.codex_home)) {
+            throw new Error(`手动选择的 Codex App 登录态账号缺少完整 auth.json: ${selectedAuthAccountId}`);
+        }
         return selected;
     }
-    return ((0, account_service_1.listAccounts)().find((account) => account.enabled &&
+    return (accounts.find((account) => account.enabled &&
         node_fs_1.default.existsSync(account.codex_home) &&
         (0, account_store_1.hasCompleteCodexAuthState)(account.codex_home)) ?? null);
 }

package/dist/app/status-service.js

@@ -6,6 +6,7 @@ exports.persistAccountEnabledState = persistAccountEnabledState;
 const config_1 = require("../config");
 const scheduler_1 = require("../scheduler");
 const status_1 = require("../status");
+const state_1 = require("../state");
 const usage_sync_1 = require("../usage-sync");
 /**
  * 刷新全部账号额度并返回最新状态快照。
@@ -29,6 +30,7 @@ function getStatusSnapshot() {
     return {
         statuses,
         selectedName: selected?.account.name ?? null,
+        codexAuthAccountId: (0, state_1.getSelectedCodexAuthAccountId)(),
         summary: (0, status_1.summarizeAccountStatuses)(statuses)
     };
 }

package/dist/codex-config.js

@@ -71,7 +71,8 @@ function buildManagedProviderBlock(eol, config) {
         "[model_providers.cslot]",
         'name = "cslot"',
         `base_url = "http://${config.server.host}:${config.server.port}/v1"`,
-        'wire_api = "responses"'
+        'wire_api = "responses"',
+        "requires_openai_auth = true"
     ];
     lines.push(PROVIDER_BLOCK_END_MARKER);
     return lines.join(eol);

package/dist/state.js

@@ -15,6 +15,8 @@ exports.getUsageCache = getUsageCache;
 exports.setUsageRefreshError = setUsageRefreshError;
 exports.clearUsageRefreshError = clearUsageRefreshError;
 exports.getUsageRefreshError = getUsageRefreshError;
+exports.getSelectedCodexAuthAccountId = getSelectedCodexAuthAccountId;
+exports.setSelectedCodexAuthAccountId = setSelectedCodexAuthAccountId;
 exports.getManagedCodexConfigState = getManagedCodexConfigState;
 exports.getManagedCodexAuthState = getManagedCodexAuthState;
 exports.setManagedCodexConfigState = setManagedCodexConfigState;
@@ -24,7 +26,7 @@ exports.clearManagedCodexAuthState = clearManagedCodexAuthState;
 const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const config_1 = require("./config");
-const STATE_SCHEMA_VERSION = 1;
+const STATE_SCHEMA_VERSION = 2;
 function getStatePath() {
     return node_path_1.default.join((0, config_1.getCslotHome)(), "state.json");
 }
@@ -41,6 +43,7 @@ function getStatePath() {
 function createDefaultState() {
     return {
         state_version: STATE_SCHEMA_VERSION,
+        selected_codex_auth_account_id: null,
         account_blocks: {},
         usage_cache: {},
         usage_refresh_errors: {},
@@ -60,6 +63,7 @@ function normalizeState(parsed) {
     const defaults = createDefaultState();
     return {
         state_version: STATE_SCHEMA_VERSION,
+        selected_codex_auth_account_id: parsed?.selected_codex_auth_account_id ?? defaults.selected_codex_auth_account_id,
         account_blocks: parsed?.account_blocks ?? defaults.account_blocks,
         usage_cache: parsed?.usage_cache ?? defaults.usage_cache,
         usage_refresh_errors: parsed?.usage_refresh_errors ?? defaults.usage_refresh_errors,
@@ -231,6 +235,32 @@ function getUsageRefreshError(accountId) {
     const state = loadState();
     return state.usage_refresh_errors[accountId] ?? null;
 }
+/**
+ * 读取用户在状态面板中手动选择的 Codex App 主登录态账号。
+ *
+ * 业务含义：
+ * 1. 该选择只决定 `cslot start` 复制哪个受管账号到主 `~/.codex/auth.json`。
+ * 2. 它不参与代理请求调度，也不改变账号 enabled 状态。
+ *
+ * @returns 手动选择的账号 id；未选择时返回 `null`。
+ * @throws 当 state 文件读取或解析失败时透传底层异常。
+ */
+function getSelectedCodexAuthAccountId() {
+    const state = loadState();
+    return state.selected_codex_auth_account_id ?? null;
+}
+/**
+ * 保存用户在状态面板中手动选择的 Codex App 主登录态账号。
+ *
+ * @param accountId 账号 id；传入 `null` 表示清除手动选择并恢复默认回退规则。
+ * @returns 无返回值。
+ * @throws 当 state 文件写入失败时透传底层异常。
+ */
+function setSelectedCodexAuthAccountId(accountId) {
+    updateState((state) => {
+        state.selected_codex_auth_account_id = accountId;
+    });
+}
 /**
  * 读取当前记录的 Codex `config.toml` 接管快照。
  *

package/dist/status-command.js

@@ -5,9 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleStatus = handleStatus;
 const node_readline_1 = __importDefault(require("node:readline"));
+const account_store_1 = require("./account-store");
 const account_service_1 = require("./app/account-service");
 const status_service_1 = require("./app/status-service");
 const scheduler_1 = require("./scheduler");
+const state_1 = require("./state");
+const codex_auth_1 = require("./codex-auth");
 const status_1 = require("./status");
 const text_1 = require("./text");
 const ANSI = {
@@ -206,16 +209,24 @@ function renderInteractiveScreen(lines) {
  * 计算交互式状态面板的初始光标位置。
  *
  * 业务规则：
- * 1. 优先定位到当前自动调度选中的账号。
- * 2. 若没有自动选中账号，则回退到首个可用账号。
- * 3. 若所有账号都不可用，则回退到首个已启用账号。
+ * 1. 优先定位到用户手动选择的 Codex App 登录态账号。
+ * 2. 若没有手动选择，则回退到当前自动调度选中的账号。
+ * 3. 若没有自动选中账号，则回退到首个可用账号。
+ * 4. 若所有账号都不可用，则回退到首个已启用账号。
  *
  * @param accounts 已按展示顺序排好的账号列表。
  * @param statuses 当前账号运行时状态快照。
+ * @param selectedAuthAccountId 用户手动选择的 Codex App 登录态账号 id。
  * @returns 初始光标所在的数组下标。
  * @throws 无显式抛出。
  */
-function resolveInitialCursorIndex(accounts, statuses) {
+function resolveInitialCursorIndex(accounts, statuses, selectedAuthAccountId) {
+    if (selectedAuthAccountId) {
+        const selectedAuthIndex = accounts.findIndex((account) => account.id === selectedAuthAccountId);
+        if (selectedAuthIndex >= 0) {
+            return selectedAuthIndex;
+        }
+    }
     const selected = (0, scheduler_1.pickBestAccount)();
     if (selected) {
         const selectedIndex = accounts.findIndex((account) => account.id === selected.account.id);
@@ -234,6 +245,31 @@ function resolveInitialCursorIndex(accounts, statuses) {
     }
     return 0;
 }
+/**
+ * 将状态面板中选中的账号立即应用为 Codex App 主登录态。
+ *
+ * 业务含义：
+ * 1. 该操作只切换主 `~/.codex/auth.json` 的来源账号，不改变代理调度顺序。
+ * 2. 被选择账号可以是 disabled，因为 enabled 只控制代理请求调度。
+ * 3. 登录态不完整时拒绝保存选择，避免下一次 `start` 静默失败或切错账号。
+ *
+ * @param account 用户在状态面板中选中的受管账号。
+ * @returns 失败时返回错误文本；成功时返回 `null`。
+ * @throws 无显式抛出；文件系统错误会转为返回文本。
+ */
+function applyCodexAuthSelection(account) {
+    try {
+        if (!(0, account_store_1.hasCompleteCodexAuthState)(account.codex_home)) {
+            return `账号 ${account.id} 缺少完整 auth.json`;
+        }
+        (0, state_1.setSelectedCodexAuthAccountId)(account.id);
+        (0, codex_auth_1.applyManagedCodexAuth)(account.codex_home, { sourceAccountId: account.id });
+        return null;
+    }
+    catch (error) {
+        return error instanceof Error ? error.message : String(error);
+    }
+}
 /**
  * 进入账号启用状态的交互式切换界面，并在用户确认退出后恢复终端状态。
  *
@@ -256,7 +292,8 @@ async function handleInteractiveToggle(initialStatuses) {
         return;
     }
     const accounts = [...accountsFromConfig].sort((left, right) => left.name.localeCompare(right.name));
-    let cursor = resolveInitialCursorIndex(accounts, initialStatuses ?? (0, status_1.collectAccountStatuses)());
+    let selectedAuthAccountId = (0, state_1.getSelectedCodexAuthAccountId)();
+    let cursor = resolveInitialCursorIndex(accounts, initialStatuses ?? (0, status_1.collectAccountStatuses)(), selectedAuthAccountId);
     let changed = false;
     enterInteractiveScreen();
     return await new Promise((resolve) => {
@@ -277,9 +314,10 @@ async function handleInteractiveToggle(initialStatuses) {
                 if (!status) {
                     return null;
                 }
+                const markers = `${account.id === autoSelectedId ? "*" : ""}${account.id === selectedAuthAccountId ? "@" : ""}`;
                 return {
                     ...status,
-                    name: account.id === autoSelectedId ? `${status.name}*` : status.name
+                    name: markers ? `${status.name}${markers}` : status.name
                 };
             })
                 .filter((item) => item !== null);
@@ -305,11 +343,12 @@ async function handleInteractiveToggle(initialStatuses) {
                 "",
                 renderSectionHeader("summary", rightWidth, styled),
                 renderSummaryLine(summary, rightWidth < 42, styled),
-                `selected=${latestSnapshot.selectedName ?? "none"}`,
+                `scheduler=${latestSnapshot.selectedName ?? "none"}`,
+                `codex_auth=${selectedAuthAccountId ?? "none"}`,
                 ...(refreshStatusText ? [`refresh=${refreshStatusText}`] : []),
                 "",
                 renderSectionHeader("help", rightWidth, styled),
-                "↑/↓ move    Space toggle    r refresh    Enter/q exit"
+                "↑/↓ move    Space toggle    a app-auth    c clear    r refresh    Enter/q exit"
             ];
             if (wideLayout) {
                 renderInteractiveScreen(renderColumns(accountLines, sideLines, 3));
@@ -367,6 +406,30 @@ async function handleInteractiveToggle(initialStatuses) {
                 render();
                 return;
             }
+            if (key.name === "a") {
+                const account = accounts[cursor];
+                if (!account) {
+                    return;
+                }
+                const errorMessage = applyCodexAuthSelection(account);
+                if (errorMessage) {
+                    refreshStatusText = errorMessage;
+                    render();
+                    return;
+                }
+                selectedAuthAccountId = account.id;
+                refreshStatusText = `codex_auth=${account.id}`;
+                render();
+                return;
+            }
+            if (key.name === "c") {
+                selectedAuthAccountId = null;
+                (0, state_1.setSelectedCodexAuthAccountId)(null);
+                (0, codex_auth_1.deactivateManagedCodexAuth)();
+                refreshStatusText = "codex_auth=cleared";
+                render();
+                return;
+            }
             if (key.name === "r") {
                 if (refreshing) {
                     return;
@@ -419,10 +482,11 @@ async function handleStatus(options) {
     }
     const displayStatuses = snapshot.statuses.map((item) => ({
         ...item,
-        name: item.id === (0, scheduler_1.pickBestAccount)()?.account.id ? `${item.name}*` : item.name
+        name: `${item.name}${item.id === (0, scheduler_1.pickBestAccount)()?.account.id ? "*" : ""}${item.id === snapshot.codexAuthAccountId ? "@" : ""}`
     }));
     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"}`);
+    console.log(`scheduler=${snapshot.selectedName ?? "none"}`);
+    console.log(`codex_auth=${snapshot.codexAuthAccountId ?? "none"}`);
 }

package/dist/status.js

@@ -201,7 +201,7 @@ function styleStatusCell(status, item, styled) {
     return status;
 }
 /**
- * 对当前自动选中账号的名称做轻量强调。
+ * 对当前自动调度账号或 Codex App 登录态账号的名称做轻量强调。
  *
  * @param name 账号展示名称。
  * @param styled 是否启用 ANSI 样式。
@@ -209,7 +209,7 @@ function styleStatusCell(status, item, styled) {
  * @throws 无显式抛出。
  */
 function styleNameCell(name, styled) {
-    if (!styled || !name.endsWith("*")) {
+    if (!styled || (!name.includes("*") && !name.includes("@"))) {
         return name;
     }
     return styleCell(name, TABLE_ANSI.cyan, styled);

package/package.json

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