yymaxapi 1.0.103 → 1.0.104

package/bin/yymaxapi.js

@@ -321,6 +321,90 @@ async function promptClaudeModelSelection(args = {}, message = '选择 Claude
   return CLAUDE_MODELS.find(model => model.id === selected) || fallback;
 }
 
+function normalizeHermesModelType(value) {
+  const normalized = String(value || '').trim().toLowerCase();
+  if (!normalized) return '';
+  if (['gpt', 'codex', 'openai'].includes(normalized)) return 'codex';
+  if (['claude', 'anthropic'].includes(normalized)) return 'claude';
+  return '';
+}
+
+function resolveHermesModelType(modelId, preferredType = '') {
+  const requestedType = normalizeHermesModelType(preferredType);
+  const inClaude = CLAUDE_MODELS.some(model => model.id === modelId);
+  const inCodex = CODEX_MODELS.some(model => model.id === modelId);
+
+  if (requestedType === 'claude' && (inClaude || !inCodex)) return 'claude';
+  if (requestedType === 'codex' && (inCodex || !inClaude)) return 'codex';
+  if (inCodex && !inClaude) return 'codex';
+  if (inClaude && !inCodex) return 'claude';
+  return requestedType || 'claude';
+}
+
+async function promptHermesModelSelection(args = {}, message = '选择 Hermes 默认模型:') {
+  const requestedModel = (args['model-id'] || args.model || '').toString().trim();
+  const requestedType = normalizeHermesModelType(
+    args.primary || args.type || args.protocol || args.provider || args.runtime
+  );
+  const explicitClaudeModel = (args['claude-model'] || '').toString().trim();
+  const explicitCodexModel = (args['codex-model'] || '').toString().trim();
+
+  let selectedType = requestedType;
+  if (!selectedType && explicitClaudeModel) selectedType = 'claude';
+  if (!selectedType && explicitCodexModel) selectedType = 'codex';
+  if (!selectedType && requestedModel) {
+    selectedType = resolveHermesModelType(requestedModel);
+  }
+
+  if (!selectedType) {
+    if (CLAUDE_MODELS.length > 0 && CODEX_MODELS.length === 0) {
+      selectedType = 'claude';
+    } else if (CODEX_MODELS.length > 0 && CLAUDE_MODELS.length === 0) {
+      selectedType = 'codex';
+    } else {
+      const { selectedType: pickedType } = await inquirer.prompt([{
+        type: 'list',
+        name: 'selectedType',
+        message: '选择 Hermes 模型类型:',
+        choices: [
+          { name: 'Claude', value: 'claude' },
+          { name: 'GPT', value: 'codex' }
+        ],
+        default: 'claude'
+      }]);
+      selectedType = pickedType;
+    }
+  }
+
+  const modelList = selectedType === 'codex' ? CODEX_MODELS : CLAUDE_MODELS;
+  const fallbackModel = modelList[0] || (selectedType === 'codex' ? getDefaultCodexModel() : getDefaultClaudeModel());
+  const explicitModelId = selectedType === 'codex'
+    ? (explicitCodexModel || requestedModel)
+    : (explicitClaudeModel || requestedModel);
+
+  if (explicitModelId) {
+    const model = modelList.find(item => item.id === explicitModelId) || { id: explicitModelId, name: explicitModelId };
+    return { type: selectedType, model };
+  }
+
+  if (modelList.length <= 1) {
+    return { type: selectedType, model: fallbackModel };
+  }
+
+  const { selected } = await inquirer.prompt([{
+    type: 'list',
+    name: 'selected',
+    message,
+    choices: modelList.map(model => ({ name: model.name, value: model.id })),
+    default: fallbackModel.id
+  }]);
+
+  return {
+    type: selectedType,
+    model: modelList.find(model => model.id === selected) || fallbackModel
+  };
+}
+
 async function promptOpencodeDefaultModelSelection(args = {}, message = '选择 Opencode 默认模型:') {
   const fallbackClaude = getDefaultClaudeModel();
   const fallbackCodex = getDefaultCodexModel();
@@ -1075,12 +1159,16 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKe
   return configPath;
 }
 
-function writeHermesConfig(baseUrl, apiKey, modelId = getDefaultClaudeModel().id) {
+function writeHermesConfig(baseUrl, apiKey, modelId = getDefaultClaudeModel().id, options = {}) {
   const dataDir = getHermesDataDir();
   const configPath = path.join(dataDir, 'config.yaml');
   const envPath = getHermesEnvPath();
   const existingConfigPath = getHermesConfigPath();
   const wslMirror = getHermesWslMirrorInfo();
+  const modelType = options.type || options.provider || '';
+  const resolvedType = resolveHermesModelType(modelId, modelType);
+  const runtimeProvider = resolvedType === 'codex' ? 'custom' : 'anthropic';
+  const apiMode = resolvedType === 'codex' ? 'codex_responses' : 'anthropic_messages';
 
   let existingConfigRaw = readTextIfExists(existingConfigPath);
   if (!existingConfigRaw && wslMirror.sourceConfigPath) {
@@ -1092,15 +1180,25 @@ function writeHermesConfig(baseUrl, apiKey, modelId = getDefaultClaudeModel().id
     existingEnvRaw = readWslTextFile(wslMirror.envPath);
   }
 
-  const normalizedBaseUrl = trimClaudeMessagesSuffix(String(baseUrl || '').trim()).replace(/\/+$/, '');
-  const nextConfigRaw = upsertSimpleYamlConfig(existingConfigRaw, {
-    provider: 'anthropic',
-    model: modelId,
-    base_url: normalizedBaseUrl
-  });
-  const nextEnvRaw = upsertEnvFile(existingEnvRaw, {
-    ANTHROPIC_API_KEY: String(apiKey || '').trim()
+  const normalizedBaseUrl = (
+    resolvedType === 'codex'
+      ? trimOpenAiEndpointSuffix(String(baseUrl || '').trim())
+      : trimClaudeMessagesSuffix(String(baseUrl || '').trim())
+  ).replace(/\/+$/, '');
+  const existingConfig = parseSimpleYamlConfig(existingConfigRaw);
+  const existingModelConfig = existingConfig.model && !Array.isArray(existingConfig.model) && typeof existingConfig.model === 'object'
+    ? existingConfig.model
+    : {};
+  const nextConfigRaw = upsertHermesModelConfig(existingConfigRaw, {
+    ...existingModelConfig,
+    default: modelId,
+    provider: runtimeProvider,
+    base_url: normalizedBaseUrl,
+    api_mode: apiMode
   });
+  const envEntries = {};
+  envEntries[resolvedType === 'codex' ? 'OPENAI_API_KEY' : 'ANTHROPIC_API_KEY'] = String(apiKey || '').trim();
+  const nextEnvRaw = upsertEnvFile(existingEnvRaw, envEntries);
 
   if (!fs.existsSync(dataDir)) fs.mkdirSync(dataDir, { recursive: true });
   fs.writeFileSync(configPath, nextConfigRaw, 'utf8');
@@ -1120,6 +1218,9 @@ function writeHermesConfig(baseUrl, apiKey, modelId = getDefaultClaudeModel().id
     wslConfigPath: wslMirror.configPath,
     wslEnvPath: wslMirror.envPath,
     modelId,
+    modelType: resolvedType,
+    provider: runtimeProvider,
+    apiMode,
     baseUrl: normalizedBaseUrl
   };
 }
@@ -3508,24 +3609,58 @@ function readWslTextFile(filePath) {
   return result.ok ? (result.output || result.stdout || '') : '';
 }
 
+function parseYamlScalar(value) {
+  let normalized = String(value ?? '').trim();
+  if (
+    (normalized.startsWith('"') && normalized.endsWith('"'))
+    || (normalized.startsWith('\'') && normalized.endsWith('\''))
+  ) {
+    try {
+      normalized = JSON.parse(normalized);
+    } catch {
+      normalized = normalized.slice(1, -1);
+    }
+  }
+  return normalized;
+}
+
 function parseSimpleYamlConfig(text) {
   const config = {};
+  let currentObjectKey = '';
+
   for (const line of String(text || '').split(/\r?\n/)) {
-    const match = line.match(/^([A-Za-z0-9_-]+)\s*:\s*(.*?)\s*$/);
-    if (!match) continue;
-    let value = match[2].trim();
-    if (
-      (value.startsWith('"') && value.endsWith('"'))
-      || (value.startsWith('\'') && value.endsWith('\''))
-    ) {
-      try {
-        value = JSON.parse(value);
-      } catch {
-        value = value.slice(1, -1);
+    if (!line.trim() || line.trim().startsWith('#')) continue;
+
+    const topLevelMatch = line.match(/^([A-Za-z0-9_-]+)\s*:\s*(.*?)\s*$/);
+    if (topLevelMatch && !line.startsWith(' ')) {
+      const key = topLevelMatch[1];
+      const rawValue = topLevelMatch[2];
+      if (rawValue === '') {
+        if (!config[key] || typeof config[key] !== 'object' || Array.isArray(config[key])) {
+          config[key] = {};
+        }
+        currentObjectKey = key;
+      } else {
+        config[key] = parseYamlScalar(rawValue);
+        currentObjectKey = '';
       }
+      continue;
     }
-    config[match[1]] = value;
+
+    if (currentObjectKey) {
+      const nestedMatch = line.match(/^\s{2}([A-Za-z0-9_-]+)\s*:\s*(.*?)\s*$/);
+      if (nestedMatch) {
+        if (!config[currentObjectKey] || typeof config[currentObjectKey] !== 'object' || Array.isArray(config[currentObjectKey])) {
+          config[currentObjectKey] = {};
+        }
+        config[currentObjectKey][nestedMatch[1]] = parseYamlScalar(nestedMatch[2]);
+        continue;
+      }
+    }
+
+    currentObjectKey = '';
   }
+
   return config;
 }
 
@@ -3533,31 +3668,71 @@ function serializeYamlScalar(value) {
   return JSON.stringify(String(value ?? ''));
 }
 
-function upsertSimpleYamlConfig(text, entries) {
-  const lines = String(text || '').replace(/\r\n/g, '\n').split('\n');
-  const normalized = lines.length === 1 && lines[0] === '' ? [] : [...lines];
-  const seen = new Set();
+function buildHermesModelConfigBlock(entries) {
+  const ordered = {};
+  for (const key of ['default', 'provider', 'base_url', 'api_mode']) {
+    if (Object.prototype.hasOwnProperty.call(entries, key)) {
+      ordered[key] = entries[key];
+    }
+  }
+  for (const [key, value] of Object.entries(entries)) {
+    if (!Object.prototype.hasOwnProperty.call(ordered, key)) {
+      ordered[key] = value;
+    }
+  }
 
-  for (let i = 0; i < normalized.length; i += 1) {
-    const match = normalized[i].match(/^([A-Za-z0-9_-]+)\s*:\s*.*$/);
-    if (!match) continue;
-    const key = match[1];
-    if (!Object.prototype.hasOwnProperty.call(entries, key)) continue;
-    normalized[i] = `${key}: ${serializeYamlScalar(entries[key])}`;
-    seen.add(key);
+  const lines = ['model:'];
+  for (const [key, value] of Object.entries(ordered)) {
+    if (value === undefined || value === null || value === '') continue;
+    lines.push(`  ${key}: ${serializeYamlScalar(value)}`);
   }
+  return lines.join('\n');
+}
 
-  for (const key of Object.keys(entries)) {
-    if (!seen.has(key)) {
-      normalized.push(`${key}: ${serializeYamlScalar(entries[key])}`);
+function upsertHermesModelConfig(text, modelEntries) {
+  let normalized = String(text || '').replace(/\r\n/g, '\n');
+  normalized = normalized.replace(/^(provider|base_url|api_mode):\s*.*\n?/gm, '');
+
+  const lines = normalized.split('\n');
+  const output = [];
+  let replaced = false;
+
+  for (let i = 0; i < lines.length; i += 1) {
+    const line = lines[i];
+    if (/^model:\s*(.*)$/.test(line)) {
+      replaced = true;
+      if (output.length > 0 && output[output.length - 1] !== '') {
+        output.push('');
+      }
+      output.push(buildHermesModelConfigBlock(modelEntries));
+
+      i += 1;
+      while (i < lines.length) {
+        const nextLine = lines[i];
+        if (/^\s{2,}/.test(nextLine)) {
+          i += 1;
+          continue;
+        }
+        if (nextLine === '') {
+          break;
+        }
+        i -= 1;
+        break;
+      }
+      continue;
     }
+    output.push(line);
   }
 
-  while (normalized.length > 0 && normalized[normalized.length - 1] === '') {
-    normalized.pop();
+  while (output.length > 0 && output[output.length - 1] === '') {
+    output.pop();
+  }
+  if (!replaced) {
+    if (output.length > 0) output.push('');
+    output.push(buildHermesModelConfigBlock(modelEntries));
   }
 
-  return normalized.join('\n') + '\n';
+  return output.join('\n').replace(/\n{3,}/g, '\n\n').trim() + '\n';
 }
 
 function parseEnvFile(text) {
@@ -4332,6 +4507,27 @@ function trimClaudeMessagesSuffix(baseUrl) {
   return trimmed;
 }
 
+function trimOpenAiEndpointSuffix(baseUrl) {
+  const trimmed = baseUrl.trim();
+  const suffixes = [
+    '/v1/responses',
+    '/responses',
+    '/v1/chat/completions',
+    '/chat/completions',
+    '/v1/models',
+    '/models',
+    '/v1'
+  ];
+
+  for (const suffix of suffixes) {
+    if (trimmed.endsWith(suffix)) {
+      return trimmed.slice(0, -suffix.length);
+    }
+  }
+
+  return trimmed;
+}
+
 async function quickSetup(paths, args = {}) {
   console.log(chalk.cyan.bold('\n🚀 快速配置向导\n'));
 
@@ -5319,7 +5515,9 @@ async function activateCodex(paths, args = {}) {
 // ============ 单独配置 Hermes ============
 async function activateHermes(paths, args = {}) {
   console.log(chalk.cyan.bold('\n🔧 配置 Hermes\n'));
-  const selectedModel = await promptClaudeModelSelection(args, '选择 Hermes 默认 Claude 模型:');
+  const selection = await promptHermesModelSelection(args, '选择 Hermes 默认模型:');
+  const selectedModel = selection.model;
+  const selectedType = selection.type;
 
   const shouldTest = !(args['no-test'] || args.noTest);
   let selectedEndpoint = ENDPOINTS[0];
@@ -5359,7 +5557,9 @@ async function activateHermes(paths, args = {}) {
   if (directKey) {
     apiKey = directKey;
   } else {
-    const envKey = process.env.ANTHROPIC_API_KEY || process.env.ANTHROPIC_AUTH_TOKEN || process.env.CLAUDE_API_KEY || '';
+    const envKey = selectedType === 'codex'
+      ? (process.env.OPENAI_API_KEY || process.env.OPENAI_AUTH_TOKEN || '')
+      : (process.env.ANTHROPIC_API_KEY || process.env.ANTHROPIC_AUTH_TOKEN || process.env.CLAUDE_API_KEY || '');
     apiKey = await promptApiKey('请输入 API Key:', envKey);
   }
   if (!apiKey) { console.log(chalk.gray('已取消')); return; }
@@ -5374,15 +5574,17 @@ async function activateHermes(paths, args = {}) {
     if (!continueAnyway) { console.log(chalk.gray('已取消')); return; }
   }
 
-  const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
+  const typeLabel = selectedType === 'codex' ? 'GPT' : 'Claude';
+  const hermesBaseUrl = buildFullUrl(selectedEndpoint.url, selectedType === 'codex' ? 'codex' : 'claude');
   const writeSpinner = ora({ text: '正在写入 Hermes 配置...', spinner: 'dots' }).start();
-  const hermesPaths = writeHermesConfig(claudeBaseUrl, apiKey, selectedModel.id);
+  const hermesPaths = writeHermesConfig(hermesBaseUrl, apiKey, selectedModel.id, { type: selectedType });
   writeSpinner.succeed('Hermes 配置写入完成');
 
   console.log(chalk.green('\n✅ Hermes 配置完成！'));
   console.log(chalk.cyan(`   Base URL: ${hermesPaths.baseUrl}`));
   console.log(chalk.gray(`   模型: ${selectedModel.name} (${selectedModel.id})`));
-  console.log(chalk.gray('   Provider: anthropic'));
+  console.log(chalk.gray(`   协议: ${typeLabel}`));
+  console.log(chalk.gray(`   Provider: ${hermesPaths.provider}`));
   console.log(chalk.gray('   API Key: 已设置'));
   console.log(chalk.gray('\n   已写入:'));
   console.log(chalk.gray(`   • ${hermesPaths.configPath}`));

package/package.json

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