yymaxapi 1.0.84 → 1.0.86

package/bin/yymaxapi.js

@@ -115,7 +115,7 @@ const DEFAULT_API_CONFIG = {
     "api": "anthropic-messages",
     "contextWindow": 200000,
     "maxTokens": 8192,
-    "providerName": "claude-yunyi"
+    "providerName": "yunyi-claude"
   },
   "codex": {
     "urlSuffix": "/codex",
@@ -1617,6 +1617,27 @@ 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;
+        }
+      }
+    }
+  }
+
   return changed;
 }
 
@@ -1920,6 +1941,442 @@ function ensureConfigStructure(config) {
   return next;
 }
 
+const YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER = 'yunyi-claude';
+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_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`;
+const YYMAXAPI_OPENCLAW_GPT_FALLBACK = `${YYMAXAPI_OPENCLAW_GPT_PROVIDER}/gpt-5.3-codex`;
+const YYMAXAPI_MANAGED_MAIN_NAMES = new Set(['Claude', 'claude', 'yunyi-claude', 'claude-yunyi']);
+const YYMAXAPI_MANAGED_GPT_NAMES = new Set(['GPT', 'Codex', 'gpt', 'yunyi-gpt', 'yunyi-codex']);
+
+function isYymaxapiOpenClawBuild() {
+  return isLikelyYunyiBaseUrl(ENDPOINTS[0]?.url || '')
+    && API_CONFIG?.claude?.api === 'anthropic-messages'
+    && API_CONFIG?.codex?.api === 'openai-completions';
+}
+
+function startsWithProviderAliases(modelKey, aliases) {
+  if (typeof modelKey !== 'string') return false;
+  for (const alias of aliases || []) {
+    if (modelKey.startsWith(`${alias}/`)) return true;
+  }
+  return false;
+}
+
+function isManagedYunyiClaudeModelKey(modelKey) {
+  return startsWithProviderAliases(modelKey, YUNYI_PROVIDER_ALIASES.claude);
+}
+
+function isManagedYunyiGptModelKey(modelKey) {
+  return startsWithProviderAliases(modelKey, YUNYI_PROVIDER_ALIASES.codex);
+}
+
+function isManagedYunyiModelKey(modelKey) {
+  return isManagedYunyiClaudeModelKey(modelKey) || isManagedYunyiGptModelKey(modelKey);
+}
+
+function stripManagedYunyiSuffix(baseUrl) {
+  return String(baseUrl || '').trim().replace(/\/(?:claude|codex)\/?$/i, '');
+}
+
+function getManagedYunyiModelCatalog(type) {
+  if (type === 'claude') {
+    return [
+      { id: 'claude-sonnet-4-6', name: 'Claude Sonnet 4.6' },
+      { id: 'claude-opus-4-6', name: 'Claude Opus 4.6' }
+    ];
+  }
+  return [
+    { id: 'gpt-5.4', name: 'GPT 5.4' },
+    { id: 'gpt-5.3-codex', name: 'GPT 5.3 Codex' }
+  ];
+}
+
+function resolveManagedYunyiModelName(type, modelId, fallbackName) {
+  const catalog = type === 'claude' ? CLAUDE_MODELS : CODEX_MODELS;
+  return catalog.find(model => model.id === modelId)?.name || fallbackName;
+}
+
+function getManagedYunyiProviderModels(type) {
+  const apiConfig = type === 'claude'
+    ? { contextWindow: API_CONFIG.claude?.contextWindow || 200000, maxTokens: API_CONFIG.claude?.maxTokens || 8192 }
+    : { contextWindow: API_CONFIG.codex?.contextWindow || 1050000, maxTokens: API_CONFIG.codex?.maxTokens || 128000 };
+
+  return getManagedYunyiModelCatalog(type).map(model => ({
+    id: model.id,
+    name: resolveManagedYunyiModelName(type, model.id, model.name),
+    contextWindow: apiConfig.contextWindow,
+    maxTokens: apiConfig.maxTokens
+  }));
+}
+
+function getAgentModelState(agent) {
+  const model = agent && typeof agent === 'object' && agent.model && typeof agent.model === 'object'
+    ? agent.model
+    : {};
+  const primary = typeof model.primary === 'string' ? model.primary.trim() : '';
+  const fallbacks = Array.isArray(model.fallbacks)
+    ? [...new Set(model.fallbacks.map(item => String(item || '').trim()).filter(Boolean))]
+    : [];
+  return { primary, fallbacks };
+}
+
+function findAgentById(config, agentId) {
+  if (!Array.isArray(config?.agents?.list) || !agentId) return null;
+  return config.agents.list.find(agent => agent && typeof agent === 'object' && agent.id === agentId) || null;
+}
+
+function resolveOpenClawTestTarget(config, args = {}) {
+  const requestedAgentId = String(args.agent || args['agent-id'] || '').trim();
+  const requestedAgent = requestedAgentId ? findAgentById(config, requestedAgentId) : null;
+  const defaultPrimary = String(config?.agents?.defaults?.model?.primary || '').trim();
+  const defaultFallbacks = Array.isArray(config?.agents?.defaults?.model?.fallbacks)
+    ? [...config.agents.defaults.model.fallbacks]
+    : [];
+
+  let primary = defaultPrimary;
+  let fallbacks = defaultFallbacks;
+  let agentId = null;
+  let agentName = '';
+
+  if (requestedAgent) {
+    const agentState = getAgentModelState(requestedAgent);
+    if (agentState.primary) {
+      primary = agentState.primary;
+      fallbacks = agentState.fallbacks;
+      agentId = requestedAgent.id;
+      agentName = String(requestedAgent.name || '').trim();
+    }
+  }
+
+  const providerName = primary.includes('/') ? primary.split('/')[0] : '';
+  const provider = providerName ? (config.models?.providers?.[providerName] || null) : null;
+  const apiType = provider?.api || '';
+  const typeLabel = apiType.startsWith('anthropic')
+    ? 'Claude'
+    : (apiType.startsWith('openai') ? 'Codex' : '模型');
+
+  return {
+    agentId,
+    agentName,
+    primary,
+    fallbacks,
+    providerName,
+    provider,
+    typeLabel,
+    defaultPrimary
+  };
+}
+
+function hasManagedYunyiFootprint(config) {
+  const providers = config?.models?.providers || {};
+  if (Object.entries(providers).some(([name, provider]) => isYunyiProviderEntry(name, provider, 'claude') || isYunyiProviderEntry(name, provider, 'codex'))) {
+    return true;
+  }
+
+  const defaultsModel = config?.agents?.defaults?.model || {};
+  if (isManagedYunyiModelKey(defaultsModel.primary)) return true;
+  if (Array.isArray(defaultsModel.fallbacks) && defaultsModel.fallbacks.some(isManagedYunyiModelKey)) return true;
+
+  if (Array.isArray(config?.agents?.list)) {
+    return config.agents.list.some(agent => {
+      if (!agent || typeof agent !== 'object') return false;
+      const name = String(agent.name || '').trim();
+      const { primary, fallbacks } = getAgentModelState(agent);
+      if (agent.id === YYMAXAPI_OPENCLAW_GPT_AGENT_ID || agent.id === YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID) {
+        return true;
+      }
+      if (agent.id === YYMAXAPI_OPENCLAW_MAIN_AGENT_ID && YYMAXAPI_MANAGED_MAIN_NAMES.has(name)) {
+        return true;
+      }
+      return isManagedYunyiModelKey(primary) || fallbacks.some(isManagedYunyiModelKey);
+    });
+  }
+
+  return false;
+}
+
+function inferManagedYunyiEndpointUrl(config, explicitEndpointUrl = '') {
+  const direct = stripManagedYunyiSuffix(explicitEndpointUrl);
+  if (direct && isLikelyYunyiBaseUrl(direct)) return direct;
+
+  const providers = config?.models?.providers || {};
+  for (const [name, provider] of Object.entries(providers)) {
+    if (!isYunyiProviderEntry(name, provider, 'claude') && !isYunyiProviderEntry(name, provider, 'codex')) continue;
+    const candidate = stripManagedYunyiSuffix(provider?.baseUrl || provider?.base_url || '');
+    if (candidate && isLikelyYunyiBaseUrl(candidate)) return candidate;
+  }
+
+  return ENDPOINTS.find(item => isLikelyYunyiBaseUrl(item.url))?.url || ENDPOINTS[0]?.url || '';
+}
+
+function inferManagedYunyiApiKey(config, explicitApiKey = '') {
+  const direct = String(explicitApiKey || '').trim();
+  if (direct) return direct;
+
+  const providers = config?.models?.providers || {};
+  for (const [name, provider] of Object.entries(providers)) {
+    if (!isYunyiProviderEntry(name, provider, 'claude') && !isYunyiProviderEntry(name, provider, 'codex')) continue;
+    const apiKey = String(provider?.apiKey || '').trim();
+    if (apiKey) return apiKey;
+  }
+
+  return '';
+}
+
+function buildManagedYunyiProviderConfig(type, endpointUrl, apiKey, existingProvider = {}) {
+  const providerName = type === 'claude' ? YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER : YYMAXAPI_OPENCLAW_GPT_PROVIDER;
+  const nextApiKey = String(apiKey || existingProvider.apiKey || '').trim();
+  const next = {
+    ...existingProvider,
+    baseUrl: buildFullUrl(endpointUrl, type),
+    auth: DEFAULT_AUTH_MODE,
+    api: type === 'claude' ? 'anthropic-messages' : 'openai-completions',
+    headers: {},
+    authHeader: type !== 'claude',
+    models: getManagedYunyiProviderModels(type)
+  };
+
+  if (nextApiKey) next.apiKey = nextApiKey;
+  if (!next.auth) next.auth = DEFAULT_AUTH_MODE;
+  if (!next.baseUrl) next.baseUrl = buildFullUrl(endpointUrl, type);
+  if (!next.api) next.api = type === 'claude' ? 'anthropic-messages' : 'openai-completions';
+  if (!Array.isArray(next.models)) next.models = getManagedYunyiProviderModels(type);
+  if (!providerName) return existingProvider;
+  return next;
+}
+
+function buildGatewayAgentSubcommand({ sessionId, agentId, message = '请回复你的模型名称' }) {
+  const agentArg = agentId ? ` --agent ${shellQuote(agentId)}` : '';
+  return `agent${agentArg} --session-id ${shellQuote(sessionId)} --message ${shellQuote(message)} --json --timeout 120`;
+}
+
+function buildGatewayAgentCliCommand({ cliBinary, nodeInfo, useNode, sessionId, agentId, message = '请回复你的模型名称' }) {
+  const subcommand = buildGatewayAgentSubcommand({ sessionId, agentId, message });
+  return useNode
+    ? `${shellQuote(nodeInfo.path)} ${shellQuote(cliBinary)} ${subcommand}`
+    : `${shellQuote(cliBinary)} ${subcommand}`;
+}
+
+function ensureAgentList(config) {
+  if (!config.agents) config.agents = {};
+  if (!Array.isArray(config.agents.list)) config.agents.list = [];
+  return config.agents.list;
+}
+
+function findAgentIndex(agentList, agentId) {
+  return agentList.findIndex(agent => agent && typeof agent === 'object' && agent.id === agentId);
+}
+
+function mergeManagedAgent(existingAgent, nextAgent) {
+  const existing = existingAgent && typeof existingAgent === 'object' ? existingAgent : {};
+  return {
+    ...existing,
+    ...nextAgent,
+    model: {
+      ...(existing.model && typeof existing.model === 'object' ? existing.model : {}),
+      ...(nextAgent.model || {})
+    }
+  };
+}
+
+function isManagedMainAgent(agent) {
+  if (!agent || typeof agent !== 'object') return true;
+  const name = String(agent.name || '').trim();
+  const { primary, fallbacks } = getAgentModelState(agent);
+  if (!primary) return true;
+  if (YYMAXAPI_MANAGED_MAIN_NAMES.has(name)) return true;
+  if (isManagedYunyiClaudeModelKey(primary) || isManagedYunyiGptModelKey(primary)) return true;
+  return fallbacks.some(modelKey => isManagedYunyiClaudeModelKey(modelKey) || isManagedYunyiGptModelKey(modelKey));
+}
+
+function isManagedClaudeSideAgent(agent) {
+  if (!agent || typeof agent !== 'object') return true;
+  const name = String(agent.name || '').trim();
+  const { primary, fallbacks } = getAgentModelState(agent);
+  if (!primary) return true;
+  if (YYMAXAPI_MANAGED_MAIN_NAMES.has(name)) return true;
+  if (isManagedYunyiClaudeModelKey(primary)) return true;
+  return fallbacks.some(isManagedYunyiClaudeModelKey);
+}
+
+function isManagedGptAgent(agent) {
+  if (!agent || typeof agent !== 'object') return true;
+  const name = String(agent.name || '').trim();
+  const { primary, fallbacks } = getAgentModelState(agent);
+  if (!primary) return true;
+  if (YYMAXAPI_MANAGED_GPT_NAMES.has(name)) return true;
+  if (isManagedYunyiGptModelKey(primary)) return true;
+  return fallbacks.some(isManagedYunyiGptModelKey);
+}
+
+function upsertManagedAgent(agentList, nextAgent, shouldManage) {
+  const index = findAgentIndex(agentList, nextAgent.id);
+  if (index === -1) {
+    agentList.push(nextAgent);
+    return { changed: true, managed: true, created: true };
+  }
+
+  const currentAgent = agentList[index];
+  if (!shouldManage(currentAgent)) {
+    return { changed: false, managed: false, preserved: true };
+  }
+
+  const mergedAgent = mergeManagedAgent(currentAgent, nextAgent);
+  if (JSON.stringify(mergedAgent) === JSON.stringify(currentAgent)) {
+    return { changed: false, managed: true };
+  }
+
+  agentList[index] = mergedAgent;
+  return { changed: true, managed: true };
+}
+
+function removeManagedAgent(agentList, agentId, shouldManage) {
+  const index = findAgentIndex(agentList, agentId);
+  if (index === -1) return false;
+  if (!shouldManage(agentList[index])) return false;
+  agentList.splice(index, 1);
+  return true;
+}
+
+function shouldManageYunyiDefaults(config) {
+  const modelState = config?.agents?.defaults?.model || {};
+  const primary = typeof modelState.primary === 'string' ? modelState.primary.trim() : '';
+  const fallbacks = Array.isArray(modelState.fallbacks) ? modelState.fallbacks : [];
+  if (!primary) return true;
+  if (isManagedYunyiModelKey(primary)) return true;
+  return fallbacks.some(isManagedYunyiModelKey);
+}
+
+function applyManagedYunyiOpenClawLayout(config, options = {}) {
+  if (!isYymaxapiOpenClawBuild()) {
+    return { changed: false, applied: false, claudeAgentId: null, preservedMain: false };
+  }
+
+  if (!options.force && !hasManagedYunyiFootprint(config)) {
+    return { changed: false, applied: false, claudeAgentId: null, preservedMain: false };
+  }
+
+  ensureConfigStructure(config);
+
+  const endpointUrl = inferManagedYunyiEndpointUrl(config, options.endpointUrl);
+  const apiKey = inferManagedYunyiApiKey(config, options.apiKey);
+  if (!endpointUrl) {
+    return { changed: false, applied: false, claudeAgentId: null, preservedMain: false };
+  }
+
+  let changed = false;
+  const providers = config.models.providers;
+
+  const nextClaudeProvider = buildManagedYunyiProviderConfig('claude', endpointUrl, apiKey, providers[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER] || {});
+  if (JSON.stringify(nextClaudeProvider) !== JSON.stringify(providers[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER] || {})) {
+    providers[YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER] = nextClaudeProvider;
+    changed = true;
+  }
+
+  const nextGptProvider = buildManagedYunyiProviderConfig('codex', endpointUrl, apiKey, providers[YYMAXAPI_OPENCLAW_GPT_PROVIDER] || {});
+  if (JSON.stringify(nextGptProvider) !== JSON.stringify(providers[YYMAXAPI_OPENCLAW_GPT_PROVIDER] || {})) {
+    providers[YYMAXAPI_OPENCLAW_GPT_PROVIDER] = nextGptProvider;
+    changed = true;
+  }
+
+  const nextClaudeAuthProfile = { provider: YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER, mode: 'api_key' };
+  if (JSON.stringify(config.auth.profiles[`${YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER}:default`] || {}) !== JSON.stringify(nextClaudeAuthProfile)) {
+    config.auth.profiles[`${YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER}:default`] = nextClaudeAuthProfile;
+    changed = true;
+  }
+
+  const nextGptAuthProfile = { provider: YYMAXAPI_OPENCLAW_GPT_PROVIDER, mode: 'api_key' };
+  if (JSON.stringify(config.auth.profiles[`${YYMAXAPI_OPENCLAW_GPT_PROVIDER}:default`] || {}) !== JSON.stringify(nextGptAuthProfile)) {
+    config.auth.profiles[`${YYMAXAPI_OPENCLAW_GPT_PROVIDER}:default`] = nextGptAuthProfile;
+    changed = true;
+  }
+
+  const defaultsModels = config.agents.defaults.models;
+  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(defaultsModels[modelKey] || {}) !== JSON.stringify(nextEntry)) {
+      defaultsModels[modelKey] = nextEntry;
+      changed = true;
+    }
+  }
+
+  const agentList = ensureAgentList(config);
+  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]
+    }
+  }, isManagedMainAgent);
+  if (mainAgentResult.changed) changed = true;
+
+  let claudeAgentId = YYMAXAPI_OPENCLAW_MAIN_AGENT_ID;
+  let preservedMain = !mainAgentResult.managed;
+  if (!mainAgentResult.managed) {
+    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]
+      }
+    }, 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 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]
+    }
+  }, isManagedGptAgent);
+  if (gptAgentResult.changed) changed = true;
+
+  if (shouldManageYunyiDefaults(config)) {
+    const nextDefaultsModel = {
+      primary: YYMAXAPI_OPENCLAW_CLAUDE_PRIMARY,
+      fallbacks: [YYMAXAPI_OPENCLAW_GPT_PRIMARY]
+    };
+    if (JSON.stringify(config.agents.defaults.model) !== JSON.stringify(nextDefaultsModel)) {
+      config.agents.defaults.model = nextDefaultsModel;
+      changed = true;
+    }
+  }
+
+  return { changed, applied: true, claudeAgentId, preservedMain };
+}
+
+function printYunyiOpenClawSwitchHint(result = {}) {
+  if (!result?.applied) return;
+  if (result.preservedMain && result.claudeAgentId === YYMAXAPI_OPENCLAW_ALT_CLAUDE_AGENT_ID) {
+    console.log(chalk.gray('   已保留你现有的 main；Yunyi Claude 入口为 yunyi-claude'));
+  } else {
+    console.log(chalk.gray('   默认主入口是 yunyi-claude'));
+  }
+  console.log(chalk.gray('   GPT 入口是 yunyi-gpt'));
+  console.log(chalk.yellow('   提示: 当前 OpenClaw Web 顶部模型下拉跨 provider 切换可能报错，建议通过左侧会话/agent 切换 Claude 和 GPT'));
+}
+
 function pruneProvidersByPrefix(config, prefixBase, keepProviders = []) {
   if (!config?.models?.providers) return [];
   const removed = [];
@@ -2260,12 +2717,14 @@ function isNodeShebang(filePath) {
       return true;
     }
     const fd = fs.openSync(filePath, 'r');
-    const buffer = Buffer.alloc(128);
+    const buffer = Buffer.alloc(256);
     const bytes = fs.readSync(fd, buffer, 0, buffer.length, 0);
     fs.closeSync(fd);
     if (bytes <= 0) return false;
     const header = buffer.toString('utf8', 0, bytes);
-    return header.startsWith('#!') && header.includes('node');
+    const firstLine = header.split(/\r?\n/, 1)[0] || '';
+    if (!firstLine.startsWith('#!')) return false;
+    return /\bnode(?:js)?\b/.test(firstLine);
   } catch {
     return false;
   }
@@ -2747,6 +3206,8 @@ function autoFixConfig(paths) {
     sanitizeDefaultModelSelection(config);
     const repairResult = applyConfigRepairsWithSync(config, paths);
     if (repairResult.changed) changed = true;
+    const yunyiLayoutResult = applyManagedYunyiOpenClawLayout(config);
+    if (yunyiLayoutResult.changed) changed = true;
     const codexProvider = codexProviderName && config.models.providers?.[codexProviderName];
     const nextModelJson = JSON.stringify(config.agents?.defaults?.model ?? null);
     if (originalModelJson !== nextModelJson) {
@@ -2766,8 +3227,12 @@ function autoFixConfig(paths) {
     }
 
     if (changed) {
-      writeConfig(paths.openclawConfig, config);
-      console.log(chalk.green('✓ 已自动修复配置（模型结构 / API 协议）'));
+      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);
+      console.log(chalk.green('✓ 已自动修复配置（Yunyi providers / agents / API 协议）'));
     }
   } catch { /* ignore */ }
 }
@@ -3468,12 +3933,21 @@ async function presetClaude(paths, args = {}) {
     config.agents.defaults.model.primary = modelKey;
     config.agents.defaults.model.fallbacks = [];
   }
+  const yunyiLayoutResult = applyManagedYunyiOpenClawLayout(config, {
+    force: true,
+    endpointUrl: selectedEndpoint.url,
+    apiKey
+  });
 
   const writeSpinner = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
   createTimestampedBackup(paths.openclawConfig, paths.configDir, 'claude');
   ensureGatewaySettings(config);
   writeConfigWithSync(paths, config);
   updateAuthProfilesWithSync(paths, providerName, apiKey);
+  if (yunyiLayoutResult.applied) {
+    updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER, apiKey);
+    updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_GPT_PROVIDER, apiKey);
+  }
   const extSynced = syncExternalTools('claude', baseUrl, apiKey, { claudeModelId: modelId, opencodeDefaultModelKey: `yunyi-claude/${modelId}` });
   writeSpinner.succeed('配置写入完成');
 
@@ -3486,6 +3960,7 @@ async function presetClaude(paths, args = {}) {
   if (repairResult.renamedProviders.length > 0) {
     console.log(chalk.gray(`   已保留并修复冲突 provider: ${repairResult.renamedProviders.map(item => `${item.from}→${item.to}`).join(', ')}`));
   }
+  printYunyiOpenClawSwitchHint(yunyiLayoutResult);
 
   const shouldTestGateway = args.test !== undefined
     ? !['false', '0', 'no'].includes(String(args.test).toLowerCase())
@@ -3644,6 +4119,11 @@ async function presetCodex(paths, args = {}) {
     config.agents.defaults.model.primary = modelKey;
     config.agents.defaults.model.fallbacks = [];
   }
+  const yunyiLayoutResult = applyManagedYunyiOpenClawLayout(config, {
+    force: true,
+    endpointUrl: selectedEndpoint.url,
+    apiKey
+  });
 
   const writeSpinner2 = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
   createTimestampedBackup(paths.openclawConfig, paths.configDir, 'codex');
@@ -3651,6 +4131,10 @@ async function presetCodex(paths, args = {}) {
   cleanupConflictingEnvVars(config, baseUrl, apiKey);
   writeConfigWithSync(paths, config);
   updateAuthProfilesWithSync(paths, providerName, apiKey);
+  if (yunyiLayoutResult.applied) {
+    updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER, apiKey);
+    updateAuthProfilesWithSync(paths, YYMAXAPI_OPENCLAW_GPT_PROVIDER, apiKey);
+  }
   const extSynced2 = syncExternalTools('codex', baseUrl, apiKey, { modelId });
   writeSpinner2.succeed('配置写入完成');
 
@@ -3663,6 +4147,7 @@ async function presetCodex(paths, args = {}) {
   if (repairResult.renamedProviders.length > 0) {
     console.log(chalk.gray(`   已保留并修复冲突 provider: ${repairResult.renamedProviders.map(item => `${item.from}→${item.to}`).join(', ')}`));
   }
+  printYunyiOpenClawSwitchHint(yunyiLayoutResult);
 
   const shouldTestGateway = args.test !== undefined
     ? !['false', '0', 'no'].includes(String(args.test).toLowerCase())
@@ -3831,6 +4316,11 @@ async function autoActivate(paths, args = {}) {
   const fallbackModelKey = isClaudePrimary ? codexModelKey : claudeModelKey;
   config.agents.defaults.model.primary = primaryModelKey;
   config.agents.defaults.model.fallbacks = [fallbackModelKey];
+  const yunyiLayoutResult = applyManagedYunyiOpenClawLayout(config, {
+    force: true,
+    endpointUrl: selectedEndpoint.url,
+    apiKey
+  });
 
   // ---- 写入配置 ----
   const writeSpinner = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
@@ -3850,12 +4340,13 @@ async function autoActivate(paths, args = {}) {
   const primaryLabel = isClaudePrimary ? 'Claude' : 'GPT';
   const selectedModel = isClaudePrimary ? claudeModel : codexModel;
   console.log(chalk.green('\n✅ 配置完成！'));
-  console.log(chalk.cyan(`   模型: ${selectedModel.name} (${primaryLabel})`));
+  console.log(chalk.cyan(`   外部工具默认: ${selectedModel.name} (${primaryLabel})`));
   console.log(chalk.gray(`   节点: ${selectedEndpoint.url} (${selectedEndpoint.name})`));
   console.log(chalk.gray('   API Key: 已设置'));
   if (extSynced.length > 0) console.log(chalk.gray(`   同步: ${extSynced.join(', ')}`));
   console.log(chalk.gray('   若遇 certificate 报错，请新开终端或执行 source ~/.zshrc 后重试（已放宽 TLS 校验）'));
   console.log(chalk.gray(`   使用 OpenCode 时可在界面中切换 ${getOpencodeSwitchHint()}；Codex 仅支持 GPT`));
+  printYunyiOpenClawSwitchHint(yunyiLayoutResult);
 
   const gwPort = config.gateway?.port || 18789;
   const gwToken = config.gateway?.auth?.token;
@@ -3876,7 +4367,10 @@ async function autoActivate(paths, args = {}) {
   }]);
 
   if (nextAction === 'test') {
-    await testConnection(paths, args);
+    const selectedOpenClawAgentId = isClaudePrimary
+      ? (yunyiLayoutResult.claudeAgentId || YYMAXAPI_OPENCLAW_MAIN_AGENT_ID)
+      : YYMAXAPI_OPENCLAW_GPT_AGENT_ID;
+    await testConnection(paths, { ...args, agent: selectedOpenClawAgentId });
   } else {
     console.log(chalk.cyan('👋 再见！\n'));
     process.exit(0);
@@ -4276,6 +4770,11 @@ async function yycodeQuickSetup(paths) {
   // 默认主力: Codex, 备用: Claude
   config.agents.defaults.model.primary = codexModelKey;
   config.agents.defaults.model.fallbacks = [claudeModelKey];
+  const yunyiLayoutResult = applyManagedYunyiOpenClawLayout(config, {
+    force: true,
+    endpointUrl: selectedEndpoint.url,
+    apiKey
+  });
 
   // ---- 写入 ----
   const writeSpinner = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
@@ -4293,10 +4792,11 @@ async function yycodeQuickSetup(paths) {
   console.log(chalk.green('\n✅ 配置完成！'));
   console.log(chalk.cyan(`   Claude Code: ${claudeBaseUrl}`));
   console.log(chalk.gray(`     模型: ${claudeModel.name}`));
-  console.log(chalk.cyan(`   Codex (主): ${codexBaseUrl}`));
+  console.log(chalk.cyan(`   Codex CLI: ${codexBaseUrl}`));
   console.log(chalk.gray(`     模型: ${codexModel.name}`));
   console.log(chalk.gray('   API Key: 已设置'));
   console.log(chalk.gray('   同步: Claude Code settings, Opencode config, Codex CLI config'));
+  printYunyiOpenClawSwitchHint(yunyiLayoutResult);
   console.log('');
 }
 
@@ -4428,7 +4928,9 @@ async function main() {
 // 获取当前配置状态摘要
 function getConfigStatusLine(paths) {
   try {
-    const config = readConfig(paths.openclawConfig);
+    const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
+    applyConfigRepairsWithSync(config, paths);
+    applyManagedYunyiOpenClawLayout(config);
     if (!config?.models?.providers) return null;
 
     const providers = Object.keys(config.models.providers);
@@ -4436,6 +4938,7 @@ function getConfigStatusLine(paths) {
     const primaryProvider = primary.split('/')[0] || '';
 
     const KNOWN_PROVIDERS = {
+      'yunyi-claude': 'Claude(包月)',
       'claude-yunyi': 'Claude(包月)',
       'yunyi': 'Codex(包月)',
       'heibai': 'MAXAPI(按量)',
@@ -4555,14 +5058,24 @@ async function selectNode(paths, type) {
   config.agents.defaults.models[modelKey] = { alias: apiConfig.providerName };
   config.agents.defaults.model.primary = modelKey;
   config.agents.defaults.model.fallbacks = (config.agents.defaults.model.fallbacks || []).filter(k => k !== modelKey);
+  const yunyiLayoutResult = applyManagedYunyiOpenClawLayout(config, {
+    force: true,
+    endpointUrl: selectedEndpoint.url,
+    apiKey: oldApiKey || ''
+  });
 
   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);
 
   console.log(chalk.green(`\n✅ ${typeLabel} 节点配置完成！`));
   console.log(chalk.cyan(`   节点: ${selectedEndpoint.name} (${selectedEndpoint.url})`));
   console.log(chalk.gray(`   模型: ${modelConfig.name} (主模型)`));
   console.log(chalk.gray(`   API Key: ${oldApiKey ? '已设置' : '未设置'}`));
+  printYunyiOpenClawSwitchHint(yunyiLayoutResult);
 }
 
 // ============ 激活 (Claude/Codex) ============
@@ -4593,6 +5106,11 @@ async function activate(paths, type) {
   const modelKey = `${apiConfig.providerName}/${modelConfig.id}`;
   config.agents.defaults.model.primary = modelKey;
   config.agents.defaults.model.fallbacks = [];
+  const yunyiLayoutResult = applyManagedYunyiOpenClawLayout(config, {
+    force: true,
+    endpointUrl: stripManagedYunyiSuffix(provider.baseUrl),
+    apiKey
+  });
 
   writeConfigWithSync(paths, config);
 
@@ -4604,12 +5122,17 @@ async function activate(paths, type) {
 
   const authStore = readAuthStore(paths.authProfiles);
   authStore.profiles[`${apiConfig.providerName}:default`] = { type: 'api_key', key: apiKey.trim(), provider: apiConfig.providerName };
+  if (yunyiLayoutResult.applied) {
+    authStore.profiles[`${YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER}:default`] = { type: 'api_key', key: apiKey.trim(), provider: YYMAXAPI_OPENCLAW_CLAUDE_PROVIDER };
+    authStore.profiles[`${YYMAXAPI_OPENCLAW_GPT_PROVIDER}:default`] = { type: 'api_key', key: apiKey.trim(), provider: YYMAXAPI_OPENCLAW_GPT_PROVIDER };
+  }
   writeAuthStore(paths.authProfiles, authStore);
 
   console.log(chalk.green(`\n✅ 已激活 ${typeLabel}`));
   console.log(chalk.cyan(`   节点: ${provider.baseUrl}`));
   console.log(chalk.gray(`   模型: ${modelConfig.name}`));
   console.log(chalk.gray(`   API Key: 已设置`));
+  printYunyiOpenClawSwitchHint(yunyiLayoutResult);
 }
 
 
@@ -4628,6 +5151,7 @@ async function switchModel(paths) {
   }
 
   const PROVIDER_LABELS = {
+    'yunyi-claude': '云翼 Claude (包月)',
     'claude-yunyi': '云翼 Claude (包月)',
     'yunyi': '云翼 Codex (包月)',
     'heibai': 'MAXAPI (按量)',
@@ -4883,30 +5407,28 @@ async function testConnection(paths, args = {}) {
 
   const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
   applyConfigRepairsWithSync(config, paths);
+  applyManagedYunyiOpenClawLayout(config);
 
   if (!config || !config.models) {
     console.log(chalk.yellow('配置文件不存在，请先选择节点'));
     return;
   }
 
-  // 检查当前激活的是哪个
-  let primary = config.agents?.defaults?.model?.primary || '';
+  const testTarget = resolveOpenClawTestTarget(config, args);
+  const primary = testTarget.primary;
   if (!primary.includes('/')) {
     console.log(chalk.yellow('⚠️ 主模型未设置，请先通过「切换 OpenClaw 模型」或「一键配置」设置主模型'));
     return;
   }
 
-  const providerName = primary.split('/')[0];
-  const provider = config.models?.providers?.[providerName];
+  const providerName = testTarget.providerName;
+  const provider = testTarget.provider;
   if (!provider) {
     console.log(chalk.yellow(`⚠️ 主模型对应的中转站不存在: ${providerName}`));
     return;
   }
 
-  const apiType = provider.api || '';
-  const typeLabel = apiType.startsWith('anthropic')
-    ? 'Claude'
-    : (apiType.startsWith('openai') ? 'Codex' : '模型');
+  const typeLabel = testTarget.typeLabel;
 
   if (!provider.apiKey) {
     console.log(chalk.yellow(`⚠️ ${typeLabel} API Key 未设置`));
@@ -4916,7 +5438,13 @@ async function testConnection(paths, args = {}) {
   // 获取 Gateway 配置
   const gatewayPort = config.gateway?.port || 18789;
 
-  console.log(chalk.gray(`当前激活: ${typeLabel}`));
+  console.log(chalk.gray(`当前测试: ${typeLabel}`));
+  if (testTarget.agentId) {
+    console.log(chalk.gray(`测试入口: ${testTarget.agentId}${testTarget.agentName ? ` (${testTarget.agentName})` : ''}`));
+  }
+  if (testTarget.agentId && testTarget.defaultPrimary && testTarget.defaultPrimary !== primary) {
+    console.log(chalk.gray(`默认主入口: ${testTarget.defaultPrimary}`));
+  }
   console.log(chalk.gray(`中转节点: ${provider.baseUrl}`));
   console.log(chalk.gray(`模型: ${primary}`));
   console.log(chalk.gray(`Gateway: http://127.0.0.1:${gatewayPort}\n`));
@@ -4992,7 +5520,7 @@ async function testConnection(paths, args = {}) {
   console.log(chalk.cyan(`\n步骤 2/2: 测试 Gateway API 端点...`));
 
   try {
-    const cliResult = await testGatewayViaAgent(primary);
+    const cliResult = await testGatewayViaAgent(primary, testTarget.agentId);
     let cliPassed = false;
 
     if (cliResult.usedCli) {
@@ -5017,7 +5545,7 @@ async function testConnection(paths, args = {}) {
             console.log(chalk.red(`   期望: ${primary}`));
             console.log(chalk.cyan(`   实际: ${actualModelKey}`));
             console.log(chalk.gray(`   这意味着 ${primary} 无法正常工作，请检查该模型的中转配置`));
-            const configuredFallbacks = config.agents?.defaults?.model?.fallbacks || [];
+            const configuredFallbacks = testTarget.fallbacks || [];
             if (configuredFallbacks.length > 0 && !configuredFallbacks.includes(actualModelKey)) {
               console.log(chalk.yellow(`   ⚠️ 实际回退模型不在当前配置的 fallbacks 中，疑似读到了另一份配置`));
               console.log(chalk.gray(`   当前 fallbacks: ${configuredFallbacks.join(', ')}`));
@@ -5508,7 +6036,7 @@ function testGatewayApi(port, token, model, endpoint = '/v1/chat/completions') {
   });
 }
 
-function testGatewayViaAgent(model) {
+function testGatewayViaAgent(model, agentId = '') {
   return new Promise((resolve) => {
     const gwEnv = detectGatewayEnv();
     const sessionId = `yymaxapi-test-${Date.now()}`;
@@ -5519,11 +6047,12 @@ function testGatewayViaAgent(model) {
     if (gwEnv === 'wsl') {
       // Gateway 在 WSL 中，agent 也要在 WSL 中执行
       const wslCli = getWslCliBinary();
+      const subcommand = buildGatewayAgentSubcommand({ sessionId, agentId });
       if (wslCli) {
-        const agentCmd = `${wslCli} agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`;
+        const agentCmd = `${wslCli} ${subcommand}`;
         cmd = `wsl -- bash -c '${agentCmd.replace(/'/g, "'\\''")}'`;
       } else {
-        const agentCmd = `openclaw agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120 2>/dev/null || clawdbot agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120 2>/dev/null || moltbot agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`;
+        const agentCmd = `openclaw ${subcommand} 2>/dev/null || clawdbot ${subcommand} 2>/dev/null || moltbot ${subcommand}`;
         cmd = `wsl -- bash -lc '${agentCmd.replace(/'/g, "'\\''")}'`;
       }
       execOpts = { timeout: 120000 };
@@ -5541,9 +6070,13 @@ function testGatewayViaAgent(model) {
       delete env.OPENAI_API_KEY;
       delete env.OPENCLAW_CODEX_KEY;
       const useNode = nodeInfo && isNodeShebang(cliBinary);
-      cmd = useNode
-        ? `"${nodeInfo.path}" "${cliBinary}" agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`
-        : `"${cliBinary}" agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`;
+      cmd = buildGatewayAgentCliCommand({
+        cliBinary,
+        nodeInfo,
+        useNode,
+        sessionId,
+        agentId
+      });
       execOpts = { timeout: 120000, env };
     }
 

package/package.json

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