yymaxapi 1.0.43 → 1.0.45

package/bin/yymaxapi.js

@@ -723,6 +723,31 @@ function writeCodexConfig(baseUrl, apiKey) {
   } catch { /* 非关键，静默失败 */ }
 }
 
+function writeOpencodeConfig(baseUrl, apiKey, modelId) {
+  const home = os.homedir();
+  const configDir = process.platform === 'win32'
+    ? path.join(process.env.APPDATA || path.join(home, 'AppData', 'Roaming'), 'opencode')
+    : path.join(home, '.config', 'opencode');
+  const configPath = path.join(configDir, 'config.json');
+  try {
+    if (!fs.existsSync(configDir)) fs.mkdirSync(configDir, { recursive: true });
+    const cleanUrl = baseUrl.replace(/\/+$/, '');
+    const config = {
+      provider: {
+        anthropic: {
+          apiKey: apiKey,
+          baseURL: cleanUrl
+        }
+      },
+      model: modelId || 'claude-sonnet-4-6'
+    };
+    fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf8');
+    return configPath;
+  } catch {
+    return null;
+  }
+}
+
 function syncExternalTools(type, baseUrl, apiKey) {
   const synced = [];
   try {
@@ -2699,7 +2724,7 @@ async function autoActivate(paths, args = {}) {
   config.agents.defaults.models[codexModelKey] = { alias: codexProviderName };
 
   // ---- 选择主力 ----
-  let primaryType = 'codex';
+  let primaryType = 'claude';
   if (args.primary === 'claude') {
     primaryType = 'claude';
   } else if (args.primary === 'codex') {
@@ -2710,8 +2735,8 @@ async function autoActivate(paths, args = {}) {
       name: 'picked',
       message: '选择主力工具（默认启动哪个）:',
       choices: [
-        { name: 'Codex (GPT)', value: 'codex' },
-        { name: 'Claude Code', value: 'claude' }
+        { name: 'Claude Code', value: 'claude' },
+        { name: 'Codex (GPT)', value: 'codex' }
       ]
     }]);
     primaryType = picked;
@@ -2767,6 +2792,163 @@ async function autoActivate(paths, args = {}) {
   }
 }
 
+// ============ 单独配置 Claude Code CLI ============
+async function activateClaudeCode(paths, args = {}) {
+  console.log(chalk.cyan.bold('\n🔧 配置 Claude Code CLI\n'));
+
+  const claudeApiConfig = API_CONFIG.claude;
+
+  // ---- 测速选节点 ----
+  const shouldTest = !(args['no-test'] || args.noTest);
+  let selectedEndpoint = ENDPOINTS[0];
+
+  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];
+    } 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 directKey = (args['api-key'] || args.apiKey || args.key || '').toString().trim();
+  let apiKey;
+  if (directKey) {
+    apiKey = directKey;
+  } else {
+    const envKey = process.env.ANTHROPIC_AUTH_TOKEN || process.env.CLAUDE_API_KEY || '';
+    apiKey = await promptApiKey('请输入 API Key:', 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
+    }]);
+    if (!continueAnyway) { console.log(chalk.gray('已取消')); return; }
+  }
+
+  // ---- 写入配置 ----
+  const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
+  const writeSpinner = ora({ text: '正在写入 Claude Code 配置...', spinner: 'dots' }).start();
+  writeClaudeCodeSettings(claudeBaseUrl, apiKey);
+  writeSpinner.succeed('Claude Code 配置写入完成');
+
+  console.log(chalk.green('\n✅ Claude Code CLI 配置完成！'));
+  console.log(chalk.cyan(`   Base URL: ${claudeBaseUrl}`));
+  console.log(chalk.gray(`   模型: claude-sonnet-4-6`));
+  console.log(chalk.gray('   API Key: 已设置'));
+  console.log(chalk.gray('\n   已写入:'));
+  console.log(chalk.gray('   • ~/.claude/settings.json'));
+  console.log(chalk.gray('   • ~/.claude.json (跳过 onboarding)'));
+  console.log(chalk.gray('   • shell 环境变量 (ANTHROPIC_BASE_URL, ANTHROPIC_AUTH_TOKEN)'));
+  console.log(chalk.yellow('\n   提示: 请重新打开终端或执行 source ~/.zshrc 使环境变量生效'));
+}
+
+// ============ 单独配置 Opencode ============
+async function activateOpencode(paths, args = {}) {
+  console.log(chalk.cyan.bold('\n🔧 配置 Opencode\n'));
+
+  const claudeApiConfig = API_CONFIG.claude;
+
+  // ---- 测速选节点 ----
+  const shouldTest = !(args['no-test'] || args.noTest);
+  let selectedEndpoint = ENDPOINTS[0];
+
+  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];
+    } 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 directKey = (args['api-key'] || args.apiKey || args.key || '').toString().trim();
+  let apiKey;
+  if (directKey) {
+    apiKey = directKey;
+  } else {
+    const envKey = process.env.ANTHROPIC_AUTH_TOKEN || process.env.CLAUDE_API_KEY || '';
+    apiKey = await promptApiKey('请输入 API Key:', 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
+    }]);
+    if (!continueAnyway) { console.log(chalk.gray('已取消')); return; }
+  }
+
+  // ---- 写入配置 ----
+  const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
+  const modelId = 'claude-sonnet-4-6';
+  const writeSpinner = ora({ text: '正在写入 Opencode 配置...', spinner: 'dots' }).start();
+  const configPath = writeOpencodeConfig(claudeBaseUrl, apiKey, modelId);
+  writeSpinner.succeed('Opencode 配置写入完成');
+
+  console.log(chalk.green('\n✅ Opencode 配置完成！'));
+  console.log(chalk.cyan(`   Base URL: ${claudeBaseUrl}`));
+  console.log(chalk.gray(`   模型: ${modelId}`));
+  console.log(chalk.gray('   API Key: 已设置'));
+  if (configPath) {
+    console.log(chalk.gray(`   配置文件: ${configPath}`));
+  }
+}
+
 // ============ yycode 精简模式（零交互一键配置） ============
 async function yycodeQuickSetup(paths) {
   console.log(chalk.cyan.bold('\n⚡ yycode 一键配置\n'));
@@ -2985,11 +3167,13 @@ async function main() {
       type: 'list',
       name: 'action',
       message: '请选择操作:',
-      pageSize: 10,
+      pageSize: 15,
       loop: false,
       choices: [
-        new inquirer.Separator('  -- 配置模型 --'),
-        { name: '  一键激活', value: 'auto_activate' },
+        new inquirer.Separator('  -- 一键配置 --'),
+        { name: '  配置 OpenClaw（Claude + Codex）', value: 'auto_activate' },
+        { name: '  配置 Claude Code', value: 'activate_claude_code' },
+        { name: '  配置 Opencode', value: 'activate_opencode' },
         new inquirer.Separator('  -- 工具 --'),
         { name: '  切换模型', value: 'switch_model' },
         { name: '  测试连接', value: 'test_connection' },
@@ -3029,6 +3213,12 @@ async function main() {
         case 'install_openclaw':
           await installOrUpdateOpenClaw();
           break;
+        case 'activate_claude_code':
+          await activateClaudeCode(paths);
+          break;
+        case 'activate_opencode':
+          await activateOpencode(paths);
+          break;
       }
     } catch (error) {
       console.log(chalk.red(`\n错误: ${error.message}\n`));

package/package.json

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