yymaxapi 1.0.100 → 1.0.101

package/bin/yymaxapi.js

@@ -254,6 +254,34 @@ function getDefaultCodexModel() {
   return CODEX_MODELS[0] || { id: 'gpt-5.4', name: 'GPT 5.4' };
 }
 
+function getExternalClaudeProviderKey() {
+  return String(API_CONFIG?.claude?.providerName || 'yunyi-claude').trim() || 'yunyi-claude';
+}
+
+function getExternalCodexProviderKey() {
+  const providerKey = String(API_CONFIG?.codex?.providerName || '').trim();
+  if (!providerKey) return 'yunyi-codex';
+  return providerKey === 'yunyi' ? 'yunyi-codex' : providerKey;
+}
+
+function getExternalModelKey(type, modelId) {
+  const providerKey = type === 'codex' ? getExternalCodexProviderKey() : getExternalClaudeProviderKey();
+  return `${providerKey}/${modelId}`;
+}
+
+function getProviderBrandPrefix() {
+  const providerKeys = [getExternalClaudeProviderKey(), getExternalCodexProviderKey()];
+  if (providerKeys.some(key => key.startsWith('maxapi'))) return 'MAXAPI';
+  if (providerKeys.some(key => key.startsWith('yunyi'))) return '云翼';
+  return 'OpenClaw';
+}
+
+function isUnifiedSingleModelMode() {
+  return CLAUDE_MODELS.length === 1
+    && CODEX_MODELS.length === 1
+    && CLAUDE_MODELS[0].id === CODEX_MODELS[0].id;
+}
+
 function buildProviderModelMap(models) {
   const mapped = {};
   for (const model of models || []) {
@@ -268,7 +296,7 @@ function getClaudeSwitchHint() {
 }
 
 function getOpencodeSwitchHint() {
-  return [...CLAUDE_MODELS, ...CODEX_MODELS].map(model => model.name).join(' / ');
+  return [...new Set([...CLAUDE_MODELS, ...CODEX_MODELS].map(model => model.name))].join(' / ');
 }
 
 async function promptClaudeModelSelection(args = {}, message = '选择 Claude 模型:') {
@@ -297,16 +325,29 @@ async function promptOpencodeDefaultModelSelection(args = {}, message = '选择
   const fallbackClaude = getDefaultClaudeModel();
   const fallbackCodex = getDefaultCodexModel();
   const requested = (args['default-model'] || args.model || args['claude-model'] || args['codex-model'] || '').toString().trim();
+  const claudeProviderKey = getExternalClaudeProviderKey();
+  const codexProviderKey = getExternalCodexProviderKey();
+
+  if (isUnifiedSingleModelMode()) {
+    const unifiedModel = CLAUDE_MODELS[0] || CODEX_MODELS[0] || fallbackClaude;
+    return {
+      type: 'claude',
+      providerKey: claudeProviderKey,
+      modelId: unifiedModel.id,
+      modelName: unifiedModel.name,
+      modelKey: getExternalModelKey('claude', unifiedModel.id)
+    };
+  }
 
   if (requested) {
     const inClaude = CLAUDE_MODELS.find(model => model.id === requested);
     if (inClaude) {
       return {
         type: 'claude',
-        providerKey: 'yunyi-claude',
+        providerKey: claudeProviderKey,
         modelId: inClaude.id,
         modelName: inClaude.name,
-        modelKey: `yunyi-claude/${inClaude.id}`
+        modelKey: getExternalModelKey('claude', inClaude.id)
       };
     }
 
@@ -314,10 +355,10 @@ async function promptOpencodeDefaultModelSelection(args = {}, message = '选择
     if (inCodex) {
       return {
         type: 'codex',
-        providerKey: 'yunyi-codex',
+        providerKey: codexProviderKey,
         modelId: inCodex.id,
         modelName: inCodex.name,
-        modelKey: `yunyi-codex/${inCodex.id}`
+        modelKey: getExternalModelKey('codex', inCodex.id)
       };
     }
   }
@@ -350,20 +391,20 @@ async function promptOpencodeDefaultModelSelection(args = {}, message = '选择
     const model = CODEX_MODELS.find(item => item.id === pickedId) || fallbackCodex;
     return {
       type: 'codex',
-      providerKey: 'yunyi-codex',
+      providerKey: codexProviderKey,
       modelId: model.id,
       modelName: model.name,
-      modelKey: `yunyi-codex/${model.id}`
+      modelKey: getExternalModelKey('codex', model.id)
     };
   }
 
   const model = CLAUDE_MODELS.find(item => item.id === pickedId) || fallbackClaude;
   return {
     type: 'claude',
-    providerKey: 'yunyi-claude',
+    providerKey: claudeProviderKey,
     modelId: model.id,
     modelName: model.name,
-    modelKey: `yunyi-claude/${model.id}`
+    modelKey: getExternalModelKey('claude', model.id)
   };
 }
 
@@ -864,13 +905,14 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
   const markerEnd = '# <<< maxapi codex <<<';
   const topMarker = '# >>> maxapi codex top >>>';
   const topMarkerEnd = '# <<< maxapi codex top <<<';
-  const providerKey = 'yunyi-codex';
+  const providerKey = getExternalCodexProviderKey();
+  const providerLabel = `${getProviderBrandPrefix()} Codex`;
+  const removableProviderKeys = [...new Set([providerKey, 'yunyi-codex', 'maxapi-codex'])];
   // 确保 base_url 以 /v1 结尾（Codex CLI 要求）
   let normalizedUrl = baseUrl.replace(/\/+$/, '');
   if (!normalizedUrl.endsWith('/v1')) normalizedUrl += '/v1';
   try {
     let existing = '';
-    const escapedProviderKey = providerKey.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
     if (fs.existsSync(configPath)) {
       existing = fs.readFileSync(configPath, 'utf8');
       // 移除旧的 maxapi section（provider block）
@@ -879,8 +921,11 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
       // 移除旧的 maxapi top-level block
       const topRe = new RegExp(`${topMarker.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}[\\s\\S]*?${topMarkerEnd.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\n?`, 'g');
       existing = existing.replace(topRe, '');
-      // 兼容旧版：移除历史遗留的未标记 yunyi-codex provider、旧 openclaw-relay、旧 yunyi opencode 标记块
-      existing = existing.replace(new RegExp(`\\[model_providers\\.${escapedProviderKey}\\]\\n(?:(?!\\[)[^\\n]*\\n?)*`, 'g'), '');
+      // 兼容旧版：移除历史遗留的 provider block、旧 openclaw-relay、旧 yunyi opencode 标记块
+      for (const removableProviderKey of removableProviderKeys) {
+        const escapedProviderKey = removableProviderKey.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        existing = existing.replace(new RegExp(`\\[model_providers\\.${escapedProviderKey}\\]\\n(?:(?!\\[)[^\\n]*\\n?)*`, 'g'), '');
+      }
       existing = existing.replace(/\[model_providers\.openclaw-relay\]\n(?:(?!\[)[^\n]*\n?)*/g, '');
       existing = existing.replace(/# >>> yunyi opencode >>>[\s\S]*?# <<< yunyi opencode <<<\n?/g, '');
       existing = existing.replace(/\n{3,}/g, '\n\n').trim();
@@ -900,7 +945,7 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
     const providerBlock = [
       marker,
       `[model_providers.${providerKey}]`,
-      `name = "云翼 Codex"`,
+      `name = "${providerLabel}"`,
       `base_url = "${normalizedUrl}"`,
       `wire_api = "responses"`,
       `experimental_bearer_token = "${apiKey}"`,
@@ -931,10 +976,13 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
   } catch { /* 非关键，静默失败 */ }
 }
 
-function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKey = `yunyi-claude/${getDefaultClaudeModel().id}`) {
+function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKey = getExternalModelKey('claude', getDefaultClaudeModel().id)) {
   const home = os.homedir();
   const claudeUrl = claudeBaseUrl.replace(/\/+$/, '');
   const codexUrl = (codexBaseUrl || '').replace(/\/+$/, '');
+  const claudeProviderKey = getExternalClaudeProviderKey();
+  const codexProviderKey = getExternalCodexProviderKey();
+  const brandPrefix = getProviderBrandPrefix();
 
   // ---- 1. opencode.json (CLI + 桌面版) ----
   const configDir = process.platform === 'win32'
@@ -950,8 +998,8 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKe
     if (!existing.provider) existing.provider = {};
 
     // Claude provider (@ai-sdk/anthropic)
-    existing.provider['yunyi-claude'] = {
-      name: '云翼 Claude',
+    existing.provider[claudeProviderKey] = {
+      name: `${brandPrefix} Claude`,
       npm: '@ai-sdk/anthropic',
       models: buildProviderModelMap(CLAUDE_MODELS),
       options: { apiKey, baseURL: `${claudeUrl}/v1` }
@@ -959,8 +1007,8 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKe
 
     // Codex provider (@ai-sdk/openai)
     if (codexUrl) {
-      existing.provider['yunyi-codex'] = {
-        name: '云翼 Codex',
+      existing.provider[codexProviderKey] = {
+        name: `${brandPrefix} Codex`,
         npm: '@ai-sdk/openai',
         models: buildProviderModelMap(CODEX_MODELS),
         options: { apiKey, baseURL: codexUrl }
@@ -978,7 +1026,8 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, defaultModelKe
 
     // 从 disabled_providers 中移除我们的 provider
     if (Array.isArray(existing.disabled_providers)) {
-      existing.disabled_providers = existing.disabled_providers.filter(p => p !== 'yunyi-claude' && p !== 'yunyi-codex');
+      const enabledProviders = new Set([claudeProviderKey, codexProviderKey, 'yunyi-claude', 'yunyi-codex', 'maxapi', 'maxapi-codex']);
+      existing.disabled_providers = existing.disabled_providers.filter(p => !enabledProviders.has(p));
       if (existing.disabled_providers.length === 0) delete existing.disabled_providers;
     }
 
@@ -1036,7 +1085,7 @@ function syncExternalTools(type, baseUrl, apiKey, extra = {}) {
       synced.push('Codex CLI config');
     }
     if (type === 'claude' && extra.codexBaseUrl) {
-      writeOpencodeConfig(baseUrl, extra.codexBaseUrl, apiKey, extra.opencodeDefaultModelKey || `yunyi-claude/${extra.claudeModelId || getDefaultClaudeModel().id}`);
+      writeOpencodeConfig(baseUrl, extra.codexBaseUrl, apiKey, extra.opencodeDefaultModelKey || getExternalModelKey('claude', extra.claudeModelId || getDefaultClaudeModel().id));
       synced.push('Opencode config');
     }
   } catch { /* ignore */ }
@@ -3399,7 +3448,7 @@ function readOpencodeCliConfig() {
   const config = readJsonIfExists(configPath) || {};
   return {
     configPath,
-    modelKey: config.model || `yunyi-claude/${getDefaultClaudeModel().id}`,
+    modelKey: config.model || getExternalModelKey('claude', getDefaultClaudeModel().id),
     configured: fs.existsSync(configPath),
     config
   };
@@ -3410,7 +3459,7 @@ function readCodexCliConfig() {
   const configRaw = fs.existsSync(configPath) ? fs.readFileSync(configPath, 'utf8') : '';
   const auth = readJsonIfExists(authPath) || {};
   const model = (configRaw.match(/^model\s*=\s*"([^"]+)"\s*$/m) || [])[1] || getDefaultCodexModel().id;
-  const provider = (configRaw.match(/^model_provider\s*=\s*"([^"]+)"\s*$/m) || [])[1] || 'yunyi-codex';
+  const provider = (configRaw.match(/^model_provider\s*=\s*"([^"]+)"\s*$/m) || [])[1] || getExternalCodexProviderKey();
   const providerBlockRegex = new RegExp(`\\[model_providers\\.${escapeRegExp(provider)}\\]([\\s\\S]*?)(?=\\n\\[|$)`, 'm');
   const providerBlock = (configRaw.match(providerBlockRegex) || [])[1] || '';
   const baseUrl = (providerBlock.match(/base_url\s*=\s*"([^"]+)"/) || [])[1] || '';
@@ -3920,6 +3969,22 @@ async function tryAutoStartGateway(port, allowAutoDaemon) {
     }
   }
 
+  if (process.platform !== 'win32') {
+    for (const sh of ['/bin/zsh', '/bin/bash']) {
+      if (!fs.existsSync(sh)) continue;
+      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+        const loginShellCmd = `${sh} -lc '${name} gateway'`;
+        console.log(chalk.yellow(`⚠️ 尝试启动 Gateway: ${loginShellCmd}`));
+        if (spawnDetached(loginShellCmd, env)) {
+          if (await waitForGateway(port, '127.0.0.1', 15000)) {
+            console.log(chalk.green('✅ Gateway 已通过 login shell 启动'));
+            return { started: true, method: 'cli-login-shell', cmd: loginShellCmd };
+          }
+        }
+      }
+    }
+  }
+
   return { started: false };
 }
 
@@ -4369,7 +4434,7 @@ async function presetClaude(paths, args = {}) {
   if (yunyiLayoutResult.applied) {
     syncManagedYunyiAuthProfiles(paths, config);
   }
-  syncExternalTools('claude', baseUrl, apiKey, { claudeModelId: modelId, opencodeDefaultModelKey: `yunyi-claude/${modelId}` });
+  syncExternalTools('claude', baseUrl, apiKey, { claudeModelId: modelId, opencodeDefaultModelKey: getExternalModelKey('claude', modelId) });
   writeSpinner.succeed('配置写入完成');
 
   console.log(chalk.green('\n✅ Claude 节点配置完成！'));
@@ -4621,15 +4686,14 @@ async function autoActivate(paths, args = {}) {
   }
 
   // ---- 选模型（Claude + GPT 合并展示） ----
-  const isSingleMode = CLAUDE_MODELS.length === 1 && CODEX_MODELS.length === 1
-    && CLAUDE_MODELS[0].id === CODEX_MODELS[0].id;
+  const isSingleMode = isUnifiedSingleModelMode();
 
   let selectedModelId;
   let selectedType; // 'claude' or 'codex'
 
   if (isSingleMode) {
     selectedModelId = CLAUDE_MODELS[0].id;
-    selectedType = 'claude';
+    selectedType = String(args.primary || '').trim() === 'codex' ? 'codex' : 'claude';
   } else {
     const modelArg = (args.model || args['claude-model'] || args['codex-model'] || '').toString().trim();
     if (modelArg) {
@@ -4725,9 +4789,9 @@ async function autoActivate(paths, args = {}) {
 
   // 主模型 = 用户选的，备选 = 另一个
   const primaryModelKey = isClaudePrimary ? claudeModelKey : codexModelKey;
-  const fallbackModelKey = isClaudePrimary ? codexModelKey : claudeModelKey;
+  const fallbackModelKey = isSingleMode ? '' : (isClaudePrimary ? codexModelKey : claudeModelKey);
   config.agents.defaults.model.primary = primaryModelKey;
-  config.agents.defaults.model.fallbacks = [fallbackModelKey];
+  config.agents.defaults.model.fallbacks = fallbackModelKey ? [fallbackModelKey] : [];
   const yunyiLayoutResult = applyManagedYunyiOpenClawLayout(config, {
     force: true,
     endpointUrl: selectedEndpoint.url,
@@ -4755,7 +4819,7 @@ async function autoActivate(paths, args = {}) {
       console.log(chalk.gray(`   已重置 ${selectionResult.agentId} 的活动会话映射`));
     }
   }
-  const opencodeDefaultModelKey = isClaudePrimary ? `yunyi-claude/${claudeModelId}` : `yunyi-codex/${codexModelId}`;
+  const opencodeDefaultModelKey = isClaudePrimary ? getExternalModelKey('claude', claudeModelId) : getExternalModelKey('codex', codexModelId);
   try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl, claudeModelId, opencodeDefaultModelKey }); } catch { /* ignore */ }
   try { syncExternalTools('codex', codexBaseUrl, apiKey, { modelId: codexModelId }); } catch { /* ignore */ }
   writeSpinner.succeed('配置写入完成');
@@ -5205,7 +5269,7 @@ async function yycodeQuickSetup(paths) {
   if (yunyiLayoutResult.applied) {
     syncManagedYunyiAuthProfiles(paths, config);
   }
-  try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl, claudeModelId, opencodeDefaultModelKey: `yunyi-codex/${codexModelId}` }); } catch { /* ignore */ }
+  try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl, claudeModelId, opencodeDefaultModelKey: getExternalModelKey('codex', codexModelId) }); } catch { /* ignore */ }
   try { syncExternalTools('codex', codexBaseUrl, apiKey, { modelId: codexModelId }); } catch { /* ignore */ }
   writeSpinner.succeed('配置写入完成');
 
@@ -5359,6 +5423,8 @@ function getConfigStatusLine(paths) {
       'claude-yunyi': 'Claude(包月)',
       'yunyi': 'Codex(包月)',
       'heibai': 'MAXAPI(按量)',
+      'maxapi': 'MAXAPI(按量)',
+      'maxapi-codex': 'MAXAPI(按量)',
     };
 
     const parts = [];
@@ -5569,6 +5635,8 @@ async function switchModel(paths) {
     'claude-yunyi': '云翼 Claude (包月)',
     'yunyi': '云翼 Codex (包月)',
     'heibai': 'MAXAPI (按量)',
+    'maxapi': 'MAXAPI (按量)',
+    'maxapi-codex': 'MAXAPI (按量)',
   };
 
   const claudeProviderName = API_CONFIG.claude.providerName;
@@ -5577,8 +5645,25 @@ async function switchModel(paths) {
   // 预设模型列表
   const choices = [];
   const presetKeys = new Set();
-
-  if (CLAUDE_MODELS.length > 0) {
+  const unifiedSingleMode = isUnifiedSingleModelMode();
+  const unifiedModel = unifiedSingleMode ? (CLAUDE_MODELS[0] || CODEX_MODELS[0] || null) : null;
+
+  if (unifiedSingleMode && unifiedModel) {
+    const preferredProviders = [
+      primary.split('/')[0],
+      providers[claudeProviderName] ? claudeProviderName : '',
+      providers[codexProviderName] ? codexProviderName : '',
+      Object.keys(providers)[0] || ''
+    ].filter(Boolean);
+    const unifiedProviderName = preferredProviders[0];
+    const modelKey = `${unifiedProviderName}/${unifiedModel.id}`;
+    const isCurrent = modelKey === primary;
+    choices.push({
+      name: isCurrent ? `${unifiedModel.name} (当前)` : unifiedModel.name,
+      value: modelKey,
+    });
+    presetKeys.add(modelKey);
+  } else if (CLAUDE_MODELS.length > 0) {
     choices.push(new inquirer.Separator('  -- Claude --'));
     for (const m of CLAUDE_MODELS) {
       const pName = providers[claudeProviderName] ? claudeProviderName : Object.keys(providers)[0];
@@ -5592,7 +5677,7 @@ async function switchModel(paths) {
     }
   }
 
-  if (CODEX_MODELS.length > 0) {
+  if (!unifiedSingleMode && CODEX_MODELS.length > 0) {
     choices.push(new inquirer.Separator('  -- GPT --'));
     for (const m of CODEX_MODELS) {
       const pName = providers[codexProviderName] ? codexProviderName : Object.keys(providers)[0];
@@ -5610,6 +5695,12 @@ async function switchModel(paths) {
   const otherModels = [];
   for (const [providerName, providerConfig] of Object.entries(providers)) {
     for (const m of (providerConfig.models || [])) {
+      if (unifiedSingleMode
+        && unifiedModel
+        && m.id === unifiedModel.id
+        && (providerName === claudeProviderName || providerName === codexProviderName)) {
+        continue;
+      }
       const modelKey = `${providerName}/${m.id}`;
       if (!presetKeys.has(modelKey)) {
         otherModels.push({ modelKey, name: m.name || m.id, providerName });
@@ -5618,6 +5709,12 @@ async function switchModel(paths) {
   }
   const registeredKeys = Object.keys(config.agents?.defaults?.models || {});
   for (const modelKey of registeredKeys) {
+    if (unifiedSingleMode && unifiedModel) {
+      const [providerName, modelId] = modelKey.split('/');
+      if (modelId === unifiedModel.id && (providerName === claudeProviderName || providerName === codexProviderName)) {
+        continue;
+      }
+    }
     if (presetKeys.has(modelKey) || otherModels.some(o => o.modelKey === modelKey)) continue;
     const [pName, mId] = modelKey.split('/');
     if (!pName || !mId) continue;

package/package.json

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