yymaxapi 1.0.70 → 1.0.71

package/bin/yymaxapi.js

@@ -1795,6 +1795,25 @@ function ensureGatewaySettings(config) {
 
 }
 
+// 清理冲突的 env.vars（避免 OPENAI_API_KEY/OPENAI_BASE_URL 指向其他服务商导致 401）
+function cleanupConflictingEnvVars(config, codexBaseUrl, apiKey) {
+  if (!config.env?.vars) return;
+  const vars = config.env.vars;
+  // 如果 OPENAI_API_KEY 存在且不是我们的 key，清掉
+  if (vars.OPENAI_API_KEY && vars.OPENAI_API_KEY !== apiKey) {
+    delete vars.OPENAI_API_KEY;
+  }
+  // 如果 OPENAI_BASE_URL 存在且不是我们的地址，清掉
+  if (vars.OPENAI_BASE_URL && codexBaseUrl && !vars.OPENAI_BASE_URL.includes(new URL(codexBaseUrl).hostname)) {
+    delete vars.OPENAI_BASE_URL;
+  }
+  // 如果 vars 空了，清掉整个 env 节点
+  if (Object.keys(vars).length === 0) {
+    delete config.env.vars;
+    if (config.env && Object.keys(config.env).length === 0) delete config.env;
+  }
+}
+
 function isPortOpen(port, host = '127.0.0.1', timeoutMs = 800) {
   return new Promise((resolve) => {
     const socket = new net.Socket();
@@ -2284,7 +2303,7 @@ async function quickSetup(paths, args = {}) {
     auth: DEFAULT_AUTH_MODE,
     api: apiConfig.api,
     headers: {},
-    authHeader: false,
+    authHeader: apiConfig.api.startsWith('openai'),
     apiKey: apiKey.trim(),
     models: [
       {
@@ -2312,6 +2331,7 @@ async function quickSetup(paths, args = {}) {
   const ws = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
   createTimestampedBackup(paths.openclawConfig, paths.configDir, 'quick-setup');
   ensureGatewaySettings(config);
+  if (apiConfig.api.startsWith('openai')) cleanupConflictingEnvVars(config, normalizedBaseUrl, apiKey);
   writeConfigWithSync(paths, config);
   updateAuthProfiles(paths.authProfiles, providerName, apiKey);
   ws.succeed('配置写入完成');
@@ -2469,7 +2489,7 @@ async function presetClaude(paths, args = {}) {
     auth: DEFAULT_AUTH_MODE,
     api: apiConfig.api,
     headers: {},
-    authHeader: false,
+    authHeader: apiConfig.api.startsWith('openai'),
     apiKey: apiKey.trim(),
     models: [
       {
@@ -2662,7 +2682,7 @@ async function presetCodex(paths, args = {}) {
     auth: DEFAULT_AUTH_MODE,
     api: apiConfig.api,
     headers: {},
-    authHeader: false,
+    authHeader: apiConfig.api.startsWith('openai'),
     apiKey: apiKey.trim(),
     models: [
       {
@@ -2689,6 +2709,7 @@ async function presetCodex(paths, args = {}) {
   const writeSpinner2 = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
   createTimestampedBackup(paths.openclawConfig, paths.configDir, 'codex');
   ensureGatewaySettings(config);
+  cleanupConflictingEnvVars(config, baseUrl, apiKey);
   writeConfigWithSync(paths, config);
   updateAuthProfiles(paths.authProfiles, providerName, apiKey);
   const extSynced2 = syncExternalTools('codex', baseUrl, apiKey);
@@ -2850,7 +2871,7 @@ async function autoActivate(paths, args = {}) {
     auth: DEFAULT_AUTH_MODE,
     api: codexApiConfig.api,
     headers: {},
-    authHeader: false,
+    authHeader: codexApiConfig.api.startsWith('openai'),
     apiKey: apiKey.trim(),
     models: [{
       id: codexModel.id,
@@ -2872,6 +2893,7 @@ async function autoActivate(paths, args = {}) {
   const writeSpinner = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
   createTimestampedBackup(paths.openclawConfig, paths.configDir, 'unified');
   ensureGatewaySettings(config);
+  cleanupConflictingEnvVars(config, codexBaseUrl, apiKey);
   writeConfigWithSync(paths, config);
   updateAuthProfiles(paths.authProfiles, claudeProviderName, apiKey);
   updateAuthProfiles(paths.authProfiles, codexProviderName, apiKey);
@@ -3291,7 +3313,7 @@ async function yycodeQuickSetup(paths) {
     auth: DEFAULT_AUTH_MODE,
     api: codexApiConfig.api,
     headers: {},
-    authHeader: false,
+    authHeader: codexApiConfig.api.startsWith('openai'),
     apiKey: apiKey.trim(),
     models: [{ id: codexModel.id, name: codexModel.name, contextWindow: codexApiConfig.contextWindow, maxTokens: codexApiConfig.maxTokens }]
   };
@@ -3306,6 +3328,7 @@ async function yycodeQuickSetup(paths) {
   const writeSpinner = ora({ text: '正在写入配置...', spinner: 'dots' }).start();
   createTimestampedBackup(paths.openclawConfig, paths.configDir, 'yycode');
   ensureGatewaySettings(config);
+  cleanupConflictingEnvVars(config, codexBaseUrl, apiKey);
   writeConfigWithSync(paths, config);
   updateAuthProfiles(paths.authProfiles, claudeProviderName, apiKey);
   updateAuthProfiles(paths.authProfiles, codexProviderName, apiKey);

package/package.json

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