codex-slot 0.1.27 → 0.1.29

package/dist/status-command.js

@@ -245,6 +245,12 @@ function resolveInitialCursorIndex(accounts, statuses, selectedAuthAccountId) {
     }
     return 0;
 }
+function buildInteractiveItems(accounts, relaySlots) {
+    return [
+        ...accounts.map((account) => ({ type: "account", id: account.id })),
+        ...relaySlots.map((slot) => ({ type: "relay", id: slot.id }))
+    ];
+}
 /**
  * 将状态面板中选中的账号立即应用为 Codex App 主登录态。
  *
@@ -286,15 +292,27 @@ async function handleInteractiveToggle(initialStatuses) {
     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."));
+    const latestSnapshotForRelays = (0, status_service_1.getStatusSnapshot)();
+    const relaySlotsFromConfig = latestSnapshotForRelays.relaySlots;
+    if (accountsFromConfig.length === 0 && relaySlotsFromConfig.length === 0) {
+        console.log((0, text_1.bi)("当前没有已录入账号或中转槽位。", "No managed accounts or relay slots found."));
         stdin.setRawMode?.(false);
         return;
     }
     const accounts = [...accountsFromConfig].sort((left, right) => left.name.localeCompare(right.name));
+    const relaySlots = [...relaySlotsFromConfig].sort((left, right) => left.name.localeCompare(right.name));
     let selectedAuthAccountId = (0, state_1.getSelectedCodexAuthAccountId)();
-    let cursor = resolveInitialCursorIndex(accounts, initialStatuses ?? (0, status_1.collectAccountStatuses)(), selectedAuthAccountId);
-    let changed = false;
+    const initialItems = buildInteractiveItems(accounts, relaySlots);
+    const selectedModelRoute = (0, state_1.getSelectedModelRoute)();
+    const initialAccountCursor = resolveInitialCursorIndex(accounts, initialStatuses ?? (0, status_1.collectAccountStatuses)(), selectedAuthAccountId);
+    const selectedRelayIndex = selectedModelRoute.mode === "relay_slot"
+        ? relaySlots.findIndex((slot) => slot.id === selectedModelRoute.relay_slot_id)
+        : -1;
+    let cursor = selectedRelayIndex >= 0
+        ? accounts.length + selectedRelayIndex
+        : Math.min(initialAccountCursor, Math.max(0, initialItems.length - 1));
+    let accountChanged = false;
+    let relayChanged = false;
     enterInteractiveScreen();
     return await new Promise((resolve) => {
         let closed = false;
@@ -304,7 +322,9 @@ async function handleInteractiveToggle(initialStatuses) {
             const screenWidth = process.stdout.columns ?? 80;
             const styled = shouldUseAnsiStyle();
             const latestSnapshot = (0, status_service_1.getStatusSnapshot)();
-            const statusSource = changed ? latestSnapshot.statuses : (initialStatuses ?? latestSnapshot.statuses);
+            const items = buildInteractiveItems(accounts, relaySlots);
+            const currentSelection = items[cursor] ?? null;
+            const statusSource = accountChanged ? 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);
@@ -321,7 +341,20 @@ async function handleInteractiveToggle(initialStatuses) {
                 };
             })
                 .filter((item) => item !== null);
-            const currentItem = displayStatuses.find((item) => item.id === accounts[cursor]?.id) ?? null;
+            const displayRelays = relaySlots.map((slot) => {
+                const selected = latestSnapshot.modelRoute.mode === "relay_slot" &&
+                    latestSnapshot.modelRoute.relay_slot_id === slot.id;
+                return {
+                    ...slot,
+                    name: selected ? `${slot.name}*` : slot.name
+                };
+            });
+            const currentAccount = currentSelection?.type === "account"
+                ? displayStatuses.find((item) => item.id === currentSelection.id) ?? null
+                : null;
+            const currentRelay = currentSelection?.type === "relay"
+                ? displayRelays.find((item) => item.id === currentSelection.id) ?? null
+                : null;
             const wideLayout = screenWidth >= 104;
             const leftWidth = wideLayout ? Math.max(68, Math.floor(screenWidth * 0.64)) : screenWidth;
             const rightWidth = wideLayout ? Math.max(28, screenWidth - leftWidth - 3) : screenWidth;
@@ -333,41 +366,71 @@ async function handleInteractiveToggle(initialStatuses) {
                     styled,
                     selectorColumn: {
                         enabledById: Object.fromEntries(accounts.map((account) => [account.id, account.enabled])),
-                        cursorAccountId: accounts[cursor]?.id ?? null
+                        cursorAccountId: currentSelection?.type === "account" ? currentSelection.id : null
                     }
                 }).split("\n")
             ];
+            const relayLines = [
+                renderSectionHeader("relays", leftWidth, styled),
+                ...(displayRelays.length > 0
+                    ? (0, status_1.renderRelayStatusTable)(displayRelays, {
+                        compact: true,
+                        maxWidth: leftWidth,
+                        styled,
+                        selectorColumn: {
+                            enabledById: Object.fromEntries(relaySlots.map((slot) => [slot.id, slot.enabled])),
+                            cursorRelayId: currentSelection?.type === "relay" ? currentSelection.id : null
+                        }
+                    }).split("\n")
+                    : ["-"])
+            ];
+            const currentDetails = currentSelection?.type === "relay"
+                ? (0, status_1.renderRelayStatusDetails)(currentRelay, { maxWidth: rightWidth, header: false }).split("\n")
+                : (0, status_1.renderStatusDetails)(currentAccount, { maxWidth: rightWidth, header: false }).split("\n");
             const sideLines = [
                 renderSectionHeader("current", rightWidth, styled),
-                ...(0, status_1.renderStatusDetails)(currentItem, { maxWidth: rightWidth, header: false }).split("\n"),
+                ...currentDetails,
                 "",
                 renderSectionHeader("summary", rightWidth, styled),
                 renderSummaryLine(summary, rightWidth < 42, styled),
+                `model_route=${latestSnapshot.modelRouteLabel}`,
                 `scheduler=${latestSnapshot.selectedName ?? "none"}`,
                 `codex_auth=${selectedAuthAccountId ?? "none"}`,
+                `relay_slots=${latestSnapshot.relaySlots.length}`,
                 ...(refreshStatusText ? [`refresh=${refreshStatusText}`] : []),
                 "",
                 renderSectionHeader("help", rightWidth, styled),
-                "↑/↓ move    Space toggle    a app-auth    c clear    r refresh    Enter/q exit"
+                "↑/↓ move    Space toggle    a app-auth    m model-route    c clear    r refresh    Enter/q exit"
+            ];
+            const leftLines = [
+                ...accountLines,
+                "",
+                ...relayLines
             ];
             if (wideLayout) {
-                renderInteractiveScreen(renderColumns(accountLines, sideLines, 3));
+                renderInteractiveScreen(renderColumns(leftLines, sideLines, 3));
                 return;
             }
             renderInteractiveScreen([
-                ...accountLines,
+                ...leftLines,
                 "",
                 renderDivider(screenWidth, styled),
                 ...sideLines
             ]);
         };
         const applyChanges = () => {
-            if (!changed) {
+            if (!accountChanged && !relayChanged) {
                 return;
             }
-            (0, status_service_1.persistAccountEnabledState)(accounts);
-            changed = false;
-            initialStatuses = (0, status_1.collectAccountStatuses)();
+            if (accountChanged) {
+                (0, status_service_1.persistAccountEnabledState)(accounts);
+                accountChanged = false;
+                initialStatuses = (0, status_1.collectAccountStatuses)();
+            }
+            if (relayChanged) {
+                (0, status_service_1.persistRelayEnabledState)(relaySlots);
+                relayChanged = false;
+            }
         };
         const exitInteractive = () => {
             if (closed) {
@@ -392,7 +455,7 @@ async function handleInteractiveToggle(initialStatuses) {
                 return;
             }
             if (key.name === "down") {
-                const nextCursor = Math.min(accounts.length - 1, cursor + 1);
+                const nextCursor = Math.min(buildInteractiveItems(accounts, relaySlots).length - 1, cursor + 1);
                 if (nextCursor !== cursor) {
                     cursor = nextCursor;
                     render();
@@ -400,14 +463,33 @@ async function handleInteractiveToggle(initialStatuses) {
                 return;
             }
             if (key.name === "space") {
-                accounts[cursor].enabled = !accounts[cursor].enabled;
-                changed = true;
+                const item = buildInteractiveItems(accounts, relaySlots)[cursor];
+                if (item?.type === "account") {
+                    const account = accounts.find((candidate) => candidate.id === item.id);
+                    if (account) {
+                        account.enabled = !account.enabled;
+                        accountChanged = true;
+                    }
+                }
+                else if (item?.type === "relay") {
+                    const slot = relaySlots.find((candidate) => candidate.id === item.id);
+                    if (slot) {
+                        slot.enabled = !slot.enabled;
+                        relayChanged = true;
+                    }
+                }
                 applyChanges();
                 render();
                 return;
             }
             if (key.name === "a") {
-                const account = accounts[cursor];
+                const item = buildInteractiveItems(accounts, relaySlots)[cursor];
+                if (item?.type !== "account") {
+                    refreshStatusText = "app-auth requires account";
+                    render();
+                    return;
+                }
+                const account = accounts.find((candidate) => candidate.id === item.id);
                 if (!account) {
                     return;
                 }
@@ -422,6 +504,33 @@ async function handleInteractiveToggle(initialStatuses) {
                 render();
                 return;
             }
+            if (key.name === "m") {
+                const item = buildInteractiveItems(accounts, relaySlots)[cursor];
+                if (item?.type === "relay") {
+                    const slot = relaySlots.find((candidate) => candidate.id === item.id);
+                    if (!slot) {
+                        return;
+                    }
+                    if (!slot.enabled) {
+                        refreshStatusText = `relay_disabled=${slot.id}`;
+                        render();
+                        return;
+                    }
+                    (0, state_1.setSelectedModelRoute)({
+                        mode: "relay_slot",
+                        relay_slot_id: slot.id
+                    });
+                    refreshStatusText = `model_route=relay:${slot.id}`;
+                    render();
+                    return;
+                }
+                (0, state_1.setSelectedModelRoute)({
+                    mode: "auth_pool"
+                });
+                refreshStatusText = "model_route=auth_pool";
+                render();
+                return;
+            }
             if (key.name === "c") {
                 selectedAuthAccountId = null;
                 (0, state_1.setSelectedCodexAuthAccountId)(null);
@@ -485,8 +594,21 @@ async function handleStatus(options) {
         name: `${item.name}${item.id === (0, scheduler_1.pickBestAccount)()?.account.id ? "*" : ""}${item.id === snapshot.codexAuthAccountId ? "@" : ""}`
     }));
     console.log((0, status_1.renderStatusTable)(displayStatuses));
+    if (snapshot.relaySlots.length > 0) {
+        const displayRelays = snapshot.relaySlots.map((slot) => ({
+            ...slot,
+            name: snapshot.modelRoute.mode === "relay_slot" &&
+                snapshot.modelRoute.relay_slot_id === slot.id
+                ? `${slot.name}*`
+                : slot.name
+        }));
+        console.log("");
+        console.log((0, status_1.renderRelayStatusTable)(displayRelays));
+    }
     console.log("");
     console.log(`available=${snapshot.summary.available} 5h_limited=${snapshot.summary.fiveHourLimited} weekly_limited=${snapshot.summary.weeklyLimited}`);
+    console.log(`model_route=${snapshot.modelRouteLabel}`);
     console.log(`scheduler=${snapshot.selectedName ?? "none"}`);
     console.log(`codex_auth=${snapshot.codexAuthAccountId ?? "none"}`);
+    console.log(`relay_slots=${snapshot.relaySlots.length}`);
 }

package/dist/status.js

@@ -4,6 +4,8 @@ exports.collectAccountStatuses = collectAccountStatuses;
 exports.summarizeAccountStatuses = summarizeAccountStatuses;
 exports.renderStatusTable = renderStatusTable;
 exports.renderStatusDetails = renderStatusDetails;
+exports.renderRelayStatusTable = renderRelayStatusTable;
+exports.renderRelayStatusDetails = renderRelayStatusDetails;
 const config_1 = require("./config");
 const account_store_1 = require("./account-store");
 const state_1 = require("./state");
@@ -554,3 +556,73 @@ function renderStatusDetails(item, options) {
     }
     return lines.join("\n");
 }
+/**
+ * 将 relay slot 状态渲染为适合终端输出的表格文本。
+ *
+ * @param slots 待展示的 relay slot 列表。
+ * @param options 渲染选项；交互模式下可传入选择列配置。
+ * @returns 可直接打印到终端的表格字符串。
+ * @throws 无显式抛出。
+ */
+function renderRelayStatusTable(slots, options) {
+    const selectorColumn = options?.selectorColumn;
+    const compact = options?.compact ?? false;
+    const maxWidth = options?.maxWidth ?? Number.POSITIVE_INFINITY;
+    const compactHeader = maxWidth < 68;
+    const relayHeader = compactHeader ? "ID" : "RELAY";
+    const statusHeader = compactHeader ? "ST" : "STATUS";
+    const relayWidth = Math.max(getDisplayWidth(relayHeader), ...slots.map((item) => getDisplayWidth(item.name)));
+    const statusWidth = compactHeader ? 8 : 10;
+    const fixedWidth = (selectorColumn ? 4 + 2 : 0) + relayWidth + 2 + statusWidth + 2;
+    const baseUrlWidth = Number.isFinite(maxWidth)
+        ? Math.max(12, Math.floor(maxWidth) - fixedWidth)
+        : Math.max(getDisplayWidth("BASE_URL"), ...slots.map((item) => getDisplayWidth(item.base_url)));
+    const rows = [
+        [
+            ...(selectorColumn ? [" "] : []),
+            relayHeader,
+            statusHeader,
+            "BASE_URL"
+        ]
+    ];
+    for (const slot of slots) {
+        const selectorCell = selectorColumn
+            ? `${selectorColumn.cursorRelayId === slot.id ? ">" : " "}[${selectorColumn.enabledById[slot.id] ? "x" : " "}]`
+            : null;
+        const status = slot.enabled ? "enabled" : "disabled";
+        rows.push([
+            ...(selectorCell ? [selectorCell] : []),
+            styleNameCell(truncateCell(slot.name, relayWidth), options?.styled ?? false),
+            truncateCell(status, statusWidth),
+            truncateCell(slot.base_url, baseUrlWidth)
+        ]);
+    }
+    const widths = rows[0].map((_, columnIndex) => Math.max(...rows.map((row) => getDisplayWidth(row[columnIndex]))));
+    return rows
+        .map((row) => row.map((cell, index) => padCell(cell, widths[index])).join("  "))
+        .join("\n");
+}
+/**
+ * 将当前选中 relay slot 渲染为紧凑详情区。
+ *
+ * @param slot 当前选中的 relay slot；为空时返回占位提示。
+ * @param options 详情区渲染选项。
+ * @returns 适合直接打印的详情区文本。
+ * @throws 无显式抛出。
+ */
+function renderRelayStatusDetails(slot, options) {
+    const includeHeader = options?.header ?? true;
+    if (!slot) {
+        return [includeHeader ? "[ relay ]" : "slot   -", includeHeader ? "slot   -" : ""]
+            .filter((line) => line.length > 0)
+            .join("\n");
+    }
+    const maxWidth = options?.maxWidth ?? Number.POSITIVE_INFINITY;
+    return [
+        ...(includeHeader ? ["[ relay ]"] : []),
+        formatDetailLine("slot", slot.name, maxWidth),
+        formatDetailLine("status", slot.enabled ? "enabled" : "disabled", maxWidth),
+        formatDetailLine("base", slot.base_url, maxWidth),
+        formatDetailLine("key", "********", maxWidth)
+    ].join("\n");
+}

package/package.json

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