yymaxapi 1.0.64 → 1.0.66

package/bin/yymaxapi.js

@@ -634,8 +634,9 @@ function writeClaudeCodeSettings(baseUrl, apiKey) {
   // 写入 shell 环境变量
   if (process.platform === 'win32') {
     try {
+      const cleanUrl = baseUrl.replace(/\/+$/, '');
       execSync(
-        `powershell -NoProfile -Command "[Environment]::SetEnvironmentVariable('ANTHROPIC_BASE_URL','${baseUrl.replace(/\/+$/, '')}','User'); [Environment]::SetEnvironmentVariable('ANTHROPIC_AUTH_TOKEN','${apiKey}','User')"`,
+        `powershell -NoProfile -Command "[Environment]::SetEnvironmentVariable('ANTHROPIC_BASE_URL','${cleanUrl}','User'); [Environment]::SetEnvironmentVariable('ANTHROPIC_AUTH_TOKEN','${apiKey}','User'); [Environment]::SetEnvironmentVariable('NODE_TLS_REJECT_UNAUTHORIZED','0','User')"`,
         { stdio: 'pipe' }
       );
     } catch { /* best-effort */ }
@@ -643,7 +644,14 @@ function writeClaudeCodeSettings(baseUrl, apiKey) {
     const marker = '# >>> yymaxapi claude >>>';
     const markerEnd = '# <<< yymaxapi claude <<<';
     const cleanUrl = baseUrl.replace(/\/+$/, '');
-    const block = [marker, `export ANTHROPIC_BASE_URL="${cleanUrl}"`, `export ANTHROPIC_AUTH_TOKEN="${apiKey}"`, markerEnd].join('\n');
+    const block = [
+      marker,
+      `export ANTHROPIC_BASE_URL="${cleanUrl}"`,
+      `export ANTHROPIC_AUTH_TOKEN="${apiKey}"`,
+      '# 中转站证书校验放宽，避免 unknown certificate verification error',
+      'export NODE_TLS_REJECT_UNAUTHORIZED=0',
+      markerEnd
+    ].join('\n');
 
     const shellEnv = process.env.SHELL || '';
     const rcFiles = [];
@@ -721,26 +729,36 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
   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');
+  const configPath = path.join(configDir, 'opencode.json');
   try {
     if (!fs.existsSync(configDir)) fs.mkdirSync(configDir, { recursive: true });
+    let existing = {};
+    if (fs.existsSync(configPath)) {
+      try { existing = JSON.parse(fs.readFileSync(configPath, 'utf8')); } catch { existing = {}; }
+    }
     const cleanClaudeUrl = claudeBaseUrl.replace(/\/+$/, '');
     let cleanCodexUrl = (codexBaseUrl || '').replace(/\/+$/, '');
-    if (cleanCodexUrl && !cleanCodexUrl.endsWith('/v1')) cleanCodexUrl += '/v1';
-    const config = {
-      provider: {
-        anthropic: {
-          apiKey: apiKey,
-          baseURL: cleanClaudeUrl
-        },
-        openai: {
+    if (!existing.provider) existing.provider = {};
+    existing.provider.anthropic = {
+      options: {
+        apiKey: apiKey,
+        baseURL: cleanClaudeUrl
+      }
+    };
+    if (cleanCodexUrl) {
+      existing.provider.openai = {
+        options: {
           apiKey: apiKey,
-          baseURL: cleanCodexUrl || cleanClaudeUrl
+          baseURL: cleanCodexUrl
         }
-      },
-      model: modelId || 'claude-sonnet-4-6'
-    };
-    fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf8');
+      };
+    }
+    const rawModelId = modelId || 'claude-sonnet-4-6';
+    existing.model = rawModelId.startsWith('anthropic/') || rawModelId.startsWith('openai/')
+      ? rawModelId
+      : `anthropic/${rawModelId}`;
+    if (!existing.$schema) existing.$schema = 'https://opencode.ai/config.json';
+    fs.writeFileSync(configPath, JSON.stringify(existing, null, 2), 'utf8');
     return configPath;
   } catch {
     return null;
@@ -2767,6 +2785,8 @@ async function autoActivate(paths, args = {}) {
   console.log(chalk.gray(`   节点: ${selectedEndpoint.url} (${selectedEndpoint.name})`));
   console.log(chalk.gray('   API Key: 已设置'));
   if (extSynced.length > 0) console.log(chalk.gray(`   同步: ${extSynced.join(', ')}`));
+  console.log(chalk.gray('   若遇 certificate 报错，请新开终端或执行 source ~/.zshrc 后重试（已放宽 TLS 校验）'));
+  console.log(chalk.gray('   使用 OpenCode 时可在界面中切换 Claude Sonnet 4.6 / GPT 5.4；Codex 仅支持 GPT'));
 
   const gwPort = config.gateway?.port || 18789;
   const gwToken = config.gateway?.auth?.token;
@@ -3691,24 +3711,8 @@ async function testConnection(paths, args = {}) {
   // 检查当前激活的是哪个
   let primary = config.agents?.defaults?.model?.primary || '';
   if (!primary.includes('/')) {
-    // primary 未设置，尝试从已有 provider 自动选择
-    const providers = config.models?.providers || {};
-    const providerNames = Object.keys(providers);
-    if (providerNames.length === 0) {
-      console.log(chalk.yellow('⚠️ 请先设置主模型'));
-      return;
-    }
-    const preferOrder = ['maxapi', 'heibai', 'claude-yunyi', 'yunyi', 'maxapi-codex'];
-    const preferred = preferOrder.find(n => providerNames.includes(n));
-    const firstP = preferred || providerNames.find(n => n.includes('claude')) || providerNames[0];
-    const firstModels = providers[firstP]?.models || [];
-    if (firstModels.length > 0) {
-      primary = `${firstP}/${firstModels[0].id}`;
-      console.log(chalk.yellow(`⚠️ 主模型未设置，自动使用: ${primary}`));
-    } else {
-      console.log(chalk.yellow('⚠️ 请先设置主模型'));
-      return;
-    }
+    console.log(chalk.yellow('⚠️ 主模型未设置，请先通过「切换模型」或「一键配置」设置主模型'));
+    return;
   }
 
   const providerName = primary.split('/')[0];

package/package.json

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