yymaxapi 1.0.81 → 1.0.83

package/bin/yymaxapi.js

@@ -636,6 +636,28 @@ function getWslMirrorInfo() {
   return { configPath, authProfiles };
 }
 
+function getGatewayListenOwner(port = 18789) {
+  if (process.platform === 'win32') return null;
+
+  const lsofResult = safeExec(`lsof -nP -iTCP:${port} -sTCP:LISTEN -F u 2>/dev/null`, { timeout: 3000 });
+  const lsofOutput = [lsofResult.output, lsofResult.stdout, lsofResult.stderr].filter(Boolean).join('\n');
+  const userLine = lsofOutput
+    .split('\n')
+    .map(line => line.trim())
+    .find(line => line.startsWith('u'));
+  if (userLine && userLine.length > 1) {
+    return userLine.slice(1).trim() || null;
+  }
+
+  const pidResult = safeExec(`lsof -ti :${port} 2>/dev/null | head -n1`, { timeout: 3000 });
+  const pid = pidResult.ok ? pidResult.output.trim().split('\n')[0] : '';
+  if (!/^\d+$/.test(pid)) return null;
+
+  const ownerResult = safeExec(`ps -o user= -p ${pid} 2>/dev/null`, { timeout: 3000 });
+  if (!ownerResult.ok || !ownerResult.output) return null;
+  return ownerResult.output.trim().split(/\s+/)[0] || null;
+}
+
 function getConfigPath() {
   const homeDir = os.homedir();
   const openclawStateDir = process.env.OPENCLAW_STATE_DIR || path.join(homeDir, '.openclaw');
@@ -664,23 +686,34 @@ function getConfigPath() {
 
   const candidates = [];
   if (envConfig) candidates.push(envConfig);
-  if (preferMoltbot) {
-    candidates.push(...moltbotCandidates, ...openclawCandidates);
-  } else {
-    candidates.push(...openclawCandidates, ...moltbotCandidates);
-  }
+  const rootCandidates = [];
+  let preferRootConfig = false;
+
+  const preferredCandidates = preferMoltbot
+    ? [...moltbotCandidates, ...openclawCandidates]
+    : [...openclawCandidates, ...moltbotCandidates];
 
   // Fallback: 当前用户非 root 时，也检查 /root 下的配置（OpenClaw 常以 root 安装）
   if (process.platform !== 'win32' && homeDir !== '/root') {
     const rootOpenclawDir = '/root/.openclaw';
     const rootClawdbotDir = '/root/.clawdbot';
-    candidates.push(
+    rootCandidates.push(
       path.join(rootOpenclawDir, 'openclaw.json'),
       path.join(rootOpenclawDir, 'moltbot.json'),
       path.join(rootClawdbotDir, 'openclaw.json'),
       path.join(rootClawdbotDir, 'clawdbot.json'),
       path.join(rootClawdbotDir, 'moltbot.json')
     );
+
+    const rootConfigExists = rootCandidates.some(p => p && fs.existsSync(p));
+    const gatewayOwner = getGatewayListenOwner();
+    preferRootConfig = rootConfigExists && gatewayOwner === 'root';
+  }
+
+  if (preferRootConfig) {
+    candidates.push(...rootCandidates, ...preferredCandidates);
+  } else {
+    candidates.push(...preferredCandidates, ...rootCandidates);
   }
 
   // Windows + WSL: 尝试读取 WSL 内的配置文件
@@ -714,18 +747,6 @@ function getConfigPath() {
 
   const configDir = path.dirname(openclawConfig);
 
-  const baseAuthCandidates = buildAuthCandidates([openclawStateDir, clawdbotStateDir]);
-  const moltbotAuthCandidates = buildAuthCandidates(moltbotStateDirs);
-
-  const authCandidates = preferMoltbot
-    ? [...moltbotAuthCandidates, ...baseAuthCandidates]
-    : [...baseAuthCandidates, ...moltbotAuthCandidates];
-
-  const authProfiles = authCandidates.find(p => fs.existsSync(p)) || authCandidates[0];
-  const authSyncTargets = process.platform === 'win32'
-    ? [...new Set(buildAuthCandidates([openclawStateDir, clawdbotStateDir]))].filter(p => p !== authProfiles)
-    : [];
-
   const syncTargets = [];
   if (openclawConfig.startsWith(openclawStateDir) && fs.existsSync(clawdbotStateDir)) {
     syncTargets.push(
@@ -734,6 +755,20 @@ function getConfigPath() {
     );
   }
 
+  const primaryAuthBases = [configDir];
+  const secondaryAuthBases = preferMoltbot
+    ? [...moltbotStateDirs, openclawStateDir, clawdbotStateDir]
+    : [openclawStateDir, clawdbotStateDir, ...moltbotStateDirs];
+  const authCandidates = [...new Set(buildAuthCandidates([...primaryAuthBases, ...secondaryAuthBases]))];
+
+  const authProfiles = authCandidates.find(p => fs.existsSync(p)) || authCandidates[0];
+
+  const authSyncBaseDirs = syncTargets.map(target => path.dirname(target));
+  if (process.platform === 'win32') {
+    authSyncBaseDirs.push(openclawStateDir, clawdbotStateDir);
+  }
+  const authSyncTargets = [...new Set(buildAuthCandidates(authSyncBaseDirs))].filter(p => p !== authProfiles);
+
   return { openclawConfig, authProfiles, configDir, syncTargets, authSyncTargets, wslConfigPath, wslAuthProfiles };
 }
 
@@ -1454,6 +1489,351 @@ function coerceModelsRecord(value) {
   return record;
 }
 
+const YUNYI_PROVIDER_ALIASES = {
+  claude: new Set(['claude-yunyi', 'yunyi-claude', 'claude_yunyi']),
+  codex: new Set(['yunyi', 'yunyi-codex', 'codex-yunyi', 'codex_yunyi'])
+};
+
+function looksLikeApiKey(value) {
+  const text = String(value || '').trim();
+  if (!text || text.includes('/') || text.includes(' ')) return false;
+  if (/^(sk-|STP|YK)/i.test(text)) return true;
+  return /^[A-Za-z0-9._-]{16,}$/.test(text);
+}
+
+function isLikelyYunyiBaseUrl(baseUrl) {
+  const urlText = String(baseUrl || '').trim();
+  if (!urlText) return false;
+  try {
+    const hostname = new URL(urlText).hostname.toLowerCase();
+    return hostname.includes('yunyi')
+      || hostname.includes('rdzhvip.com')
+      || hostname === '47.99.42.193'
+      || hostname === '47.97.100.10';
+  } catch {
+    return /yunyi|rdzhvip\.com|47\.99\.42\.193|47\.97\.100\.10/i.test(urlText);
+  }
+}
+
+function isYunyiProviderEntry(name, providerConfig, type) {
+  const cfg = providerConfig || {};
+  const providerName = String(name || '').trim();
+  if (YUNYI_PROVIDER_ALIASES[type]?.has(providerName)) return true;
+
+  const baseUrl = String(cfg.baseUrl || cfg.base_url || '').trim();
+  const api = String(cfg.api || '').trim();
+  if (!isLikelyYunyiBaseUrl(baseUrl)) return false;
+
+  if (type === 'claude') {
+    return api.startsWith('anthropic') || /\/claude(?:\/|$)/.test(baseUrl);
+  }
+  return api.startsWith('openai') || /\/codex(?:\/|$)/.test(baseUrl);
+}
+
+function normalizeProviderModelEntry(model, fallbackContext = {}) {
+  if (!model) return null;
+  if (typeof model === 'string') {
+    return {
+      id: model,
+      name: model,
+      contextWindow: fallbackContext.contextWindow,
+      maxTokens: fallbackContext.maxTokens
+    };
+  }
+  if (typeof model !== 'object') return null;
+
+  const id = String(model.id || model.model || '').trim();
+  if (!id) return null;
+  return {
+    ...model,
+    id,
+    name: model.name || id,
+    contextWindow: model.contextWindow || fallbackContext.contextWindow,
+    maxTokens: model.maxTokens || fallbackContext.maxTokens
+  };
+}
+
+function mergeProviderModels(existingModels = [], incomingModels = [], fallbackContext = {}) {
+  const merged = [];
+  const seen = new Set();
+
+  for (const item of [...existingModels, ...incomingModels]) {
+    const normalized = normalizeProviderModelEntry(item, fallbackContext);
+    if (!normalized || seen.has(normalized.id)) continue;
+    seen.add(normalized.id);
+    merged.push(normalized);
+  }
+
+  return merged;
+}
+
+function renameProviderReferencesInConfig(config, oldName, newName) {
+  if (!oldName || !newName || oldName === newName) return false;
+  let changed = false;
+
+  if (config?.agents?.defaults?.models) {
+    for (const key of Object.keys(config.agents.defaults.models)) {
+      if (!key.startsWith(`${oldName}/`)) continue;
+      const nextKey = `${newName}/${key.slice(oldName.length + 1)}`;
+      if (!config.agents.defaults.models[nextKey]) {
+        const entry = { ...(config.agents.defaults.models[key] || {}) };
+        if (!entry.alias || entry.alias === oldName) entry.alias = newName;
+        config.agents.defaults.models[nextKey] = entry;
+      }
+      delete config.agents.defaults.models[key];
+      changed = true;
+    }
+  }
+
+  if (config?.agents?.defaults?.model) {
+    const modelState = config.agents.defaults.model;
+    if (typeof modelState.primary === 'string' && modelState.primary.startsWith(`${oldName}/`)) {
+      modelState.primary = `${newName}/${modelState.primary.slice(oldName.length + 1)}`;
+      changed = true;
+    }
+    if (Array.isArray(modelState.fallbacks)) {
+      const nextFallbacks = modelState.fallbacks.map(modelKey => (
+        typeof modelKey === 'string' && modelKey.startsWith(`${oldName}/`)
+          ? `${newName}/${modelKey.slice(oldName.length + 1)}`
+          : modelKey
+      ));
+      if (JSON.stringify(nextFallbacks) !== JSON.stringify(modelState.fallbacks)) {
+        modelState.fallbacks = nextFallbacks;
+        changed = true;
+      }
+    }
+  }
+
+  if (config?.auth?.profiles) {
+    for (const key of Object.keys(config.auth.profiles)) {
+      if (!key.startsWith(`${oldName}:`)) continue;
+      const suffix = key.slice(oldName.length + 1);
+      const nextKey = `${newName}:${suffix}`;
+      const profile = { ...(config.auth.profiles[key] || {}) };
+      profile.provider = newName;
+      config.auth.profiles[nextKey] = profile;
+      delete config.auth.profiles[key];
+      changed = true;
+    }
+  }
+
+  return changed;
+}
+
+function suggestConflictProviderName(config, baseName) {
+  const providers = config?.models?.providers || {};
+  let candidate = `${baseName}-legacy`;
+  let index = 2;
+  while (providers[candidate]) {
+    candidate = `${baseName}-legacy-${index}`;
+    index += 1;
+  }
+  return candidate;
+}
+
+function sanitizeProviderConfig(name, providerConfig, typeHint = null) {
+  if (!providerConfig || typeof providerConfig !== 'object') return false;
+  let changed = false;
+
+  if (providerConfig.base_url && !providerConfig.baseUrl) {
+    providerConfig.baseUrl = providerConfig.base_url;
+    delete providerConfig.base_url;
+    changed = true;
+  }
+
+  if (providerConfig.model && !providerConfig.models) {
+    providerConfig.models = [providerConfig.model];
+    delete providerConfig.model;
+    changed = true;
+  }
+
+  const inferredType = typeHint
+    || (String(providerConfig.api || '').startsWith('anthropic') ? 'claude'
+      : String(providerConfig.api || '').startsWith('openai') ? 'codex'
+        : null);
+  const fallbackContext = inferredType === 'claude'
+    ? { contextWindow: API_CONFIG.claude?.contextWindow, maxTokens: API_CONFIG.claude?.maxTokens }
+    : inferredType === 'codex'
+      ? { contextWindow: API_CONFIG.codex?.contextWindow, maxTokens: API_CONFIG.codex?.maxTokens }
+      : {};
+
+  if (providerConfig.models) {
+    const nextModels = mergeProviderModels(providerConfig.models, [], fallbackContext);
+    if (JSON.stringify(nextModels) !== JSON.stringify(providerConfig.models)) {
+      providerConfig.models = nextModels;
+      changed = true;
+    }
+  }
+
+  if (!providerConfig.auth && providerConfig.apiKey) {
+    providerConfig.auth = DEFAULT_AUTH_MODE;
+    changed = true;
+  } else if (typeof providerConfig.auth === 'string') {
+    const authValue = providerConfig.auth.trim();
+    if (authValue === 'api_key') {
+      providerConfig.auth = DEFAULT_AUTH_MODE;
+      changed = true;
+    } else if (!['api-key', 'token', 'none'].includes(authValue)) {
+      if (!providerConfig.apiKey && looksLikeApiKey(authValue)) {
+        providerConfig.apiKey = authValue;
+        providerConfig.auth = DEFAULT_AUTH_MODE;
+        changed = true;
+      } else if (providerConfig.apiKey) {
+        providerConfig.auth = DEFAULT_AUTH_MODE;
+        changed = true;
+      }
+    }
+  }
+
+  if (!providerConfig.headers || Array.isArray(providerConfig.headers) || typeof providerConfig.headers !== 'object') {
+    providerConfig.headers = {};
+    changed = true;
+  }
+
+  if (providerConfig.authHeader === undefined) {
+    if (String(providerConfig.api || '').startsWith('openai')) {
+      providerConfig.authHeader = true;
+      changed = true;
+    } else if (String(providerConfig.api || '').startsWith('anthropic')) {
+      providerConfig.authHeader = false;
+      changed = true;
+    }
+  }
+
+  return changed;
+}
+
+function sanitizeConfigAuthProfiles(config) {
+  if (!config.auth) config.auth = {};
+  if (!config.auth.profiles || typeof config.auth.profiles !== 'object' || Array.isArray(config.auth.profiles)) {
+    config.auth.profiles = {};
+    return true;
+  }
+
+  let changed = false;
+  for (const [key, profile] of Object.entries(config.auth.profiles)) {
+    const provider = (profile && typeof profile === 'object' && profile.provider) || key.split(':')[0];
+    if (!provider) {
+      delete config.auth.profiles[key];
+      changed = true;
+      continue;
+    }
+    const nextProfile = {
+      provider,
+      mode: (profile && typeof profile === 'object' && (profile.mode === 'api-key' ? 'api_key' : profile.mode)) || 'api_key'
+    };
+    if (JSON.stringify(profile) !== JSON.stringify(nextProfile)) {
+      config.auth.profiles[key] = nextProfile;
+      changed = true;
+    }
+  }
+  return changed;
+}
+
+function repairYunyiProviderAliases(config) {
+  if (!config?.models?.providers) return { changed: false, renamedProviders: [] };
+
+  let changed = false;
+  const renamedProviders = [];
+  const providers = config.models.providers;
+
+  for (const type of ['claude', 'codex']) {
+    const canonicalName = API_CONFIG[type]?.providerName;
+    if (!canonicalName) continue;
+
+    const candidateEntries = Object.entries(providers).filter(([name, providerConfig]) => isYunyiProviderEntry(name, providerConfig, type));
+    if (candidateEntries.length === 0) continue;
+
+    if (!providers[canonicalName]) {
+      providers[canonicalName] = {};
+      changed = true;
+    }
+
+    sanitizeProviderConfig(canonicalName, providers[canonicalName], type);
+
+    for (const [name, providerConfig] of candidateEntries) {
+      sanitizeProviderConfig(name, providerConfig, type);
+      if (name === canonicalName) continue;
+
+      const target = providers[canonicalName];
+      if (!target.baseUrl && providerConfig.baseUrl) target.baseUrl = providerConfig.baseUrl;
+      if (!target.api && providerConfig.api) target.api = providerConfig.api;
+      if (!target.apiKey && providerConfig.apiKey) target.apiKey = providerConfig.apiKey;
+      if (!target.auth && providerConfig.auth) target.auth = providerConfig.auth;
+      if (target.authHeader === undefined && providerConfig.authHeader !== undefined) target.authHeader = providerConfig.authHeader;
+      if ((!target.headers || Object.keys(target.headers).length === 0) && providerConfig.headers && typeof providerConfig.headers === 'object') {
+        target.headers = { ...providerConfig.headers };
+      }
+      target.models = mergeProviderModels(target.models, providerConfig.models, type === 'claude'
+        ? { contextWindow: API_CONFIG.claude?.contextWindow, maxTokens: API_CONFIG.claude?.maxTokens }
+        : { contextWindow: API_CONFIG.codex?.contextWindow, maxTokens: API_CONFIG.codex?.maxTokens });
+
+      delete providers[name];
+      renamedProviders.push({ from: name, to: canonicalName });
+      renameProviderReferencesInConfig(config, name, canonicalName);
+      changed = true;
+    }
+
+    sanitizeProviderConfig(canonicalName, providers[canonicalName], type);
+  }
+
+  return { changed, renamedProviders };
+}
+
+function reserveProviderName(config, desiredName, expectedType) {
+  const providers = config?.models?.providers || {};
+  const existing = providers[desiredName];
+  if (!existing) return { changed: false, renamedProviders: [] };
+  if (isYunyiProviderEntry(desiredName, existing, expectedType)) {
+    return { changed: false, renamedProviders: [] };
+  }
+
+  const nextName = suggestConflictProviderName(config, desiredName);
+  providers[nextName] = existing;
+  delete providers[desiredName];
+  sanitizeProviderConfig(nextName, providers[nextName]);
+  renameProviderReferencesInConfig(config, desiredName, nextName);
+  return { changed: true, renamedProviders: [{ from: desiredName, to: nextName }] };
+}
+
+function repairConfigProviders(config, options = {}) {
+  if (!config.models) config.models = {};
+  if (!config.models.providers || typeof config.models.providers !== 'object' || Array.isArray(config.models.providers)) {
+    config.models.providers = {};
+  }
+
+  let changed = false;
+  const renamedProviders = [];
+
+  for (const type of ['claude', 'codex']) {
+    const desiredName = API_CONFIG[type]?.providerName;
+    if (!desiredName) continue;
+    const reserved = reserveProviderName(config, desiredName, type);
+    if (reserved.changed) {
+      changed = true;
+      renamedProviders.push(...reserved.renamedProviders);
+    }
+  }
+
+  const repairedAliases = repairYunyiProviderAliases(config);
+  if (repairedAliases.changed) changed = true;
+
+  for (const [name, providerConfig] of Object.entries(config.models.providers)) {
+    if (sanitizeProviderConfig(name, providerConfig)) {
+      changed = true;
+    }
+  }
+
+  if (sanitizeConfigAuthProfiles(config)) {
+    changed = true;
+  }
+
+  return {
+    changed,
+    renamedProviders: [...renamedProviders, ...repairedAliases.renamedProviders]
+  };
+}
+
 function isValidModelRef(value) {
   return typeof value === 'string' && value.trim().includes('/');
 }
@@ -1702,6 +2082,32 @@ function syncMirroredAuthStores(paths) {
   }
 }
 
+function renameProviderInAuthStore(paths, oldProvider, newProvider) {
+  if (!paths?.authProfiles || !oldProvider || !newProvider || oldProvider === newProvider) return false;
+  const store = readAuthStore(paths.authProfiles);
+  let changed = false;
+
+  for (const key of Object.keys(store.profiles)) {
+    if (!key.startsWith(`${oldProvider}:`)) continue;
+    const suffix = key.slice(oldProvider.length + 1);
+    const nextKey = `${newProvider}:${suffix}`;
+    const profile = { ...(store.profiles[key] || {}) };
+    if (!store.profiles[nextKey]) {
+      profile.provider = newProvider;
+      store.profiles[nextKey] = profile;
+    }
+    delete store.profiles[key];
+    changed = true;
+  }
+
+  if (changed) {
+    writeAuthStore(paths.authProfiles, store);
+    syncMirroredAuthStores(paths);
+  }
+
+  return changed;
+}
+
 function pruneAuthProfilesExceptWithSync(paths, keepProviders = []) {
   const removed = pruneAuthProfilesExcept(paths.authProfiles, keepProviders);
   syncMirroredAuthStores(paths);
@@ -1713,6 +2119,16 @@ function updateAuthProfilesWithSync(paths, providerName, apiKey) {
   syncMirroredAuthStores(paths);
 }
 
+function applyConfigRepairsWithSync(config, paths) {
+  const repairResult = repairConfigProviders(config);
+  if (paths && repairResult.renamedProviders.length > 0) {
+    for (const item of repairResult.renamedProviders) {
+      renameProviderInAuthStore(paths, item.from, item.to);
+    }
+  }
+  return repairResult;
+}
+
 function pruneAuthProfilesByPrefix(authProfilesPath, prefixBase, keepProviders = []) {
   const keepSet = new Set(keepProviders);
   const store = readAuthStore(authProfilesPath);
@@ -2144,6 +2560,14 @@ function summarizeCliTestOutput(text) {
   return lines[0].slice(0, 160);
 }
 
+function buildReadableAgentError(text, fallback = '') {
+  const cleaned = cleanCliTestOutput(text);
+  if (!cleaned) return fallback;
+  const lines = cleaned.split('\n').map(line => line.trim()).filter(Boolean);
+  const preferred = lines.find(line => /agent failed before reply|all models failed|auth_permanent|auth issue|unauthorized|forbidden|missing environment variable|provider .* issue|invalid config/i.test(line));
+  return (preferred || lines[0] || fallback).slice(0, 300);
+}
+
 function looksLikeCliTestError(text) {
   const lower = cleanCliTestOutput(text).toLowerCase();
   if (!lower) return false;
@@ -2316,15 +2740,14 @@ function autoFixConfig(paths) {
     const config = readConfig(paths.openclawConfig);
     if (!config) return;
 
-    config.models = config.models || {};
-    config.models.providers = config.models.providers || {};
-
     let changed = false;
     const codexProviderName = API_CONFIG.codex?.providerName;
-    const codexProvider = codexProviderName && config.models.providers[codexProviderName];
     const originalModelJson = JSON.stringify(config.agents?.defaults?.model ?? null);
     ensureConfigStructure(config);
     sanitizeDefaultModelSelection(config);
+    const repairResult = applyConfigRepairsWithSync(config, paths);
+    if (repairResult.changed) changed = true;
+    const codexProvider = codexProviderName && config.models.providers?.[codexProviderName];
     const nextModelJson = JSON.stringify(config.agents?.defaults?.model ?? null);
     if (originalModelJson !== nextModelJson) {
       changed = true;
@@ -2847,26 +3270,7 @@ async function quickSetup(paths, args = {}) {
 
   let config = readConfig(paths.openclawConfig) || {};
   config = ensureConfigStructure(config);
-
-  const existingProviders = Object.keys(config.models.providers || {});
-  const toRemove = existingProviders.filter(name => name !== providerName);
-  if (toRemove.length > 0 && !args.force) {
-    const { overwrite } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'overwrite',
-      message: `检测到已有中转配置: ${existingProviders.join(', ')}，将仅保留 ${providerName}。是否继续？`,
-      default: false
-    }]);
-    if (!overwrite) {
-      console.log(chalk.gray('已取消'));
-      return;
-    }
-  }
-
-  if (toRemove.length > 0) {
-    pruneProvidersExcept(config, [providerName]);
-    pruneAuthProfilesExceptWithSync(paths, [providerName]);
-  }
+  const repairResult = applyConfigRepairsWithSync(config, paths);
 
   config.models.providers[providerName] = {
     baseUrl: normalizedBaseUrl,
@@ -2914,6 +3318,9 @@ async function quickSetup(paths, args = {}) {
   if (setPrimary) {
     console.log(chalk.yellow(`   主模型: ${modelKey}`));
   }
+  if (repairResult.renamedProviders.length > 0) {
+    console.log(chalk.gray(`   已保留并修复冲突 provider: ${repairResult.renamedProviders.map(item => `${item.from}→${item.to}`).join(', ')}`));
+  }
 }
 
 async function presetClaude(paths, args = {}) {
@@ -2960,31 +3367,10 @@ async function presetClaude(paths, args = {}) {
   }
 
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
+  const repairResult = applyConfigRepairsWithSync(config, paths);
 
   const providerName = (args['provider-name'] || args.provider || providerPrefix).toString().trim() || apiConfig.providerName;
-
-  const existingProviders = Object.keys(config.models.providers || {});
-  const toRemove = existingProviders.filter(name => name !== providerName);
-
-  if (toRemove.length > 0 && !args.force) {
-    const { overwrite } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'overwrite',
-      message: `检测到已有中转配置: ${existingProviders.join(', ')}，将仅保留 ${providerName}。是否继续？`,
-      default: false
-    }]);
-    if (!overwrite) {
-      console.log(chalk.gray('已取消'));
-      return;
-    }
-  }
-
-  const removedProviders = toRemove.length > 0
-    ? pruneProvidersExcept(config, [providerName])
-    : [];
-  if (removedProviders.length > 0) {
-    pruneAuthProfilesExceptWithSync(paths, [providerName]);
-  }
+  const removedProviders = repairResult.renamedProviders.map(item => item.from);
 
   const baseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
 
@@ -3097,6 +3483,9 @@ async function presetClaude(paths, args = {}) {
   console.log(chalk.gray(`   模型: ${modelName}`));
   console.log(chalk.gray('   API Key: 已设置'));
   if (extSynced.length > 0) console.log(chalk.gray(`   同步: ${extSynced.join(', ')}`));
+  if (repairResult.renamedProviders.length > 0) {
+    console.log(chalk.gray(`   已保留并修复冲突 provider: ${repairResult.renamedProviders.map(item => `${item.from}→${item.to}`).join(', ')}`));
+  }
 
   const shouldTestGateway = args.test !== undefined
     ? !['false', '0', 'no'].includes(String(args.test).toLowerCase())
@@ -3157,28 +3546,8 @@ async function presetCodex(paths, args = {}) {
   }
 
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
-  const existingProviders = Object.keys(config.models.providers || {});
-  const toRemove = existingProviders.filter(name => name !== providerName);
-
-  if (toRemove.length > 0 && !args.force) {
-    const { overwrite } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'overwrite',
-      message: `检测到已有中转配置: ${existingProviders.join(', ')}，将仅保留 ${providerName}。是否继续？`,
-      default: false
-    }]);
-    if (!overwrite) {
-      console.log(chalk.gray('已取消'));
-      return;
-    }
-  }
-
-  const removedProviders = toRemove.length > 0
-    ? pruneProvidersExcept(config, [providerName])
-    : [];
-  if (removedProviders.length > 0) {
-    pruneAuthProfilesExceptWithSync(paths, [providerName]);
-  }
+  const repairResult = applyConfigRepairsWithSync(config, paths);
+  const removedProviders = repairResult.renamedProviders.map(item => item.from);
 
   const baseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
 
@@ -3291,6 +3660,9 @@ async function presetCodex(paths, args = {}) {
   console.log(chalk.gray(`   模型: ${modelName}`));
   console.log(chalk.gray('   API Key: 已设置'));
   if (extSynced2.length > 0) console.log(chalk.gray(`   同步: ${extSynced2.join(', ')}`));
+  if (repairResult.renamedProviders.length > 0) {
+    console.log(chalk.gray(`   已保留并修复冲突 provider: ${repairResult.renamedProviders.map(item => `${item.from}→${item.to}`).join(', ')}`));
+  }
 
   const shouldTestGateway = args.test !== undefined
     ? !['false', '0', 'no'].includes(String(args.test).toLowerCase())
@@ -3399,6 +3771,7 @@ async function autoActivate(paths, args = {}) {
 
   // ---- 构建配置 ----
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
+  applyConfigRepairsWithSync(config, paths);
 
   const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
   const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
@@ -4245,6 +4618,7 @@ async function switchModel(paths) {
   console.log(chalk.cyan('🔄 切换 OpenClaw 模型\n'));
 
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
+  applyConfigRepairsWithSync(config, paths);
   const primary = config.agents?.defaults?.model?.primary || '';
   const providers = config.models?.providers || {};
 
@@ -4507,9 +4881,10 @@ async function testConnection(paths, args = {}) {
   console.log(chalk.cyan('🧪 测试 OpenClaw / 各 CLI 连接\n'));
   invalidateGatewayEnvCache();
 
-  const config = readConfig(paths.openclawConfig);
+  const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
+  applyConfigRepairsWithSync(config, paths);
 
-  if (!config) {
+  if (!config || !config.models) {
     console.log(chalk.yellow('配置文件不存在，请先选择节点'));
     return;
   }
@@ -4688,6 +5063,10 @@ async function testConnection(paths, args = {}) {
       if (!cliResult.success) {
         console.log(chalk.red(`\n❌ Gateway CLI 测试失败`));
         console.log(chalk.red(`   错误: ${cliResult.error || '未知错误'}`));
+        if (cliResult.rawError && cliResult.rawError !== cliResult.error) {
+          console.log(chalk.gray(`   原始输出: ${cliResult.rawError.substring(0, 300)}`));
+        }
+        console.log(chalk.gray('   可继续执行: openclaw logs --follow'));
         console.log(chalk.gray(`   将尝试使用 HTTP 端点测试...`));
       }
     }
@@ -5193,10 +5572,18 @@ function testGatewayViaAgent(model) {
           // stdout 有 JSON，走正常解析流程而非直接报错
           stdout = fallbackOutput;
         } else {
+          const plainCmd = cmd.replace(/\s--json\b/, '');
+          const plainResult = safeExec(plainCmd, execOpts);
+          const plainCombined = `${plainResult.output || ''}\n${plainResult.stdout || ''}\n${plainResult.stderr || ''}`.trim();
+          const readableError = buildReadableAgentError(
+            `${cleanStderr}\n${fallbackOutput}\n${plainCombined}`,
+            (error.message || 'CLI 执行失败').trim()
+          );
           resolve({
             success: false,
             usedCli: true,
-            error: (cleanStderr || fallbackOutput || error.message || 'CLI 执行失败').trim()
+            error: readableError,
+            rawError: (cleanStderr || fallbackOutput || plainCombined || error.message || 'CLI 执行失败').trim()
           });
           return;
         }

package/package.json

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