@openxiaobu/codexl 0.1.0 → 0.1.1

package/README.md

@@ -1,28 +1,19 @@
 # codexl
 
-Local multi-account / multi-workspace switcher for Codex.
+`codexl` is a local multi-account / multi-workspace switcher for Codex.
 
-`codexl` 是一个本地 `Codex` 多账号 / 多工作空间切换器。
+[中文文档](./docs/zh-CN.md)
 
-## Overview
-
-English:
+## Features
 
 - Reuse the official `~/.codex` login state
 - Manage multiple accounts or workspaces as separate slots
 - Fetch the latest usage from the official usage endpoint
 - Expose a local provider endpoint for Codex
 - Apply local cooldown rules for temporary, 5-hour, and weekly limits
+- Write a managed provider block into `~/.codex/config.toml`
 
-中文：
-
-- 复用官方 `~/.codex` 登录态
-- 将多个账号或工作空间作为独立槽位管理
-- 直接调用官方 usage 接口获取最新额度
-- 暴露本地 provider 给 `Codex` 使用
-- 对临时限流、5 小时限制、周限制做本地熔断
-
-## Install
+## Installation
 
 ```bash
 npm i -g @openxiaobu/codexl
@@ -34,39 +25,39 @@ Verify:
 codexl --help
 ```
 
+This repository is the source repository.
+GitHub installation from the repository URL is not supported.
+
 ## Quick Start
 
-1. Import your current Codex login state
+Import your current Codex login state:
 
 ```bash
 codexl import current ~
 ```
 
-2. Check latest usage
+`import` copies the official login state into `~/.codexl/homes/<name>` instead of referencing the source HOME directly.
+
+Check latest usage:
 
 ```bash
 codexl status
 ```
 
-3. Start the local proxy
+Start the local proxy:
 
 ```bash
 codexl start
-```
-
-Custom port:
-
-```bash
 codexl start --port 4399
 ```
 
-4. Show current local endpoint and key
+Show the current local endpoint and key:
 
 ```bash
 codexl get
 ```
 
-5. Write provider config into `~/.codex/config.toml`
+Write provider config into `~/.codex/config.toml`:
 
 ```bash
 codexl config
@@ -85,23 +76,16 @@ codexl get
 codexl config [codexPath]
 ```
 
-More details: [HELP.md](./HELP.md)
-
 ## How `status` Works
 
-English:
-
-1. Read `access_token` / `refresh_token` / `account_id` from the official Codex login state
-2. Request `https://chatgpt.com/backend-api/wham/usage`
-3. Store the latest result in `~/.codexl/state.json`
-4. Render the latest local cache
+`codexl status` does not render stale data from the official `registry.json` cache.
 
-中文：
+Instead it:
 
-1. 从官方登录态中读取 `access_token` / `refresh_token` / `account_id`
-2. 请求 `https://chatgpt.com/backend-api/wham/usage`
-3. 将最新结果写入 `~/.codexl/state.json`
-4. 最后读取本地最新缓存进行展示
+1. Reads `access_token`, `refresh_token`, and `account_id` from the official Codex login state
+2. Requests `https://chatgpt.com/backend-api/wham/usage`
+3. Stores the latest result in `~/.codexl/state.json`
+4. Renders the latest local cache
 
 ## Generated Codex Config
 
@@ -117,7 +101,7 @@ wire_api = "responses"
 # <<< codexl managed end <<<
 ```
 
-Rules:
+Behavior:
 
 - If `[model_providers.codexl]` already exists, it is replaced
 - If global `model_provider` exists, it is changed to `codexl`
@@ -134,22 +118,14 @@ Rules:
 - `~/.codexl/codexl.pid`
 - `~/.codexl/logs/service.log`
 
-If you previously used `~/.codexsw`, it will be migrated automatically.
+If you previously used `~/.codexsw`, it is migrated automatically.
 
 ## Limit Handling
 
-English:
-
-- Weekly limit: blocked until weekly reset time
-- 5-hour limit: blocked until 5-hour reset time
+- Weekly limit: blocked until the weekly reset time
+- 5-hour limit: blocked until the 5-hour reset time
 - Temporary limit: blocked for 5 minutes
 
-中文：
-
-- 周限制：禁用到周窗口重置时间
-- 5 小时限制：禁用到 5 小时窗口重置时间
-- 临时限流：先禁用 5 分钟
-
 ## Repository
 
 - GitHub: https://github.com/openxiaobu/codexl

package/dist/account-store.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCodexDataDir = getCodexDataDir;
 exports.readRegistry = readRegistry;
 exports.readAuthFile = readAuthFile;
+exports.cloneCodexAuthState = cloneCodexAuthState;
+exports.hasCompleteCodexAuthState = hasCompleteCodexAuthState;
 exports.writeAuthFile = writeAuthFile;
 exports.resolvePrimaryRegistryAccount = resolvePrimaryRegistryAccount;
 exports.registerManagedAccount = registerManagedAccount;
@@ -49,6 +51,65 @@ function readAuthFile(codexHome) {
     }
     return JSON.parse(node_fs_1.default.readFileSync(authPath, "utf8"));
 }
+/**
+ * 将来源 HOME 下的官方 `.codex` 登录态复制到目标 HOME。
+ *
+ * 只复制认证和账号元数据所需文件，不复制历史日志、缓存等无关内容。
+ *
+ * @param sourceHome 来源 HOME 目录。
+ * @param targetHome 目标 HOME 目录。
+ * @returns 无返回值。
+ * @throws 当来源目录缺少关键认证文件时抛出错误。
+ */
+function cloneCodexAuthState(sourceHome, targetHome) {
+    const sourceCodexDir = getCodexDataDir(sourceHome);
+    const targetCodexDir = getCodexDataDir(targetHome);
+    const sourceAuthPath = node_path_1.default.join(sourceCodexDir, "auth.json");
+    const sourceAccountsDir = node_path_1.default.join(sourceCodexDir, "accounts");
+    const sourceRegistryPath = node_path_1.default.join(sourceAccountsDir, "registry.json");
+    if (!node_fs_1.default.existsSync(sourceAuthPath)) {
+        throw new Error(`来源目录缺少 auth.json: ${sourceAuthPath}`);
+    }
+    if (!node_fs_1.default.existsSync(sourceRegistryPath)) {
+        throw new Error(`来源目录缺少 registry.json: ${sourceRegistryPath}`);
+    }
+    node_fs_1.default.mkdirSync(targetCodexDir, { recursive: true });
+    node_fs_1.default.mkdirSync(node_path_1.default.join(targetCodexDir, "accounts"), { recursive: true });
+    node_fs_1.default.copyFileSync(sourceAuthPath, node_path_1.default.join(targetCodexDir, "auth.json"));
+    node_fs_1.default.copyFileSync(sourceRegistryPath, node_path_1.default.join(targetCodexDir, "accounts", "registry.json"));
+    for (const entry of node_fs_1.default.readdirSync(sourceAccountsDir, { withFileTypes: true })) {
+        if (!entry.isFile()) {
+            continue;
+        }
+        if (!entry.name.endsWith(".auth.json")) {
+            continue;
+        }
+        node_fs_1.default.copyFileSync(node_path_1.default.join(sourceAccountsDir, entry.name), node_path_1.default.join(targetCodexDir, "accounts", entry.name));
+    }
+}
+/**
+ * 检查某个 HOME 下的官方登录态是否完整。
+ *
+ * 完整标准：
+ * 1. 存在 `.codex/auth.json`
+ * 2. 存在 `.codex/accounts/registry.json`
+ * 3. 至少存在一个账户级 `*.auth.json`
+ *
+ * @param codexHome 待检查的 HOME 目录。
+ * @returns 为 `true` 表示登录态完整，可用于调度；否则为 `false`。
+ */
+function hasCompleteCodexAuthState(codexHome) {
+    const codexDir = getCodexDataDir(codexHome);
+    const authPath = node_path_1.default.join(codexDir, "auth.json");
+    const accountsDir = node_path_1.default.join(codexDir, "accounts");
+    const registryPath = node_path_1.default.join(accountsDir, "registry.json");
+    if (!node_fs_1.default.existsSync(authPath) || !node_fs_1.default.existsSync(registryPath) || !node_fs_1.default.existsSync(accountsDir)) {
+        return false;
+    }
+    return node_fs_1.default
+        .readdirSync(accountsDir, { withFileTypes: true })
+        .some((entry) => entry.isFile() && entry.name.endsWith(".auth.json"));
+}
 /**
  * 将最新认证信息回写到指定账号的 `auth.json`。
  *

package/dist/cli.js

@@ -29,17 +29,20 @@ async function handleStatus() {
     console.log(`available=${available} cooldown=${cooldown} weekly_limited=${weeklyLimited}`);
 }
 /**
- * 将已有的 Codex HOME 目录纳入 codexl 管理。
+ * 将已有的 Codex HOME 目录中的登录态复制到 codexl 自己的隔离目录并纳入管理。
  *
  * @param accountId 本地账号标识。
  * @param codexHome 现有 HOME 目录；若未传则默认使用当前用户 HOME。
  * @returns 无返回值。
  */
 function handleAccountImport(accountId, codexHome) {
-    const home = codexHome ? (0, config_1.expandHome)(codexHome) : process.env.HOME ?? "";
-    const account = (0, account_store_1.registerManagedAccount)(accountId, home);
+    const sourceHome = codexHome ? (0, config_1.expandHome)(codexHome) : process.env.HOME ?? "";
+    const managedHome = (0, config_1.getManagedHome)(accountId);
+    (0, account_store_1.cloneCodexAuthState)(sourceHome, managedHome);
+    const account = (0, account_store_1.registerManagedAccount)(accountId, managedHome);
     console.log(`账号已导入: ${account.id}`);
-    console.log(`来源 HOME: ${account.codex_home}`);
+    console.log(`来源 HOME: ${sourceHome}`);
+    console.log(`已复制到: ${account.codex_home}`);
 }
 /**
  * 执行隔离登录流程，将账号录入到 codexl 管理目录。

package/dist/login.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loginManagedAccount = loginManagedAccount;
 const node_child_process_1 = require("node:child_process");
+const node_fs_1 = __importDefault(require("node:fs"));
 const account_store_1 = require("./account-store");
 const config_1 = require("./config");
 /**
@@ -13,7 +17,7 @@ const config_1 = require("./config");
  */
 async function loginManagedAccount(accountId) {
     const managedHome = (0, config_1.getManagedHome)(accountId);
-    (0, account_store_1.registerManagedAccount)(accountId, managedHome);
+    node_fs_1.default.mkdirSync(managedHome, { recursive: true });
     return await new Promise((resolve, reject) => {
         const child = (0, node_child_process_1.spawn)("codex", ["login"], {
             env: {
@@ -24,6 +28,10 @@ async function loginManagedAccount(accountId) {
         });
         child.on("exit", (code) => {
             if (code === 0) {
+                if (!(0, account_store_1.hasCompleteCodexAuthState)(managedHome)) {
+                    reject(new Error("codex login 已退出，但未检测到完整登录态，请重新登录"));
+                    return;
+                }
                 (0, account_store_1.registerManagedAccount)(accountId, managedHome);
                 resolve(managedHome);
                 return;

package/dist/status.js

@@ -1,12 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectAccountStatuses = collectAccountStatuses;
 exports.renderStatusTable = renderStatusTable;
-const node_fs_1 = __importDefault(require("node:fs"));
-const node_path_1 = __importDefault(require("node:path"));
 const config_1 = require("./config");
 const account_store_1 = require("./account-store");
 const state_1 = require("./state");
@@ -44,9 +39,7 @@ function formatReset(unixSeconds) {
 function collectAccountStatuses() {
     const config = (0, config_1.loadConfig)();
     return config.accounts.map((account) => {
-        const codexDir = (0, account_store_1.getCodexDataDir)(account.codex_home);
-        const registryPath = node_path_1.default.join(codexDir, "accounts", "registry.json");
-        const exists = node_fs_1.default.existsSync(registryPath);
+        const exists = (0, account_store_1.hasCompleteCodexAuthState)(account.codex_home);
         const primary = exists ? (0, account_store_1.resolvePrimaryRegistryAccount)(account.codex_home) : null;
         const usageCache = (0, state_1.getUsageCache)(account.id);
         const activeEmail = usageCache?.email ?? primary?.email ?? account.email;
@@ -80,7 +73,7 @@ function collectAccountStatuses() {
                 !isFiveHourLimited &&
                 !isWeeklyLimited &&
                 !localBlocked,
-            sourcePath: codexDir
+            sourcePath: account.codex_home
         };
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openxiaobu/codexl",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "本地 Codex 多账号切换与状态管理工具",
   "type": "commonjs",
   "main": "dist/cli.js",
@@ -13,6 +13,7 @@
   "scripts": {
     "clean": "rm -rf dist",
     "build": "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"
   },