@pikecode/api-key-manager 1.0.31 → 1.0.33

package/README.md

@@ -9,7 +9,7 @@
 
 - 🎯 **双 IDE 支持** - 同时管理 Claude Code 和 Codex CLI 配置
 - 🔄 **快速切换** - 一键切换不同的 API 提供商
-- 🔐 **安全存储** - 本地加密存储 API 密钥
+- 🔐 **安全存储** - 本地文件存储（Unix 自动设置为 0600 权限）
 - 🎨 **多认证模式** - 支持 OAuth、API Key、Auth Token
 - 🚀 **启动参数** - 为每个供应商配置专属启动参数
 - 💾 **备份恢复** - 配置导出、导入、备份功能
@@ -95,13 +95,16 @@ akm list --codex
 
 # 仅列出 Claude Code 供应商
 akm list --claude
+
+# 显示完整 Token（默认脱敏，慎用）
+akm list --show-token
 ```
 
 **显示内容：**
 - ✅ 当前激活的供应商
 - 🟢/🟡/🔴 API 可用性状态
 - [Codex]/[Claude] IDE 类型标签
-- 认证模式、环境变量、启动参数
+- 认证模式、环境变量、启动参数（Token 默认脱敏，可用 `--show-token` 显示完整）
 - 创建时间、最后使用时间
 
 #### `akm current`
@@ -109,6 +112,9 @@ akm list --claude
 
 ```bash
 akm current
+
+# 显示完整 Token（默认脱敏，慎用）
+akm current --show-token
 ```
 
 **显示内容：**

package/bin/akm.js

@@ -83,10 +83,11 @@ program
   .description('列出所有API密钥配置')
   .option('--codex', '仅显示 Codex CLI 供应商')
   .option('--claude', '仅显示 Claude Code 供应商')
+  .option('--show-token', '显示完整 Token（默认脱敏）')
   .action(async (options) => {
     try {
       const filter = options.codex ? 'codex' : (options.claude ? 'claude' : null);
-      await registry.executeCommand('list', filter);
+      await registry.executeCommand('list', filter, { showToken: options.showToken });
     } catch (error) {
       console.error(chalk.red('❌ 列表失败:'), error.message);
       process.exit(1);
@@ -97,9 +98,10 @@ program
 program
   .command('current')
   .description('显示当前活跃的配置')
-  .action(async () => {
+  .option('--show-token', '显示完整 Token（默认脱敏）')
+  .action(async (options) => {
     try {
-      await registry.executeCommand('current');
+      await registry.executeCommand('current', { showToken: options.showToken });
     } catch (error) {
       console.error(chalk.red('❌ 获取当前配置失败:'), error.message);
       process.exit(1);

package/package.json

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

package/src/commands/add.js

@@ -1,15 +1,16 @@
 const inquirer = require('inquirer');
 const chalk = require('chalk');
-const { ConfigManager } = require('../config');
+const { configManager } = require('../config');
 const { validator } = require('../utils/validator');
 const { Logger } = require('../utils/logger');
 const { UIHelper } = require('../utils/ui-helper');
+const { maskToken } = require('../utils/secrets');
 const { BaseCommand } = require('./BaseCommand');
 
 class ProviderAdder extends BaseCommand {
   constructor(options = {}) {
     super();
-    this.configManager = new ConfigManager();
+    this.configManager = configManager;
     this.presetIdeName = options.ideName || null;
   }
 
@@ -391,6 +392,9 @@ class ProviderAdder extends BaseCommand {
     } catch (error) {
       // 移除 ESC 键监听
       this.removeESCListener(escListener);
+      if (this.isEscCancelled(error)) {
+        return;
+      }
       throw error;
     }
   }
@@ -407,9 +411,9 @@ class ProviderAdder extends BaseCommand {
         }
       }
 
-      const launchArgs = answers.configureLaunchArgs
-        ? await this.promptLaunchArgsSelection()
-        : [];
+      const launchArgs = answers.ideName === 'codex'
+        ? (Array.isArray(answers.launchArgs) ? answers.launchArgs : [])
+        : (answers.configureLaunchArgs ? await this.promptLaunchArgsSelection() : []);
 
       const modelConfig = answers.configureModels
         ? await this.promptModelConfiguration()
@@ -621,32 +625,8 @@ class ProviderAdder extends BaseCommand {
     }, '跳过配置');
 
     try {
-      const codexArgs = [
-        {
-          name: 'resume',
-          label: '继续上次对话',
-          description: '恢复之前的会话',
-          checked: false
-        },
-        {
-          name: '--full-auto',
-          label: '全自动模式',
-          description: '自动批准 + 工作区写入沙盒 (与跳过沙盒互斥)',
-          checked: false
-        },
-        {
-          name: '--dangerously-bypass-approvals-and-sandbox',
-          label: '跳过审批和沙盒',
-          description: '危险：跳过所有安全检查 (与全自动互斥)',
-          checked: false
-        },
-        {
-          name: '--search',
-          label: '启用网页搜索',
-          description: '允许模型搜索网页',
-          checked: false
-        }
-      ];
+      const { getCodexLaunchArgs, checkExclusiveArgs } = require('../utils/launch-args');
+      const codexArgs = getCodexLaunchArgs();
 
       const { launchArgs } = await this.prompt([
         {
@@ -662,6 +642,12 @@ class ProviderAdder extends BaseCommand {
       ]);
 
       this.removeESCListener(escListener);
+
+      const conflictError = checkExclusiveArgs(launchArgs, codexArgs);
+      if (conflictError) {
+        Logger.warning(conflictError);
+        return await this.promptCodexLaunchArgsSelection();
+      }
       return launchArgs;
     } catch (error) {
       this.removeESCListener(escListener);
@@ -686,7 +672,7 @@ class ProviderAdder extends BaseCommand {
         console.log(chalk.gray(`  OPENAI_BASE_URL: ${answers.baseUrl}`));
       }
       if (answers.authToken) {
-        console.log(chalk.gray(`  OPENAI_API_KEY: ${answers.authToken}`));
+        console.log(chalk.gray(`  OPENAI_API_KEY: ${maskToken(answers.authToken)}`));
       }
       if (answers.launchArgs && answers.launchArgs.length > 0) {
         console.log(chalk.gray(`  启动参数: ${answers.launchArgs.join(' ')}`));
@@ -712,7 +698,7 @@ class ProviderAdder extends BaseCommand {
     if (answers.baseUrl) {
       console.log(chalk.gray(`  基础URL: ${answers.baseUrl}`));
     }
-    console.log(chalk.gray(`  Token: ${answers.authToken}`));
+    console.log(chalk.gray(`  Token: ${maskToken(answers.authToken)}`));
 
     if (launchArgs.length > 0) {
       console.log(chalk.gray(`  启动参数: ${launchArgs.join(' ')}`));

package/src/commands/backup.js

@@ -1,12 +1,12 @@
 const fs = require('fs-extra');
 const path = require('path');
 const chalk = require('chalk');
-const { ConfigManager } = require('../config');
+const { configManager } = require('../config');
 const { Logger } = require('../utils/logger');
 
 class BackupManager {
   constructor() {
-    this.configManager = new ConfigManager();
+    this.configManager = configManager;
   }
 
   /**

package/src/commands/current.js

@@ -1,14 +1,16 @@
 const chalk = require('chalk');
-const { ConfigManager } = require('../config');
+const { configManager } = require('../config');
 const { Logger } = require('../utils/logger');
+const { maybeMaskToken } = require('../utils/secrets');
 
 class CurrentConfig {
   constructor() {
-    this.configManager = new ConfigManager();
+    this.configManager = configManager;
   }
 
-  async show() {
+  async show(options = {}) {
     try {
+      const showToken = Boolean(options.showToken);
       await this.configManager.ensureLoaded();
       const currentProvider = this.configManager.getCurrentProvider();
       
@@ -30,7 +32,7 @@ class CurrentConfig {
           console.log(chalk.gray(`OPENAI_BASE_URL: ${currentProvider.baseUrl}`));
         }
         if (currentProvider.authToken) {
-          console.log(chalk.gray(`OPENAI_API_KEY: ${currentProvider.authToken}`));
+          console.log(chalk.gray(`OPENAI_API_KEY: ${maybeMaskToken(currentProvider.authToken, showToken)}`));
         }
         console.log(chalk.gray(`创建时间: ${new Date(currentProvider.createdAt).toLocaleString()}`));
         console.log(chalk.gray(`最后使用: ${new Date(currentProvider.lastUsed).toLocaleString()}`));
@@ -41,7 +43,7 @@ class CurrentConfig {
           console.log(chalk.gray(`set OPENAI_BASE_URL=${currentProvider.baseUrl}`));
         }
         if (currentProvider.authToken) {
-          console.log(chalk.gray(`set OPENAI_API_KEY=${currentProvider.authToken}`));
+          console.log(chalk.gray(`set OPENAI_API_KEY=${maybeMaskToken(currentProvider.authToken, showToken)}`));
         }
         console.log(chalk.gray('codex'));
         return;
@@ -64,7 +66,7 @@ class CurrentConfig {
       if (currentProvider.baseUrl) {
         console.log(chalk.gray(`基础URL: ${currentProvider.baseUrl}`));
       }
-      console.log(chalk.gray(`认证Token: ${currentProvider.authToken}`));
+      console.log(chalk.gray(`认证Token: ${maybeMaskToken(currentProvider.authToken, showToken)}`));
       console.log(chalk.gray(`创建时间: ${new Date(currentProvider.createdAt).toLocaleString()}`));
       console.log(chalk.gray(`最后使用: ${new Date(currentProvider.lastUsed).toLocaleString()}`));
       
@@ -82,17 +84,17 @@ class CurrentConfig {
         console.log(chalk.gray(`set ANTHROPIC_BASE_URL=${currentProvider.baseUrl}`));
       }
       if (currentProvider.authMode === 'oauth_token') {
-        console.log(chalk.gray(`set CLAUDE_CODE_OAUTH_TOKEN=${currentProvider.authToken}`));
+        console.log(chalk.gray(`set CLAUDE_CODE_OAUTH_TOKEN=${maybeMaskToken(currentProvider.authToken, showToken)}`));
       } else if (currentProvider.authMode === 'api_key') {
         // 根据 tokenType 显示对应的环境变量
         if (currentProvider.tokenType === 'auth_token') {
-          console.log(chalk.gray(`set ANTHROPIC_AUTH_TOKEN=${currentProvider.authToken}`));
+          console.log(chalk.gray(`set ANTHROPIC_AUTH_TOKEN=${maybeMaskToken(currentProvider.authToken, showToken)}`));
         } else {
-          console.log(chalk.gray(`set ANTHROPIC_API_KEY=${currentProvider.authToken}`));
+          console.log(chalk.gray(`set ANTHROPIC_API_KEY=${maybeMaskToken(currentProvider.authToken, showToken)}`));
         }
       } else {
         // auth_token 模式
-        console.log(chalk.gray(`set ANTHROPIC_AUTH_TOKEN=${currentProvider.authToken}`));
+        console.log(chalk.gray(`set ANTHROPIC_AUTH_TOKEN=${maybeMaskToken(currentProvider.authToken, showToken)}`));
       }
       if (currentProvider.models?.primary) {
         console.log(chalk.gray(`set ANTHROPIC_MODEL=${currentProvider.models.primary}`));
@@ -109,9 +111,9 @@ class CurrentConfig {
   }
 }
 
-async function currentCommand() {
+async function currentCommand(options = {}) {
   const current = new CurrentConfig();
-  await current.show();
+  await current.show(options);
 }
 
 module.exports = { currentCommand, CurrentConfig };

package/src/commands/edit.js

@@ -1,6 +1,6 @@
 const inquirer = require('inquirer');
 const chalk = require('chalk');
-const { ConfigManager } = require('../config');
+const { configManager } = require('../config');
 const { validator } = require('../utils/validator');
 const { Logger } = require('../utils/logger');
 const { UIHelper } = require('../utils/ui-helper');
@@ -9,7 +9,7 @@ const { BaseCommand } = require('./BaseCommand');
 class ProviderEditor extends BaseCommand {
   constructor() {
     super();
-    this.configManager = new ConfigManager();
+    this.configManager = configManager;
   }
 
   async interactive(providerName) {
@@ -86,6 +86,14 @@ class ProviderEditor extends BaseCommand {
         ];
 
         if (isCodex) {
+          const existingLaunchArgs = Array.isArray(providerToEdit.launchArgs) ? providerToEdit.launchArgs : [];
+          const { getCodexLaunchArgs, checkExclusiveArgs } = require('../utils/launch-args');
+          const codexArgs = getCodexLaunchArgs();
+
+          const knownCodexArgNames = new Set(codexArgs.map(arg => arg.name));
+          const customCodexArgs = existingLaunchArgs
+            .filter(arg => typeof arg === 'string' && !knownCodexArgNames.has(arg));
+
           questions.push(
             {
               type: 'input',
@@ -106,6 +114,30 @@ class ProviderEditor extends BaseCommand {
                 if (!input) return 'API Key 不能为空';
                 return validator.validateToken(input) || true;
               }
+            },
+            {
+              type: 'checkbox',
+              name: 'launchArgs',
+              message: 'Codex 启动参数:',
+              choices: [
+                ...codexArgs.map(arg => ({
+                  name: `${arg.label} (${arg.name})${arg.description ? ' - ' + arg.description : ''}`,
+                  value: arg.name,
+                  checked: existingLaunchArgs.includes(arg.name),
+                })),
+                ...customCodexArgs.map(arg => ({
+                  name: `${arg} ${chalk.gray('(自定义参数)')}`,
+                  value: arg,
+                  checked: true,
+                })),
+              ],
+              validate: (selected) => {
+                const conflictError = checkExclusiveArgs(selected, codexArgs);
+                if (conflictError) {
+                  return conflictError;
+                }
+                return true;
+              }
             }
           );
         } else {
@@ -135,9 +167,19 @@ class ProviderEditor extends BaseCommand {
             {
               type: 'input',
               name: 'baseUrl',
-              message: 'API基础URL:',
-              default: providerToEdit.baseUrl,
-              validate: (input) => validator.validateUrl(input) || true,
+              message: (answers) => {
+                if (answers.authMode === 'auth_token') {
+                  return 'API基础URL (留空使用官方API):';
+                }
+                return 'API基础URL:';
+              },
+              default: providerToEdit.baseUrl || '',
+              validate: (input, answers) => {
+                if (answers.authMode === 'auth_token' && !input) {
+                  return true;
+                }
+                return validator.validateUrl(input) || true;
+              },
               when: (answers) => answers.authMode === 'api_key' || answers.authMode === 'auth_token',
             },
             {
@@ -202,15 +244,17 @@ class ProviderEditor extends BaseCommand {
           ideName: 'codex',
           baseUrl: answers.baseUrl || null,
           authToken: answers.authToken,
-          launchArgs: existingProvider.launchArgs || [],
+          launchArgs: answers.launchArgs,
           setAsDefault: false
         });
       } else {
         // Re-use addProvider which can overwrite existing providers
+        // oauth_token 模式不需要 baseUrl，显式设为 null
+        const baseUrl = answers.authMode === 'oauth_token' ? null : answers.baseUrl;
         await this.configManager.addProvider(name, {
           displayName: answers.displayName,
           ideName,
-          baseUrl: answers.baseUrl,
+          baseUrl,
           authToken: answers.authToken,
           authMode: answers.authMode,
           tokenType: answers.tokenType, // 仅在 authMode 为 'api_key' 时使用

package/src/commands/list.js

@@ -1,16 +1,18 @@
 const chalk = require('chalk');
-const { ConfigManager } = require('../config');
+const { configManager } = require('../config');
 const { Logger } = require('../utils/logger');
 const { ProviderStatusChecker } = require('../utils/provider-status-checker');
+const { maybeMaskToken } = require('../utils/secrets');
 
 class ProviderLister {
   constructor() {
-    this.configManager = new ConfigManager();
+    this.configManager = configManager;
     this.statusChecker = new ProviderStatusChecker();
   }
 
-  async list(filter = null) {
+  async list(filter = null, options = {}) {
     try {
+      const showToken = Boolean(options.showToken);
       await this.configManager.ensureLoaded();
       let providers = this.configManager.listProviders();
       const currentProvider = this.configManager.getCurrentProvider();
@@ -60,7 +62,7 @@ class ProviderLister {
             console.log(chalk.gray(`   OPENAI_BASE_URL: ${provider.baseUrl}`));
           }
           if (provider.authToken) {
-            console.log(chalk.gray(`   OPENAI_API_KEY: ${provider.authToken}`));
+            console.log(chalk.gray(`   OPENAI_API_KEY: ${maybeMaskToken(provider.authToken, showToken)}`));
           }
         } else {
           // 显示认证模式
@@ -75,7 +77,7 @@ class ProviderLister {
           if (provider.authMode === 'oauth_token') {
             // OAuth 模式
             if (provider.authToken) {
-              console.log(chalk.gray(`   CLAUDE_CODE_OAUTH_TOKEN: ${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}`));
@@ -87,7 +89,7 @@ class ProviderLister {
             }
             if (provider.authToken) {
               const tokenEnvName = provider.tokenType === 'auth_token' ? 'ANTHROPIC_AUTH_TOKEN' : 'ANTHROPIC_API_KEY';
-              console.log(chalk.gray(`   ${tokenEnvName}: ${provider.authToken}`));
+              console.log(chalk.gray(`   ${tokenEnvName}: ${maybeMaskToken(provider.authToken, showToken)}`));
             }
           } else {
             // auth_token 模式
@@ -95,7 +97,7 @@ class ProviderLister {
               console.log(chalk.gray(`   ANTHROPIC_BASE_URL: ${provider.baseUrl}`));
             }
             if (provider.authToken) {
-              console.log(chalk.gray(`   ANTHROPIC_AUTH_TOKEN: ${provider.authToken}`));
+              console.log(chalk.gray(`   ANTHROPIC_AUTH_TOKEN: ${maybeMaskToken(provider.authToken, showToken)}`));
             }
           }
         }
@@ -161,9 +163,9 @@ class ProviderLister {
   }
 }
 
-async function listCommand(filter = null) {
+async function listCommand(filter = null, options = {}) {
   const lister = new ProviderLister();
-  await lister.list(filter);
+  await lister.list(filter, options);
 }
 
 module.exports = { listCommand, ProviderLister };

package/src/commands/remove.js

@@ -1,5 +1,5 @@
 const inquirer = require('inquirer');
-const { ConfigManager } = require('../config');
+const { configManager } = require('../config');
 const { Logger } = require('../utils/logger');
 const { UIHelper } = require('../utils/ui-helper');
 const { BaseCommand } = require('./BaseCommand');
@@ -7,7 +7,7 @@ const { BaseCommand } = require('./BaseCommand');
 class ProviderRemover extends BaseCommand {
   constructor() {
     super();
-    this.configManager = new ConfigManager();
+    this.configManager = configManager;
   }
 
   async remove(providerName) {