yymaxapi 1.0.92 → 1.0.94

package/bin/yymaxapi.js

@@ -1478,6 +1478,22 @@ const YUNYI_PROVIDER_ALIASES = {
   codex: new Set(['yunyi', 'yunyi-codex', 'codex-yunyi', 'codex_yunyi'])
 };
 
+function getCanonicalYunyiProviderName(type) {
+  return String(API_CONFIG?.[type]?.providerName || (type === 'claude' ? 'yunyi-claude' : 'yunyi')).trim();
+}
+
+function getLegacyYunyiProviderAliases(type = '') {
+  const types = type ? [type] : ['claude', 'codex'];
+  const aliases = [];
+  for (const currentType of types) {
+    const canonical = getCanonicalYunyiProviderName(currentType);
+    for (const alias of YUNYI_PROVIDER_ALIASES[currentType] || []) {
+      if (alias && alias !== canonical) aliases.push(alias);
+    }
+  }
+  return [...new Set(aliases)];
+}
+
 function looksLikeApiKey(value) {
   const text = String(value || '').trim();
   if (!text || text.includes('/') || text.includes(' ')) return false;
@@ -1555,6 +1571,27 @@ function renameProviderReferencesInConfig(config, oldName, newName) {
   if (!oldName || !newName || oldName === newName) return false;
   let changed = false;
 
+  const renameModelSelection = (modelState) => {
+    if (!modelState || typeof modelState !== 'object') return false;
+    let localChanged = false;
+    if (typeof modelState.primary === 'string' && modelState.primary.startsWith(`${oldName}/`)) {
+      modelState.primary = `${newName}/${modelState.primary.slice(oldName.length + 1)}`;
+      localChanged = 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;
+        localChanged = true;
+      }
+    }
+    return localChanged;
+  };
+
   if (config?.agents?.defaults?.models) {
     for (const key of Object.keys(config.agents.defaults.models)) {
       if (!key.startsWith(`${oldName}/`)) continue;
@@ -1570,22 +1607,11 @@ function renameProviderReferencesInConfig(config, oldName, newName) {
   }
 
   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 (renameModelSelection(config.agents.defaults.model)) changed = true;
+  }
+
+  if (config?.agents?.defaults?.imageModel) {
+    if (renameModelSelection(config.agents.defaults.imageModel)) changed = true;
   }
 
   if (config?.auth?.profiles) {
@@ -1604,21 +1630,7 @@ function renameProviderReferencesInConfig(config, oldName, newName) {
   if (Array.isArray(config?.agents?.list)) {
     for (const agent of config.agents.list) {
       if (!agent || typeof agent !== 'object' || !agent.model || typeof agent.model !== 'object') continue;
-      if (typeof agent.model.primary === 'string' && agent.model.primary.startsWith(`${oldName}/`)) {
-        agent.model.primary = `${newName}/${agent.model.primary.slice(oldName.length + 1)}`;
-        changed = true;
-      }
-      if (Array.isArray(agent.model.fallbacks)) {
-        const nextFallbacks = agent.model.fallbacks.map(modelKey => (
-          typeof modelKey === 'string' && modelKey.startsWith(`${oldName}/`)
-            ? `${newName}/${modelKey.slice(oldName.length + 1)}`
-            : modelKey
-        ));
-        if (JSON.stringify(nextFallbacks) !== JSON.stringify(agent.model.fallbacks)) {
-          agent.model.fallbacks = nextFallbacks;
-          changed = true;
-        }
-      }
+      if (renameModelSelection(agent.model)) changed = true;
     }
   }
 
@@ -1930,6 +1942,7 @@ const YYMAXAPI_OPENCLAW_GPT_PROVIDER = 'yunyi';
 const YYMAXAPI_OPENCLAW_MAIN_AGENT_ID = 'main';
 const YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID = 'yunyi-claude';
 const YYMAXAPI_OPENCLAW_GPT_AGENT_ID = 'yunyi-gpt';
+const YYMAXAPI_OPENCLAW_LEGACY_GPT_AGENT_IDS = ['gpt'];
 const YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY = `${YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER}/claude-sonnet-4-6`;
 const YYMAXAPI_OPENCLAW_CLAUDE_FALLBACK = `${YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER}/claude-opus-4-6`;
 const YYMAXAPI_OPENCLAW_GPT_PRIMARY = `${YYMAXAPI_OPENCLAW_GPT_PROVIDER}/gpt-5.4`;
@@ -2394,6 +2407,25 @@ function removeManagedAgent(agentList, agentId, shouldManage) {
   return true;
 }
 
+function pruneLegacyYunyiAliasesInConfig(config) {
+  if (!config || typeof config !== 'object') return false;
+  let changed = false;
+  const providers = config?.models?.providers || {};
+
+  for (const type of ['claude', 'codex']) {
+    const canonical = type === 'claude' ? YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER : YYMAXAPI_OPENCLAW_GPT_PROVIDER;
+    for (const alias of getLegacyYunyiProviderAliases(type)) {
+      if (renameProviderReferencesInConfig(config, alias, canonical)) changed = true;
+      if (providers[alias]) {
+        delete providers[alias];
+        changed = true;
+      }
+    }
+  }
+
+  return changed;
+}
+
 function shouldManageYunyiDefaults(config) {
   const modelState = config?.agents?.defaults?.model || {};
   const primary = typeof modelState.primary === 'string' ? modelState.primary.trim() : '';
@@ -2436,6 +2468,35 @@ function normalizeManagedYunyiImageModel(modelState = {}, options = {}) {
   return { primary, fallbacks };
 }
 
+function pruneLegacyYunyiAuthProfilesWithSync(paths) {
+  if (!paths?.authProfiles) return [];
+  const legacyProviders = new Set(getLegacyYunyiProviderAliases());
+  const store = readAuthStore(paths.authProfiles);
+  const removed = [];
+
+  for (const key of Object.keys(store.profiles || {})) {
+    const provider = key.split(':')[0];
+    if (!legacyProviders.has(provider)) continue;
+    delete store.profiles[key];
+    removed.push(provider);
+  }
+
+  if (removed.length > 0) {
+    writeAuthStore(paths.authProfiles, store);
+    syncMirroredAuthStores(paths);
+  }
+
+  return [...new Set(removed)];
+}
+
+function syncManagedYunyiAuthProfiles(paths, config) {
+  const managedClaudeKey = String(config?.models?.providers?.[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER]?.apiKey || '').trim();
+  const managedGptKey = String(config?.models?.providers?.[YYMAXAPI_OPENCLAW_GPT_PROVIDER]?.apiKey || '').trim();
+  if (managedClaudeKey) updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER, managedClaudeKey);
+  if (managedGptKey) updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_GPT_PROVIDER, managedGptKey);
+  pruneLegacyYunyiAuthProfilesWithSync(paths);
+}
+
 function applyManagedYunyiOpenClawLayout(config, options = {}) {
   if (!isYymaxapiOpenClawBuild()) {
     return { changed: false, applied: false, claudeAgentId: null, preservedMain: false };
@@ -2529,6 +2590,10 @@ function applyManagedYunyiOpenClawLayout(config, options = {}) {
     model: normalizeManagedYunyiModelState('codex', currentGptAgentState, options)
   }, isManagedGptAgent);
   if (gptAgentResult.changed) changed = true;
+  for (const legacyAgentId of YYMAXAPI_OPENCLAW_LEGACY_GPT_AGENT_IDS) {
+    if (legacyAgentId === YYMAXAPI_OPENCLAW_GPT_AGENT_ID) continue;
+    if (removeManagedAgent(agentList, legacyAgentId, isManagedGptAgent)) changed = true;
+  }
 
   if (shouldManageYunyiDefaults(config)) {
     const nextDefaultsModel = normalizeManagedYunyiDefaultsModel(config.agents.defaults.model, options);
@@ -2547,6 +2612,10 @@ function applyManagedYunyiOpenClawLayout(config, options = {}) {
     }
   }
 
+  if (pruneLegacyYunyiAliasesInConfig(config)) {
+    changed = true;
+  }
+
   return { changed, applied: true, claudeAgentId, preservedMain };
 }
 
@@ -3409,10 +3478,7 @@ function autoFixConfig(paths) {
 
     if (changed) {
       writeConfigWithSync(paths, config);
-      const managedClaudeKey = String(config.models.providers?.[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER]?.apiKey || '').trim();
-      const managedGptKey = String(config.models.providers?.[YYMAXAPI_OPENCLAW_GPT_PROVIDER]?.apiKey || '').trim();
-      if (managedClaudeKey) updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER, managedClaudeKey);
-      if (managedGptKey) updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_GPT_PROVIDER, managedGptKey);
+      syncManagedYunyiAuthProfiles(paths, config);
       console.log(chalk.green('✓ 已自动修复配置（Yunyi providers / agents / API 协议）'));
     }
   } catch { /* ignore */ }
@@ -4126,8 +4192,7 @@ async function presetClaude(paths, args = {}) {
   writeConfigWithSync(paths, config);
   updateAuthProfilesWithSync(paths, providerName, apiKey);
   if (yunyiLayoutResult.applied) {
-    updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER, apiKey);
-    updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_GPT_PROVIDER, apiKey);
+    syncManagedYunyiAuthProfiles(paths, config);
   }
   syncExternalTools('claude', baseUrl, apiKey, { claudeModelId: modelId, opencodeDefaultModelKey: `yunyi-claude/${modelId}` });
   writeSpinner.succeed('配置写入完成');
@@ -4309,8 +4374,7 @@ async function presetCodex(paths, args = {}) {
   writeConfigWithSync(paths, config);
   updateAuthProfilesWithSync(paths, providerName, apiKey);
   if (yunyiLayoutResult.applied) {
-    updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER, apiKey);
-    updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_GPT_PROVIDER, apiKey);
+    syncManagedYunyiAuthProfiles(paths, config);
   }
   syncExternalTools('codex', baseUrl, apiKey, { modelId });
   writeSpinner2.succeed('配置写入完成');
@@ -4494,6 +4558,7 @@ async function autoActivate(paths, args = {}) {
     endpointUrl: selectedEndpoint.url,
     apiKey
   });
+  applyManagedYunyiModelSelection(config, primaryModelKey);
 
   // ---- 写入配置 ----
   const writeSpinner = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
@@ -4503,6 +4568,9 @@ async function autoActivate(paths, args = {}) {
   writeConfigWithSync(paths, config);
   updateAuthProfilesWithSync(paths, claudeProviderName, apiKey);
   updateAuthProfilesWithSync(paths, codexProviderName, apiKey);
+  if (yunyiLayoutResult.applied) {
+    syncManagedYunyiAuthProfiles(paths, config);
+  }
   const opencodeDefaultModelKey = isClaudePrimary ? `yunyi-claude/${claudeModelId}` : `yunyi-codex/${codexModelId}`;
   try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl, claudeModelId, opencodeDefaultModelKey }); } catch { /* ignore */ }
   try { syncExternalTools('codex', codexBaseUrl, apiKey, { modelId: codexModelId }); } catch { /* ignore */ }
@@ -4950,6 +5018,9 @@ async function yycodeQuickSetup(paths) {
   writeConfigWithSync(paths, config);
   updateAuthProfilesWithSync(paths, claudeProviderName, apiKey);
   updateAuthProfilesWithSync(paths, codexProviderName, apiKey);
+  if (yunyiLayoutResult.applied) {
+    syncManagedYunyiAuthProfiles(paths, config);
+  }
   try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl, claudeModelId, opencodeDefaultModelKey: `yunyi-codex/${codexModelId}` }); } catch { /* ignore */ }
   try { syncExternalTools('codex', codexBaseUrl, apiKey, { modelId: codexModelId }); } catch { /* ignore */ }
   writeSpinner.succeed('配置写入完成');
@@ -5228,10 +5299,7 @@ async function selectNode(paths, type) {
 
   ensureGatewaySettings(config);
   writeConfigWithSync(paths, config);
-  const managedClaudeKey = String(config.models.providers?.[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER]?.apiKey || '').trim();
-  const managedGptKey = String(config.models.providers?.[YYMAXAPI_OPENCLAW_GPT_PROVIDER]?.apiKey || '').trim();
-  if (managedClaudeKey) updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER, managedClaudeKey);
-  if (managedGptKey) updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_GPT_PROVIDER, managedGptKey);
+  syncManagedYunyiAuthProfiles(paths, config);
 
   console.log(chalk.green(`\n✅ ${typeLabel} 节点配置完成！`));
   console.log(chalk.cyan(`   ${typeLabel}: ${modelConfig.name}`));
@@ -5287,6 +5355,9 @@ async function activate(paths, type) {
     authStore.profiles[`${YYMAXAPI_OPENCLAW_GPT_PROVIDER}:default`] = { type: 'api_key', key: apiKey.trim(), provider: YYMAXAPI_OPENCLAW_GPT_PROVIDER };
   }
   writeAuthStore(paths.authProfiles, authStore);
+  if (yunyiLayoutResult.applied) {
+    pruneLegacyYunyiAuthProfilesWithSync(paths);
+  }
 
   console.log(chalk.green(`\n✅ 已激活 ${typeLabel}`));
   console.log(chalk.cyan(`   ${typeLabel}: ${modelConfig.name}`));

package/package.json

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