@openxiaobu/codexl 0.1.1 → 0.1.3

package/README.md

@@ -11,7 +11,7 @@
 - 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`
+- Automatically switch `~/.codex/config.toml` to the `codexl` provider while the local proxy is running
 
 ## Installation
 
@@ -51,16 +51,10 @@ codexl start
 codexl start --port 4399
 ```
 
-Show the current local endpoint and key:
+`start` will automatically write the required provider config into `~/.codex/config.toml`:
 
 ```bash
-codexl get
-```
-
-Write provider config into `~/.codex/config.toml`:
-
-```bash
-codexl config
+codexl start
 ```
 
 ## Commands
@@ -72,8 +66,6 @@ codexl import <name> [HOME]
 codexl status
 codexl start [--port <port>]
 codexl stop
-codexl get
-codexl config [codexPath]
 ```
 
 ## How `status` Works
@@ -87,9 +79,9 @@ Instead it:
 3. Stores the latest result in `~/.codexl/state.json`
 4. Renders the latest local cache
 
-## Generated Codex Config
+## Managed Codex Config
 
-`codexl config` writes a managed provider block like this:
+`codexl start` writes a managed provider block like this:
 
 ```toml
 # >>> codexl managed start >>>
@@ -107,7 +99,8 @@ Behavior:
 - If global `model_provider` exists, it is changed to `codexl`
 - If commented `# model_provider = ...` exists, it is reopened as `model_provider = "codexl"`
 - Global `model` is kept unchanged
-- If you start with `--port`, the port is saved to `~/.codexl/config.yaml`, and later `get` / `config` will use that port
+- If you start with `--port`, the port is saved to `~/.codexl/config.yaml`
+- `codexl stop` comments out the active `model_provider = "codexl"` line and keeps the rest of the file unchanged
 
 ## Data Directory
 

package/dist/account-store.js

@@ -51,6 +51,25 @@ function readAuthFile(codexHome) {
     }
     return JSON.parse(node_fs_1.default.readFileSync(authPath, "utf8"));
 }
+/**
+ * 从 `id_token` 中解析邮箱。
+ *
+ * @param auth 认证文件对象。
+ * @returns 邮箱地址；缺失或解析失败时返回 `undefined`。
+ */
+function resolveEmailFromAuth(auth) {
+    const idToken = auth?.tokens?.id_token;
+    if (!idToken) {
+        return undefined;
+    }
+    try {
+        const payload = JSON.parse(Buffer.from(idToken.split(".")[1] ?? "", "base64url").toString("utf8"));
+        return payload.email;
+    }
+    catch {
+        return undefined;
+    }
+}
 /**
  * 将来源 HOME 下的官方 `.codex` 登录态复制到目标 HOME。
  *
@@ -92,23 +111,18 @@ function cloneCodexAuthState(sourceHome, targetHome) {
  *
  * 完整标准：
  * 1. 存在 `.codex/auth.json`
- * 2. 存在 `.codex/accounts/registry.json`
- * 3. 至少存在一个账户级 `*.auth.json`
+ * 2. `auth.json` 中存在 `access_token`
+ * 3. `auth.json` 中存在 `refresh_token`
+ * 4. `auth.json` 中存在 `account_id`
  *
  * @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"));
+    const auth = readAuthFile(codexHome);
+    return Boolean(auth?.tokens?.access_token &&
+        auth?.tokens?.refresh_token &&
+        auth?.tokens?.account_id);
 }
 /**
  * 将最新认证信息回写到指定账号的 `auth.json`。
@@ -153,11 +167,12 @@ function registerManagedAccount(accountId, codexHome) {
     // 预先创建账号隔离目录，方便后续直接执行 codex login。
     node_fs_1.default.mkdirSync(home, { recursive: true });
     const primary = resolvePrimaryRegistryAccount(home);
+    const auth = readAuthFile(home);
     const account = {
         id: accountId,
         name: accountId,
         codex_home: home,
-        email: primary?.email,
+        email: primary?.email ?? resolveEmailFromAuth(auth),
         enabled: true,
         imported_at: new Date().toISOString()
     };

package/dist/cli.js

@@ -115,6 +115,7 @@ async function handleStart(portOverride) {
         }
         return;
     }
+    applyManagedCodexConfig();
     const logPath = (0, config_1.getServiceLogPath)();
     const logFd = node_fs_1.default.openSync(logPath, "a");
     const child = (0, node_child_process_1.spawn)(process.execPath, [__filename.replace(/cli\.js$/, "serve.js"), "--port", String(port)], {
@@ -136,38 +137,41 @@ function handleStop() {
     const pid = getRunningPid();
     if (!pid) {
         console.log("服务未运行");
+        deactivateManagedCodexConfig();
         return;
     }
     process.kill(pid, "SIGTERM");
     node_fs_1.default.rmSync((0, config_1.getPidPath)(), { force: true });
+    deactivateManagedCodexConfig();
     console.log(`服务已停止，PID=${pid}`);
 }
 /**
- * 输出当前 `codex` 需要的 provider 配置与本地 key 信息。
+ * 对正则元字符做转义，供动态构造匹配模式使用。
  *
- * @returns 无返回值。
+ * @param input 原始字符串。
+ * @returns 经过转义后的安全正则片段。
  */
-function handleGetConfig() {
-    const config = (0, config_1.loadConfig)();
-    console.log(`base_url=${`http://${config.server.host}:${config.server.port}/v1`}`);
-    console.log(`api_key=${config.server.api_key}`);
-}
 function escapeRegExp(input) {
     return input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 /**
- * 将 codexl provider 配置写入指定的 codex config.toml。
+ * 返回默认的 `codex config.toml` 路径。
  *
- * @param targetPathOrDir 可选的 codex 配置目录或 config.toml 文件路径。
- * @returns 无返回值。
+ * @returns 默认 `config.toml` 绝对路径。
  */
-function handleConfig(targetPathOrDir) {
+function getDefaultCodexConfigPath() {
+    return node_path_1.default.join(process.env.HOME ?? "", ".codex", "config.toml");
+}
+/**
+ * 生成 codexl 托管的 provider 配置块。
+ *
+ * @returns 可直接写入 `config.toml` 的配置块内容。
+ */
+function buildManagedConfigBlock() {
     const config = (0, config_1.loadConfig)();
-    const rawTarget = targetPathOrDir ? (0, config_1.expandHome)(targetPathOrDir) : node_path_1.default.join(process.env.HOME ?? "", ".codex", "config.toml");
-    const targetFile = rawTarget.endsWith(".toml") ? rawTarget : node_path_1.default.join(rawTarget, "config.toml");
     const startMarker = "# >>> codexl managed start >>>";
     const endMarker = "# <<< codexl managed end <<<";
-    const block = [
+    return [
         startMarker,
         "[model_providers.codexl]",
         'name = "codexl"',
@@ -176,6 +180,19 @@ function handleConfig(targetPathOrDir) {
         'wire_api = "responses"',
         endMarker
     ].join("\n");
+}
+/**
+ * 将 codexl provider 配置写入指定的 codex config.toml。
+ *
+ * @param targetPathOrDir 可选的 codex 配置目录或 config.toml 文件路径。
+ * @returns 实际写入的 `config.toml` 文件路径。
+ */
+function applyManagedCodexConfig(targetPathOrDir, options) {
+    const rawTarget = targetPathOrDir ? (0, config_1.expandHome)(targetPathOrDir) : getDefaultCodexConfigPath();
+    const targetFile = rawTarget.endsWith(".toml") ? rawTarget : node_path_1.default.join(rawTarget, "config.toml");
+    const startMarker = "# >>> codexl managed start >>>";
+    const endMarker = "# <<< codexl managed end <<<";
+    const block = buildManagedConfigBlock();
     let original = "";
     if (node_fs_1.default.existsSync(targetFile)) {
         original = node_fs_1.default.readFileSync(targetFile, "utf8");
@@ -240,10 +257,31 @@ function handleConfig(targetPathOrDir) {
     }
     const nextContent = `${lines.join("\n").replace(/\n{3,}/g, "\n\n").trimEnd()}\n`;
     node_fs_1.default.writeFileSync(targetFile, nextContent, "utf8");
-    console.log(`已写入: ${targetFile}`);
-    console.log(`base_url=http://${config.server.host}:${config.server.port}/v1`);
-    console.log(`api_key=${config.server.api_key}`);
-    console.log('提示: 已写入 codexl provider；如果原来存在 model_provider，则已切换为 codexl；model 保持不变。');
+    if (!options?.silent) {
+        const config = (0, config_1.loadConfig)();
+        console.log(`已写入: ${targetFile}`);
+        console.log(`base_url=http://${config.server.host}:${config.server.port}/v1`);
+        console.log(`api_key=${config.server.api_key}`);
+        console.log("提示: start 会自动接管 codex provider，stop 会自动恢复。");
+    }
+    return targetFile;
+}
+/**
+ * 关闭 codexl 作为当前默认 provider 的接管状态。
+ *
+ * @returns 无返回值。
+ */
+function deactivateManagedCodexConfig() {
+    const targetFile = getDefaultCodexConfigPath();
+    if (!node_fs_1.default.existsSync(targetFile)) {
+        return;
+    }
+    const original = node_fs_1.default.readFileSync(targetFile, "utf8");
+    const nextContent = original.replace(/^(\s*)model_provider\s*=\s*"codexl"\s*$/m, '$1# model_provider = "codexl"');
+    if (nextContent !== original) {
+        node_fs_1.default.writeFileSync(targetFile, nextContent, "utf8");
+        console.log(`已更新: ${targetFile}`);
+    }
 }
 /**
  * CLI 主入口，负责命令注册与执行。
@@ -256,10 +294,9 @@ async function main() {
     (0, config_1.getCodexSwHome)();
     (0, config_1.loadConfig)();
     program
-        .name("codexsw")
         .name("codexl")
         .description("本地 Codex 多账号切换与状态管理工具")
-        .version("0.1.0");
+        .version("0.1.2");
     program
         .command("add")
         .description("登录并新增一个账号或工作空间")
@@ -292,12 +329,6 @@ async function main() {
         await handleStart(options.port);
     });
     program.command("stop").description("停止后台代理服务").action(handleStop);
-    program.command("get").description("输出当前 base_url 和 api_key").action(handleGetConfig);
-    program
-        .command("config")
-        .description("自动写入 codex 的 config.toml，默认 ~/.codex/config.toml")
-        .argument("[codexPath]", "codex 配置目录或 config.toml 文件路径")
-        .action(handleConfig);
     await program.parseAsync(process.argv);
 }
 void main().catch((error) => {

package/package.json

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