ai-account-switch 1.8.1 → 1.11.0

package/src/commands/account.js

@@ -102,6 +102,10 @@ async function addAccount(name, options) {
                     {
                         name: "responses - Use API key in auth.json (requires_openai_auth) (在 auth.json 中使用 API key)",
                         value: WIRE_API_MODES.RESPONSES
+                    },
+                    {
+                        name: "env - Use API key from environment variable (从环境变量获取 API key)",
+                        value: WIRE_API_MODES.ENV
                     }
                 ],
                 default: DEFAULT_WIRE_API
@@ -125,6 +129,34 @@ async function addAccount(name, options) {
                 `\n✓ Selected wire_api mode (已选择模式): ${wireApiSelection}\n`
             )
         );
+
+        // If env mode is selected, prompt for environment variable name
+        let envKeyName = null;
+        if (wireApiSelection === WIRE_API_MODES.ENV) {
+            const envKeyAnswer = await inquirer.prompt([
+                {
+                    type: "input",
+                    name: "envKey",
+                    message: "Enter environment variable name for API key (请输入 API key 的环境变量名称):",
+                    default: "AIS_USER_API_KEY",
+                    validate: (input) => {
+                        if (!input.trim()) {
+                            return "Environment variable name is required (环境变量名称不能为空)";
+                        }
+                        if (!/^[A-Z_][A-Z0-9_]*$/.test(input.trim())) {
+                            return "Invalid variable name. Use uppercase letters, numbers, and underscores (e.g., MY_API_KEY) (变量名无效。请使用大写字母、数字和下划线,例如: MY_API_KEY)";
+                        }
+                        return true;
+                    }
+                }
+            ]);
+            envKeyName = envKeyAnswer.envKey.trim();
+            console.log(
+                chalk.cyan(
+                    `\n✓ Environment variable (环境变量): ${envKeyName}\n`
+                )
+            );
+        }
     } else if (typeAnswer.type === "Droids") {
         console.log(
             chalk.cyan("\n📝 Droids Configuration Tips (Droids 配置提示):")
@@ -210,6 +242,10 @@ async function addAccount(name, options) {
     // Add wire_api selection for Codex accounts
     if (typeAnswer.type === "Codex" && wireApiSelection) {
         accountData.wireApi = wireApiSelection;
+        // Add environment variable name for env mode
+        if (wireApiSelection === WIRE_API_MODES.ENV && envKeyName) {
+            accountData.envKey = envKeyName;
+        }
     }
 
     // Handle custom environment variables
@@ -514,6 +550,22 @@ async function addAccount(name, options) {
                     "   Your API key will be stored in ~/.codex/auth.json (API key 将存储在 ~/.codex/auth.json)\n"
                 )
             );
+        } else if (accountData.wireApi === WIRE_API_MODES.ENV) {
+            console.log(
+                chalk.yellow(
+                    "   ⚠ Note: This account uses 'env' mode (此账号使用 'env' 模式)"
+                )
+            );
+            console.log(
+                chalk.white(
+                    `   You need to export the environment variable before using Codex (使用 Codex 前需要导出环境变量):`
+                )
+            );
+            console.log(
+                chalk.cyan(
+                    `   export ${accountData.envKey}="${accountData.apiKey}"\n`
+                )
+            );
         } else {
             console.log(
                 chalk.cyan(
@@ -623,11 +675,14 @@ function listAccounts() {
         const account = accounts[name];
         const isActive = currentProject && currentProject.name === name;
         const marker = isActive ? chalk.green("● ") : "  ";
+
+        // Display ID and name
+        const idDisplay = chalk.yellow(`[${account.id}]`);
         const nameDisplay = isActive
             ? chalk.green.bold(name)
             : chalk.cyan(name);
 
-        console.log(`${marker}${nameDisplay}`);
+        console.log(`${marker}${idDisplay} ${nameDisplay}`);
         console.log(`   Type: ${account.type}`);
         console.log(`   API Key: ${maskApiKey(account.apiKey)}`);
         if (account.apiUrl) console.log(`   API URL: ${account.apiUrl}`);
@@ -687,9 +742,9 @@ function listAccounts() {
 /**
  * Switch to a specific account for current project
  */
-async function useAccount(name) {
-    if (!name) {
-        // If no name provided, show interactive selection
+async function useAccount(nameOrId) {
+    if (!nameOrId) {
+        // If no name/ID provided, show interactive selection
         const accounts = config.getAllAccounts();
         const accountNames = Object.keys(accounts);
 
@@ -702,21 +757,32 @@ async function useAccount(name) {
             return;
         }
 
+        // Create choices with ID and name
+        const choices = accountNames.map(name => {
+            const account = accounts[name];
+            return {
+                name: `[${account.id}] ${name}`,
+                value: name
+            };
+        });
+
         const answers = await inquirer.prompt([
             {
                 type: "list",
                 name: "accountName",
                 message: "Select an account to use (请选择要使用的账号):",
-                choices: accountNames,
+                choices: choices,
             },
         ]);
 
-        name = answers.accountName;
+        nameOrId = answers.accountName;
     }
 
-    if (!config.accountExists(name)) {
+    // Find account by ID or name
+    const accountInfo = config.getAccountByIdOrName(nameOrId);
+    if (!accountInfo) {
         console.log(
-            chalk.red(`✗ Account '${name}' not found. (未找到账号 '${name}'。)`)
+            chalk.red(`✗ Account '${nameOrId}' not found. (未找到账号 '${nameOrId}'。)`)
         );
         console.log(
             chalk.yellow(
@@ -726,6 +792,7 @@ async function useAccount(name) {
         return;
     }
 
+    const name = accountInfo.name;
     const success = config.setProjectAccount(name);
     if (success) {
         const fs = require("fs");
@@ -775,6 +842,22 @@ async function useAccount(name) {
                             `✓ API key stored in ~/.codex/auth.json (API key 已存储在 ~/.codex/auth.json)`
                         )
                     );
+                } else if (account.wireApi === WIRE_API_MODES.ENV) {
+                    console.log(
+                        chalk.yellow(
+                            `✓ Wire API mode: ${WIRE_API_MODES.ENV} (使用 ${WIRE_API_MODES.ENV} 模式)`
+                        )
+                    );
+                    console.log(
+                        chalk.green(
+                            `\n✓ Copy and run this command (复制并执行此命令):`
+                        )
+                    );
+                    console.log(
+                        chalk.cyan.bold(
+                            `   export ${account.envKey || 'AIS_USER_API_KEY'}="${account.apiKey}" && codex --profile ${profileName}`
+                        )
+                    );
                 } else {
                     console.log(
                         chalk.cyan(
@@ -920,6 +1003,7 @@ function showInfo() {
     console.log(
         chalk.bold("\n📌 Current Project Account Info (当前项目账号信息):\n")
     );
+    console.log(`${chalk.cyan("Account ID:")} ${chalk.yellow(`[${projectAccount.id}]`)}`);
     console.log(
         `${chalk.cyan("Account Name:")} ${chalk.green.bold(
             projectAccount.name
@@ -989,8 +1073,8 @@ function showInfo() {
 /**
  * Remove an account
  */
-async function removeAccount(name) {
-    if (!name) {
+async function removeAccount(nameOrId) {
+    if (!nameOrId) {
         const accounts = config.getAllAccounts();
         const accountNames = Object.keys(accounts);
 
@@ -999,30 +1083,43 @@ async function removeAccount(name) {
             return;
         }
 
+        // Create choices with ID and name
+        const choices = accountNames.map(name => {
+            const account = accounts[name];
+            return {
+                name: `[${account.id}] ${name}`,
+                value: name
+            };
+        });
+
         const answers = await inquirer.prompt([
             {
                 type: "list",
                 name: "accountName",
                 message: "Select an account to remove (请选择要删除的账号):",
-                choices: accountNames,
+                choices: choices,
             },
         ]);
 
-        name = answers.accountName;
+        nameOrId = answers.accountName;
     }
 
-    if (!config.accountExists(name)) {
+    // Find account by ID or name
+    const accountInfo = config.getAccountByIdOrName(nameOrId);
+    if (!accountInfo) {
         console.log(
-            chalk.red(`✗ Account '${name}' not found. (未找到账号 '${name}'。)`)
+            chalk.red(`✗ Account '${nameOrId}' not found. (未找到账号 '${nameOrId}'。)`)
         );
         return;
     }
 
+    const name = accountInfo.name;
+
     const { confirm } = await inquirer.prompt([
         {
             type: "confirm",
             name: "confirm",
-            message: `Are you sure you want to remove account '${name}'? (确定要删除账号 '${name}' 吗?)`,
+            message: `Are you sure you want to remove account '${name}' (ID: ${accountInfo.id})? (确定要删除账号 '${name}' (ID: ${accountInfo.id}) 吗?)`,
             default: false,
         },
     ]);
@@ -1069,30 +1166,34 @@ function showCurrent() {
 /**
  * Export account configuration
  */
-function exportAccount(name) {
-    if (!name) {
+function exportAccount(nameOrId) {
+    if (!nameOrId) {
         console.log(
-            chalk.red("Please specify an account name. (请指定账号名称。)")
+            chalk.red("Please specify an account name or ID. (请指定账号名称或 ID。)")
         );
         console.log(
             chalk.cyan(
-                "Usage: ais export <account-name> (用法: ais export <账号名>)"
+                "Usage: ais export <account-name-or-id> (用法: ais export <账号名或ID>)"
             )
         );
         return;
     }
 
-    const account = config.getAccount(name);
-    if (!account) {
+    // Find account by ID or name
+    const accountInfo = config.getAccountByIdOrName(nameOrId);
+    if (!accountInfo) {
         console.log(
-            chalk.red(`✗ Account '${name}' not found. (未找到账号 '${name}'。)`)
+            chalk.red(`✗ Account '${nameOrId}' not found. (未找到账号 '${nameOrId}'。)`)
         );
         return;
     }
 
+    const name = accountInfo.name;
+    const { name: _, ...account } = accountInfo; // Remove the name property from accountInfo
+
     console.log(
         chalk.bold(
-            `\n📤 Export for account '${name}' (账号 '${name}' 的导出数据):\n`
+            `\n📤 Export for account '${name}' (ID: ${account.id}) (账号 '${name}' 的导出数据):\n`
         )
     );
     console.log(JSON.stringify({ [name]: account }, null, 2));