yymaxapi 1.0.88 → 1.0.89

package/bin/yymaxapi.js

@@ -2011,6 +2011,150 @@ function findAgentById(config, agentId) {
   return config.agents.list.find(agent => agent && typeof agent === 'object' && agent.id === agentId) || null;
 }
 
+function canonicalizeManagedYunyiModelKey(modelKey, preferredType = '') {
+  const text = String(modelKey || '').trim();
+  if (!text.includes('/')) return text;
+  const [, modelId = ''] = text.split('/');
+  if (!modelId) return text;
+  if (preferredType === 'claude' || (!preferredType && isManagedYunyiClaudeModelKey(text))) {
+    return `${YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER}/${modelId}`;
+  }
+  if (preferredType === 'codex' || preferredType === 'gpt' || (!preferredType && isManagedYunyiGptModelKey(text))) {
+    return `${YYMAXAPI_OPENCLAW_GPT_PROVIDER}/${modelId}`;
+  }
+  return text;
+}
+
+function getManagedYunyiKnownModelKeys(type) {
+  return type === 'claude'
+    ? [YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY, YYMAXAPI_OPENCLAW_CLAUDE_FALLBACK]
+    : [YYMAXAPI_OPENCLAW_GPT_PRIMARY, YYMAXAPI_OPENCLAW_GPT_FALLBACK];
+}
+
+function normalizeManagedYunyiModelState(type, modelState = {}, options = {}) {
+  const knownKeys = getManagedYunyiKnownModelKeys(type);
+  const fallbackPrimary = knownKeys[0];
+  const currentPrimary = canonicalizeManagedYunyiModelKey(modelState.primary || '', type);
+  const canPreserve = !options.force && currentPrimary && knownKeys.includes(currentPrimary);
+  const primary = canPreserve ? currentPrimary : fallbackPrimary;
+
+  let fallbacks = Array.isArray(modelState.fallbacks) ? modelState.fallbacks : [];
+  fallbacks = [...new Set(
+    fallbacks
+      .map(item => canonicalizeManagedYunyiModelKey(item, type))
+      .filter(item => item && item !== primary && knownKeys.includes(item))
+  )];
+
+  if (fallbacks.length === 0) {
+    fallbacks = knownKeys.filter(item => item !== primary);
+  }
+
+  return { primary, fallbacks };
+}
+
+function normalizeManagedYunyiDefaultsModel(modelState = {}, options = {}) {
+  const currentPrimary = String(modelState.primary || '').trim();
+  const canPreserve = !options.force && currentPrimary && isManagedYunyiModelKey(currentPrimary);
+  const primary = canPreserve
+    ? canonicalizeManagedYunyiModelKey(currentPrimary)
+    : YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY;
+
+  let fallbacks = Array.isArray(modelState.fallbacks) ? modelState.fallbacks : [];
+  fallbacks = [...new Set(
+    fallbacks
+      .map(item => {
+        const text = String(item || '').trim();
+        return isManagedYunyiModelKey(text) ? canonicalizeManagedYunyiModelKey(text) : text;
+      })
+      .filter(item => item && item !== primary)
+  )];
+
+  if (fallbacks.length === 0) {
+    fallbacks = [isManagedYunyiClaudeModelKey(primary) ? YYMAXAPI_OPENCLAW_GPT_PRIMARY : YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY];
+  }
+
+  return { primary, fallbacks };
+}
+
+function getManagedClaudeAgentId(config) {
+  const mainAgent = findAgentById(config, YYMAXAPI_OPENCLAW_MAIN_AGENT_ID);
+  if (mainAgent && isManagedMainAgent(mainAgent)) {
+    return YYMAXAPI_OPENCLAW_MAIN_AGENT_ID;
+  }
+
+  const sideAgent = findAgentById(config, YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID);
+  if (sideAgent && isManagedClaudeSideAgent(sideAgent)) {
+    return YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID;
+  }
+
+  return mainAgent ? YYMAXAPI_OPENCLAW_MAIN_AGENT_ID : (sideAgent ? YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID : null);
+}
+
+function inferManagedYunyiAgentIdForModelKey(config, modelKey) {
+  if (isManagedYunyiGptModelKey(modelKey)) return YYMAXAPI_OPENCLAW_GPT_AGENT_ID;
+  if (isManagedYunyiClaudeModelKey(modelKey)) return getManagedClaudeAgentId(config);
+  return null;
+}
+
+function applyManagedYunyiModelSelection(config, selectedModelKey) {
+  ensureConfigStructure(config);
+
+  const normalizedSelected = canonicalizeManagedYunyiModelKey(selectedModelKey);
+  const selectedType = isManagedYunyiClaudeModelKey(normalizedSelected)
+    ? 'claude'
+    : (isManagedYunyiGptModelKey(normalizedSelected) ? 'codex' : '');
+
+  if (!selectedType) {
+    return { changed: false, selectedModelKey: normalizedSelected, agentId: null };
+  }
+
+  let changed = false;
+  const previousPrimary = String(config.agents?.defaults?.model?.primary || '').trim();
+  const previousCanonical = isManagedYunyiModelKey(previousPrimary)
+    ? canonicalizeManagedYunyiModelKey(previousPrimary)
+    : previousPrimary;
+  const nextDefaultsModel = {
+    primary: normalizedSelected,
+    fallbacks: previousCanonical && previousCanonical !== normalizedSelected ? [previousCanonical] : []
+  };
+
+  if (JSON.stringify(config.agents.defaults.model) !== JSON.stringify(nextDefaultsModel)) {
+    config.agents.defaults.model = nextDefaultsModel;
+    changed = true;
+  }
+
+  const managedModelAliases = {
+    [YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY]: YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER,
+    [YYMAXAPI_OPENCLAW_CLAUDE_FALLBACK]: YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER,
+    [YYMAXAPI_OPENCLAW_GPT_PRIMARY]: YYMAXAPI_OPENCLAW_GPT_PROVIDER,
+    [YYMAXAPI_OPENCLAW_GPT_FALLBACK]: YYMAXAPI_OPENCLAW_GPT_PROVIDER
+  };
+  for (const [modelKey, alias] of Object.entries(managedModelAliases)) {
+    const nextEntry = { alias };
+    if (JSON.stringify(config.agents.defaults.models[modelKey] || {}) !== JSON.stringify(nextEntry)) {
+      config.agents.defaults.models[modelKey] = nextEntry;
+      changed = true;
+    }
+  }
+
+  const agentId = inferManagedYunyiAgentIdForModelKey(config, normalizedSelected)
+    || (selectedType === 'codex' ? YYMAXAPI_OPENCLAW_GPT_AGENT_ID : YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID);
+  const agentList = ensureAgentList(config);
+  const nextAgent = {
+    id: agentId,
+    default: agentId === YYMAXAPI_OPENCLAW_MAIN_AGENT_ID,
+    name: selectedType === 'codex' ? 'yunyi-gpt' : 'yunyi-claude',
+    model: normalizeManagedYunyiModelState(selectedType, { primary: normalizedSelected })
+  };
+  const shouldManage = selectedType === 'codex'
+    ? isManagedGptAgent
+    : (agentId === YYMAXAPI_OPENCLAW_MAIN_AGENT_ID ? isManagedMainAgent : isManagedClaudeSideAgent);
+  const updateResult = upsertManagedAgent(agentList, nextAgent, shouldManage);
+  if (updateResult.changed) changed = true;
+
+  return { changed, selectedModelKey: normalizedSelected, agentId };
+}
+
 function resolveOpenClawTestTarget(config, args = {}) {
   const requestedAgentId = String(args.agent || args['agent-id'] || '').trim();
   const requestedAgent = requestedAgentId ? findAgentById(config, requestedAgentId) : null;
@@ -2027,11 +2171,23 @@ function resolveOpenClawTestTarget(config, args = {}) {
   if (requestedAgent) {
     const agentState = getAgentModelState(requestedAgent);
     if (agentState.primary) {
-      primary = agentState.primary;
+      primary = canonicalizeManagedYunyiModelKey(agentState.primary);
       fallbacks = agentState.fallbacks;
       agentId = requestedAgent.id;
       agentName = String(requestedAgent.name || '').trim();
     }
+  } else {
+    const inferredAgentId = inferManagedYunyiAgentIdForModelKey(config, primary);
+    const inferredAgent = inferredAgentId ? findAgentById(config, inferredAgentId) : null;
+    if (inferredAgent) {
+      const agentState = getAgentModelState(inferredAgent);
+      if (agentState.primary) {
+        primary = canonicalizeManagedYunyiModelKey(agentState.primary);
+        fallbacks = agentState.fallbacks.map(item => isManagedYunyiModelKey(item) ? canonicalizeManagedYunyiModelKey(item) : item);
+      }
+      agentId = inferredAgent.id;
+      agentName = String(inferredAgent.name || '').trim();
+    }
   }
 
   const providerName = primary.includes('/') ? primary.split('/')[0] : '';
@@ -2293,28 +2449,24 @@ function applyManagedYunyiOpenClawLayout(config, options = {}) {
   }
 
   const agentList = ensureAgentList(config);
+  const currentMainAgentState = getAgentModelState(findAgentById(config, YYMAXAPI_OPENCLAW_MAIN_AGENT_ID));
   const mainAgentResult = upsertManagedAgent(agentList, {
     id: YYMAXAPI_OPENCLAW_MAIN_AGENT_ID,
     default: true,
     name: 'yunyi-claude',
-    model: {
-      primary: YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY,
-      fallbacks: [YYMAXAPI_OPENCLAW_CLAUDE_FALLBACK]
-    }
+    model: normalizeManagedYunyiModelState('claude', currentMainAgentState, options)
   }, isManagedMainAgent);
   if (mainAgentResult.changed) changed = true;
 
   let claudeAgentId = YYMAXAPI_OPENCLAW_MAIN_AGENT_ID;
   let preservedMain = !mainAgentResult.managed;
   if (!mainAgentResult.managed) {
+    const currentClaudeSideState = getAgentModelState(findAgentById(config, YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID));
     const fallbackClaudeAgentResult = upsertManagedAgent(agentList, {
       id: YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID,
       default: false,
       name: 'yunyi-claude',
-      model: {
-        primary: YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY,
-        fallbacks: [YYMAXAPI_OPENCLAW_CLAUDE_FALLBACK]
-      }
+      model: normalizeManagedYunyiModelState('claude', currentClaudeSideState, options)
     }, isManagedClaudeSideAgent);
     if (fallbackClaudeAgentResult.changed) changed = true;
     claudeAgentId = fallbackClaudeAgentResult.managed ? YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID : null;
@@ -2322,22 +2474,17 @@ function applyManagedYunyiOpenClawLayout(config, options = {}) {
     changed = true;
   }
 
+  const currentGptAgentState = getAgentModelState(findAgentById(config, YYMAXAPI_OPENCLAW_GPT_AGENT_ID));
   const gptAgentResult = upsertManagedAgent(agentList, {
     id: YYMAXAPI_OPENCLAW_GPT_AGENT_ID,
     default: false,
     name: 'yunyi-gpt',
-    model: {
-      primary: YYMAXAPI_OPENCLAW_GPT_PRIMARY,
-      fallbacks: [YYMAXAPI_OPENCLAW_GPT_FALLBACK]
-    }
+    model: normalizeManagedYunyiModelState('codex', currentGptAgentState, options)
   }, isManagedGptAgent);
   if (gptAgentResult.changed) changed = true;
 
   if (shouldManageYunyiDefaults(config)) {
-    const nextDefaultsModel = {
-      primary: YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY,
-      fallbacks: [YYMAXAPI_OPENCLAW_GPT_PRIMARY]
-    };
+    const nextDefaultsModel = normalizeManagedYunyiDefaultsModel(config.agents.defaults.model, options);
     if (JSON.stringify(config.agents.defaults.model) !== JSON.stringify(nextDefaultsModel)) {
       config.agents.defaults.model = nextDefaultsModel;
       changed = true;
@@ -5097,7 +5244,8 @@ async function switchModel(paths) {
 
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
   applyConfigRepairsWithSync(config, paths);
-  const primary = config.agents?.defaults?.model?.primary || '';
+  applyManagedYunyiOpenClawLayout(config);
+  let primary = config.agents?.defaults?.model?.primary || '';
   const providers = config.models?.providers || {};
 
   if (Object.keys(providers).length === 0) {
@@ -5195,6 +5343,7 @@ async function switchModel(paths) {
   }]);
 
   let finalSelected = selected;
+  let selectedAgentId = '';
 
   if (selected === '__other__') {
     if (otherModels.length === 0) {
@@ -5225,42 +5374,51 @@ async function switchModel(paths) {
     return;
   }
 
-  const selectedProviderKey = finalSelected.split('/')[0];
-  const selectedModelId = finalSelected.split('/')[1];
-  config.agents.defaults.model.primary = finalSelected;
-  if (!config.agents.defaults.models[finalSelected]) {
-    config.agents.defaults.models[finalSelected] = { alias: selectedProviderKey };
-  }
-
-  // 同步更新 provider.models
-  const providerConfig = providers[selectedProviderKey];
-  if (providerConfig && selectedModelId) {
-    const existingModel = (providerConfig.models || []).find(m => m.id === selectedModelId);
-    if (!existingModel) {
-      const allModels = [...CLAUDE_MODELS, ...CODEX_MODELS];
-      const knownModel = allModels.find(m => m.id === selectedModelId);
-      const apiType = providerConfig.api || '';
-      const isAnthropic = apiType.startsWith('anthropic');
-      const defaultCtx = isAnthropic ? (API_CONFIG.claude?.contextWindow || 200000) : (API_CONFIG.codex?.contextWindow || 200000);
-      const defaultMax = isAnthropic ? (API_CONFIG.claude?.maxTokens || 8192) : (API_CONFIG.codex?.maxTokens || 8192);
-      providerConfig.models = [{
-        id: selectedModelId,
-        name: knownModel ? knownModel.name : selectedModelId,
-        contextWindow: defaultCtx,
-        maxTokens: defaultMax
-      }];
-    } else {
-      providerConfig.models = [existingModel];
+  if (isManagedYunyiModelKey(finalSelected)) {
+    const selectionResult = applyManagedYunyiModelSelection(config, finalSelected);
+    finalSelected = selectionResult.selectedModelKey;
+    selectedAgentId = selectionResult.agentId || '';
+  } else {
+    const selectedProviderKey = finalSelected.split('/')[0];
+    const selectedModelId = finalSelected.split('/')[1];
+    config.agents.defaults.model.primary = finalSelected;
+    if (!config.agents.defaults.models[finalSelected]) {
+      config.agents.defaults.models[finalSelected] = { alias: selectedProviderKey };
+    }
+
+    // 同步更新 provider.models
+    const providerConfig = providers[selectedProviderKey];
+    if (providerConfig && selectedModelId) {
+      const existingModel = (providerConfig.models || []).find(m => m.id === selectedModelId);
+      if (!existingModel) {
+        const allModels = [...CLAUDE_MODELS, ...CODEX_MODELS];
+        const knownModel = allModels.find(m => m.id === selectedModelId);
+        const apiType = providerConfig.api || '';
+        const isAnthropic = apiType.startsWith('anthropic');
+        const defaultCtx = isAnthropic ? (API_CONFIG.claude?.contextWindow || 200000) : (API_CONFIG.codex?.contextWindow || 200000);
+        const defaultMax = isAnthropic ? (API_CONFIG.claude?.maxTokens || 8192) : (API_CONFIG.codex?.maxTokens || 8192);
+        providerConfig.models = [{
+          id: selectedModelId,
+          name: knownModel ? knownModel.name : selectedModelId,
+          contextWindow: defaultCtx,
+          maxTokens: defaultMax
+        }];
+      } else {
+        providerConfig.models = [existingModel];
+      }
     }
-  }
 
-  config.agents.defaults.model.fallbacks = (config.agents.defaults.model.fallbacks || []).filter(k => k !== finalSelected);
-  if (primary && primary !== finalSelected && !config.agents.defaults.model.fallbacks.includes(primary)) {
-    config.agents.defaults.model.fallbacks.push(primary);
+    config.agents.defaults.model.fallbacks = (config.agents.defaults.model.fallbacks || []).filter(k => k !== finalSelected);
+    if (primary && primary !== finalSelected && !config.agents.defaults.model.fallbacks.includes(primary)) {
+      config.agents.defaults.model.fallbacks.push(primary);
+    }
   }
+
+  primary = finalSelected;
   ensureGatewaySettings(config);
   writeConfigWithSync(paths, config);
 
+  const selectedProviderKey = finalSelected.split('/')[0];
   const selectedProviderConfig = providers[selectedProviderKey];
   const selectedLabel = PROVIDER_LABELS[selectedProviderKey] || selectedProviderKey;
   console.log(chalk.green(`\n✅ 已切换到 ${finalSelected}`));
@@ -5286,7 +5444,7 @@ async function switchModel(paths) {
 
   // 重启后直接测试连接
   console.log('');
-  await testConnection(paths, {});
+  await testConnection(paths, selectedAgentId ? { agent: selectedAgentId } : {});
 }
 // ============ 权限管理 (tools.profile) ============
 const TOOLS_PROFILES = [

package/package.json

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