ai-account-switch 1.7.0 → 1.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-account-switch",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "A cross-platform CLI tool to manage and switch Claude/Codex/Droids account configurations",
   "main": "src/index.js",
   "bin": {

package/src/commands/account.js

@@ -1,6 +1,7 @@
 const chalk = require("chalk");
 const inquirer = require("inquirer");
 const ConfigManager = require("../config");
+const { WIRE_API_MODES, DEFAULT_WIRE_API, ACCOUNT_TYPES } = require("../config");
 const { maskApiKey } = require("./helpers");
 const { promptForModelGroup } = require("./model");
 
@@ -53,6 +54,9 @@ async function addAccount(name, options) {
         },
     ]);
 
+    // Store wire_api selection for Codex accounts
+    let wireApiSelection = null;
+
     // Show configuration tips based on account type
     if (typeAnswer.type === "Codex") {
         console.log(
@@ -60,12 +64,22 @@ async function addAccount(name, options) {
         );
         console.log(
             chalk.gray(
-                "   • API URL should include the full path (e.g., https://api.example.com/v1) (API URL 应包含完整路径,例如: https://api.example.com/v1)"
+                "   • For domain-only URLs (e.g., https://api.example.com), /v1 will be added automatically"
             )
         );
         console.log(
             chalk.gray(
-                "   • AIS will automatically add /v1 if missing (AIS 会自动添加 /v1 如果缺失)"
+                "     对于仅域名的 URL (例如 https://api.example.com), 将自动添加 /v1"
+            )
+        );
+        console.log(
+            chalk.gray(
+                "   • URLs with existing paths (e.g., https://api.example.com/v2) will remain unchanged"
+            )
+        );
+        console.log(
+            chalk.gray(
+                "     已有路径的 URL (例如 https://api.example.com/v2) 将保持不变"
             )
         );
         console.log(
@@ -73,6 +87,44 @@ async function addAccount(name, options) {
                 "   • Codex uses OpenAI-compatible API format (Codex 使用 OpenAI 兼容的 API 格式)\n"
             )
         );
+
+        // Prompt for wire_api mode selection
+        const wireApiAnswer = await inquirer.prompt([
+            {
+                type: "list",
+                name: "wireApi",
+                message: "Select wire_api mode (请选择 wire_api 模式):",
+                choices: [
+                    {
+                        name: "chat - Use API key in HTTP headers (OpenAI-compatible) (在 HTTP 头中使用 API key,OpenAI 兼容)",
+                        value: WIRE_API_MODES.CHAT
+                    },
+                    {
+                        name: "responses - Use API key in auth.json (requires_openai_auth) (在 auth.json 中使用 API key)",
+                        value: WIRE_API_MODES.RESPONSES
+                    }
+                ],
+                default: DEFAULT_WIRE_API
+            }
+        ]);
+
+        wireApiSelection = wireApiAnswer.wireApi;
+
+        // Validate input
+        if (!Object.values(WIRE_API_MODES).includes(wireApiSelection)) {
+            console.log(
+                chalk.yellow(
+                    `⚠ Invalid wire_api mode, using default: ${DEFAULT_WIRE_API} (无效的模式，使用默认值)`
+                )
+            );
+            wireApiSelection = DEFAULT_WIRE_API;
+        }
+
+        console.log(
+            chalk.cyan(
+                `\n✓ Selected wire_api mode (已选择模式): ${wireApiSelection}\n`
+            )
+        );
     } else if (typeAnswer.type === "Droids") {
         console.log(
             chalk.cyan("\n📝 Droids Configuration Tips (Droids 配置提示):")
@@ -121,7 +173,11 @@ async function addAccount(name, options) {
             name: "apiUrl",
             message:
                 typeAnswer.type === "Codex"
-                    ? "Enter API URL (请输入 API URL) (e.g., https://api.example.com or https://api.example.com/v1) :"
+                    ? "Enter API URL (请输入 API URL)\n" +
+                      "  Examples (示例):\n" +
+                      "    https://api.example.com → will add /v1 (将添加 /v1)\n" +
+                      "    https://api.example.com/v2 → will keep as is (保持不变)\n" +
+                      "  URL:"
                     : typeAnswer.type === "CCR"
                     ? "Enter API URL (请输入 API URL):"
                     : "Enter API URL (optional) (请输入 API URL,可选):",
@@ -151,6 +207,11 @@ async function addAccount(name, options) {
     // Merge type into accountData
     accountData.type = typeAnswer.type;
 
+    // Add wire_api selection for Codex accounts
+    if (typeAnswer.type === "Codex" && wireApiSelection) {
+        accountData.wireApi = wireApiSelection;
+    }
+
     // Handle custom environment variables
     if (accountData.addCustomEnv) {
         accountData.customEnv = {};
@@ -440,6 +501,27 @@ async function addAccount(name, options) {
             )
         );
         console.log(chalk.cyan(`   ais use ${name}\n`));
+
+        // Show wire_api mode specific information
+        if (accountData.wireApi === WIRE_API_MODES.RESPONSES) {
+            console.log(
+                chalk.yellow(
+                    "   ⚠ Note: This account uses 'responses' mode (此账号使用 'responses' 模式)"
+                )
+            );
+            console.log(
+                chalk.white(
+                    "   Your API key will be stored in ~/.codex/auth.json (API key 将存储在 ~/.codex/auth.json)\n"
+                )
+            );
+        } else {
+            console.log(
+                chalk.cyan(
+                    "   ✓ This account uses 'chat' mode (此账号使用 'chat' 模式)\n"
+                )
+            );
+        }
+
         console.log(
             chalk.white(
                 "2. Use Codex with the generated profile (使用生成的配置文件运行 Codex):"
@@ -548,6 +630,7 @@ function listAccounts() {
         console.log(`${marker}${nameDisplay}`);
         console.log(`   Type: ${account.type}`);
         console.log(`   API Key: ${maskApiKey(account.apiKey)}`);
+        if (account.apiUrl) console.log(`   API URL: ${account.apiUrl}`);
         if (account.email) console.log(`   Email: ${account.email}`);
         if (account.description)
             console.log(`   Description: ${account.description}`);
@@ -575,6 +658,11 @@ function listAccounts() {
         ) {
             console.log(`   Model: ${account.model}`);
         }
+        // Display wire_api configuration for Codex accounts
+        if (account.type === ACCOUNT_TYPES.CODEX) {
+            const wireApi = account.wireApi || `${DEFAULT_WIRE_API} (default)`;
+            console.log(`   Wire API: ${wireApi}`);
+        }
         console.log(
             `   Created: ${new Date(account.createdAt).toLocaleString()}`
         );
@@ -674,6 +762,27 @@ async function useAccount(name) {
                         `✓ Codex profile created (Codex 配置文件已创建): ${profileName}`
                     )
                 );
+
+                // Display wire_api mode information
+                if (account.wireApi === WIRE_API_MODES.RESPONSES) {
+                    console.log(
+                        chalk.yellow(
+                            `✓ Wire API mode: ${WIRE_API_MODES.RESPONSES} (使用 ${WIRE_API_MODES.RESPONSES} 模式)`
+                        )
+                    );
+                    console.log(
+                        chalk.yellow(
+                            `✓ API key stored in ~/.codex/auth.json (API key 已存储在 ~/.codex/auth.json)`
+                        )
+                    );
+                } else {
+                    console.log(
+                        chalk.cyan(
+                            `✓ Wire API mode: ${WIRE_API_MODES.CHAT} (使用 ${WIRE_API_MODES.CHAT} 模式)`
+                        )
+                    );
+                }
+
                 console.log("");
                 console.log(chalk.bold.cyan("📖 Next Steps (下一步):"));
                 console.log(
@@ -864,6 +973,10 @@ function showInfo() {
     ) {
         console.log(`${chalk.cyan("Model:")} ${projectAccount.model}`);
     }
+    // Display wire_api configuration for Codex accounts
+    if (projectAccount.type === ACCOUNT_TYPES.CODEX && projectAccount.wireApi) {
+        console.log(`${chalk.cyan("Wire API:")} ${projectAccount.wireApi}`);
+    }
     console.log(
         `${chalk.cyan("Set At:")} ${new Date(
             projectAccount.setAt

package/src/config.js

@@ -2,6 +2,22 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
+// Constants for wire API modes
+const WIRE_API_MODES = {
+  CHAT: 'chat',
+  RESPONSES: 'responses'
+};
+
+const DEFAULT_WIRE_API = WIRE_API_MODES.CHAT;
+
+// Constants for account types
+const ACCOUNT_TYPES = {
+  CLAUDE: 'Claude',
+  CODEX: 'Codex',
+  CCR: 'CCR',
+  DROIDS: 'Droids'
+};
+
 /**
  * Cross-platform configuration manager
  * Stores global accounts in user home directory
@@ -556,10 +572,23 @@ class ConfigManager {
         profileConfig += `model = "${account.model}"\n`;
       }
 
-      // Ensure API URL has proper path
+      // Smart /v1 path handling
       let baseUrl = account.apiUrl || '';
-      if (baseUrl && !baseUrl.match(/\/v1\/?$/)) {
-        baseUrl = baseUrl.replace(/\/$/, '') + '/v1';
+      if (baseUrl) {
+        // Remove trailing slashes
+        baseUrl = baseUrl.replace(/\/+$/, '');
+
+        // Check if URL already has a path beyond the domain
+        // Pattern: protocol://domain or protocol://domain:port (no path)
+        const isDomainOnly = baseUrl.match(/^https?:\/\/[^\/]+$/);
+
+        // Only add /v1 if:
+        // 1. URL is domain-only (no path), OR
+        // 2. URL explicitly ends with /v1 already (ensure consistency)
+        if (isDomainOnly) {
+          baseUrl += '/v1';
+        }
+        // If URL has a path (e.g., /v2, /custom, /api), keep it as is
       }
 
       // Remove existing provider if it exists (simpler than updating)
@@ -574,11 +603,26 @@ class ConfigManager {
         profileConfig += `base_url = "${baseUrl}"\n`;
       }
 
-      // Determine wire_api: use "chat" for most APIs (OpenAI-compatible)
-      profileConfig += `wire_api = "chat"\n`;
-
-      // Add authentication header
-      profileConfig += `http_headers = { "Authorization" = "Bearer ${account.apiKey}" }\n`;
+      // Determine wire_api based on account configuration (default to chat for backward compatibility)
+      const wireApi = account.wireApi || DEFAULT_WIRE_API;
+
+      if (wireApi === WIRE_API_MODES.CHAT) {
+        // Chat mode: use HTTP headers for authentication
+        profileConfig += `wire_api = "${WIRE_API_MODES.CHAT}"\n`;
+        profileConfig += `http_headers = { "Authorization" = "Bearer ${account.apiKey}" }\n`;
+
+        // Note: We do NOT clear auth.json here because:
+        // 1. auth.json is a global file shared by all projects
+        // 2. Other projects may be using responses mode and need the API key
+        // 3. Chat mode doesn't use auth.json anyway, so no conflict exists
+      } else if (wireApi === WIRE_API_MODES.RESPONSES) {
+        // Responses mode: use auth.json for authentication
+        profileConfig += `wire_api = "${WIRE_API_MODES.RESPONSES}"\n`;
+        profileConfig += `requires_openai_auth = true\n`;
+
+        // Update auth.json with API key
+        this.updateCodexAuthJson(account.apiKey);
+      }
     }
 
     // Remove all old profiles with the same name (including duplicates)
@@ -607,6 +651,146 @@ class ConfigManager {
     fs.writeFileSync(helperScript, profileName, 'utf8');
   }
 
+  /**
+   * Read auth.json file
+   * @private
+   * @returns {Object} Parsed auth data or empty object
+   */
+  _readAuthJson(authJsonFile) {
+    if (!fs.existsSync(authJsonFile)) {
+      return {};
+    }
+
+    try {
+      const content = fs.readFileSync(authJsonFile, 'utf8');
+      return JSON.parse(content);
+    } catch (parseError) {
+      const chalk = require('chalk');
+      console.warn(
+        chalk.yellow(
+          `⚠ Warning: Could not parse existing auth.json, will create new file (警告: 无法解析现有 auth.json，将创建新文件)`
+        )
+      );
+      return {};
+    }
+  }
+
+  /**
+   * Write auth.json file atomically with proper permissions
+   * Uses atomic write (temp file + rename) to prevent corruption from concurrent access
+   * @private
+   * @param {string} authJsonFile - Path to auth.json
+   * @param {Object} authData - Auth data to write
+   */
+  _writeAuthJson(authJsonFile, authData) {
+    const chalk = require('chalk');
+    const tempFile = `${authJsonFile}.tmp.${process.pid}`;
+
+    try {
+      // Write to temporary file first (atomic operation)
+      fs.writeFileSync(tempFile, JSON.stringify(authData, null, 2), 'utf8');
+
+      // Set file permissions to 600 (owner read/write only) for security
+      if (process.platform !== 'win32') {
+        fs.chmodSync(tempFile, 0o600);
+      }
+
+      // Atomically rename temp file to actual file
+      // This is atomic on POSIX systems and prevents corruption
+      fs.renameSync(tempFile, authJsonFile);
+    } catch (error) {
+      // Clean up temp file if it exists
+      if (fs.existsSync(tempFile)) {
+        try {
+          fs.unlinkSync(tempFile);
+        } catch (cleanupError) {
+          // Ignore cleanup errors
+        }
+      }
+      throw error;
+    }
+  }
+
+  /**
+   * Clear OPENAI_API_KEY in ~/.codex/auth.json for chat mode
+   * @deprecated This method is no longer called automatically.
+   * Chat mode doesn't require clearing auth.json since it doesn't use it.
+   */
+  clearCodexAuthJson() {
+    const chalk = require('chalk');
+    const codexDir = path.join(os.homedir(), '.codex');
+    const authJsonFile = path.join(codexDir, 'auth.json');
+
+    try {
+      // Ensure .codex directory exists
+      if (!fs.existsSync(codexDir)) {
+        fs.mkdirSync(codexDir, { recursive: true });
+      }
+
+      // Read existing auth data
+      const authData = this._readAuthJson(authJsonFile);
+
+      // Clear OPENAI_API_KEY (set to empty string)
+      authData.OPENAI_API_KEY = "";
+
+      // Write atomically with proper permissions
+      this._writeAuthJson(authJsonFile, authData);
+
+      console.log(
+        chalk.cyan(
+          `✓ Cleared OPENAI_API_KEY in auth.json (chat mode) (已清空 auth.json 中的 OPENAI_API_KEY)`
+        )
+      );
+    } catch (error) {
+      console.error(
+        chalk.yellow(
+          `⚠ Warning: Failed to clear auth.json: ${error.message} (警告: 清空 auth.json 失败)`
+        )
+      );
+      // Don't throw error, just warn - this is not critical for chat mode
+    }
+  }
+
+  /**
+   * Update ~/.codex/auth.json with API key for responses mode
+   * @param {string} apiKey - API key to store in auth.json
+   * @throws {Error} If file operations fail
+   */
+  updateCodexAuthJson(apiKey) {
+    const chalk = require('chalk');
+    const codexDir = path.join(os.homedir(), '.codex');
+    const authJsonFile = path.join(codexDir, 'auth.json');
+
+    try {
+      // Ensure .codex directory exists
+      if (!fs.existsSync(codexDir)) {
+        fs.mkdirSync(codexDir, { recursive: true });
+      }
+
+      // Read existing auth data
+      const authData = this._readAuthJson(authJsonFile);
+
+      // Update OPENAI_API_KEY
+      authData.OPENAI_API_KEY = apiKey;
+
+      // Write atomically with proper permissions
+      this._writeAuthJson(authJsonFile, authData);
+
+      console.log(
+        chalk.green(
+          `✓ Updated auth.json at: ${authJsonFile} (已更新 auth.json)`
+        )
+      );
+    } catch (error) {
+      console.error(
+        chalk.red(
+          `✗ Failed to update auth.json: ${error.message} (更新 auth.json 失败)`
+        )
+      );
+      throw error;
+    }
+  }
+
   /**
    * Get current project's active account
    * Searches upwards from current directory to find project root
@@ -1147,3 +1331,6 @@ class ConfigManager {
 }
 
 module.exports = ConfigManager;
+module.exports.WIRE_API_MODES = WIRE_API_MODES;
+module.exports.DEFAULT_WIRE_API = DEFAULT_WIRE_API;
+module.exports.ACCOUNT_TYPES = ACCOUNT_TYPES;

package/src/ui-server.js

@@ -2,6 +2,7 @@ const http = require('http');
 const path = require('path');
 const fs = require('fs');
 const ConfigManager = require('./config');
+const { WIRE_API_MODES, DEFAULT_WIRE_API } = require('./config');
 
 class UIServer {
   constructor(port = null) {
@@ -1491,6 +1492,18 @@ class UIServer {
                     <label for="apiUrl" data-i18n="apiUrl">API URL (可选)</label>
                     <input type="text" id="apiUrl" data-i18n-placeholder="apiUrlPlaceholder" placeholder="https://api.anthropic.com">
                 </div>
+                <!-- Wire API selection for Codex accounts -->
+                <div class="form-group" id="wireApiGroup" style="display: none;">
+                    <label for="wireApi">Wire API 模式</label>
+                    <select id="wireApi">
+                        <option value="chat">chat - HTTP Headers 认证 (OpenAI 兼容)</option>
+                        <option value="responses">responses - auth.json 认证 (requires_openai_auth)</option>
+                    </select>
+                    <small style="color: #666; display: block; margin-top: 5px;">
+                        chat: API key 存储在 HTTP headers 中<br>
+                        responses: API key 存储在 ~/.codex/auth.json 中
+                    </small>
+                </div>
                 <div class="form-group">
                     <label for="email" data-i18n="email">邮箱 (可选)</label>
                     <input type="email" id="email" data-i18n-placeholder="emailPlaceholder" placeholder="user@example.com">
@@ -1615,6 +1628,13 @@ class UIServer {
     </div>
 
     <script>
+        // Constants for wire API modes (injected from backend)
+        const WIRE_API_MODES = {
+            CHAT: '${WIRE_API_MODES.CHAT}',
+            RESPONSES: '${WIRE_API_MODES.RESPONSES}'
+        };
+        const DEFAULT_WIRE_API = '${DEFAULT_WIRE_API}';
+
         // i18n translations
         const translations = {
             zh: {
@@ -2021,6 +2041,12 @@ class UIServer {
                             <div class="info-value">\${data.model}</div>
                         </div>
                         \` : ''}
+                        \${data.type === 'Codex' ? \`
+                        <div class="account-info">
+                            <div class="info-label">Wire API</div>
+                            <div class="info-value">\${data.wireApi || (DEFAULT_WIRE_API + ' (default)')}</div>
+                        </div>
+                        \` : ''}
                         \${data.type === 'CCR' && data.ccrConfig ? \`
                         <div class="account-info">
                             <div class="info-label">CCR Provider</div>
@@ -2051,6 +2077,12 @@ class UIServer {
             const simpleModelGroup = document.getElementById('simpleModelGroup');
             const claudeModelGroup = document.getElementById('claudeModelGroup');
             const ccrModelGroup = document.getElementById('ccrModelGroup');
+            const wireApiGroup = document.getElementById('wireApiGroup');
+
+            // Show/hide wire_api field for Codex accounts
+            if (wireApiGroup) {
+                wireApiGroup.style.display = accountType === 'Codex' ? 'block' : 'none';
+            }
 
             if (accountType === 'Codex' || accountType === 'Droids') {
                 simpleModelGroup.style.display = 'block';
@@ -2117,6 +2149,12 @@ class UIServer {
             if (account.type === 'Codex' || account.type === 'Droids') {
                 // Load simple model field
                 document.getElementById('simpleModel').value = account.model || '';
+
+                // Load wire_api for Codex accounts
+                if (account.type === 'Codex') {
+                    document.getElementById('wireApi').value = account.wireApi || DEFAULT_WIRE_API;
+                }
+
                 // Clear model groups and CCR config
                 document.getElementById('modelGroupsList').innerHTML = '';
                 modelGroupCount = 0;
@@ -2379,6 +2417,14 @@ class UIServer {
                 if (simpleModel) {
                     accountData.model = simpleModel;
                 }
+
+                // Add wire_api for Codex accounts
+                if (accountType === 'Codex') {
+                    const wireApi = document.getElementById('wireApi').value;
+                    if (wireApi) {
+                        accountData.wireApi = wireApi;
+                    }
+                }
             } else if (accountType === 'CCR') {
                 // Collect CCR config
                 const providerName = document.getElementById('ccrProviderName').value.trim();