yymaxapi 1.0.33 → 1.0.35

package/bin/yymaxapi.js

@@ -640,6 +640,10 @@ function writeCodexConfig(baseUrl, apiKey) {
   const configPath = path.join(codexDir, 'config.toml');
   const marker = '# >>> maxapi codex >>>';
   const markerEnd = '# <<< maxapi codex <<<';
+  const providerKey = 'openclaw-relay';
+  // 确保 base_url 以 /v1 结尾（Codex CLI 要求）
+  let normalizedUrl = baseUrl.replace(/\/+$/, '');
+  if (!normalizedUrl.endsWith('/v1')) normalizedUrl += '/v1';
   try {
     let existing = '';
     if (fs.existsSync(configPath)) {
@@ -650,12 +654,14 @@ function writeCodexConfig(baseUrl, apiKey) {
     }
     const section = [
       marker,
-      `model = "o4-mini"`,
-      `provider = "openai"`,
+      `model = "gpt-5.3-codex"`,
+      `model_provider = "${providerKey}"`,
       ``,
-      `[providers.openai]`,
-      `api_key = "${apiKey}"`,
-      `base_url = "${baseUrl.replace(/\/+$/, '')}"`,
+      `[model_providers.${providerKey}]`,
+      `name = "OpenClaw Relay"`,
+      `base_url = "${normalizedUrl}"`,
+      `wire_api = "responses"`,
+      `env_key = "OPENAI_API_KEY"`,
       markerEnd
     ].join('\n');
     const content = existing ? `${existing}\n\n${section}\n` : `${section}\n`;
@@ -2711,9 +2717,183 @@ async function autoActivate(paths, args = {}) {
   }
 }
 
+// ============ yycode 精简模式（零交互一键配置） ============
+async function yycodeQuickSetup(paths) {
+  console.log(chalk.cyan.bold('\n⚡ yycode 一键配置\n'));
+
+  const claudeApiConfig = API_CONFIG.claude;
+  const codexApiConfig = API_CONFIG.codex;
+  const claudeProviderName = claudeApiConfig.providerName;
+  const codexProviderName = codexApiConfig.providerName;
+
+  // ---- 探测已有 key ----
+  let apiKey = '';
+  let keySource = '';
+
+  // 1. CLI 参数
+  const args = parseArgs(process.argv.slice(2));
+  const directKey = (args['api-key'] || args.apiKey || args.key || '').toString().trim();
+  if (directKey) {
+    apiKey = directKey;
+    keySource = '命令行参数';
+  }
+
+  // 2. 环境变量
+  if (!apiKey) {
+    const envKeys = ['OPENCLAW_CLAUDE_KEY', 'OPENCLAW_CODEX_KEY', 'CLAUDE_API_KEY', 'OPENAI_API_KEY', 'OPENCLAW_API_KEY'];
+    for (const k of envKeys) {
+      if (process.env[k] && process.env[k].trim()) {
+        apiKey = process.env[k].trim();
+        keySource = `环境变量 ${k}`;
+        break;
+      }
+    }
+  }
+
+  // 3. 已有 OpenClaw 配置（云翼 Claude Code 密钥）
+  if (!apiKey) {
+    try {
+      const config = readConfig(paths.openclawConfig);
+      if (config && config.models && config.models.providers) {
+        // 优先取 claude-yunyi 的 key
+        const preferredOrder = [claudeProviderName, codexProviderName];
+        for (const name of preferredOrder) {
+          const p = config.models.providers[name];
+          if (p && p.apiKey && p.apiKey.trim()) {
+            apiKey = p.apiKey.trim();
+            keySource = `已有配置 (${name})`;
+            break;
+          }
+        }
+        // 其他 provider 的 key
+        if (!apiKey) {
+          for (const [name, p] of Object.entries(config.models.providers)) {
+            if (p.apiKey && p.apiKey.trim()) {
+              apiKey = p.apiKey.trim();
+              keySource = `已有配置 (${name})`;
+              break;
+            }
+          }
+        }
+      }
+    } catch { /* ignore */ }
+  }
+
+  // 4. 都没有，提示输入
+  if (apiKey) {
+    const masked = apiKey.length > 8 ? apiKey.slice(0, 5) + '***' + apiKey.slice(-3) : '***';
+    console.log(chalk.green(`✓ 已检测到 API Key: ${masked} (来源: ${keySource})`));
+  } else {
+    apiKey = await promptApiKey('请输入 API Key:', '');
+    if (!apiKey) { console.log(chalk.gray('已取消')); return; }
+  }
+
+  // ---- 静默测速选最快节点 ----
+  const speedSpinner = ora({ text: '正在测速选择最快节点...', spinner: 'dots' }).start();
+  let selectedEndpoint = ENDPOINTS[0];
+  try {
+    const speedResult = await testAllEndpoints(ENDPOINTS, { autoFallback: true });
+    if (speedResult.ranked && speedResult.ranked.length > 0) {
+      selectedEndpoint = speedResult.ranked[0];
+    }
+    speedSpinner.succeed(`节点: ${selectedEndpoint.name}`);
+  } catch {
+    speedSpinner.succeed(`节点: ${selectedEndpoint.name} (默认)`);
+  }
+
+  // ---- 验证 key ----
+  const validation = await validateApiKey(selectedEndpoint.url, apiKey);
+  if (!validation.valid) {
+    console.log(chalk.yellow('⚠ API Key 验证失败，仍将写入配置'));
+  }
+
+  // ---- 写入两套配置 ----
+  const config = ensureConfigStructure(readConfig(paths.openclawConfig) || {});
+
+  // 清理旧 provider
+  const existingProviders = Object.keys(config.models.providers || {});
+  const toRemove = existingProviders.filter(n => n !== claudeProviderName && n !== codexProviderName);
+  if (toRemove.length > 0) {
+    pruneProvidersExcept(config, [claudeProviderName, codexProviderName]);
+    pruneAuthProfilesExcept(paths.authProfiles, [claudeProviderName, codexProviderName]);
+  }
+
+  // Claude 侧
+  const claudeBaseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
+  const claudeModelId = 'claude-opus-4-6';
+  const claudeModel = CLAUDE_MODELS.find(m => m.id === claudeModelId) || { id: claudeModelId, name: 'Claude Opus 4.6' };
+  const claudeModelKey = `${claudeProviderName}/${claudeModelId}`;
+
+  config.models.providers[claudeProviderName] = {
+    baseUrl: claudeBaseUrl,
+    auth: DEFAULT_AUTH_MODE,
+    api: claudeApiConfig.api,
+    headers: {},
+    authHeader: false,
+    apiKey: apiKey.trim(),
+    models: [{ id: claudeModel.id, name: claudeModel.name, contextWindow: claudeApiConfig.contextWindow, maxTokens: claudeApiConfig.maxTokens }]
+  };
+  config.auth.profiles[`${claudeProviderName}:default`] = { provider: claudeProviderName, mode: 'api_key' };
+  config.agents.defaults.models[claudeModelKey] = { alias: claudeProviderName };
+
+  // Codex 侧
+  const codexBaseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
+  const codexModelId = 'gpt-5.3-codex';
+  const codexModel = CODEX_MODELS.find(m => m.id === codexModelId) || { id: codexModelId, name: 'GPT 5.3 Codex' };
+  const codexModelKey = `${codexProviderName}/${codexModelId}`;
+
+  config.models.providers[codexProviderName] = {
+    baseUrl: codexBaseUrl,
+    auth: DEFAULT_AUTH_MODE,
+    api: codexApiConfig.api,
+    headers: {},
+    authHeader: false,
+    apiKey: apiKey.trim(),
+    models: [{ id: codexModel.id, name: codexModel.name, contextWindow: codexApiConfig.contextWindow, maxTokens: codexApiConfig.maxTokens }]
+  };
+  config.auth.profiles[`${codexProviderName}:default`] = { provider: codexProviderName, mode: 'api_key' };
+  config.agents.defaults.models[codexModelKey] = { alias: codexProviderName };
+
+  // 默认主力: Codex, 备用: Claude
+  config.agents.defaults.model.primary = codexModelKey;
+  config.agents.defaults.model.fallbacks = [claudeModelKey];
+
+  // ---- 写入 ----
+  const writeSpinner = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
+  createTimestampedBackup(paths.openclawConfig, paths.configDir, 'yycode');
+  ensureGatewaySettings(config);
+  writeConfigWithSync(paths, config);
+  updateAuthProfiles(paths.authProfiles, claudeProviderName, apiKey);
+  updateAuthProfiles(paths.authProfiles, codexProviderName, apiKey);
+  try { syncExternalTools('claude', claudeBaseUrl, apiKey); } catch { /* ignore */ }
+  try { syncExternalTools('codex', codexBaseUrl, apiKey); } catch { /* ignore */ }
+  writeSpinner.succeed('配置写入完成');
+
+  // ---- 结果 ----
+  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.gray(`     模型: ${codexModel.name}`));
+  console.log(chalk.gray('   API Key: 已设置'));
+  console.log(chalk.gray('   同步: Claude Code settings, Codex CLI config'));
+  console.log('');
+}
+
+
 // ============ 主程序 ============
 async function main() {
   console.clear();
+
+  // yycode 精简模式：检测到 yycode CLI 时直接走零交互流程
+  const isYYCode = path.basename(process.argv[1] || '').replace(/\.js$/, '') === 'yycode';
+  if (isYYCode) {
+    const paths = getConfigPath();
+    backupOriginalConfig(paths.openclawConfig, paths.configDir);
+    await yycodeQuickSetup(paths);
+    return;
+  }
+
   console.log(chalk.cyan.bold('\n🔧 OpenClaw API 配置工具\n'));
 
   const paths = getConfigPath();
@@ -2989,7 +3169,7 @@ async function testConnection(paths, args = {}) {
   }
 
   // 检查当前激活的是哪个
-  const primary = config.agents?.defaults?.model?.primary || '';
+  let primary = config.agents?.defaults?.model?.primary || '';
   if (!primary.includes('/')) {
     console.log(chalk.yellow('⚠️ 请先设置主模型'));
     return;
@@ -3020,6 +3200,35 @@ async function testConnection(paths, args = {}) {
   console.log(chalk.gray(`模型: ${primary}`));
   console.log(chalk.gray(`Gateway: http://localhost:${gatewayPort}\n`));
 
+  // 模型切换（仅 Claude）
+  if (apiType.startsWith('anthropic')) {
+    const currentModelId = primary.split('/')[1] || '';
+    const switchModels = [
+      { id: 'claude-opus-4-6', name: 'Claude Opus 4.6' },
+      { id: 'claude-sonnet-4-6', name: 'Claude Sonnet 4.6' },
+    ];
+    const { switchModel } = await inquirer.prompt([{
+      type: 'list',
+      name: 'switchModel',
+      message: '选择测试模型:',
+      default: currentModelId,
+      choices: switchModels.map(m => ({
+        name: m.id === currentModelId ? `${m.name} (当前)` : m.name,
+        value: m.id,
+      })),
+    }]);
+    if (switchModel !== currentModelId) {
+      primary = `${providerName}/${switchModel}`;
+      config.agents.defaults.model.primary = primary;
+      if (!config.agents.defaults.models) config.agents.defaults.models = {};
+      if (!config.agents.defaults.models[primary]) {
+        config.agents.defaults.models[primary] = { alias: providerName };
+      }
+      writeConfigWithSync(paths, config);
+      console.log(chalk.green(`  ✅ 已切换到 ${switchModels.find(m => m.id === switchModel).name}\n`));
+    }
+  }
+
   // 获取 Gateway token
   const gatewayToken = config.gateway?.auth?.token;
   if (!gatewayToken) {

package/package.json

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