yymaxapi 1.0.31 → 1.0.33

package/bin/yymaxapi.js

@@ -979,7 +979,7 @@ function detectGatewayEnv(port = 18789) {
       }
     }
   } catch { }
-  // Fallback: Windows 没有原生 OpenClaw CLI，但 WSL 里有 → 判定为 WSL
+  // Fallback: Windows 没有原生 OpenClaw CLI → 检查 WSL / Docker
   const nativeCli = resolveCliBinary();
   if (!nativeCli) {
     const wslCli = getWslCliBinary();
@@ -993,6 +993,12 @@ function detectGatewayEnv(port = 18789) {
       _gwEnvCache = 'docker';
       return 'docker';
     }
+    // Windows 没有原生 CLI，WSL 可用但未找到具体 CLI 路径
+    // 仍然判定为 WSL（Gateway 大概率在 WSL 里，CLI 可能不在 bash -l 的 PATH 中）
+    if (isWslAvailable()) {
+      _gwEnvCache = 'wsl';
+      return 'wsl';
+    }
   }
   _gwEnvCache = 'native';
   return 'native';
@@ -2501,60 +2507,207 @@ async function presetCodex(paths, args = {}) {
   }
 }
 
-// ============ 一键激活（自动识别服务类型） ============
-async function autoActivate(paths) {
-  console.log(chalk.cyan.bold('\n🚀 一键激活（自动识别服务类型）\n'));
+// ============ 一键激活（同时配置 Claude Code + Codex） ============
+async function autoActivate(paths, args = {}) {
+  console.log(chalk.cyan.bold('\n🚀 一键激活（同时配置 Claude Code + Codex）\n'));
 
-  const apiKey = await promptApiKey('请输入 API Key:', '');
-  if (!apiKey) { console.log(chalk.gray('已取消')); return; }
+  const claudeApiConfig = API_CONFIG.claude;
+  const codexApiConfig = API_CONFIG.codex;
+  const claudeProviderName = claudeApiConfig.providerName;
+  const codexProviderName = codexApiConfig.providerName;
 
-  // 用第一个节点验证，获取 service_type
-  const nodeUrl = ENDPOINTS[0] ? ENDPOINTS[0].url : '';
-  if (!nodeUrl) { console.log(chalk.red('没有可用节点')); return; }
+  // ---- 测速选节点 ----
+  const shouldTest = !(args['no-test'] || args.noTest);
+  let selectedEndpoint = ENDPOINTS[0];
 
-  console.log('');
-  const validation = await validateApiKey(nodeUrl, apiKey);
+  if (shouldTest) {
+    console.log(chalk.cyan('📡 开始测速节点...\n'));
+    const speedResult = await testAllEndpoints(ENDPOINTS, { autoFallback: true });
 
+    const sorted = speedResult.ranked || [];
+    if (sorted.length > 0) {
+      const defaultEp = ENDPOINTS[0];
+      const { selectedIndex } = await inquirer.prompt([{
+        type: 'list',
+        name: 'selectedIndex',
+        message: '选择节点:',
+        choices: [
+          { name: `* 使用默认节点 (${defaultEp.name})`, value: -1 },
+          new inquirer.Separator('  ---- 或按测速结果选择 ----'),
+          ...sorted.map((e, i) => ({
+            name: `${e.name} - ${e.latency}ms (评分:${e.score})`,
+            value: i
+          }))
+        ]
+      }]);
+      selectedEndpoint = selectedIndex === -1 ? defaultEp : sorted[selectedIndex];
+      if (speedResult.usedFallback) {
+        console.log(chalk.yellow(`\n⚠ 当前使用备用节点\n`));
+      }
+    } else {
+      console.log(chalk.red('\n⚠️  所有节点（含备用）均不可达'));
+      const { proceed } = await inquirer.prompt([{
+        type: 'confirm', name: 'proceed',
+        message: '仍要写入默认节点配置吗？', default: false
+      }]);
+      if (!proceed) { console.log(chalk.gray('已取消')); return; }
+    }
+  }
+
+  // ---- API Key ----
+  const apiKeyEnvFallbacks = [
+    'OPENCLAW_CLAUDE_KEY',
+    'OPENCLAW_CODEX_KEY',
+    'CLAUDE_API_KEY',
+    'OPENAI_API_KEY',
+    'OPENCLAW_API_KEY'
+  ];
+  const directKey = (args['api-key'] || args.apiKey || args.key || '').toString().trim();
+  let apiKey;
+  if (directKey) {
+    apiKey = directKey;
+  } else {
+    const envKey = getApiKeyFromArgs({}, apiKeyEnvFallbacks);
+    apiKey = await promptApiKey('请输入 API Key（同时用于 Claude Code 和 Codex）:', envKey || '');
+  }
+  if (!apiKey) { console.log(chalk.gray('已取消')); return; }
+
+  // ---- 验证 ----
+  console.log('');
+  const validation = await validateApiKey(selectedEndpoint.url, apiKey);
   if (!validation.valid) {
     const { continueAnyway } = await inquirer.prompt([{
       type: 'confirm', name: 'continueAnyway',
-      message: 'API Key 验证失败，是否手动选择服务类型继续？', default: false
+      message: 'API Key 验证失败，是否仍然继续写入配置？', default: false
     }]);
     if (!continueAnyway) { console.log(chalk.gray('已取消')); return; }
   }
 
-  const serviceType = (validation.data && validation.data.service_type || '').toLowerCase();
-  let targetType = '';
-
-  if (serviceType.includes('claude') || serviceType.includes('anthropic')) {
-    targetType = 'claude';
-    console.log(chalk.cyan(`\n识别为 Claude 服务，进入 Claude 配置流程...\n`));
-  } else if (serviceType.includes('codex') || serviceType.includes('gpt') || serviceType.includes('openai')) {
-    targetType = 'codex';
-    console.log(chalk.cyan(`\n识别为 Codex 服务，进入 Codex 配置流程...\n`));
-  }
-
-  if (!targetType) {
-    // 无法自动识别，让用户选
-    const hasClaude = CLAUDE_MODELS && CLAUDE_MODELS.length > 0;
-    const hasCodex = CODEX_MODELS && CODEX_MODELS.length > 0;
-    const typeChoices = [];
-    if (hasClaude) typeChoices.push({ name: 'Claude', value: 'claude' });
-    if (hasCodex) typeChoices.push({ name: 'Codex (GPT)', value: 'codex' });
-    if (typeChoices.length === 0) { targetType = 'claude'; }
-    else if (typeChoices.length === 1) { targetType = typeChoices[0].value; }
-    else {
-      const { picked } = await inquirer.prompt([{
-        type: 'list', name: 'picked', message: '无法自动识别服务类型，请选择:', choices: typeChoices
-      }]);
-      targetType = picked;
-    }
+  // ---- 构建配置 ----
+  const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
+
+  const existingProviders = Object.keys(config.models.providers || {});
+  const toRemove = existingProviders.filter(n => n !== claudeProviderName && n !== codexProviderName);
+  if (toRemove.length > 0 && !args.force) {
+    const { overwrite } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'overwrite',
+      message: `检测到已有中转配置: ${existingProviders.join(', ')}，将替换为 ${claudeProviderName} + ${codexProviderName}。是否继续？`,
+      default: false
+    }]);
+    if (!overwrite) { console.log(chalk.gray('已取消')); return; }
   }
 
-  if (targetType === 'claude') {
-    await presetClaude(paths, { 'api-key': apiKey });
+  if (toRemove.length > 0) {
+    pruneProvidersExcept(config, [claudeProviderName, codexProviderName]);
+    pruneAuthProfilesExcept(paths.authProfiles, [claudeProviderName, codexProviderName]);
+  }
+
+  // Claude 侧
+  const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
+  const claudeModelId = 'claude-opus-4-6';
+  const claudeModel = CLAUDE_MODELS.find(m => m.id === claudeModelId) || { id: claudeModelId, name: 'Claude Opus 4.6' };
+  const claudeModelKey = `${claudeProviderName}/${claudeModelId}`;
+
+  config.models.providers[claudeProviderName] = {
+    baseUrl: claudeBaseUrl,
+    auth: DEFAULT_AUTH_MODE,
+    api: claudeApiConfig.api,
+    headers: {},
+    authHeader: false,
+    apiKey: apiKey.trim(),
+    models: [{
+      id: claudeModel.id,
+      name: claudeModel.name,
+      contextWindow: claudeApiConfig.contextWindow,
+      maxTokens: claudeApiConfig.maxTokens
+    }]
+  };
+  config.auth.profiles[`${claudeProviderName}:default`] = { provider: claudeProviderName, mode: 'api_key' };
+  config.agents.defaults.models[claudeModelKey] = { alias: claudeProviderName };
+
+  // Codex 侧
+  const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
+  const codexModelId = 'gpt-5.3-codex';
+  const codexModel = CODEX_MODELS.find(m => m.id === codexModelId) || { id: codexModelId, name: 'GPT 5.3 Codex' };
+  const codexModelKey = `${codexProviderName}/${codexModelId}`;
+
+  config.models.providers[codexProviderName] = {
+    baseUrl: codexBaseUrl,
+    auth: DEFAULT_AUTH_MODE,
+    api: codexApiConfig.api,
+    headers: {},
+    authHeader: false,
+    apiKey: apiKey.trim(),
+    models: [{
+      id: codexModel.id,
+      name: codexModel.name,
+      contextWindow: codexApiConfig.contextWindow,
+      maxTokens: codexApiConfig.maxTokens
+    }]
+  };
+  config.auth.profiles[`${codexProviderName}:default`] = { provider: codexProviderName, mode: 'api_key' };
+  config.agents.defaults.models[codexModelKey] = { alias: codexProviderName };
+
+  // ---- 选择主力 ----
+  let primaryType = 'codex';
+  if (args.primary === 'claude') {
+    primaryType = 'claude';
+  } else if (args.primary === 'codex') {
+    primaryType = 'codex';
   } else {
-    await presetCodex(paths, { 'api-key': apiKey });
+    const { picked } = await inquirer.prompt([{
+      type: 'list',
+      name: 'picked',
+      message: '选择主力工具（默认启动哪个）:',
+      choices: [
+        { name: 'Codex (GPT)', value: 'codex' },
+        { name: 'Claude Code', value: 'claude' }
+      ]
+    }]);
+    primaryType = picked;
+  }
+
+  const primaryModelKey = primaryType === 'claude' ? claudeModelKey : codexModelKey;
+  config.agents.defaults.model.primary = primaryModelKey;
+  const fallbackModelKey = primaryType === 'claude' ? codexModelKey : claudeModelKey;
+  config.agents.defaults.model.fallbacks = [fallbackModelKey];
+
+  // ---- 写入配置 ----
+  const writeSpinner = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
+  createTimestampedBackup(paths.openclawConfig, paths.configDir, 'unified');
+  ensureGatewaySettings(config);
+  writeConfigWithSync(paths, config);
+  updateAuthProfiles(paths.authProfiles, claudeProviderName, apiKey);
+  updateAuthProfiles(paths.authProfiles, codexProviderName, apiKey);
+  const extSynced = [];
+  try { syncExternalTools('claude', claudeBaseUrl, apiKey); extSynced.push('Claude Code settings'); } catch { /* ignore */ }
+  try { syncExternalTools('codex', codexBaseUrl, apiKey); extSynced.push('Codex CLI config'); } catch { /* ignore */ }
+  writeSpinner.succeed('配置写入完成');
+
+  // ---- 输出结果 ----
+  const primaryTag = primaryType === 'claude' ? ' (主)' : '';
+  const codexTag = primaryType === 'codex' ? ' (主)' : '';
+  console.log(chalk.green('\n✅ 一键激活完成！'));
+  console.log(chalk.cyan(`   Claude Code${primaryTag}: ${claudeBaseUrl}`));
+  console.log(chalk.gray(`     模型: ${claudeModel.name}`));
+  console.log(chalk.cyan(`   Codex${codexTag}: ${codexBaseUrl}`));
+  console.log(chalk.gray(`     模型: ${codexModel.name}`));
+  console.log(chalk.gray('   API Key: 已设置'));
+  if (extSynced.length > 0) console.log(chalk.gray(`   同步: ${extSynced.join(', ')}`));
+
+  // ---- 测试连接 ----
+  const shouldTestGateway = args.test !== undefined
+    ? !['false', '0', 'no'].includes(String(args.test).toLowerCase())
+    : await inquirer.prompt([{
+      type: 'confirm',
+      name: 'testGateway',
+      message: '是否立即通过 OpenClaw Gateway 测试？',
+      default: true
+    }]).then(r => r.testGateway);
+
+  if (shouldTestGateway) {
+    await testConnection(paths, args);
   }
 }
 
@@ -2577,11 +2730,11 @@ async function main() {
     return;
   }
   if (args.preset === 'claude' || args._.includes('preset-claude') || args._.includes('claude-preset')) {
-    await presetClaude(paths, args);
+    await autoActivate(paths, { ...args, primary: 'claude' });
     return;
   }
   if (args.preset === 'codex' || args._.includes('preset-codex') || args._.includes('codex-preset')) {
-    await presetCodex(paths, args);
+    await autoActivate(paths, { ...args, primary: 'codex' });
     return;
   }
   if (args._.includes('test')) {
@@ -2606,9 +2759,7 @@ async function main() {
       loop: false,
       choices: [
         new inquirer.Separator('  -- 配置模型 --'),
-        { name: '  一键激活（自动识别）', value: 'auto_activate' },
-        { name: '  激活 Claude', value: 'activate_claude' },
-        { name: '  激活 Codex (GPT)', value: 'activate_codex' },
+        { name: '  一键激活', value: 'auto_activate' },
         new inquirer.Separator('  -- 工具 --'),
         { name: '  测试连接', value: 'test_connection' },
         { name: '  查看配置', value: 'view_config' },
@@ -2632,12 +2783,6 @@ async function main() {
         case 'auto_activate':
           await autoActivate(paths);
           break;
-        case 'activate_claude':
-          await presetClaude(paths, {});
-          break;
-        case 'activate_codex':
-          await presetCodex(paths, {});
-          break;
         case 'test_connection':
           await testConnection(paths, {});
           break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yymaxapi",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "跨平台 OpenClaw/Clawdbot 配置管理工具 - 管理中转地址、模型切换、API Keys、测速优化",
   "main": "bin/yymaxapi.js",
   "bin": {