@pikecode/api-key-manager 1.0.31 → 1.0.33

package/src/commands/switch.js

@@ -2,7 +2,7 @@ const path = require('path');
 const inquirer = require('inquirer');
 const chalk = require('chalk');
 const Choices = require('inquirer/lib/objects/choices');
-const { ConfigManager } = require('../config');
+const { configManager } = require('../config');
 const { executeWithEnv } = require('../utils/env-launcher');
 const { executeCodexWithEnv } = require('../utils/codex-launcher');
 const { Logger } = require('../utils/logger');
@@ -11,16 +11,18 @@ const { findSettingsConflict, backupSettingsFile, clearConflictKeys, saveSetting
 const { BaseCommand } = require('./BaseCommand');
 const { validator } = require('../utils/validator');
 const { ProviderStatusChecker } = require('../utils/provider-status-checker');
+const { maskToken } = require('../utils/secrets');
 
 class EnvSwitcher extends BaseCommand {
   constructor() {
     super();
-    this.configManager = new ConfigManager();
+    this.configManager = configManager;
     this.statusChecker = new ProviderStatusChecker();
     this.latestStatusMap = {};
     this.currentPromptContext = null;
     this.activeStatusRefresh = null;
     this.filter = null;
+    this.filteredProviders = null; // 保存过滤后的供应商列表用于状态更新
   }
 
   async validateProvider(providerName) {
@@ -38,6 +40,22 @@ class EnvSwitcher extends BaseCommand {
       const provider = await this.validateProvider(providerName);
       const isCodex = provider.ideName === 'codex';
       const availableArgs = isCodex ? this.getCodexLaunchArgs() : this.getAvailableLaunchArgs();
+      const defaultLaunchArgs = Array.isArray(provider.launchArgs) ? provider.launchArgs : [];
+      const knownArgNames = new Set(availableArgs.map(arg => arg.name));
+      const customLaunchArgs = defaultLaunchArgs
+        .filter(arg => typeof arg === 'string' && !knownArgNames.has(arg));
+      const mergedArgs = [
+        ...availableArgs.map(arg => ({
+          ...arg,
+          checked: defaultLaunchArgs.includes(arg.name) || Boolean(arg.checked)
+        })),
+        ...customLaunchArgs.map(name => ({
+          name,
+          label: name,
+          description: '自定义启动参数',
+          checked: true
+        }))
+      ];
       const ideDisplayName = isCodex ? 'Codex CLI' : 'Claude Code';
       
       console.log(UIHelper.createTitle('启动配置', UIHelper.icons.launch));
@@ -65,7 +83,7 @@ class EnvSwitcher extends BaseCommand {
           type: 'checkbox',
           name: 'selectedArgs',
           message: '选择启动参数:',
-          choices: availableArgs.map(arg => {
+          choices: mergedArgs.map(arg => {
             const commandText = UIHelper.colors.muted(`(${arg.name})`);
             const descriptionText = arg.description
               ? ` ${UIHelper.colors.muted(arg.description)}`
@@ -74,7 +92,7 @@ class EnvSwitcher extends BaseCommand {
             return {
               name: `${UIHelper.colors.accent(arg.label || arg.name)} ${commandText}${descriptionText}`,
               value: arg.name,
-              checked: arg.checked || false
+              checked: Boolean(arg.checked)
             };
           })
         }
@@ -265,78 +283,20 @@ class EnvSwitcher extends BaseCommand {
   }
 
   getAvailableLaunchArgs() {
-    return [
-      {
-        name: '--continue',
-        label: '继续上次对话',
-        description: '恢复上次的对话记录',
-        checked: false
-      },
-      {
-        name: '--dangerously-skip-permissions',
-        label: '最高权限',
-        description: '仅在沙盒环境中使用',
-        checked: false
-      }
-    ];
+    const { getClaudeLaunchArgs } = require('../utils/launch-args');
+    return getClaudeLaunchArgs();
   }
 
   checkExclusiveArgs(selectedArgs, availableArgs) {
-    if (!selectedArgs || selectedArgs.length < 2) {
-      return null;
-    }
-
-    for (const argDef of availableArgs) {
-      if (!argDef.exclusive || !selectedArgs.includes(argDef.name)) {
-        continue;
-      }
-
-      for (const exclusiveArg of argDef.exclusive) {
-        if (selectedArgs.includes(exclusiveArg)) {
-          const arg1 = availableArgs.find(a => a.name === argDef.name);
-          const arg2 = availableArgs.find(a => a.name === exclusiveArg);
-          return `"${arg1?.label || argDef.name}" 和 "${arg2?.label || exclusiveArg}" 不能同时选择`;
-        }
-      }
-    }
-
-    return null;
+    const { checkExclusiveArgs } = require('../utils/launch-args');
+    return checkExclusiveArgs(selectedArgs, availableArgs);
   }
 
   getCodexLaunchArgs() {
-    return [
-      {
-        name: 'resume',
-        label: '继续上次对话',
-        description: '恢复之前的会话',
-        checked: false,
-        isSubcommand: true
-      },
-      {
-        name: '--full-auto',
-        label: '全自动模式',
-        description: '自动批准 + 工作区写入沙盒',
-        checked: false,
-        exclusive: ['--dangerously-bypass-approvals-and-sandbox']
-      },
-      {
-        name: '--dangerously-bypass-approvals-and-sandbox',
-        label: '跳过审批和沙盒',
-        description: '危险：跳过所有安全检查',
-        checked: false,
-        exclusive: ['--full-auto']
-      },
-      {
-        name: '--search',
-        label: '启用网页搜索',
-        description: '允许模型搜索网页',
-        checked: false
-      }
-    ];
+    const { getCodexLaunchArgs } = require('../utils/launch-args');
+    return getCodexLaunchArgs();
   }
 
-  // getArgDescription 方法已被移除，直接使用 arg.description
-
   async showProviderSelection() {
     try {
       // 并行加载配置和准备界面
@@ -348,7 +308,10 @@ class EnvSwitcher extends BaseCommand {
       } else if (this.filter === 'claude') {
         providers = providers.filter(p => p.ideName !== 'codex');
       }
-      
+
+      // 保存过滤后的供应商列表用于状态更新
+      this.filteredProviders = providers;
+
       const initialStatusMap = this._buildInitialStatusMap(providers);
       // 显示欢迎界面（立即渲染）
       this.showWelcomeScreen(providers, initialStatusMap, null);
@@ -394,6 +357,7 @@ class EnvSwitcher extends BaseCommand {
       const escListener = this.createESCListener(() => {
         Logger.info('退出程序');
         this.showExitScreen();
+        this.destroy();
         process.exit(0);
       }, '退出程序');
 
@@ -429,6 +393,7 @@ class EnvSwitcher extends BaseCommand {
         this.currentPromptContext = null;
       }
       this._cancelStatusRefresh();
+      this.filteredProviders = null; // 清除保存的供应商列表
     }
   }
 
@@ -474,6 +439,7 @@ class EnvSwitcher extends BaseCommand {
         return await this.showManageMenu();
       case '__EXIT__':
         this.showExitScreen();
+        this.destroy();
         process.exit(0);
       default:
         return await this.showLaunchArgsSelection(selection);
@@ -1141,7 +1107,8 @@ class EnvSwitcher extends BaseCommand {
     }
 
     const includeActions = this.currentPromptContext === 'manage';
-    const providers = this.configManager.listProviders();
+    // 使用保存的过滤后供应商列表，而不是重新获取全部
+    const providers = this.filteredProviders || this.configManager.listProviders();
     const statusMap = this.latestStatusMap || {};
     const updatedChoicesBase = this.createProviderChoices(providers, includeActions, statusMap);
     const updatedChoices = [...updatedChoicesBase];
@@ -1192,6 +1159,7 @@ class EnvSwitcher extends BaseCommand {
         return await this.showProviderSelection();
       case 'exit':
         Logger.info('👋 再见！');
+        this.destroy();
         process.exit(0);
       default:
         // 如果选择的是供应商名称，显示该供应商的详细信息
@@ -1233,9 +1201,13 @@ class EnvSwitcher extends BaseCommand {
       }
 
       // 继续添加其他信息
+      const baseUrlDisplay = provider.baseUrl
+        || ((provider.authMode === 'oauth_token' || provider.authMode === 'auth_token')
+          ? '✨ 官方默认服务器'
+          : '⚠️ 未设置');
       details.push(
-        ['基础URL', provider.baseUrl || (provider.authMode === 'oauth_token' ? '✨ 官方默认服务器' : '⚠️ 未设置')],
-        ['认证令牌', provider.authToken || '未设置'],
+        ['基础URL', baseUrlDisplay],
+        ['认证令牌', provider.authToken ? maskToken(provider.authToken) : '未设置'],
         ['主模型', provider.models?.primary || '未设置'],
         ['快速模型', provider.models?.smallFast || '未设置'],
         ['创建时间', UIHelper.formatTime(provider.createdAt)],
@@ -1453,7 +1425,8 @@ class EnvSwitcher extends BaseCommand {
         await this.configManager.ensureLoaded();
         const providersMap = this.configManager.config.providers;
 
-        if (providersMap[newName] && providersMap[newName] !== provider) {
+        // 如果新名称已存在且不是当前供应商，则报错
+        if (providersMap[newName]) {
           Logger.error(`供应商名称 '${newName}' 已存在，请使用其他名称`);
           return await this.showManageMenu();
         }

package/src/config.js

@@ -12,6 +12,17 @@ class ConfigManager {
     this.loadPromise = null; // 防止并发加载
   }
 
+  _normalizeOptionalString(value) {
+    if (value === null || value === undefined) {
+      return null;
+    }
+    if (typeof value !== 'string') {
+      return value;
+    }
+    const trimmed = value.trim();
+    return trimmed.length === 0 ? null : trimmed;
+  }
+
   getDefaultConfig() {
     return {
       version: '1.0.0',
@@ -78,6 +89,8 @@ class ConfigManager {
 
         // 迁移旧的认证模式
         this._migrateAuthModes();
+        // 修复 current 标记与 currentProvider 不一致的问题（兼容旧版本写入的脏数据）
+        this._syncCurrentFlags();
 
         const stat = await fs.stat(this.configPath);
         this.lastModified = stat.mtime;
@@ -195,30 +208,78 @@ class ConfigManager {
     }
   }
 
+  _syncCurrentFlags() {
+    if (!this.config || !this.config.providers) {
+      return;
+    }
+
+    const current = this.config.currentProvider;
+    const providers = this.config.providers;
+    const keys = Object.keys(providers);
+
+    if (current && providers[current]) {
+      keys.forEach((key) => {
+        providers[key].current = key === current;
+      });
+      return;
+    }
+
+    keys.forEach((key) => {
+      providers[key].current = false;
+    });
+  }
+
   async addProvider(name, providerConfig) {
     await this.ensureLoaded();
 
-    const isCodex = providerConfig.ideName === 'codex';
+    const existing = this.config.providers[name];
+    const now = new Date().toISOString();
+
+    const ideName = providerConfig.ideName || existing?.ideName || 'claude';
+    const isCodex = ideName === 'codex';
+
+    const baseUrl = this._normalizeOptionalString(
+      providerConfig.baseUrl !== undefined ? providerConfig.baseUrl : existing?.baseUrl
+    );
 
+    const authToken = providerConfig.authToken !== undefined ? providerConfig.authToken : existing?.authToken;
+
+    const launchArgs = Array.isArray(providerConfig.launchArgs)
+      ? providerConfig.launchArgs
+      : (existing?.launchArgs || []);
+
+    // 基础字段
     this.config.providers[name] = {
       name,
-      displayName: providerConfig.displayName || name,
-      ideName: providerConfig.ideName || 'claude',
-      baseUrl: providerConfig.baseUrl,
-      authToken: providerConfig.authToken,
-      launchArgs: providerConfig.launchArgs || [],
-      createdAt: new Date().toISOString(),
-      lastUsed: new Date().toISOString(),
-      current: false
+      displayName: providerConfig.displayName || existing?.displayName || name,
+      ideName,
+      baseUrl,
+      authToken,
+      launchArgs,
+      createdAt: existing?.createdAt || now,
+      lastUsed: existing?.lastUsed || now,
+      usageCount: existing?.usageCount || 0,
+      current: Boolean(existing?.current || this.config.currentProvider === name)
     };
 
     // Claude Code 特定字段
     if (!isCodex) {
-      this.config.providers[name].authMode = providerConfig.authMode || 'api_key';
-      this.config.providers[name].tokenType = providerConfig.tokenType || 'api_key';
+      const authMode = providerConfig.authMode || existing?.authMode || 'api_key';
+      const tokenType = authMode === 'api_key'
+        ? (providerConfig.tokenType ?? existing?.tokenType ?? 'api_key')
+        : null;
+      const primaryModel = providerConfig.primaryModel !== undefined
+        ? providerConfig.primaryModel
+        : (existing?.models?.primary ?? null);
+      const smallFastModel = providerConfig.smallFastModel !== undefined
+        ? providerConfig.smallFastModel
+        : (existing?.models?.smallFast ?? null);
+
+      this.config.providers[name].authMode = authMode;
+      this.config.providers[name].tokenType = tokenType;
       this.config.providers[name].models = {
-        primary: providerConfig.primaryModel || null,
-        smallFast: providerConfig.smallFastModel || null
+        primary: primaryModel,
+        smallFast: smallFastModel
       };
     } else {
       // Codex 不需要这些字段，设置为 null 以保持向后兼容
@@ -228,18 +289,15 @@ class ConfigManager {
     }
 
     // 如果是第一个供应商或设置为默认，则设为当前供应商
-    if (Object.keys(this.config.providers).length === 1 || providerConfig.setAsDefault) {
-      // 重置所有供应商的current状态
-      Object.keys(this.config.providers).forEach(key => {
-        this.config.providers[key].current = false;
-      });
-      
-      // 设置新的当前供应商
-      this.config.providers[name].current = true;
-      this.config.providers[name].lastUsed = new Date().toISOString();
+    const shouldSetCurrent = (!existing && Object.keys(this.config.providers).length === 1) || providerConfig.setAsDefault;
+    if (shouldSetCurrent) {
       this.config.currentProvider = name;
+      this.config.providers[name].lastUsed = now;
     }
 
+    // 保证 current 标记与 currentProvider 一致，避免出现多个 current 或丢失 current 的情况
+    this._syncCurrentFlags();
+
     return await this.save();
   }
 
@@ -317,4 +375,7 @@ class ConfigManager {
   }
 }
 
-module.exports = { ConfigManager };
+// 单例实例
+const configManager = new ConfigManager();
+
+module.exports = { ConfigManager, configManager };

package/src/utils/codex-launcher.js

@@ -1,46 +1,5 @@
 const spawn = require('cross-spawn');
-
-/**
- * 清理环境变量值，移除危险字符
- * @param {string} value - 要清理的值
- * @returns {string} 清理后的值
- */
-function sanitizeEnvValue(value) {
-  if (typeof value !== 'string') {
-    throw new Error('环境变量值必须是字符串');
-  }
-
-  // 移除控制字符
-  let cleaned = value.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, '');
-
-  // 检测可能的 shell 命令注入
-  if (/[;&|`$()]/.test(cleaned)) {
-    throw new Error('环境变量值包含潜在不安全的字符');
-  }
-
-  return cleaned;
-}
-
-function clearTerminal() {
-  if (!process.stdout || typeof process.stdout.write !== 'function') {
-    return;
-  }
-
-  try {
-    process.stdout.write('\x1bc');
-  } catch (error) {
-    // 某些终端可能不支持 RIS 序列，忽略即可
-  }
-
-  const sequence = process.platform === 'win32'
-    ? '\x1b[3J\x1b[2J\x1b[0f'
-    : '\x1b[3J\x1b[2J\x1b[H';
-  try {
-    process.stdout.write(sequence);
-  } catch (error) {
-    // 忽略清屏失败
-  }
-}
+const { sanitizeEnvValue, clearTerminal } = require('./env-utils');
 
 /**
  * 构建 Codex CLI 环境变量

package/src/utils/env-launcher.js

@@ -1,46 +1,5 @@
 const spawn = require('cross-spawn');
-
-/**
- * 清理环境变量值，移除危险字符
- * @param {string} value - 要清理的值
- * @returns {string} 清理后的值
- */
-function sanitizeEnvValue(value) {
-  if (typeof value !== 'string') {
-    throw new Error('环境变量值必须是字符串');
-  }
-
-  // 移除控制字符
-  let cleaned = value.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, '');
-
-  // 检测可能的 shell 命令注入
-  if (/[;&|`$()]/.test(cleaned)) {
-    throw new Error('环境变量值包含潜在不安全的字符');
-  }
-
-  return cleaned;
-}
-
-function clearTerminal() {
-  if (!process.stdout || typeof process.stdout.write !== 'function') {
-    return;
-  }
-
-  try {
-    process.stdout.write('\x1bc');
-  } catch (error) {
-    // 某些终端可能不支持 RIS 序列，忽略即可
-  }
-
-  const sequence = process.platform === 'win32'
-    ? '\x1b[3J\x1b[2J\x1b[0f'
-    : '\x1b[3J\x1b[2J\x1b[H';
-  try {
-    process.stdout.write(sequence);
-  } catch (error) {
-    // 忽略清屏失败
-  }
-}
+const { sanitizeEnvValue, clearTerminal } = require('./env-utils');
 
 function buildEnvVariables(config) {
   const env = { ...process.env };
@@ -50,6 +9,9 @@ function buildEnvVariables(config) {
     if (config.authMode === 'oauth_token') {
       env.CLAUDE_CODE_OAUTH_TOKEN = sanitizeEnvValue(config.authToken);
     } else if (config.authMode === 'api_key') {
+      if (!config.baseUrl) {
+        throw new Error('未配置基础地址');
+      }
       env.ANTHROPIC_BASE_URL = sanitizeEnvValue(config.baseUrl);
       // 根据 tokenType 选择设置哪种 token
       if (config.tokenType === 'auth_token') {
@@ -60,7 +22,9 @@ function buildEnvVariables(config) {
       }
     } else {
       // auth_token 模式
-      env.ANTHROPIC_BASE_URL = sanitizeEnvValue(config.baseUrl);
+      if (config.baseUrl) {
+        env.ANTHROPIC_BASE_URL = sanitizeEnvValue(config.baseUrl);
+      }
       env.ANTHROPIC_AUTH_TOKEN = sanitizeEnvValue(config.authToken);
     }
 

package/src/utils/env-utils.js

@@ -0,0 +1,52 @@
+/**
+ * 环境变量工具函数
+ * 提供 env-launcher.js 和 codex-launcher.js 共用的功能
+ */
+
+/**
+ * 清理环境变量值，移除危险字符
+ * @param {string} value - 要清理的值
+ * @returns {string} 清理后的值
+ */
+function sanitizeEnvValue(value) {
+  if (typeof value !== 'string') {
+    throw new Error('环境变量值必须是字符串');
+  }
+
+  // 移除控制字符
+  let cleaned = value.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F]/g, '');
+
+  // 检测可能的 shell 命令注入（允许 $ 因为 token 可能包含）
+  // 只禁止明确的命令分隔符和反引号执行
+  if (/[;&|`]/.test(cleaned)) {
+    throw new Error('环境变量值包含潜在不安全的字符');
+  }
+
+  return cleaned;
+}
+
+/**
+ * 清屏函数
+ */
+function clearTerminal() {
+  if (!process.stdout || typeof process.stdout.write !== 'function') {
+    return;
+  }
+
+  try {
+    process.stdout.write('\x1bc');
+  } catch (error) {
+    // 某些终端可能不支持 RIS 序列，忽略即可
+  }
+
+  const sequence = process.platform === 'win32'
+    ? '\x1b[3J\x1b[2J\x1b[0f'
+    : '\x1b[3J\x1b[2J\x1b[H';
+  try {
+    process.stdout.write(sequence);
+  } catch (error) {
+    // 忽略清屏失败
+  }
+}
+
+module.exports = { sanitizeEnvValue, clearTerminal };

package/src/utils/error-handler.js

@@ -1,5 +1,5 @@
 const chalk = require('chalk');
-const { Logger } = require('./utils/logger');
+const { Logger } = require('./logger');
 
 class ErrorHandler {
   static handle(error, context = '') {

package/src/utils/launch-args.js

@@ -0,0 +1,96 @@
+/**
+ * 启动参数定义模块
+ * 统一管理 Claude Code 和 Codex CLI 的启动参数
+ */
+
+const claudeLaunchArgs = [
+  {
+    name: '--continue',
+    label: '继续上次对话',
+    description: '恢复上次的对话记录',
+    checked: false
+  },
+  {
+    name: '--dangerously-skip-permissions',
+    label: '最高权限',
+    description: '仅在沙盒环境中使用',
+    checked: false
+  }
+];
+
+const codexLaunchArgs = [
+  {
+    name: 'resume',
+    label: '继续上次对话',
+    description: '恢复之前的会话',
+    checked: false,
+    isSubcommand: true
+  },
+  {
+    name: '--full-auto',
+    label: '全自动模式',
+    description: '自动批准 + 工作区写入沙盒',
+    checked: false,
+    exclusive: ['--dangerously-bypass-approvals-and-sandbox']
+  },
+  {
+    name: '--dangerously-bypass-approvals-and-sandbox',
+    label: '跳过审批和沙盒',
+    description: '危险：跳过所有安全检查',
+    checked: false,
+    exclusive: ['--full-auto']
+  },
+  {
+    name: '--search',
+    label: '启用网页搜索',
+    description: '允许模型搜索网页',
+    checked: false
+  }
+];
+
+function getClaudeLaunchArgs() {
+  return claudeLaunchArgs.map(arg => ({ ...arg }));
+}
+
+function getCodexLaunchArgs() {
+  return codexLaunchArgs.map(arg => ({ ...arg }));
+}
+
+function getLaunchArgs(ideName) {
+  return ideName === 'codex' ? getCodexLaunchArgs() : getClaudeLaunchArgs();
+}
+
+/**
+ * 检查互斥参数
+ * @param {string[]} selectedArgs - 选中的参数列表
+ * @param {Array} availableArgs - 可用参数定义
+ * @returns {string|null} 冲突错误信息或 null
+ */
+function checkExclusiveArgs(selectedArgs, availableArgs) {
+  if (!selectedArgs || selectedArgs.length < 2) {
+    return null;
+  }
+
+  for (const argDef of availableArgs) {
+    if (!argDef.exclusive || !selectedArgs.includes(argDef.name)) {
+      continue;
+    }
+
+    for (const exclusiveArg of argDef.exclusive) {
+      if (selectedArgs.includes(exclusiveArg)) {
+        const arg1 = availableArgs.find(a => a.name === argDef.name);
+        const arg2 = availableArgs.find(a => a.name === exclusiveArg);
+        return `"${arg1?.label || argDef.name}" 和 "${arg2?.label || exclusiveArg}" 不能同时选择`;
+      }
+    }
+  }
+
+  return null;
+}
+
+module.exports = {
+  getClaudeLaunchArgs,
+  getCodexLaunchArgs,
+  getLaunchArgs,
+  checkExclusiveArgs
+};