yymaxapi 1.0.99 → 1.0.100

package/bin/yymaxapi.js

@@ -2115,9 +2115,146 @@ function getManagedClaudeAgentId(config) {
   return mainAgent ? YYMAXAPI_OPENCLAW_MAIN_AGENT_ID : (sideAgent ? YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID : null);
 }
 
+function getManagedYunyiActiveType(config) {
+  const defaultsPrimary = canonicalizeManagedYunyiModelKey(String(config?.agents?.defaults?.model?.primary || '').trim());
+  if (isManagedYunyiClaudeModelKey(defaultsPrimary)) return 'claude';
+  if (isManagedYunyiGptModelKey(defaultsPrimary)) return 'codex';
+
+  const mainState = getAgentModelState(findAgentById(config, YYMAXAPI_OPENCLAW_MAIN_AGENT_ID));
+  const mainPrimary = canonicalizeManagedYunyiModelKey(mainState.primary || '');
+  if (isManagedYunyiClaudeModelKey(mainPrimary)) return 'claude';
+  if (isManagedYunyiGptModelKey(mainPrimary)) return 'codex';
+
+  return 'claude';
+}
+
+function findManagedYunyiAgentState(config, type) {
+  const candidateIds = type === 'claude'
+    ? [YYMAXAPI_OPENCLAW_MAIN_AGENT_ID, YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID]
+    : [YYMAXAPI_OPENCLAW_MAIN_AGENT_ID, YYMAXAPI_OPENCLAW_GPT_AGENT_ID, ...YYMAXAPI_OPENCLAW_LEGACY_GPT_AGENT_IDS];
+
+  const matcher = type === 'claude' ? isManagedYunyiClaudeModelKey : isManagedYunyiGptModelKey;
+
+  for (const agentId of candidateIds) {
+    const state = getAgentModelState(findAgentById(config, agentId));
+    const primary = canonicalizeManagedYunyiModelKey(state.primary || '', type);
+    if (matcher(primary)) return state;
+  }
+
+  return {};
+}
+
+function getManagedYunyiDesiredPrimaryModelKey(config, type, explicitModelKey = '') {
+  const explicitPrimary = canonicalizeManagedYunyiModelKey(explicitModelKey, type);
+  if (type === 'claude' ? isManagedYunyiClaudeModelKey(explicitPrimary) : isManagedYunyiGptModelKey(explicitPrimary)) {
+    return explicitPrimary;
+  }
+
+  const defaultsPrimary = canonicalizeManagedYunyiModelKey(String(config?.agents?.defaults?.model?.primary || '').trim(), type);
+  if (type === 'claude' ? isManagedYunyiClaudeModelKey(defaultsPrimary) : isManagedYunyiGptModelKey(defaultsPrimary)) {
+    return defaultsPrimary;
+  }
+
+  return '';
+}
+
+function resolveManagedYunyiAgentAssignments(config, preferredType = '') {
+  const mainAgent = findAgentById(config, YYMAXAPI_OPENCLAW_MAIN_AGENT_ID);
+  const preservedMain = Boolean(mainAgent) && !isManagedMainAgent(mainAgent);
+  const activeType = preferredType || getManagedYunyiActiveType(config);
+
+  if (preservedMain) {
+    return {
+      preservedMain: true,
+      activeType,
+      mainAgentType: '',
+      claudeAgentId: YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID,
+      gptAgentId: YYMAXAPI_OPENCLAW_GPT_AGENT_ID
+    };
+  }
+
+  return activeType === 'codex'
+    ? {
+        preservedMain: false,
+        activeType,
+        mainAgentType: 'codex',
+        claudeAgentId: YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID,
+        gptAgentId: YYMAXAPI_OPENCLAW_MAIN_AGENT_ID
+      }
+    : {
+        preservedMain: false,
+        activeType: 'claude',
+        mainAgentType: 'claude',
+        claudeAgentId: YYMAXAPI_OPENCLAW_MAIN_AGENT_ID,
+        gptAgentId: YYMAXAPI_OPENCLAW_GPT_AGENT_ID
+      };
+}
+
+function syncManagedYunyiAgents(config, options = {}) {
+  ensureConfigStructure(config);
+
+  const assignments = resolveManagedYunyiAgentAssignments(config, options.preferredType);
+  const agentList = ensureAgentList(config);
+  const claudeDesiredPrimary = getManagedYunyiDesiredPrimaryModelKey(config, 'claude', options.selectedModelKey);
+  const gptDesiredPrimary = getManagedYunyiDesiredPrimaryModelKey(config, 'codex', options.selectedModelKey);
+  const claudeState = normalizeManagedYunyiModelState('claude', {
+    ...findManagedYunyiAgentState(config, 'claude'),
+    ...(claudeDesiredPrimary ? { primary: claudeDesiredPrimary } : {})
+  }, options);
+  const gptState = normalizeManagedYunyiModelState('codex', {
+    ...findManagedYunyiAgentState(config, 'codex'),
+    ...(gptDesiredPrimary ? { primary: gptDesiredPrimary } : {})
+  }, options);
+  let changed = false;
+
+  if (!assignments.preservedMain) {
+    const mainType = assignments.mainAgentType === 'codex' ? 'codex' : 'claude';
+    const mainState = mainType === 'codex' ? gptState : claudeState;
+    const mainResult = upsertManagedAgent(agentList, {
+      id: YYMAXAPI_OPENCLAW_MAIN_AGENT_ID,
+      default: true,
+      name: mainType === 'codex' ? 'yunyi-gpt' : 'yunyi-claude',
+      model: mainState
+    }, isManagedMainAgent);
+    if (mainResult.changed) changed = true;
+  }
+
+  if (assignments.claudeAgentId === YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID) {
+    const sideClaudeResult = upsertManagedAgent(agentList, {
+      id: YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID,
+      default: false,
+      name: 'yunyi-claude',
+      model: claudeState
+    }, isManagedClaudeSideAgent);
+    if (sideClaudeResult.changed) changed = true;
+  } else if (removeManagedAgent(agentList, YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID, isManagedClaudeSideAgent)) {
+    changed = true;
+  }
+
+  if (assignments.gptAgentId === YYMAXAPI_OPENCLAW_GPT_AGENT_ID) {
+    const gptResult = upsertManagedAgent(agentList, {
+      id: YYMAXAPI_OPENCLAW_GPT_AGENT_ID,
+      default: false,
+      name: 'yunyi-gpt',
+      model: gptState
+    }, isManagedGptAgent);
+    if (gptResult.changed) changed = true;
+  } else if (removeManagedAgent(agentList, YYMAXAPI_OPENCLAW_GPT_AGENT_ID, isManagedGptAgent)) {
+    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;
+  }
+
+  return { changed, ...assignments };
+}
+
 function inferManagedYunyiAgentIdForModelKey(config, modelKey) {
-  if (isManagedYunyiGptModelKey(modelKey)) return YYMAXAPI_OPENCLAW_GPT_AGENT_ID;
-  if (isManagedYunyiClaudeModelKey(modelKey)) return getManagedClaudeAgentId(config);
+  const assignments = resolveManagedYunyiAgentAssignments(config);
+  if (isManagedYunyiGptModelKey(modelKey)) return assignments.gptAgentId;
+  if (isManagedYunyiClaudeModelKey(modelKey)) return assignments.claudeAgentId || getManagedClaudeAgentId(config);
   return null;
 }
 
@@ -2157,20 +2294,15 @@ function applyManagedYunyiModelSelection(config, selectedModelKey) {
     }
   }
 
-  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;
+  const syncResult = syncManagedYunyiAgents(config, {
+    preferredType: selectedType,
+    selectedModelKey: normalizedSelected
+  });
+  if (syncResult.changed) changed = true;
+
+  const agentId = selectedType === 'codex'
+    ? syncResult.gptAgentId
+    : syncResult.claudeAgentId;
 
   return { changed, selectedModelKey: normalizedSelected, agentId };
 }
@@ -2544,45 +2676,6 @@ 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: 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: normalizeManagedYunyiModelState('claude', currentClaudeSideState, options)
-    }, isManagedClaudeSideAgent);
-    if (fallbackClaudeAgentResult.changed) changed = true;
-    claudeAgentId = fallbackClaudeAgentResult.managed ? YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID : null;
-  } else if (removeManagedAgent(agentList, YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID, isManagedClaudeSideAgent)) {
-    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: 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);
     if (JSON.stringify(config.agents.defaults.model) !== JSON.stringify(nextDefaultsModel)) {
@@ -2604,14 +2697,26 @@ function applyManagedYunyiOpenClawLayout(config, options = {}) {
     changed = true;
   }
 
-  return { changed, applied: true, claudeAgentId, preservedMain };
+  const syncResult = syncManagedYunyiAgents(config, options);
+  if (syncResult.changed) changed = true;
+
+  return {
+    changed,
+    applied: true,
+    claudeAgentId: syncResult.claudeAgentId,
+    gptAgentId: syncResult.gptAgentId,
+    preservedMain: syncResult.preservedMain,
+    mainAgentType: syncResult.mainAgentType
+  };
 }
 
 function printYunyiOpenClawSwitchHint(result = {}) {
   if (!result?.applied) return;
   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';
+    : (result.mainAgentType === 'codex'
+        ? 'OpenClaw: main=yunyi-gpt, Claude=yunyi-claude'
+        : 'OpenClaw: main=yunyi-claude, GPT=yunyi-gpt');
   console.log(chalk.cyan(`   ${summary}`));
 }
 
@@ -4628,7 +4733,10 @@ async function autoActivate(paths, args = {}) {
     endpointUrl: selectedEndpoint.url,
     apiKey
   });
-  applyManagedYunyiModelSelection(config, primaryModelKey);
+  const selectionResult = applyManagedYunyiModelSelection(config, primaryModelKey);
+  const finalYunyiLayoutResult = yunyiLayoutResult.applied
+    ? { ...yunyiLayoutResult, ...resolveManagedYunyiAgentAssignments(config, selectedType), applied: true }
+    : yunyiLayoutResult;
 
   // ---- 写入配置 ----
   const writeSpinner = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
@@ -4641,10 +4749,10 @@ async function autoActivate(paths, args = {}) {
   if (yunyiLayoutResult.applied) {
     syncManagedYunyiAuthProfiles(paths, config);
   }
-  if (!isClaudePrimary) {
-    const resetResult = resetManagedAgentSessionsWithSync(paths, YYMAXAPI_OPENCLAW_GPT_AGENT_ID);
+  if (selectionResult.agentId) {
+    const resetResult = resetManagedAgentSessionsWithSync(paths, selectionResult.agentId);
     if (resetResult.changed) {
-      console.log(chalk.gray(`   已重置 ${YYMAXAPI_OPENCLAW_GPT_AGENT_ID} 的活动会话映射`));
+      console.log(chalk.gray(`   已重置 ${selectionResult.agentId} 的活动会话映射`));
     }
   }
   const opencodeDefaultModelKey = isClaudePrimary ? `yunyi-claude/${claudeModelId}` : `yunyi-codex/${codexModelId}`;
@@ -4656,7 +4764,7 @@ async function autoActivate(paths, args = {}) {
   const selectedModel = isClaudePrimary ? claudeModel : codexModel;
   console.log(chalk.green('\n✅ 配置完成！'));
   console.log(chalk.cyan(`   外部工具默认: ${selectedModel.name}`));
-  printYunyiOpenClawSwitchHint(yunyiLayoutResult);
+  printYunyiOpenClawSwitchHint(finalYunyiLayoutResult);
 
   const gwPort = config.gateway?.port || 18789;
   const gwToken = config.gateway?.auth?.token;
@@ -4677,9 +4785,10 @@ async function autoActivate(paths, args = {}) {
   }]);
 
   if (nextAction === 'test') {
-    const selectedOpenClawAgentId = isClaudePrimary
-      ? (yunyiLayoutResult.claudeAgentId || YYMAXAPI_OPENCLAW_MAIN_AGENT_ID)
-      : YYMAXAPI_OPENCLAW_GPT_AGENT_ID;
+    const selectedOpenClawAgentId = selectionResult.agentId
+      || (isClaudePrimary
+        ? (finalYunyiLayoutResult.claudeAgentId || YYMAXAPI_OPENCLAW_MAIN_AGENT_ID)
+        : (finalYunyiLayoutResult.gptAgentId || YYMAXAPI_OPENCLAW_GPT_AGENT_ID));
     await testConnection(paths, { ...args, agent: selectedOpenClawAgentId });
   } else {
     console.log(chalk.cyan('👋 再见！\n'));
@@ -5619,7 +5728,7 @@ async function switchModel(paths) {
   primary = finalSelected;
   ensureGatewaySettings(config);
   writeConfigWithSync(paths, config);
-  if (selectedAgentId === YYMAXAPI_OPENCLAW_GPT_AGENT_ID) {
+  if (selectedAgentId && [YYMAXAPI_OPENCLAW_MAIN_AGENT_ID, YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID, YYMAXAPI_OPENCLAW_GPT_AGENT_ID].includes(selectedAgentId)) {
     const resetResult = resetManagedAgentSessionsWithSync(paths, selectedAgentId);
     if (resetResult.changed) {
       console.log(chalk.gray(`   已重置 ${selectedAgentId} 的活动会话映射`));

package/package.json

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