yymaxapi 1.0.49 → 1.0.51

package/bin/yymaxapi.js

@@ -138,6 +138,8 @@ const DEFAULT_API_CONFIG = {
   }
 };
 
+const SKIP_API_VALIDATION = false;
+
 function normalizeEndpoints(raw, fallback) {
   if (!Array.isArray(raw)) return fallback;
   const normalized = raw
@@ -371,6 +373,9 @@ function httpGetJson(url, headers = {}, timeout = 10000) {
 }
 
 async function validateApiKey(nodeUrl, apiKey) {
+  if (SKIP_API_VALIDATION) {
+    return { valid: true, skipped: true };
+  }
   const verifyUrl = `${nodeUrl.replace(/\/+$/, '')}/user/api/v1/me`;
   const maxRetries = 3;
   const spinner = ora({ text: '正在验证 API Key...', spinner: 'dots' }).start();
@@ -1177,8 +1182,23 @@ function coerceModelsRecord(value) {
   return record;
 }
 
+const OPENCLAW_KNOWN_ROOT_KEYS = new Set([
+  'models', 'agents', 'auth', 'gateway', 'tools',
+  'channels', 'mcpServers', 'globalShortcut', 'customModes',
+  'permissions', 'proxy', 'env', 'hooks', 'storage',
+]);
+
+function sanitizeRootKeys(config) {
+  for (const key of Object.keys(config)) {
+    if (!OPENCLAW_KNOWN_ROOT_KEYS.has(key)) {
+      delete config[key];
+    }
+  }
+}
+
 function ensureConfigStructure(config) {
   const next = config || {};
+  sanitizeRootKeys(next);
   if (!next.models) next.models = {};
   if (!next.models.providers) next.models.providers = {};
   if (!next.agents) next.agents = {};
@@ -2661,25 +2681,54 @@ async function autoActivate(paths, args = {}) {
   // ---- 构建配置 ----
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
 
-  // 增量写入: 只添加/更新云翼 provider，保留其他已有配置
-
-  // Claude 侧 — 让用户选模型
   const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
-  let claudeModelId = (args['claude-model'] || '').toString().trim();
-  if (!claudeModelId && CLAUDE_MODELS.length > 1) {
-    const { picked } = await inquirer.prompt([{
-      type: 'list',
-      name: 'picked',
-      message: '选择 Claude 模型:',
-      choices: CLAUDE_MODELS.map(m => ({ name: m.name, value: m.id })),
-      default: CLAUDE_MODELS[0].id
-    }]);
-    claudeModelId = picked;
+  const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
+
+  // 检测单一模式：Claude 和 Codex 只有一个模型且 id 相同（如 maxapi 的 heibai）
+  const isSingleMode = CLAUDE_MODELS.length === 1 && CODEX_MODELS.length === 1
+    && CLAUDE_MODELS[0].id === CODEX_MODELS[0].id;
+
+  let claudeModelId, codexModelId;
+
+  if (isSingleMode) {
+    // 单一模式：固定模型，不选择，不分 Claude/Codex
+    claudeModelId = CLAUDE_MODELS[0].id;
+    codexModelId = CODEX_MODELS[0].id;
+  } else {
+    // 多模型模式：让用户选模型
+    claudeModelId = (args['claude-model'] || '').toString().trim();
+    if (!claudeModelId && CLAUDE_MODELS.length > 1) {
+      const { picked } = await inquirer.prompt([{
+        type: 'list',
+        name: 'picked',
+        message: '选择 Claude 模型:',
+        choices: CLAUDE_MODELS.map(m => ({ name: m.name, value: m.id })),
+        default: CLAUDE_MODELS[0].id
+      }]);
+      claudeModelId = picked;
+    }
+    if (!claudeModelId) claudeModelId = CLAUDE_MODELS[0]?.id || 'claude-sonnet-4-6';
+
+    codexModelId = (args['codex-model'] || '').toString().trim();
+    if (!codexModelId && CODEX_MODELS.length > 1) {
+      const { pickedCodex } = await inquirer.prompt([{
+        type: 'list',
+        name: 'pickedCodex',
+        message: '选择 Codex 模型:',
+        choices: CODEX_MODELS.map(m => ({ name: m.name, value: m.id })),
+        default: CODEX_MODELS[0].id
+      }]);
+      codexModelId = pickedCodex;
+    }
+    if (!codexModelId) codexModelId = CODEX_MODELS[0]?.id || 'gpt-5.3-codex';
   }
-  if (!claudeModelId) claudeModelId = CLAUDE_MODELS[0]?.id || 'claude-sonnet-4-6';
+
   const claudeModel = CLAUDE_MODELS.find(m => m.id === claudeModelId) || { id: claudeModelId, name: claudeModelId };
+  const codexModel = CODEX_MODELS.find(m => m.id === codexModelId) || { id: codexModelId, name: codexModelId };
   const claudeModelKey = `${claudeProviderName}/${claudeModelId}`;
+  const codexModelKey = `${codexProviderName}/${codexModelId}`;
 
+  // 写入 Claude provider
   config.models.providers[claudeProviderName] = {
     baseUrl: claudeBaseUrl,
     auth: DEFAULT_AUTH_MODE,
@@ -2697,23 +2746,7 @@ async function autoActivate(paths, args = {}) {
   config.auth.profiles[`${claudeProviderName}:default`] = { provider: claudeProviderName, mode: 'api_key' };
   config.agents.defaults.models[claudeModelKey] = { alias: claudeProviderName };
 
-  // Codex 侧 — 让用户选模型
-  const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
-  let codexModelId = (args['codex-model'] || '').toString().trim();
-  if (!codexModelId && CODEX_MODELS.length > 1) {
-    const { pickedCodex } = await inquirer.prompt([{
-      type: 'list',
-      name: 'pickedCodex',
-      message: '选择 Codex 模型:',
-      choices: CODEX_MODELS.map(m => ({ name: m.name, value: m.id })),
-      default: CODEX_MODELS[0].id
-    }]);
-    codexModelId = pickedCodex;
-  }
-  if (!codexModelId) codexModelId = CODEX_MODELS[0]?.id || 'gpt-5.3-codex';
-  const codexModel = CODEX_MODELS.find(m => m.id === codexModelId) || { id: codexModelId, name: codexModelId };
-  const codexModelKey = `${codexProviderName}/${codexModelId}`;
-
+  // 写入 Codex provider（单一模式下仍写入，保证配置完整）
   config.models.providers[codexProviderName] = {
     baseUrl: codexBaseUrl,
     auth: DEFAULT_AUTH_MODE,
@@ -2732,27 +2765,34 @@ async function autoActivate(paths, args = {}) {
   config.agents.defaults.models[codexModelKey] = { alias: codexProviderName };
 
   // ---- 选择主力 ----
-  let primaryType = 'claude';
-  if (args.primary === 'claude') {
-    primaryType = 'claude';
-  } else if (args.primary === 'codex') {
-    primaryType = 'codex';
+  let primaryModelKey, fallbackModelKey;
+  if (isSingleMode) {
+    // 单一模式：直接用 Claude provider 作为 primary，不需要用户选
+    primaryModelKey = claudeModelKey;
+    fallbackModelKey = codexModelKey;
   } else {
-    const { picked } = await inquirer.prompt([{
-      type: 'list',
-      name: 'picked',
-      message: '选择主力工具（默认启动哪个）:',
-      choices: [
-        { name: 'Claude Code', value: 'claude' },
-        { name: 'Codex (GPT)', value: 'codex' }
-      ]
-    }]);
-    primaryType = picked;
+    let primaryType = 'claude';
+    if (args.primary === 'claude') {
+      primaryType = 'claude';
+    } else if (args.primary === 'codex') {
+      primaryType = 'codex';
+    } else {
+      const { picked } = await inquirer.prompt([{
+        type: 'list',
+        name: 'picked',
+        message: '选择主力工具（默认启动哪个）:',
+        choices: [
+          { name: 'Claude Code', value: 'claude' },
+          { name: 'Codex (GPT)', value: 'codex' }
+        ]
+      }]);
+      primaryType = picked;
+    }
+    primaryModelKey = primaryType === 'claude' ? claudeModelKey : codexModelKey;
+    fallbackModelKey = primaryType === 'claude' ? codexModelKey : claudeModelKey;
   }
 
-  const primaryModelKey = primaryType === 'claude' ? claudeModelKey : codexModelKey;
   config.agents.defaults.model.primary = primaryModelKey;
-  const fallbackModelKey = primaryType === 'claude' ? codexModelKey : claudeModelKey;
   config.agents.defaults.model.fallbacks = [fallbackModelKey];
 
   // ---- 写入配置 ----
@@ -2768,13 +2808,19 @@ async function autoActivate(paths, args = {}) {
   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}`));
+  if (isSingleMode) {
+    console.log(chalk.cyan(`   节点: ${selectedEndpoint.url}`));
+    console.log(chalk.gray(`     模型: ${claudeModel.name}`));
+  } else {
+    const primaryType = primaryModelKey === claudeModelKey ? 'claude' : 'codex';
+    const primaryTag = primaryType === 'claude' ? ' (主)' : '';
+    const codexTag = primaryType === 'codex' ? ' (主)' : '';
+    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(', ')}`));
 
@@ -2782,7 +2828,7 @@ async function autoActivate(paths, args = {}) {
   const gwToken = config.gateway?.auth?.token;
   if (gwToken) {
     console.log(chalk.green(`\n🌐 Web Dashboard:`));
-    console.log(chalk.cyan(`   http://localhost:${gwPort}/?token=${gwToken}`));
+    console.log(chalk.cyan(`   http://127.0.0.1:${gwPort}/?token=${gwToken}`));
   }
 
   // ---- 测试连接 ----
@@ -3567,7 +3613,7 @@ async function switchModel(paths) {
 
   if (gwToken) {
     console.log(chalk.green(`\n🌐 Web Dashboard:`));
-    console.log(chalk.cyan(`   http://localhost:${gwPort}/?token=${gwToken}`));
+    console.log(chalk.cyan(`   http://127.0.0.1:${gwPort}/?token=${gwToken}`));
   }
 }
 // ============ 权限管理 (tools.profile) ============
@@ -3658,8 +3704,7 @@ async function testConnection(paths, args = {}) {
       console.log(chalk.yellow('⚠️ 请先设置主模型'));
       return;
     }
-    // 优先选云翼/maxapi provider
-    const preferOrder = ['claude-yunyi', 'yunyi', 'heibai'];
+    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 || [];
@@ -3695,7 +3740,7 @@ async function testConnection(paths, args = {}) {
   console.log(chalk.gray(`当前激活: ${typeLabel}`));
   console.log(chalk.gray(`中转节点: ${provider.baseUrl}`));
   console.log(chalk.gray(`模型: ${primary}`));
-  console.log(chalk.gray(`Gateway: http://localhost:${gatewayPort}\n`));
+  console.log(chalk.gray(`Gateway: http://127.0.0.1:${gatewayPort}\n`));
   // 获取 Gateway token
   const gatewayToken = config.gateway?.auth?.token;
   if (!gatewayToken) {
@@ -3819,7 +3864,7 @@ async function testConnection(paths, args = {}) {
       }
     }
 
-    console.log(chalk.gray(`   端点: http://localhost:${gatewayPort}/v1/responses`));
+    console.log(chalk.gray(`   端点: http://127.0.0.1:${gatewayPort}/v1/responses`));
     const startTime = Date.now();
     let result = await testGatewayApi(gatewayPort, gatewayToken, primary);
     const latency = Date.now() - startTime;
@@ -4017,15 +4062,11 @@ async function restartGatewayNative(silent = false) {
   const gwConfig = readConfig(configPaths.openclawConfig);
   const gatewayPort = gwConfig?.gateway?.port || 18789;
 
-  // 策略 A：先尝试 exec "gateway restart"（给 8s 超时——足够杀旧进程）
-  // 注意：该命令通常会启动前台 daemon 不退出，超时是正常的
+  // 策略 A：尝试 exec "gateway restart"（短超时），然后端口探测
   const restartCmds = buildGatewayCommands(resolved, nodeInfo, useNode, 'restart');
-
-  let execAttempted = false;
-  for (const cmd of restartCmds) {
-    execAttempted = true;
-    const result = safeExec(cmd, { timeout: 8000, env });
-    // 不管是否 "成功"（通常会超时），检查端口是否可达
+  if (restartCmds.length > 0) {
+    // 只尝试第一条（最精确的路径），避免逐条超时累积
+    safeExec(restartCmds[0], { timeout: 8000, env });
     if (await waitForGateway(gatewayPort, '127.0.0.1', 5000)) {
       if (!silent) console.log(chalk.green(`✅ Gateway 已重启`));
       return true;
@@ -4035,29 +4076,34 @@ async function restartGatewayNative(silent = false) {
   // 策略 B：杀旧进程 → spawn 后台启动新 Gateway → 端口探测
   if (!silent) console.log(chalk.gray('   常规重启未生效，尝试杀进程后重新启动...'));
   await killGatewayProcesses(gatewayPort);
-  await new Promise(resolve => setTimeout(resolve, 1500));
+  await new Promise(resolve => setTimeout(resolve, 1000));
 
   const startCmds = buildGatewayCommands(resolved, nodeInfo, useNode, 'start');
   for (const cmd of startCmds) {
     if (spawnDetached(cmd, env)) {
-      if (await waitForGateway(gatewayPort, '127.0.0.1', 12000)) {
+      if (await waitForGateway(gatewayPort, '127.0.0.1', 10000)) {
         if (!silent) console.log(chalk.green('✅ Gateway 已重启'));
         return true;
       }
+      break; // spawn 成功但端口未通，不再逐条重试
     }
   }
 
   // 策略 C：用 login shell 启动（加载 nvm/fnm 等 PATH）
   if (process.platform !== 'win32') {
     if (!silent) console.log(chalk.gray('   尝试通过 login shell 启动...'));
+    let launched = false;
     for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+      if (launched) break;
       for (const sh of ['/bin/zsh', '/bin/bash']) {
         if (!fs.existsSync(sh)) continue;
         if (spawnDetached(`${sh} -lc '${name} gateway'`, env)) {
-          if (await waitForGateway(gatewayPort, '127.0.0.1', 12000)) {
+          launched = true;
+          if (await waitForGateway(gatewayPort, '127.0.0.1', 10000)) {
             if (!silent) console.log(chalk.green('✅ Gateway 已重启 (login shell)'));
             return true;
           }
+          break;
         }
       }
     }
@@ -4087,30 +4133,7 @@ function buildGatewayCommands(resolved, nodeInfo, useNode, action) {
   }
 
   const names = ['openclaw', 'clawdbot', 'moltbot'];
-  if (process.platform === 'win32') {
-    for (const name of names) commands.push(`${name} ${verb}`);
-    if (isWslAvailable()) {
-      const wslCli = getWslCliBinary();
-      if (wslCli) commands.push(`wsl -- bash -lc "${wslCli} ${verb}"`);
-      for (const name of names) commands.push(`wsl -- bash -lc "${name} ${verb}"`);
-    }
-  } else {
-    for (const name of names) commands.push(`${name} ${verb}`);
-  }
-
-  if (isDockerAvailable()) {
-    const containers = findOpenclawDockerContainers();
-    for (const c of containers) {
-      if (c.cli === 'node') {
-        commands.push(dockerCmd(`exec ${c.id} bash -lc "node ${c.cliPath} ${verb}"`));
-      } else if (c.cli !== 'unknown') {
-        commands.push(dockerCmd(`exec ${c.id} bash -lc "${c.cli} ${verb}"`));
-      }
-      for (const name of names) {
-        commands.push(dockerCmd(`exec ${c.id} bash -lc "${name} ${verb}"`));
-      }
-    }
-  }
+  for (const name of names) commands.push(`${name} ${verb}`);
 
   return [...new Set(commands)].filter(Boolean);
 }

package/package.json

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