yymaxapi 1.0.86 → 1.0.87

package/bin/yymaxapi.js

@@ -2368,13 +2368,10 @@ function applyManagedYunyiOpenClawLayout(config, options = {}) {
 
 function printYunyiOpenClawSwitchHint(result = {}) {
   if (!result?.applied) return;
-  if (result.preservedMain && result.claudeAgentId === YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID) {
-    console.log(chalk.gray('   已保留你现有的 main；Yunyi Claude 入口为 yunyi-claude'));
-  } else {
-    console.log(chalk.gray('   默认主入口是 yunyi-claude'));
-  }
-  console.log(chalk.gray('   GPT 入口是 yunyi-gpt'));
-  console.log(chalk.yellow('   提示: 当前 OpenClaw Web 顶部模型下拉跨 provider 切换可能报错，建议通过左侧会话/agent 切换 Claude 和 GPT'));
+  const summary = result.preservedMain && result.claudeAgentId === YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID
+    ? 'OpenClaw: main 已保留, Claude=yunyi-claude, GPT=yunyi-gpt'
+    : 'OpenClaw: main=yunyi-claude, GPT=yunyi-gpt';
+  console.log(chalk.cyan(`   ${summary}`));
 }
 
 function pruneProvidersByPrefix(config, prefixBase, keepProviders = []) {
@@ -3948,17 +3945,13 @@ async function presetClaude(paths, args = {}) {
     updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER, apiKey);
     updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_GPT_PROVIDER, apiKey);
   }
-  const extSynced = syncExternalTools('claude', baseUrl, apiKey, { claudeModelId: modelId, opencodeDefaultModelKey: `yunyi-claude/${modelId}` });
+  syncExternalTools('claude', baseUrl, apiKey, { claudeModelId: modelId, opencodeDefaultModelKey: `yunyi-claude/${modelId}` });
   writeSpinner.succeed('配置写入完成');
 
   console.log(chalk.green('\n✅ Claude 节点配置完成！'));
-  const tag = setPrimary ? ' (主)' : '';
-  console.log(chalk.cyan(`   ${providerName}${tag}: ${buildFullUrl(selectedEndpoint.url, 'claude')}`));
-  console.log(chalk.gray(`   模型: ${modelName}`));
-  console.log(chalk.gray('   API Key: 已设置'));
-  if (extSynced.length > 0) console.log(chalk.gray(`   同步: ${extSynced.join(', ')}`));
+  console.log(chalk.cyan(`   Claude: ${modelName}`));
   if (repairResult.renamedProviders.length > 0) {
-    console.log(chalk.gray(`   已保留并修复冲突 provider: ${repairResult.renamedProviders.map(item => `${item.from}→${item.to}`).join(', ')}`));
+    console.log(chalk.cyan(`   已修复 provider 冲突: ${repairResult.renamedProviders.map(item => `${item.from}→${item.to}`).join(', ')}`));
   }
   printYunyiOpenClawSwitchHint(yunyiLayoutResult);
 
@@ -4135,17 +4128,13 @@ async function presetCodex(paths, args = {}) {
     updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER, apiKey);
     updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_GPT_PROVIDER, apiKey);
   }
-  const extSynced2 = syncExternalTools('codex', baseUrl, apiKey, { modelId });
+  syncExternalTools('codex', baseUrl, apiKey, { modelId });
   writeSpinner2.succeed('配置写入完成');
 
   console.log(chalk.green('\n✅ Codex 节点配置完成！'));
-  const tag = setPrimary ? ' (主)' : '';
-  console.log(chalk.cyan(`   ${providerName}${tag}: ${baseUrl}`));
-  console.log(chalk.gray(`   模型: ${modelName}`));
-  console.log(chalk.gray('   API Key: 已设置'));
-  if (extSynced2.length > 0) console.log(chalk.gray(`   同步: ${extSynced2.join(', ')}`));
+  console.log(chalk.cyan(`   Codex: ${modelName}`));
   if (repairResult.renamedProviders.length > 0) {
-    console.log(chalk.gray(`   已保留并修复冲突 provider: ${repairResult.renamedProviders.map(item => `${item.from}→${item.to}`).join(', ')}`));
+    console.log(chalk.cyan(`   已修复 provider 冲突: ${repairResult.renamedProviders.map(item => `${item.from}→${item.to}`).join(', ')}`));
   }
   printYunyiOpenClawSwitchHint(yunyiLayoutResult);
 
@@ -4330,22 +4319,15 @@ async function autoActivate(paths, args = {}) {
   writeConfigWithSync(paths, config);
   updateAuthProfilesWithSync(paths, claudeProviderName, apiKey);
   updateAuthProfilesWithSync(paths, codexProviderName, apiKey);
-  const extSynced = [];
   const opencodeDefaultModelKey = isClaudePrimary ? `yunyi-claude/${claudeModelId}` : `yunyi-codex/${codexModelId}`;
-  try { extSynced.push(...syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl, claudeModelId, opencodeDefaultModelKey })); } catch { /* ignore */ }
-  try { extSynced.push(...syncExternalTools('codex', codexBaseUrl, apiKey, { modelId: codexModelId })); } catch { /* ignore */ }
+  try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl, claudeModelId, opencodeDefaultModelKey }); } catch { /* ignore */ }
+  try { syncExternalTools('codex', codexBaseUrl, apiKey, { modelId: codexModelId }); } catch { /* ignore */ }
   writeSpinner.succeed('配置写入完成');
 
   // ---- 输出结果 ----
-  const primaryLabel = isClaudePrimary ? 'Claude' : 'GPT';
   const selectedModel = isClaudePrimary ? claudeModel : codexModel;
   console.log(chalk.green('\n✅ 配置完成！'));
-  console.log(chalk.cyan(`   外部工具默认: ${selectedModel.name} (${primaryLabel})`));
-  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 时可在界面中切换 ${getOpencodeSwitchHint()}；Codex 仅支持 GPT`));
+  console.log(chalk.cyan(`   外部工具默认: ${selectedModel.name}`));
   printYunyiOpenClawSwitchHint(yunyiLayoutResult);
 
   const gwPort = config.gateway?.port || 18789;
@@ -4790,12 +4772,8 @@ async function yycodeQuickSetup(paths) {
 
   // ---- 结果 ----
   console.log(chalk.green('\n✅ 配置完成！'));
-  console.log(chalk.cyan(`   Claude Code: ${claudeBaseUrl}`));
-  console.log(chalk.gray(`     模型: ${claudeModel.name}`));
-  console.log(chalk.cyan(`   Codex CLI: ${codexBaseUrl}`));
-  console.log(chalk.gray(`     模型: ${codexModel.name}`));
-  console.log(chalk.gray('   API Key: 已设置'));
-  console.log(chalk.gray('   同步: Claude Code settings, Opencode config, Codex CLI config'));
+  console.log(chalk.cyan(`   Claude Code: ${claudeModel.name}`));
+  console.log(chalk.cyan(`   Codex CLI: ${codexModel.name}`));
   printYunyiOpenClawSwitchHint(yunyiLayoutResult);
   console.log('');
 }
@@ -5072,9 +5050,7 @@ async function selectNode(paths, type) {
   if (managedGptKey) updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_GPT_PROVIDER, managedGptKey);
 
   console.log(chalk.green(`\n✅ ${typeLabel} 节点配置完成！`));
-  console.log(chalk.cyan(`   节点: ${selectedEndpoint.name} (${selectedEndpoint.url})`));
-  console.log(chalk.gray(`   模型: ${modelConfig.name} (主模型)`));
-  console.log(chalk.gray(`   API Key: ${oldApiKey ? '已设置' : '未设置'}`));
+  console.log(chalk.cyan(`   ${typeLabel}: ${modelConfig.name}`));
   printYunyiOpenClawSwitchHint(yunyiLayoutResult);
 }
 
@@ -5129,9 +5105,7 @@ async function activate(paths, type) {
   writeAuthStore(paths.authProfiles, authStore);
 
   console.log(chalk.green(`\n✅ 已激活 ${typeLabel}`));
-  console.log(chalk.cyan(`   节点: ${provider.baseUrl}`));
-  console.log(chalk.gray(`   模型: ${modelConfig.name}`));
-  console.log(chalk.gray(`   API Key: 已设置`));
+  console.log(chalk.cyan(`   ${typeLabel}: ${modelConfig.name}`));
   printYunyiOpenClawSwitchHint(yunyiLayoutResult);
 }
 
@@ -5438,16 +5412,11 @@ async function testConnection(paths, args = {}) {
   // 获取 Gateway 配置
   const gatewayPort = config.gateway?.port || 18789;
 
-  console.log(chalk.gray(`当前测试: ${typeLabel}`));
+  console.log(chalk.cyan(`当前测试: ${typeLabel}`));
   if (testTarget.agentId) {
-    console.log(chalk.gray(`测试入口: ${testTarget.agentId}${testTarget.agentName ? ` (${testTarget.agentName})` : ''}`));
-  }
-  if (testTarget.agentId && testTarget.defaultPrimary && testTarget.defaultPrimary !== primary) {
-    console.log(chalk.gray(`默认主入口: ${testTarget.defaultPrimary}`));
+    console.log(chalk.cyan(`测试入口: ${testTarget.agentId}${testTarget.agentName ? ` (${testTarget.agentName})` : ''}`));
   }
-  console.log(chalk.gray(`中转节点: ${provider.baseUrl}`));
-  console.log(chalk.gray(`模型: ${primary}`));
-  console.log(chalk.gray(`Gateway: http://127.0.0.1:${gatewayPort}\n`));
+  console.log(chalk.cyan(`模型: ${primary}\n`));
   // 获取 Gateway token
   const gatewayToken = config.gateway?.auth?.token;
   if (!gatewayToken) {
@@ -5574,17 +5543,6 @@ async function testConnection(paths, args = {}) {
             console.log(chalk.cyan(`   Provider: ${cliResult.provider}`));
             console.log(chalk.cyan(`   Model: ${cliResult.model}`));
           }
-          if (cliResult.message) {
-            const reply = sanitizeModelReply(cliResult.message, {
-              provider: cliResult.provider,
-              model: cliResult.model,
-              modelKey: primary
-            });
-            console.log(chalk.yellow(`   模型回复: ${reply}`));
-          }
-          if (!isFallback) {
-            console.log(chalk.gray('   将继续验证 Web 鉴权端点（避免"CLI 正常但网页 401"）...'));
-          }
         }
       }
 
@@ -5615,7 +5573,6 @@ async function testConnection(paths, args = {}) {
     const primaryApi = config.models?.providers?.[primaryProvider]?.api || '';
     const isAnthropic = primaryApi.startsWith('anthropic');
     const testEndpoint = isAnthropic ? '/v1/messages' : '/v1/chat/completions';
-    console.log(chalk.gray(`   端点: http://127.0.0.1:${gatewayPort}${testEndpoint}`));
     const startTime = Date.now();
     let result = await testGatewayApi(gatewayPort, gatewayToken, primary, testEndpoint);
     const latency = Date.now() - startTime;
@@ -5623,26 +5580,17 @@ async function testConnection(paths, args = {}) {
     // 回退：如果首选端点返回 404/405，尝试另一个
     if (!result.success && result.reachable && [404, 405].includes(result.status)) {
       const fallbackEndpoint = isAnthropic ? '/v1/chat/completions' : '/v1/responses';
-      console.log(chalk.gray(`   ${testEndpoint} 不支持，回退测试 ${fallbackEndpoint}...`));
       result = await testGatewayApi(gatewayPort, gatewayToken, primary, fallbackEndpoint);
     }
 
     // CLI 对话已成功 + Gateway 可达（404/405）= Dashboard 通过 WebSocket 工作，视为通过
     if (!result.success && cliPassed && result.reachable && [404, 405].includes(result.status)) {
       console.log(chalk.green(`\n✅ Gateway 测试通过`));
-      console.log(chalk.cyan(`   CLI 对话正常，Gateway 可达`));
-      console.log(chalk.gray(`   注: Gateway Dashboard 通过 WebSocket 通信，REST 端点返回 405 属正常现象`));
       console.log(chalk.green(`\n🌐 Web Dashboard 访问地址:`));
       console.log(chalk.cyan(`   http://127.0.0.1:${gatewayPort}/#token=${gatewayToken}`));
     } else if (result.success) {
-      console.log(chalk.green(`\n✅ Gateway 测试成功！Web Dashboard 可正常使用`));
+      console.log(chalk.green(`\n✅ Gateway 测试通过`));
       console.log(chalk.cyan(`   响应时间: ${latency}ms`));
-      const reply = sanitizeModelReply(result.message, {
-        provider: providerName,
-        model: primary.includes('/') ? primary.split('/')[1] : '',
-        modelKey: primary
-      });
-      console.log(chalk.yellow(`   模型回复: ${reply}`));
       console.log(chalk.green(`\n🌐 Web Dashboard 访问地址:`));
       console.log(chalk.cyan(`   http://127.0.0.1:${gatewayPort}/#token=${gatewayToken}`));
     } else {

package/package.json

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