yymaxapi 1.0.119 → 1.0.121

package/bin/yymaxapi.js

@@ -337,6 +337,12 @@ function resolveHermesModelType(modelId, preferredType = '') {
   return requestedType || 'claude';
 }
 
+function getKnownModelName(modelId) {
+  const normalized = String(modelId || '').trim();
+  const model = [...CLAUDE_MODELS, ...CODEX_MODELS].find(item => item.id === normalized);
+  return model?.name || normalized || '未选择模型';
+}
+
 async function promptHermesModelSelection(args = {}, message = '选择 Hermes 默认模型:') {
   const requestedModel = (args['model-id'] || args.model || '').toString().trim();
   const requestedType = normalizeHermesModelType(
@@ -3846,7 +3852,7 @@ function scoreHermesWslCandidate(candidate) {
 }
 
 function getHermesWslMirrorInfo(options = {}) {
-  if (process.platform !== 'win32' || !isWslAvailable()) {
+  if (process.platform !== 'win32') {
     return {
       dataDir: null,
       sourceConfigPath: null,
@@ -3892,7 +3898,8 @@ function getHermesWslMirrorInfo(options = {}) {
     sourceConfigPath,
     configPath: candidate.configPath,
     envPath: candidate.envPath,
-    target: candidate.target
+    target: candidate.target,
+    commandPath: selected?.commandPath || probeHermesWslCommand(candidate.target)
   };
 }
 
@@ -4115,6 +4122,36 @@ function readHermesCliConfig() {
   };
 }
 
+function buildHermesCliConfigFromRaw(configRaw, envRaw, configPath = '', envPath = '') {
+  const parsed = parseSimpleYamlConfig(configRaw);
+  const envEntries = parseEnvFile(envRaw);
+  const modelConfig = parsed?.model && typeof parsed.model === 'object' ? parsed.model : {};
+  const modelId = String(modelConfig.default || '').trim() || getDefaultClaudeModel().id;
+  const provider = String(modelConfig.provider || '').trim().toLowerCase();
+  const type = resolveHermesModelType(modelId, provider);
+  const apiKey = type === 'codex'
+    ? (envEntries.OPENAI_API_KEY || '')
+    : (envEntries.ANTHROPIC_API_KEY || envEntries.ANTHROPIC_TOKEN || '');
+
+  return {
+    configPath,
+    envPath,
+    configured: !!configRaw || !!envRaw,
+    modelId,
+    provider,
+    type,
+    baseUrl: String(modelConfig.base_url || '').trim(),
+    apiKey
+  };
+}
+
+function readHermesWslCliConfig(wslMirror = getHermesWslMirrorInfo()) {
+  const configPath = wslMirror.sourceConfigPath || wslMirror.configPath;
+  const configRaw = readWslTextFile(configPath, wslMirror.target);
+  const envRaw = readWslTextFile(wslMirror.envPath, wslMirror.target);
+  return buildHermesCliConfigFromRaw(configRaw, envRaw, configPath, wslMirror.envPath);
+}
+
 function getOpencodeConfigPath() {
   const home = os.homedir();
   return process.platform === 'win32'
@@ -4374,6 +4411,9 @@ function testCodexCliConnection() {
 
 function testHermesCliConnection() {
   const cliBinary = resolveCommandBinary('hermes');
+  if (!cliBinary && process.platform === 'win32') {
+    return testHermesWslCliConnection();
+  }
   if (!cliBinary) return { name: 'Hermes CLI', status: 'skipped', detail: '未安装 hermes 命令' };
 
   const config = readHermesCliConfig();
@@ -4419,6 +4459,40 @@ function testHermesCliConnection() {
   };
 }
 
+function testHermesWslCliConnection() {
+  const wslMirror = getHermesWslMirrorInfo();
+  const commandPath = wslMirror.commandPath || probeHermesWslCommand(wslMirror.target || {});
+  if (!commandPath) return { name: 'Hermes CLI (WSL)', status: 'skipped', detail: '未检测到 WSL 内 hermes 命令' };
+
+  const config = readHermesWslCliConfig(wslMirror);
+  if (!config.configured) return { name: 'Hermes CLI (WSL)', status: 'skipped', detail: '未检测到 WSL ~/.hermes/config.yaml 或 ~/.hermes/.env' };
+  if (!config.apiKey) return { name: 'Hermes CLI (WSL)', status: 'failed', detail: 'Hermes 配置缺少 API Key' };
+
+  const providerArg = config.provider === 'anthropic' ? ' --provider anthropic' : '';
+  const command = [
+    `export HERMES_HOME=${shellQuote(wslMirror.dataDir)}`,
+    'export NODE_TLS_REJECT_UNAUTHORIZED=0',
+    'export NODE_NO_WARNINGS=1',
+    'set -a',
+    `[ -f "$HERMES_HOME/.env" ] && . "$HERMES_HOME/.env"`,
+    'set +a',
+    `${shellQuote(commandPath)} chat -Q -q ${shellQuote('请只回复 OK')}${providerArg}`
+  ].join('; ');
+  const result = runWslCommand(command, { timeout: 120000, maxBuffer: 1024 * 1024 }, { ...(wslMirror.target || {}), login: true });
+  const combined = cleanCliTestOutput(`${result.output || ''}\n${result.stdout || ''}\n${result.stderr || ''}`);
+  const reply = extractHermesCliReply(combined);
+
+  if (result.ok && /^OK$/i.test(reply) && !looksLikeCliTestError(combined)) {
+    return { name: 'Hermes CLI (WSL)', status: 'success', detail: 'OK' };
+  }
+
+  return {
+    name: 'Hermes CLI (WSL)',
+    status: 'failed',
+    detail: reply || summarizeCliTestOutput(combined) || result.error || '命令执行失败'
+  };
+}
+
 async function testAdditionalCliConnections(args = {}, options = {}) {
   if (args['no-app-test'] || args.noAppTest) return;
 
@@ -5889,10 +5963,11 @@ async function activateHermes(paths, args = {}) {
 async function main() {
   console.clear();
 
-  console.log(chalk.cyan.bold('\n🔧 OpenClaw API 配置工具\n'));
+  console.log(chalk.cyan.bold('\n🔧 yymaxapi 配置工具\n'));
 
   const paths = getConfigPath();
-  console.log(chalk.gray(`配置文件: ${paths.openclawConfig}\n`));
+  console.log(chalk.gray(`OpenClaw 配置: ${paths.openclawConfig}`));
+  console.log(chalk.gray(`Hermes 配置: ${getHermesConfigPath()}\n`));
 
   // 首次运行备份
   if (backupOriginalConfig(paths.openclawConfig, paths.configDir)) {
@@ -5931,10 +6006,15 @@ async function main() {
 
   while (true) {
     // 显示当前状态
-    const statusLine = getConfigStatusLine(paths);
-    if (statusLine) {
+    const statusLines = [
+      getConfigStatusLine(paths),
+      getHermesStatusLine()
+    ].filter(Boolean);
+    if (statusLines.length > 0) {
       console.log(chalk.gray('─'.repeat(40)));
-      console.log(statusLine);
+      for (const statusLine of statusLines) {
+        console.log(statusLine);
+      }
       console.log(chalk.gray('─'.repeat(40)) + '\n');
     }
 
@@ -6057,7 +6137,7 @@ function getConfigStatusLine(paths) {
     }
 
     if (parts.length === 0 && otherCount === 0) {
-      return chalk.gray('当前状态: 未配置任何模型');
+      return chalk.gray('OpenClaw: 未配置任何模型');
     }
 
     const primaryModelId = primary.split('/')[1] || '';
@@ -6065,7 +6145,39 @@ function getConfigStatusLine(paths) {
 
     const gwEnv = detectGatewayEnv();
     const envTag = gwEnv === 'wsl' ? chalk.cyan(' [WSL]') : '';
-    return chalk.gray('当前状态: ') + parts.join('  ') + chalk.gray('  (✓ 主模型  ○ 已配置)') + modelTag + envTag;
+    return chalk.gray('OpenClaw: ') + parts.join('  ') + chalk.gray('  (✓ 主模型  ○ 已配置)') + modelTag + envTag;
+  } catch {
+    return null;
+  }
+}
+
+function getHermesStatusLine() {
+  try {
+    let config = readHermesCliConfig();
+    let wslMirror = null;
+
+    if (process.platform === 'win32') {
+      wslMirror = getHermesWslMirrorInfo();
+      if (!config.configured && (wslMirror.configPath || wslMirror.envPath)) {
+        config = readHermesWslCliConfig(wslMirror);
+      }
+    }
+
+    if (!config.configured) return null;
+
+    const modelName = getKnownModelName(config.modelId);
+    const readyMark = config.apiKey ? chalk.green('✓') : chalk.yellow('○');
+    const modelTag = config.modelId ? chalk.cyan(` [模型: ${config.modelId}]`) : '';
+    const protocolTag = config.type === 'codex' ? chalk.cyan(' [GPT]') : chalk.cyan(' [Claude]');
+    const hasWslTarget = !!(wslMirror?.sourceConfigPath || wslMirror?.commandPath);
+    let envTag = '';
+    if (hasWslTarget && wslMirror?.target?.user) {
+      envTag = chalk.cyan(` [WSL ${wslMirror.target.user}]`);
+    } else if (hasWslTarget) {
+      envTag = chalk.cyan(' [WSL]');
+    }
+
+    return chalk.gray('Hermes-Agent: ') + chalk.green(`${modelName} ${readyMark}`) + protocolTag + modelTag + envTag;
   } catch {
     return null;
   }

package/package.json

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