@pikecode/api-key-manager 1.0.25 → 1.0.27

package/bin/akm.js

@@ -120,5 +120,51 @@ program
     }
   });
 
+// Export command
+program
+  .command('export')
+  .argument('[file]', '导出文件路径 (默认: akm-config-{timestamp}.json)')
+  .description('导出配置到文件')
+  .option('--mask', '脱敏 Token (导入后需重新设置)')
+  .action(async (file, options) => {
+    try {
+      await registry.executeCommand('export', file, options);
+    } catch (error) {
+      console.error(chalk.red('❌ 导出失败:'), error.message);
+      process.exit(1);
+    }
+  });
+
+// Import command
+program
+  .command('import')
+  .argument('<file>', '要导入的配置文件路径')
+  .description('从文件导入配置')
+  .option('--overwrite', '覆盖已存在的供应商')
+  .action(async (file, options) => {
+    try {
+      await registry.executeCommand('import', file, options);
+    } catch (error) {
+      console.error(chalk.red('❌ 导入失败:'), error.message);
+      process.exit(1);
+    }
+  });
+
+// Backup command
+program
+  .command('backup')
+  .description('备份和恢复配置')
+  .option('-l, --list', '列出所有备份')
+  .option('-r, --restore <file>', '从备份恢复')
+  .option('-d, --dir <path>', '指定备份目录')
+  .action(async (options) => {
+    try {
+      await registry.executeCommand('backup', options);
+    } catch (error) {
+      console.error(chalk.red('❌ 备份操作失败:'), error.message);
+      process.exit(1);
+    }
+  });
+
 // Parse arguments
 program.parse();

package/package.json

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

package/src/CommandRegistry.js

@@ -71,4 +71,19 @@ registry.registerLazy('edit', async () => {
   return editCommand;
 });
 
+registry.registerLazy('export', async () => {
+  const { exportCommand } = require('./commands/backup');
+  return exportCommand;
+});
+
+registry.registerLazy('import', async () => {
+  const { importCommand } = require('./commands/backup');
+  return importCommand;
+});
+
+registry.registerLazy('backup', async () => {
+  const { backupCommand } = require('./commands/backup');
+  return backupCommand;
+});
+
 module.exports = { CommandRegistry, registry };

package/src/commands/add.js

@@ -622,6 +622,12 @@ class ProviderAdder extends BaseCommand {
 
     try {
       const codexArgs = [
+        {
+          name: 'resume',
+          label: '继续上次对话',
+          description: '恢复之前的会话',
+          checked: false
+        },
         {
           name: '--full-auto',
           label: '全自动模式',

package/src/commands/backup.js

@@ -0,0 +1,327 @@
+const fs = require('fs-extra');
+const path = require('path');
+const chalk = require('chalk');
+const { ConfigManager } = require('../config');
+const { Logger } = require('../utils/logger');
+
+class BackupManager {
+  constructor() {
+    this.configManager = new ConfigManager();
+  }
+
+  /**
+   * 导出配置到指定文件
+   * @param {string} outputPath - 输出文件路径
+   * @param {object} options - 选项
+   */
+  async export(outputPath, options = {}) {
+    try {
+      await this.configManager.ensureLoaded();
+      const config = this.configManager.config;
+
+      if (!config.providers || Object.keys(config.providers).length === 0) {
+        Logger.warning('没有供应商配置可导出');
+        return;
+      }
+
+      // 准备导出数据
+      const exportData = {
+        version: '1.0',
+        exportedAt: new Date().toISOString(),
+        providers: config.providers,
+        currentProvider: config.currentProvider
+      };
+
+      // 如果需要脱敏
+      if (options.mask) {
+        exportData.providers = this.maskTokens(exportData.providers);
+      }
+
+      // 确定输出路径
+      const finalPath = outputPath || `akm-config-${this.getTimestamp()}.json`;
+      const absolutePath = path.isAbsolute(finalPath) ? finalPath : path.join(process.cwd(), finalPath);
+
+      // 写入文件
+      await fs.writeJson(absolutePath, exportData, { spaces: 2 });
+
+      Logger.success(`配置已导出到: ${absolutePath}`);
+      console.log(chalk.gray(`  供应商数量: ${Object.keys(config.providers).length}`));
+      if (options.mask) {
+        console.log(chalk.yellow('  注意: Token 已脱敏，导入后需要重新设置'));
+      }
+
+    } catch (error) {
+      Logger.error(`导出配置失败: ${error.message}`);
+      throw error;
+    }
+  }
+
+  /**
+   * 从文件导入配置
+   * @param {string} inputPath - 输入文件路径
+   * @param {object} options - 选项
+   */
+  async import(inputPath, options = {}) {
+    try {
+      if (!inputPath) {
+        Logger.error('请指定要导入的配置文件路径');
+        return;
+      }
+
+      const absolutePath = path.isAbsolute(inputPath) ? inputPath : path.join(process.cwd(), inputPath);
+
+      if (!await fs.pathExists(absolutePath)) {
+        Logger.error(`文件不存在: ${absolutePath}`);
+        return;
+      }
+
+      const importData = await fs.readJson(absolutePath);
+
+      // 验证导入数据
+      if (!importData.providers || typeof importData.providers !== 'object') {
+        Logger.error('无效的配置文件格式');
+        return;
+      }
+
+      await this.configManager.ensureLoaded();
+
+      const importedCount = Object.keys(importData.providers).length;
+      let addedCount = 0;
+      let skippedCount = 0;
+
+      for (const [name, provider] of Object.entries(importData.providers)) {
+        const exists = this.configManager.getProvider(name);
+
+        if (exists && !options.overwrite) {
+          Logger.warning(`供应商 "${name}" 已存在，跳过 (使用 --overwrite 覆盖)`);
+          skippedCount++;
+          continue;
+        }
+
+        // 添加或更新供应商
+        this.configManager.config.providers[name] = {
+          ...provider,
+          name,
+          importedAt: new Date().toISOString()
+        };
+        addedCount++;
+      }
+
+      // 如果设置了 currentProvider 且该供应商存在
+      if (importData.currentProvider && this.configManager.config.providers[importData.currentProvider]) {
+        if (!this.configManager.config.currentProvider || options.overwrite) {
+          this.configManager.config.currentProvider = importData.currentProvider;
+        }
+      }
+
+      await this.configManager.save();
+
+      Logger.success(`配置导入完成`);
+      console.log(chalk.gray(`  导入文件: ${absolutePath}`));
+      console.log(chalk.gray(`  成功导入: ${addedCount} 个供应商`));
+      if (skippedCount > 0) {
+        console.log(chalk.yellow(`  跳过: ${skippedCount} 个已存在的供应商`));
+      }
+
+    } catch (error) {
+      Logger.error(`导入配置失败: ${error.message}`);
+      throw error;
+    }
+  }
+
+  /**
+   * 备份当前配置
+   * @param {string} backupDir - 备份目录
+   */
+  async backup(backupDir) {
+    try {
+      await this.configManager.ensureLoaded();
+
+      // 确定备份目录
+      const homeDir = process.env.HOME || process.env.USERPROFILE;
+      const defaultBackupDir = path.join(homeDir, '.akm-backups');
+      const finalDir = backupDir || defaultBackupDir;
+
+      // 确保备份目录存在
+      await fs.ensureDir(finalDir);
+
+      // 生成备份文件名
+      const backupFileName = `akm-backup-${this.getTimestamp()}.json`;
+      const backupPath = path.join(finalDir, backupFileName);
+
+      // 读取原始配置文件
+      const configPath = this.configManager.configPath;
+      if (!await fs.pathExists(configPath)) {
+        Logger.warning('配置文件不存在，无需备份');
+        return;
+      }
+
+      // 复制配置文件
+      await fs.copy(configPath, backupPath);
+
+      Logger.success(`配置已备份到: ${backupPath}`);
+
+      // 清理旧备份（保留最近 10 个）
+      await this.cleanOldBackups(finalDir, 10);
+
+    } catch (error) {
+      Logger.error(`备份配置失败: ${error.message}`);
+      throw error;
+    }
+  }
+
+  /**
+   * 列出所有备份
+   * @param {string} backupDir - 备份目录
+   */
+  async listBackups(backupDir) {
+    try {
+      const homeDir = process.env.HOME || process.env.USERPROFILE;
+      const defaultBackupDir = path.join(homeDir, '.akm-backups');
+      const finalDir = backupDir || defaultBackupDir;
+
+      if (!await fs.pathExists(finalDir)) {
+        Logger.warning('备份目录不存在');
+        return;
+      }
+
+      const files = await fs.readdir(finalDir);
+      const backups = files
+        .filter(f => f.startsWith('akm-backup-') && f.endsWith('.json'))
+        .sort()
+        .reverse();
+
+      if (backups.length === 0) {
+        Logger.warning('没有找到备份文件');
+        return;
+      }
+
+      console.log(chalk.blue('\n备份列表:'));
+      console.log(chalk.gray('═'.repeat(60)));
+
+      for (const backup of backups) {
+        const backupPath = path.join(finalDir, backup);
+        const stat = await fs.stat(backupPath);
+        const size = (stat.size / 1024).toFixed(2);
+        console.log(chalk.white(`  ${backup}`));
+        console.log(chalk.gray(`    大小: ${size} KB | 时间: ${stat.mtime.toLocaleString()}`));
+      }
+
+      console.log(chalk.gray('═'.repeat(60)));
+      console.log(chalk.blue(`总计: ${backups.length} 个备份`));
+      console.log(chalk.gray(`备份目录: ${finalDir}`));
+
+    } catch (error) {
+      Logger.error(`列出备份失败: ${error.message}`);
+      throw error;
+    }
+  }
+
+  /**
+   * 从备份恢复
+   * @param {string} backupFile - 备份文件路径或名称
+   */
+  async restore(backupFile) {
+    try {
+      const homeDir = process.env.HOME || process.env.USERPROFILE;
+      const defaultBackupDir = path.join(homeDir, '.akm-backups');
+
+      let backupPath;
+      if (path.isAbsolute(backupFile)) {
+        backupPath = backupFile;
+      } else if (backupFile.includes('/') || backupFile.includes('\\')) {
+        backupPath = path.join(process.cwd(), backupFile);
+      } else {
+        // 假设是备份目录中的文件名
+        backupPath = path.join(defaultBackupDir, backupFile);
+      }
+
+      if (!await fs.pathExists(backupPath)) {
+        Logger.error(`备份文件不存在: ${backupPath}`);
+        return;
+      }
+
+      // 先备份当前配置
+      await this.backup();
+
+      // 恢复备份
+      const configPath = this.configManager.configPath;
+      await fs.copy(backupPath, configPath);
+
+      Logger.success(`配置已从备份恢复: ${backupPath}`);
+
+    } catch (error) {
+      Logger.error(`恢复备份失败: ${error.message}`);
+      throw error;
+    }
+  }
+
+  /**
+   * 清理旧备份
+   */
+  async cleanOldBackups(backupDir, keepCount) {
+    const files = await fs.readdir(backupDir);
+    const backups = files
+      .filter(f => f.startsWith('akm-backup-') && f.endsWith('.json'))
+      .sort()
+      .reverse();
+
+    if (backups.length > keepCount) {
+      const toDelete = backups.slice(keepCount);
+      for (const file of toDelete) {
+        await fs.remove(path.join(backupDir, file));
+      }
+      if (toDelete.length > 0) {
+        Logger.info(`已清理 ${toDelete.length} 个旧备份`);
+      }
+    }
+  }
+
+  /**
+   * Token 脱敏处理
+   */
+  maskTokens(providers) {
+    const masked = {};
+    for (const [name, provider] of Object.entries(providers)) {
+      masked[name] = {
+        ...provider,
+        authToken: provider.authToken ? this.maskToken(provider.authToken) : null
+      };
+    }
+    return masked;
+  }
+
+  maskToken(token) {
+    if (!token || token.length < 10) return '***';
+    return token.substring(0, 8) + '***' + token.substring(token.length - 4);
+  }
+
+  getTimestamp() {
+    const now = new Date();
+    return now.toISOString().replace(/[:.]/g, '-').substring(0, 19);
+  }
+}
+
+async function exportCommand(outputPath, options) {
+  const manager = new BackupManager();
+  await manager.export(outputPath, options);
+}
+
+async function importCommand(inputPath, options) {
+  const manager = new BackupManager();
+  await manager.import(inputPath, options);
+}
+
+async function backupCommand(options) {
+  const manager = new BackupManager();
+
+  if (options.list) {
+    await manager.listBackups(options.dir);
+  } else if (options.restore) {
+    await manager.restore(options.restore);
+  } else {
+    await manager.backup(options.dir);
+  }
+}
+
+module.exports = { exportCommand, importCommand, backupCommand, BackupManager };

package/src/commands/switch.js

@@ -93,6 +93,13 @@ class EnvSwitcher extends BaseCommand {
       
       this.removeESCListener(escListener);
 
+      // 检查互斥参数
+      const conflictError = this.checkExclusiveArgs(answers.selectedArgs, availableArgs);
+      if (conflictError) {
+        Logger.warning(conflictError);
+        return await this.showLaunchArgsSelection(providerName);
+      }
+
       // 选择参数后直接启动
       await this.launchProvider(provider, answers.selectedArgs);
       
@@ -274,8 +281,37 @@ class EnvSwitcher extends BaseCommand {
     ];
   }
 
+  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;
+  }
+
   getCodexLaunchArgs() {
     return [
+      {
+        name: 'resume',
+        label: '继续上次对话',
+        description: '恢复之前的会话',
+        checked: false,
+        isSubcommand: true
+      },
       {
         name: '--full-auto',
         label: '全自动模式',

package/src/utils/codex-launcher.js

@@ -87,7 +87,12 @@ async function executeCodexWithEnv(config, launchArgs = []) {
   }
 
   const env = buildCodexEnvVariables(config);
-  const args = Array.isArray(launchArgs) ? [...launchArgs] : [];
+
+  // 处理参数：子命令放前面，选项放后面
+  const rawArgs = Array.isArray(launchArgs) ? [...launchArgs] : [];
+  const subcommands = rawArgs.filter(arg => !arg.startsWith('-'));
+  const options = rawArgs.filter(arg => arg.startsWith('-'));
+  const args = [...subcommands, ...options];
 
   clearTerminal();