@pikecode/api-key-manager 1.0.45 → 1.1.1

package/src/commands/list.js

@@ -9,7 +9,7 @@ const { configManager } = require('../config');
 const { Logger } = require('../utils/logger');
 const { ProviderStatusChecker } = require('../utils/provider-status-checker');
 const { maybeMaskToken } = require('../utils/secrets');
-const { AUTH_MODE_DISPLAY, TOKEN_TYPE_DISPLAY, BASE_URL } = require('../constants');
+const { AUTH_MODE_DISPLAY, BASE_URL } = require('../constants');
 
 /**
  * 供应商列表显示类
@@ -29,12 +29,14 @@ class ProviderLister {
    * @param {string|null} filter - 过滤器 ('codex', 'claude', 或 null 表示全部)
    * @param {Object} options - 显示选项
    * @param {boolean} [options.showToken=true] - 是否显示完整 token
+   * @param {boolean} [options.checkStatus=false] - 是否检测在线状态
    * @returns {Promise<void>}
    */
   async list(filter = null, options = {}) {
     try {
       // 默认显示完整 token，不再加密
       const showToken = options.showToken !== false;
+      const checkStatus = options.checkStatus === true;
       await this.configManager.ensureLoaded();
       let providers = this.configManager.listProviders();
       const currentProvider = this.configManager.getCurrentProvider();
@@ -46,7 +48,7 @@ class ProviderLister {
         providers = providers.filter(p => p.ideName !== 'codex');
       }
 
-      const statusMap = await this.statusChecker.checkAll(providers);
+      const statusMap = checkStatus ? await this.statusChecker.checkAll(providers) : {};
 
       if (providers.length === 0) {
         if (filter) {
@@ -66,9 +68,6 @@ class ProviderLister {
       providers.forEach((provider, index) => {
         const isCurrent = provider.name === currentProvider?.name;
         const status = isCurrent ? '✅' : '🔹';
-        const availability = statusMap[provider.name] || { state: 'unknown', label: '未知', latency: null };
-        const availabilityIcon = this._iconForState(availability.state);
-        const availabilityText = this._formatAvailability(availability);
         const nameColor = isCurrent ? chalk.green : chalk.white;
 
         // IDE 类型标签
@@ -78,7 +77,15 @@ class ProviderLister {
 
         // 如果有别名，显示别名
         const aliasText = provider.alias ? chalk.yellow(` [别名: ${provider.alias}]`) : '';
-        console.log(`${status} ${availabilityIcon} ${ideTag} ${nameColor(provider.name)} (${provider.displayName})${aliasText} - ${availabilityText}`);
+
+        if (checkStatus) {
+          const availability = statusMap[provider.name] || { state: 'unknown', label: '未知', latency: null };
+          const availabilityIcon = this._iconForState(availability.state);
+          const availabilityText = this._formatAvailability(availability);
+          console.log(`${status} ${availabilityIcon} ${ideTag} ${nameColor(provider.name)} (${provider.displayName})${aliasText} - ${availabilityText}`);
+        } else {
+          console.log(`${status} ${ideTag} ${nameColor(provider.name)} (${provider.displayName})${aliasText}`);
+        }
 
         if (provider.ideName === 'codex') {
           console.log(chalk.gray('   IDE: Codex CLI'));
@@ -93,30 +100,20 @@ class ProviderLister {
           console.log(chalk.gray(`   认证模式: ${AUTH_MODE_DISPLAY[provider.authMode] || provider.authMode}`));
 
           // 根据不同模式显示对应的环境变量名称
-          if (provider.authMode === 'oauth_token') {
-            // OAuth 模式
-            if (provider.authToken) {
-              console.log(chalk.gray(`   CLAUDE_CODE_OAUTH_TOKEN: ${maybeMaskToken(provider.authToken, showToken)}`));
-            }
-            if (provider.baseUrl) {
-              console.log(chalk.gray(`   ANTHROPIC_BASE_URL: ${provider.baseUrl}`));
-            }
-          } else if (provider.authMode === 'api_key') {
-            // API Key 模式
+          if (provider.authMode === 'auth_token') {
             if (provider.baseUrl) {
               console.log(chalk.gray(`   ANTHROPIC_BASE_URL: ${provider.baseUrl}`));
             }
             if (provider.authToken) {
-              const tokenEnvName = TOKEN_TYPE_DISPLAY[provider.tokenType] || 'ANTHROPIC_API_KEY';
-              console.log(chalk.gray(`   ${tokenEnvName}: ${maybeMaskToken(provider.authToken, showToken)}`));
+              console.log(chalk.gray(`   ANTHROPIC_AUTH_TOKEN: ${maybeMaskToken(provider.authToken, showToken)}`));
             }
           } else {
-            // auth_token 模式
+            // API Key 模式（默认）
             if (provider.baseUrl) {
               console.log(chalk.gray(`   ANTHROPIC_BASE_URL: ${provider.baseUrl}`));
             }
             if (provider.authToken) {
-              console.log(chalk.gray(`   ANTHROPIC_AUTH_TOKEN: ${maybeMaskToken(provider.authToken, showToken)}`));
+              console.log(chalk.gray(`   ANTHROPIC_API_KEY: ${maybeMaskToken(provider.authToken, showToken)}`));
             }
           }
         }

package/src/commands/mcp.js

@@ -0,0 +1,467 @@
+/**
+ * MCP Server Management Command
+ * 管理 ~/.claude.json 中的 MCP 服务器配置
+ * @module commands/mcp
+ */
+
+const fs = require('fs-extra');
+const path = require('path');
+const os = require('os');
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+const { Logger } = require('../utils/logger');
+const { UIHelper } = require('../utils/ui-helper');
+const { BaseCommand } = require('./BaseCommand');
+
+const CLAUDE_JSON_PATH = path.join(os.homedir(), '.claude.json');
+
+// 预设 MCP 服务器模板
+const MCP_PRESETS = [
+  {
+    name: 'Playwright',
+    description: '浏览器自动化测试',
+    config: {
+      command: 'npx',
+      args: ['-y', '@playwright/mcp@latest'],
+      type: 'stdio'
+    }
+  },
+  {
+    name: 'filesystem',
+    description: '文件系统访问',
+    config: {
+      command: 'npx',
+      args: ['-y', '@modelcontextprotocol/server-filesystem', os.homedir()],
+      type: 'stdio'
+    }
+  },
+  {
+    name: 'memory',
+    description: '知识图谱记忆',
+    config: {
+      command: 'npx',
+      args: ['-y', '@modelcontextprotocol/server-memory'],
+      type: 'stdio'
+    }
+  },
+  {
+    name: 'fetch',
+    description: '网页内容获取',
+    config: {
+      command: 'npx',
+      args: ['-y', '@modelcontextprotocol/server-fetch'],
+      type: 'stdio'
+    }
+  }
+];
+
+class McpManager extends BaseCommand {
+  constructor() {
+    super();
+  }
+
+  /**
+   * 读取 ~/.claude.json
+   */
+  async _readClaudeJson() {
+    if (!await fs.pathExists(CLAUDE_JSON_PATH)) {
+      return {};
+    }
+    return await fs.readJson(CLAUDE_JSON_PATH);
+  }
+
+  /**
+   * 写入 ~/.claude.json
+   */
+  async _writeClaudeJson(data) {
+    await fs.writeJson(CLAUDE_JSON_PATH, data, { spaces: 2 });
+  }
+
+  /**
+   * 获取 mcpServers 对象
+   */
+  _getMcpServers(data) {
+    return data.mcpServers || {};
+  }
+
+  /**
+   * 列出所有 MCP 服务器
+   */
+  async list() {
+    const data = await this._readClaudeJson();
+    const servers = this._getMcpServers(data);
+    const names = Object.keys(servers);
+
+    console.log(UIHelper.createTitle('MCP 服务器列表', '🔌'));
+    console.log();
+
+    if (names.length === 0) {
+      Logger.info('暂无 MCP 服务器配置。使用 akm mcp add 添加。');
+      return;
+    }
+
+    names.forEach(name => {
+      const server = servers[name];
+      const cmd = server.command || '(unknown)';
+      const args = (server.args || []).join(' ');
+      const envKeys = Object.keys(server.env || {});
+      const envInfo = envKeys.length > 0 ? chalk.gray(` env: ${envKeys.join(', ')}`) : '';
+
+      console.log(`  ${chalk.cyan('●')} ${chalk.bold(name)}`);
+      console.log(`    ${chalk.gray('命令:')} ${cmd} ${args}`);
+      if (server.type) {
+        console.log(`    ${chalk.gray('类型:')} ${server.type}`);
+      }
+      if (envInfo) {
+        console.log(`    ${envInfo}`);
+      }
+      console.log();
+    });
+
+    console.log(chalk.gray(`  共 ${names.length} 个 MCP 服务器`));
+  }
+
+  /**
+   * 添加 MCP 服务器
+   */
+  async add() {
+    console.log(UIHelper.createTitle('添加 MCP 服务器', '➕'));
+    console.log();
+
+    let sourceChoice;
+    try {
+      sourceChoice = await this.prompt([
+        {
+          type: 'list',
+          name: 'source',
+          message: '选择添加方式:',
+          choices: [
+            { name: '📦 从预设模板选择', value: 'preset' },
+            { name: '✏️  手动配置', value: 'manual' },
+            new inquirer.Separator(),
+            { name: '取消', value: null }
+          ]
+        }
+      ]);
+    } catch (error) {
+      if (this.isEscCancelled(error)) return;
+      throw error;
+    }
+
+    if (!sourceChoice.source) {
+      Logger.info('操作已取消。');
+      return;
+    }
+
+    const data = await this._readClaudeJson();
+    const servers = this._getMcpServers(data);
+
+    if (sourceChoice.source === 'preset') {
+      await this._addFromPreset(data, servers);
+    } else {
+      await this._addManual(data, servers);
+    }
+  }
+
+  async _addFromPreset(data, servers) {
+    // 过滤掉已存在的预设
+    const available = MCP_PRESETS.filter(p => !servers[p.name]);
+
+    if (available.length === 0) {
+      Logger.info('所有预设模板已添加。可使用手动配置添加自定义服务器。');
+      return;
+    }
+
+    let selection;
+    try {
+      selection = await this.prompt([
+        {
+          type: 'checkbox',
+          name: 'presets',
+          message: '选择要添加的 MCP 服务器:',
+          choices: available.map(p => ({
+            name: `${p.name} - ${p.description}`,
+            value: p.name
+          })),
+          validate: input => input.length > 0 ? true : '请至少选择一个'
+        }
+      ]);
+    } catch (error) {
+      if (this.isEscCancelled(error)) return;
+      throw error;
+    }
+
+    if (!data.mcpServers) {
+      data.mcpServers = {};
+    }
+
+    selection.presets.forEach(name => {
+      const preset = MCP_PRESETS.find(p => p.name === name);
+      data.mcpServers[name] = { ...preset.config, env: {} };
+    });
+
+    await this._writeClaudeJson(data);
+    Logger.success(`已添加 ${selection.presets.length} 个 MCP 服务器: ${selection.presets.join(', ')}`);
+  }
+
+  async _addManual(data, servers) {
+    let config;
+    try {
+      config = await this.prompt([
+        {
+          type: 'input',
+          name: 'name',
+          message: '服务器名称:',
+          validate: input => {
+            if (!input || !input.trim()) return '名称不能为空';
+            if (servers[input.trim()]) return `'${input.trim()}' 已存在`;
+            return true;
+          }
+        },
+        {
+          type: 'input',
+          name: 'command',
+          message: '启动命令 (如 npx, node, python):',
+          validate: input => input && input.trim() ? true : '命令不能为空'
+        },
+        {
+          type: 'input',
+          name: 'args',
+          message: '命令参数 (空格分隔):',
+          default: ''
+        },
+        {
+          type: 'list',
+          name: 'type',
+          message: '通信类型:',
+          choices: [
+            { name: 'stdio (标准输入输出)', value: 'stdio' },
+            { name: 'sse (Server-Sent Events)', value: 'sse' }
+          ],
+          default: 'stdio'
+        },
+        {
+          type: 'input',
+          name: 'env',
+          message: '环境变量 (格式: KEY=VALUE, 多个用逗号分隔, 留空跳过):',
+          default: ''
+        }
+      ]);
+    } catch (error) {
+      if (this.isEscCancelled(error)) return;
+      throw error;
+    }
+
+    const name = config.name.trim();
+    const args = config.args.trim() ? config.args.trim().split(/\s+/) : [];
+    const env = {};
+    if (config.env.trim()) {
+      config.env.split(',').forEach(pair => {
+        const [key, ...valueParts] = pair.trim().split('=');
+        if (key) {
+          env[key.trim()] = valueParts.join('=').trim();
+        }
+      });
+    }
+
+    if (!data.mcpServers) {
+      data.mcpServers = {};
+    }
+
+    data.mcpServers[name] = {
+      command: config.command.trim(),
+      args,
+      env,
+      type: config.type
+    };
+
+    await this._writeClaudeJson(data);
+    Logger.success(`MCP 服务器 '${name}' 已添加。`);
+  }
+
+  /**
+   * 编辑 MCP 服务器
+   */
+  async edit() {
+    const data = await this._readClaudeJson();
+    const servers = this._getMcpServers(data);
+    const names = Object.keys(servers);
+
+    if (names.length === 0) {
+      Logger.warning('暂无 MCP 服务器配置。');
+      return;
+    }
+
+    let selection;
+    try {
+      selection = await this.prompt([
+        {
+          type: 'list',
+          name: 'name',
+          message: '选择要编辑的 MCP 服务器:',
+          choices: [
+            ...names.map(n => ({
+              name: `${n} ${chalk.gray('(' + (servers[n].command || '') + ')')}`,
+              value: n
+            })),
+            new inquirer.Separator(),
+            { name: '取消', value: null }
+          ]
+        }
+      ]);
+    } catch (error) {
+      if (this.isEscCancelled(error)) return;
+      throw error;
+    }
+
+    if (!selection.name) {
+      Logger.info('操作已取消。');
+      return;
+    }
+
+    const name = selection.name;
+    const server = servers[name];
+
+    let updates;
+    try {
+      updates = await this.prompt([
+        {
+          type: 'input',
+          name: 'command',
+          message: '启动命令:',
+          default: server.command || '',
+          validate: input => input && input.trim() ? true : '命令不能为空'
+        },
+        {
+          type: 'input',
+          name: 'args',
+          message: '命令参数 (空格分隔):',
+          default: (server.args || []).join(' ')
+        },
+        {
+          type: 'list',
+          name: 'type',
+          message: '通信类型:',
+          choices: [
+            { name: 'stdio (标准输入输出)', value: 'stdio' },
+            { name: 'sse (Server-Sent Events)', value: 'sse' }
+          ],
+          default: server.type || 'stdio'
+        },
+        {
+          type: 'input',
+          name: 'env',
+          message: '环境变量 (KEY=VALUE, 逗号分隔):',
+          default: Object.entries(server.env || {}).map(([k, v]) => `${k}=${v}`).join(', ')
+        }
+      ]);
+    } catch (error) {
+      if (this.isEscCancelled(error)) return;
+      throw error;
+    }
+
+    const args = updates.args.trim() ? updates.args.trim().split(/\s+/) : [];
+    const env = {};
+    if (updates.env.trim()) {
+      updates.env.split(',').forEach(pair => {
+        const [key, ...valueParts] = pair.trim().split('=');
+        if (key) {
+          env[key.trim()] = valueParts.join('=').trim();
+        }
+      });
+    }
+
+    data.mcpServers[name] = {
+      command: updates.command.trim(),
+      args,
+      env,
+      type: updates.type
+    };
+
+    await this._writeClaudeJson(data);
+    Logger.success(`MCP 服务器 '${name}' 已更新。`);
+  }
+
+  /**
+   * 删除 MCP 服务器
+   */
+  async remove() {
+    const data = await this._readClaudeJson();
+    const servers = this._getMcpServers(data);
+    const names = Object.keys(servers);
+
+    if (names.length === 0) {
+      Logger.warning('暂无 MCP 服务器配置。');
+      return;
+    }
+
+    let selection;
+    try {
+      selection = await this.prompt([
+        {
+          type: 'checkbox',
+          name: 'names',
+          message: '选择要删除的 MCP 服务器:',
+          choices: names.map(n => ({
+            name: `${n} ${chalk.gray('(' + (servers[n].command || '') + ' ' + (servers[n].args || []).join(' ') + ')')}`,
+            value: n
+          })),
+          validate: input => input.length > 0 ? true : '请至少选择一个'
+        }
+      ]);
+    } catch (error) {
+      if (this.isEscCancelled(error)) return;
+      throw error;
+    }
+
+    // 二次确认
+    let confirm;
+    try {
+      confirm = await this.prompt([
+        {
+          type: 'confirm',
+          name: 'ok',
+          message: `确认删除 ${selection.names.length} 个 MCP 服务器: ${selection.names.join(', ')}？`,
+          default: false
+        }
+      ]);
+    } catch (error) {
+      if (this.isEscCancelled(error)) return;
+      throw error;
+    }
+
+    if (!confirm.ok) {
+      Logger.info('操作已取消。');
+      return;
+    }
+
+    selection.names.forEach(name => {
+      delete data.mcpServers[name];
+    });
+
+    await this._writeClaudeJson(data);
+    Logger.success(`已删除 ${selection.names.length} 个 MCP 服务器: ${selection.names.join(', ')}`);
+  }
+}
+
+const VALID_SUBCOMMANDS = ['list', 'add', 'edit', 'remove'];
+
+async function mcpCommand(subcommand) {
+  const manager = new McpManager();
+  try {
+    if (!VALID_SUBCOMMANDS.includes(subcommand)) {
+      Logger.error(`未知子命令: ${subcommand}`);
+      console.log(chalk.gray(`  可用子命令: ${VALID_SUBCOMMANDS.join(', ')}`));
+      return;
+    }
+    await manager[subcommand]();
+  } catch (error) {
+    if (!manager.isEscCancelled(error)) {
+      Logger.error(`MCP 操作失败: ${error.message}`);
+    }
+  } finally {
+    manager.destroy();
+  }
+}
+
+module.exports = { mcpCommand, McpManager, MCP_PRESETS };

package/src/commands/switch.js

@@ -17,7 +17,7 @@ const { findSettingsConflict, backupSettingsFile, clearConflictKeys, saveSetting
 const { BaseCommand } = require('./BaseCommand');
 const { validator } = require('../utils/validator');
 const { ProviderStatusChecker } = require('../utils/provider-status-checker');
-const { AUTH_MODE_DISPLAY, TOKEN_TYPE_DISPLAY, BASE_URL } = require('../constants');
+const { AUTH_MODE_DISPLAY, BASE_URL } = require('../constants');
 const { LaunchArgsHelper } = require('./switch/launch-args-helper');
 const { StatusHelper } = require('./switch/status-helper');
 
@@ -1238,15 +1238,9 @@ class EnvSwitcher extends BaseCommand {
         ['认证模式', AUTH_MODE_DISPLAY[provider.authMode] || provider.authMode]
       ];
 
-      // 如果是 api_key 模式，添加 tokenType 信息
-      if (provider.authMode === 'api_key' && provider.tokenType) {
-        const tokenTypeDisplay = TOKEN_TYPE_DISPLAY[provider.tokenType];
-        details.push(['Token类型', tokenTypeDisplay]);
-      }
-
       // 继续添加其他信息
       const baseUrlDisplay = provider.baseUrl
-        || ((provider.authMode === 'oauth_token' || provider.authMode === 'auth_token')
+        || (provider.authMode === 'auth_token'
           ? BASE_URL.OFFICIAL_DEFAULT
           : '⚠️ 未设置');
       details.push(
@@ -1385,23 +1379,11 @@ class EnvSwitcher extends BaseCommand {
             name: 'authMode',
             message: '认证模式:',
             choices: [
-              { name: '🔑 通用API密钥模式 - 支持 ANTHROPIC_API_KEY 和 ANTHROPIC_AUTH_TOKEN', value: 'api_key' },
-              { name: '🔐 认证令牌模式 (仅 ANTHROPIC_AUTH_TOKEN) - 适用于某些服务商', value: 'auth_token' },
-              { name: '🌐 OAuth令牌模式 (CLAUDE_CODE_OAUTH_TOKEN) - 适用于官方Claude Code', value: 'oauth_token' }
+              { name: '🔑 ANTHROPIC_API_KEY - 大多数第三方代理使用', value: 'api_key' },
+              { name: '🔐 ANTHROPIC_AUTH_TOKEN - 部分服务商使用', value: 'auth_token' }
             ],
             default: provider.authMode || 'api_key'
           },
-          {
-            type: 'list',
-            name: 'tokenType',
-            message: 'Token类型:',
-            choices: [
-              { name: '🔑 ANTHROPIC_API_KEY - 通用API密钥', value: 'api_key' },
-              { name: '🔐 ANTHROPIC_AUTH_TOKEN - 认证令牌', value: 'auth_token' }
-            ],
-            default: provider.tokenType || 'api_key',
-            when: (answers) => answers.authMode === 'api_key'
-          },
           {
             type: 'input',
             name: 'primaryModel',
@@ -1447,17 +1429,8 @@ class EnvSwitcher extends BaseCommand {
           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 '认证令牌:';
-          }
+          const envVar = answers.authMode === 'auth_token' ? 'ANTHROPIC_AUTH_TOKEN' : 'ANTHROPIC_API_KEY';
+          return `Token (${envVar}):`;
         },
         default: provider.authToken,
         prefillDefault: true
@@ -1506,16 +1479,12 @@ class EnvSwitcher extends BaseCommand {
       // 更新供应商配置
       provider.displayName = answers.displayName || newName;
       provider.alias = answers.alias || null;
-      // oauth_token 模式不需要 baseUrl，显式设为 null
-      provider.baseUrl = answers.authMode === 'oauth_token' ? null : answers.baseUrl;
+      provider.baseUrl = answers.baseUrl;
       provider.authToken = answers.authToken;
 
       // Claude Code 特定的更新
       if (!isCodex) {
         provider.authMode = answers.authMode;
-        if (answers.tokenType) {
-          provider.tokenType = answers.tokenType; // 仅在 authMode 为 'api_key' 时使用
-        }
 
         // 更新模型配置
         if (!provider.models) {
@@ -1526,7 +1495,6 @@ class EnvSwitcher extends BaseCommand {
       } else {
         // 确保 Codex 配置不包含 Claude 特定字段
         provider.authMode = null;
-        provider.tokenType = null;
         provider.models = null;
       }
 

package/src/config.js

@@ -11,7 +11,6 @@ const chalk = require('chalk');
  * @property {string} authMode - 认证模式
  * @property {string} authToken - 认证令牌
  * @property {string|null} baseUrl - API 基础 URL
- * @property {string|null} tokenType - Token 类型
  * @property {Object|null} models - 模型配置
  * @property {string[]} launchArgs - 启动参数
  * @property {boolean} current - 是否为当前供应商
@@ -320,9 +319,6 @@ class ConfigManager {
     // Claude Code 特定字段
     if (!isCodex) {
       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);
@@ -331,7 +327,6 @@ class ConfigManager {
         : (existing?.models?.smallFast ?? null);
 
       this.config.providers[name].authMode = authMode;
-      this.config.providers[name].tokenType = tokenType;
       this.config.providers[name].models = {
         primary: primaryModel,
         smallFast: smallFastModel
@@ -339,7 +334,6 @@ class ConfigManager {
     } else {
       // Codex 不需要这些字段，设置为 null 以保持向后兼容
       this.config.providers[name].authMode = null;
-      this.config.providers[name].tokenType = null;
       this.config.providers[name].models = null;
     }