@pikecode/api-key-manager 1.0.28 → 1.0.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikecode/api-key-manager",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "A CLI tool for managing and switching multiple API provider configurations",
   "main": "src/index.js",
   "bin": {

package/src/commands/switch.js

@@ -1325,27 +1325,32 @@ class EnvSwitcher extends BaseCommand {
         this.showManageMenu();
       }, '取消编辑');
 
-      let answers;
-      try {
-        answers = await this.prompt([
-          {
-            type: 'input',
-            name: 'name',
-            message: '请输入供应商名称 (用于命令行):',
-            default: provider.name,
-            validate: (input) => {
-              const error = validator.validateName(input);
-              if (error) return error;
-              return true;
-            }
-          },
-          {
-            type: 'input',
-            name: 'displayName',
-            message: '显示名称:',
-            default: provider.displayName,
-            prefillDefault: true
-          },
+      // 根据 IDE 类型构建不同的问卷
+      const isCodex = provider.ideName === 'codex';
+      const questions = [
+        {
+          type: 'input',
+          name: 'name',
+          message: '请输入供应商名称 (用于命令行):',
+          default: provider.name,
+          validate: (input) => {
+            const error = validator.validateName(input);
+            if (error) return error;
+            return true;
+          }
+        },
+        {
+          type: 'input',
+          name: 'displayName',
+          message: '显示名称:',
+          default: provider.displayName,
+          prefillDefault: true
+        }
+      ];
+
+      // Claude Code 特定的字段
+      if (!isCodex) {
+        questions.push(
           {
             type: 'list',
             name: 'authMode',
@@ -1368,33 +1373,6 @@ class EnvSwitcher extends BaseCommand {
             default: provider.tokenType || 'api_key',
             when: (answers) => answers.authMode === 'api_key'
           },
-          {
-            type: 'input',
-            name: 'baseUrl',
-            message: '基础URL:',
-            default: provider.baseUrl,
-            prefillDefault: true,
-            when: (answers) => answers.authMode === 'api_key' || answers.authMode === 'auth_token'
-          },
-          {
-            type: 'input',
-            name: 'authToken',
-            message: (answers) => {
-              switch (answers.authMode) {
-                case 'api_key':
-                  const tokenTypeLabel = answers.tokenType === 'auth_token' ? 'ANTHROPIC_AUTH_TOKEN' : 'ANTHROPIC_API_KEY';
-                  return `Token (${tokenTypeLabel}):`;
-                case 'auth_token':
-                  return '认证令牌 (ANTHROPIC_AUTH_TOKEN):';
-                case 'oauth_token':
-                  return 'OAuth令牌 (CLAUDE_CODE_OAUTH_TOKEN):';
-                default:
-                  return '认证令牌:';
-              }
-            },
-            default: provider.authToken,
-            prefillDefault: true
-          },
           {
             type: 'input',
             name: 'primaryModel',
@@ -1421,7 +1399,44 @@ class EnvSwitcher extends BaseCommand {
               return true;
             }
           }
-        ]);
+        );
+      }
+
+      // 通用字段（Claude 和 Codex 都需要）
+      questions.push({
+        type: 'input',
+        name: 'baseUrl',
+        message: isCodex ? '基础URL (OPENAI_BASE_URL):' : '基础URL:',
+        default: provider.baseUrl,
+        prefillDefault: true
+      });
+
+      questions.push({
+        type: 'input',
+        name: 'authToken',
+        message: (answers) => {
+          if (isCodex) {
+            return 'API Key (OPENAI_API_KEY):';
+          }
+          switch (answers.authMode) {
+            case 'api_key':
+              const tokenTypeLabel = answers.tokenType === 'auth_token' ? 'ANTHROPIC_AUTH_TOKEN' : 'ANTHROPIC_API_KEY';
+              return `Token (${tokenTypeLabel}):`;
+            case 'auth_token':
+              return '认证令牌 (ANTHROPIC_AUTH_TOKEN):';
+            case 'oauth_token':
+              return 'OAuth令牌 (CLAUDE_CODE_OAUTH_TOKEN):';
+            default:
+              return '认证令牌:';
+          }
+        },
+        default: provider.authToken,
+        prefillDefault: true
+      });
+
+      let answers;
+      try {
+        answers = await this.prompt(questions);
       } catch (error) {
         this.removeESCListener(escListener);
         if (this.isEscCancelled(error)) {
@@ -1462,17 +1477,29 @@ class EnvSwitcher extends BaseCommand {
       provider.displayName = answers.displayName || newName;
       provider.baseUrl = answers.baseUrl;
       provider.authToken = answers.authToken;
-      provider.authMode = answers.authMode;
-      if (answers.tokenType) {
-        provider.tokenType = answers.tokenType; // 仅在 authMode 为 'api_key' 时使用
-      }
       
-      // 更新模型配置
-      if (!provider.models) {
-        provider.models = {};
+      // Claude Code 特定的更新
+      if (!isCodex) {
+        provider.authMode = answers.authMode;
+        if (answers.tokenType) {
+          provider.tokenType = answers.tokenType; // 仅在 authMode 为 'api_key' 时使用
+        }
+        
+        // 更新模型配置
+        if (!provider.models) {
+          provider.models = {};
+        }
+        provider.models.primary = answers.primaryModel || null;
+        provider.models.smallFast = answers.smallFastModel || null;
+      } else {
+        // 确保 Codex 配置不包含 Claude 特定字段
+        provider.authMode = null;
+        provider.tokenType = null;
+        provider.models = null;
       }
-      provider.models.primary = answers.primaryModel || null;
-      provider.models.smallFast = answers.smallFastModel || null;
+
+      // 确保 ideName 不被改变
+      provider.ideName = isCodex ? 'codex' : 'claude';
 
       await this.configManager.save();
       Logger.success(`供应商 '${newName}' 已更新`);

package/src/config.js

@@ -198,24 +198,35 @@ class ConfigManager {
   async addProvider(name, providerConfig) {
     await this.ensureLoaded();
 
+    const isCodex = providerConfig.ideName === 'codex';
+
     this.config.providers[name] = {
       name,
       displayName: providerConfig.displayName || name,
-      ideName: providerConfig.ideName || 'claude', // 历史兼容性字段
+      ideName: providerConfig.ideName || 'claude',
       baseUrl: providerConfig.baseUrl,
       authToken: providerConfig.authToken,
-      authMode: providerConfig.authMode || 'api_key',
-      tokenType: providerConfig.tokenType || 'api_key', // 仅在 authMode 为 'api_key' 时使用
       launchArgs: providerConfig.launchArgs || [],
-      models: {
-        primary: providerConfig.primaryModel || null,
-        smallFast: providerConfig.smallFastModel || null
-      },
       createdAt: new Date().toISOString(),
       lastUsed: new Date().toISOString(),
       current: false
     };
 
+    // Claude Code 特定字段
+    if (!isCodex) {
+      this.config.providers[name].authMode = providerConfig.authMode || 'api_key';
+      this.config.providers[name].tokenType = providerConfig.tokenType || 'api_key';
+      this.config.providers[name].models = {
+        primary: providerConfig.primaryModel || null,
+        smallFast: providerConfig.smallFastModel || null
+      };
+    } else {
+      // Codex 不需要这些字段，设置为 null 以保持向后兼容
+      this.config.providers[name].authMode = null;
+      this.config.providers[name].tokenType = null;
+      this.config.providers[name].models = null;
+    }
+
     // 如果是第一个供应商或设置为默认，则设为当前供应商
     if (Object.keys(this.config.providers).length === 1 || providerConfig.setAsDefault) {
       // 重置所有供应商的current状态