yymaxapi 1.0.85 → 1.0.86

package/bin/yymaxapi.js

@@ -2025,6 +2025,53 @@ function getAgentModelState(agent) {
   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'))) {
@@ -2103,6 +2150,18 @@ function buildManagedYunyiProviderConfig(type, endpointUrl, apiKey, existingProv
   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 = [];
@@ -4308,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);
@@ -4866,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);
@@ -5343,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 未设置`));
@@ -5376,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`));
@@ -5452,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) {
@@ -5477,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(', ')}`));
@@ -5968,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()}`;
@@ -5979,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 };
@@ -6001,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.85",
+  "version": "1.0.86",
   "description": "跨平台 OpenClaw/Clawdbot 配置管理工具 - 管理中转地址、模型切换、API Keys、测速优化",
   "main": "bin/yymaxapi.js",
   "bin": {