yymaxapi 1.0.78 → 1.0.80

package/bin/yymaxapi.js

@@ -468,6 +468,53 @@ function buildAuthCandidates(baseDirs) {
   return auths;
 }
 
+function buildPosixAuthCandidates(baseDirs) {
+  const auths = [];
+  for (const baseDir of baseDirs) {
+    auths.push(
+      path.posix.join(baseDir, 'agents', 'main', 'agent', 'auth-profiles.json'),
+      path.posix.join(baseDir, 'agent', 'auth-profiles.json')
+    );
+  }
+  return auths;
+}
+
+function findExistingWslFile(candidates = []) {
+  for (const candidate of candidates) {
+    const check = safeExec(`wsl -- bash -c "test -f '${candidate}' && echo yes"`, { timeout: 5000 });
+    if (check.ok && check.output.trim() === 'yes') {
+      return candidate;
+    }
+  }
+  return null;
+}
+
+function getWslMirrorInfo() {
+  if (process.platform !== 'win32' || !isWslAvailable()) {
+    return { configPath: null, authProfiles: null };
+  }
+
+  const wslHome = getWslHome() || '/root';
+  const configCandidates = [
+    `${wslHome}/.openclaw/openclaw.json`,
+    `${wslHome}/.openclaw/moltbot.json`,
+    `${wslHome}/.clawdbot/openclaw.json`,
+    `${wslHome}/.clawdbot/clawdbot.json`,
+    '/root/.openclaw/openclaw.json',
+    '/root/.openclaw/moltbot.json',
+    '/root/.clawdbot/openclaw.json',
+    '/root/.clawdbot/clawdbot.json'
+  ];
+
+  const configPath = findExistingWslFile(configCandidates);
+  const authBases = configPath
+    ? [path.posix.dirname(configPath)]
+    : [`${wslHome}/.openclaw`, `${wslHome}/.clawdbot`, '/root/.openclaw', '/root/.clawdbot'];
+  const authProfiles = findExistingWslFile(buildPosixAuthCandidates(authBases));
+
+  return { configPath, authProfiles };
+}
+
 function getConfigPath() {
   const homeDir = os.homedir();
   const openclawStateDir = process.env.OPENCLAW_STATE_DIR || path.join(homeDir, '.openclaw');
@@ -516,29 +563,24 @@ function getConfigPath() {
   }
 
   // Windows + WSL: 尝试读取 WSL 内的配置文件
+  let wslConfigPath = null;
+  let wslAuthProfiles = null;
   if (process.platform === 'win32' && isWslAvailable()) {
     try {
-      const wslHome = getWslHome() || '/root';
-      const wslPaths = [
-        `${wslHome}/.openclaw/openclaw.json`,
-        `${wslHome}/.openclaw/moltbot.json`,
-        `${wslHome}/.clawdbot/openclaw.json`,
-        '/root/.openclaw/openclaw.json',
-        '/root/.openclaw/moltbot.json',
-      ];
-      for (const wp of wslPaths) {
-        const check = safeExec(`wsl -- bash -c "test -f '${wp}' && echo yes"`, { timeout: 5000 });
-        if (check.ok && check.output.trim() === 'yes') {
-          // 将 WSL 配置复制到 Windows 侧，保持同步
-          const winDest = path.join(openclawStateDir, path.basename(wp));
-          try {
-            const content = execFileSync('wsl', ['bash', '-c', `cat '${wp}'`], { encoding: 'utf8', timeout: 10000, stdio: 'pipe' });
-            if (!fs.existsSync(openclawStateDir)) fs.mkdirSync(openclawStateDir, { recursive: true });
+      const mirrorInfo = getWslMirrorInfo();
+      wslConfigPath = mirrorInfo.configPath;
+      wslAuthProfiles = mirrorInfo.authProfiles;
+
+      if (wslConfigPath) {
+        const winDest = path.join(openclawStateDir, path.basename(wslConfigPath));
+        try {
+          if (!fs.existsSync(openclawStateDir)) fs.mkdirSync(openclawStateDir, { recursive: true });
+          if (!fs.existsSync(winDest)) {
+            const content = execFileSync('wsl', ['bash', '-c', `cat '${wslConfigPath}'`], { encoding: 'utf8', timeout: 10000, stdio: 'pipe' });
             fs.writeFileSync(winDest, content, 'utf8');
-            if (!candidates.includes(winDest)) candidates.unshift(winDest);
-          } catch { }
-          break;
-        }
+          }
+          if (!candidates.includes(winDest)) candidates.unshift(winDest);
+        } catch { }
       }
     } catch { }
   }
@@ -559,6 +601,9 @@ function getConfigPath() {
     : [...baseAuthCandidates, ...moltbotAuthCandidates];
 
   const authProfiles = authCandidates.find(p => fs.existsSync(p)) || authCandidates[0];
+  const authSyncTargets = process.platform === 'win32'
+    ? [...new Set(buildAuthCandidates([openclawStateDir, clawdbotStateDir]))].filter(p => p !== authProfiles)
+    : [];
 
   const syncTargets = [];
   if (openclawConfig.startsWith(openclawStateDir) && fs.existsSync(clawdbotStateDir)) {
@@ -568,7 +613,7 @@ function getConfigPath() {
     );
   }
 
-  return { openclawConfig, authProfiles, configDir, syncTargets };
+  return { openclawConfig, authProfiles, configDir, syncTargets, authSyncTargets, wslConfigPath, wslAuthProfiles };
 }
 
 // ============ 配置读写 ============
@@ -688,7 +733,7 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
   const markerEnd = '# <<< maxapi codex <<<';
   const topMarker = '# >>> maxapi codex top >>>';
   const topMarkerEnd = '# <<< maxapi codex top <<<';
-  const providerKey = 'openclaw-relay';
+  const providerKey = 'yunyi-codex';
   // 确保 base_url 以 /v1 结尾（Codex CLI 要求）
   let normalizedUrl = baseUrl.replace(/\/+$/, '');
   if (!normalizedUrl.endsWith('/v1')) normalizedUrl += '/v1';
@@ -702,9 +747,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, '');
-      // 兼容旧版：移除散落在 section 内的旧 model/model_provider（来自旧版 marker block 残留）
+      // 兼容旧版：移除散落的 model/model_provider、旧 openclaw-relay、旧 yunyi opencode 标记块
       existing = existing.replace(/^model\s*=\s*"[^"]*"\s*$/gm, '');
       existing = existing.replace(/^model_provider\s*=\s*"[^"]*"\s*$/gm, '');
+      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();
     }
 
@@ -720,7 +767,7 @@ function writeCodexConfig(baseUrl, apiKey, modelId = 'gpt-5.4') {
     const providerBlock = [
       marker,
       `[model_providers.${providerKey}]`,
-      `name = "OpenClaw Relay"`,
+      `name = "云翼 Codex"`,
       `base_url = "${normalizedUrl}"`,
       `wire_api = "responses"`,
       `experimental_bearer_token = "${apiKey}"`,
@@ -819,31 +866,14 @@ function writeOpencodeConfig(claudeBaseUrl, codexBaseUrl, apiKey, modelId) {
     // 移除旧标记块（仅移除 yunyi opencode 自己的）
     content = content.replace(/# >>> yunyi opencode >>>[\s\S]*?# <<< yunyi opencode <<<\n?/g, '');
 
-    // 移除旧的 yunyi model_providers 段落（包括 yunyi-cli 写入的 [model_providers.yunyi]）
-    content = content.replace(/\[model_providers\.yunyi[^\]]*\]\n(?:(?!\[)[^\n]*\n?)*/g, '');
-
-    // 只追加 yunyi-codex provider（Claude 配置仅在 opencode.json 中，Codex CLI 不支持 wire_api=anthropic）
-    const providers = [''];
-    if (codexUrl) {
-      providers.push(
-        '# >>> yunyi opencode >>>',
-        '[model_providers.yunyi-codex]',
-        'name = "云翼 Codex"',
-        `base_url = "${codexUrl}"`,
-        'wire_api = "responses"',
-        `experimental_bearer_token = "${apiKey}"`,
-        'requires_openai_auth = false',
-        '# <<< yunyi opencode <<<'
-      );
-    }
+    // 移除旧版 yunyi-cli 写入的 [model_providers.yunyi] 和 [model_providers.yunyi-claude]（不动 yunyi-codex，由 writeCodexConfig 管理）
+    content = content.replace(/\[model_providers\.yunyi\]\n(?:(?!\[)[^\n]*\n?)*/g, '');
+    content = content.replace(/\[model_providers\.yunyi-claude\]\n(?:(?!\[)[^\n]*\n?)*/g, '');
 
     // 清理多余空行
     content = content.replace(/\n{3,}/g, '\n\n').trim();
 
-    // 追加 provider section
-    if (providers.length > 1) {
-      content += '\n\n' + providers.join('\n') + '\n';
-    }
+    // yunyi-codex provider 由 writeCodexConfig 统一管理，此处不再重复写入
 
     fs.writeFileSync(codexConfigPath, content, 'utf8');
 
@@ -894,10 +924,15 @@ function syncClawdbotConfigs(paths, config) {
 function writeConfigWithSync(paths, config) {
   writeConfig(paths.openclawConfig, config);
   syncClawdbotConfigs(paths, config);
+  const hasWslMirror = process.platform === 'win32' && !!paths.wslConfigPath;
+  if (hasWslMirror) {
+    syncConfigToWsl(paths.openclawConfig, paths.wslConfigPath);
+  }
+  invalidateGatewayEnvCache();
   // 如果 Gateway 在 WSL，自动同步配置过去
   const gwEnv = detectGatewayEnv();
-  if (gwEnv === 'wsl') {
-    syncConfigToWsl(paths.openclawConfig);
+  if (!hasWslMirror && gwEnv === 'wsl') {
+    syncConfigToWsl(paths.openclawConfig, paths.wslConfigPath);
   }
   // 如果 Gateway 在 Docker 容器内，自动同步配置过去
   if (gwEnv === 'docker' && _selectedDockerContainer) {
@@ -1096,6 +1131,10 @@ let _gwEnvCache = null;
 let _wslAvailCache = null;
 let _wslHomeCache = undefined; // undefined = 未检测, null = 检测失败
 
+function invalidateGatewayEnvCache() {
+  _gwEnvCache = null;
+}
+
 function isWslAvailable() {
   if (process.platform !== 'win32') return false;
   if (_wslAvailCache !== null) return _wslAvailCache;
@@ -1221,16 +1260,12 @@ function execAsyncInGatewayEnv(cmd, options = {}) {
 }
 
 // 同步配置到 WSL（仅在 Gateway 环境为 WSL 时调用）
-function syncConfigToWsl(windowsConfigPath) {
+function syncConfigToWsl(windowsConfigPath, wslDestPath) {
   try {
     const wslHome = getWslHome();
-    if (!wslHome) return;
-    const winNorm = windowsConfigPath.replace(/\\/g, '/');
-    const match = winNorm.match(/^([A-Za-z]):\/(.*)/);
-    if (!match) return;
-    const wslSrc = `/mnt/${match[1].toLowerCase()}/${match[2]}`;
-    const wslDest = `${wslHome}/.openclaw/openclaw.json`;
-    execFileSync('wsl', ['bash', '-c', `mkdir -p "${wslHome}/.openclaw" && cp "${wslSrc}" "${wslDest}"`], { timeout: 10000, stdio: 'pipe' });
+    if (!wslHome && !wslDestPath) return;
+    const target = wslDestPath || `${wslHome}/.openclaw/openclaw.json`;
+    syncFileToWsl(windowsConfigPath, target);
   } catch { /* best-effort */ }
 }
 
@@ -1427,9 +1462,70 @@ function readAuthStore(authProfilesPath) {
 }
 
 function writeAuthStore(authProfilesPath, store) {
+  const authDir = path.dirname(authProfilesPath);
+  if (!fs.existsSync(authDir)) {
+    fs.mkdirSync(authDir, { recursive: true });
+  }
   fs.writeFileSync(authProfilesPath, JSON.stringify(store, null, 2), 'utf8');
 }
 
+function toWslMountPath(windowsPath) {
+  const winNorm = String(windowsPath || '').replace(/\\/g, '/');
+  const match = winNorm.match(/^([A-Za-z]):\/(.*)/);
+  if (!match) return null;
+  return `/mnt/${match[1].toLowerCase()}/${match[2]}`;
+}
+
+function syncFileToWsl(windowsPath, wslDestPath) {
+  if (process.platform !== 'win32' || !wslDestPath) return false;
+  const wslSrc = toWslMountPath(windowsPath);
+  if (!wslSrc) return false;
+
+  const wslDir = path.posix.dirname(wslDestPath);
+  execFileSync('wsl', ['bash', '-lc', `mkdir -p ${shellQuote(wslDir)} && cp ${shellQuote(wslSrc)} ${shellQuote(wslDestPath)}`], {
+    timeout: 10000,
+    stdio: 'pipe'
+  });
+  return true;
+}
+
+function syncAuthProfilesToWsl(windowsAuthProfilesPath, wslDestPath) {
+  try {
+    const wslHome = getWslHome();
+    if (!wslHome && !wslDestPath) return;
+    const target = wslDestPath || path.posix.join(wslHome, '.openclaw', 'agents', 'main', 'agent', 'auth-profiles.json');
+    syncFileToWsl(windowsAuthProfilesPath, target);
+  } catch { /* best-effort */ }
+}
+
+function syncMirroredAuthStores(paths) {
+  if (!paths?.authProfiles) return;
+
+  const store = readAuthStore(paths.authProfiles);
+  for (const target of [...new Set(paths.authSyncTargets || [])]) {
+    if (!target || target === paths.authProfiles) continue;
+    try {
+      writeAuthStore(target, store);
+    } catch { /* best-effort */ }
+  }
+
+  if (process.platform === 'win32' && (paths.wslAuthProfiles || paths.wslConfigPath)) {
+    const derivedWslAuthPath = paths.wslAuthProfiles || path.posix.join(path.posix.dirname(paths.wslConfigPath), 'agents', 'main', 'agent', 'auth-profiles.json');
+    syncAuthProfilesToWsl(paths.authProfiles, derivedWslAuthPath);
+  }
+}
+
+function pruneAuthProfilesExceptWithSync(paths, keepProviders = []) {
+  const removed = pruneAuthProfilesExcept(paths.authProfiles, keepProviders);
+  syncMirroredAuthStores(paths);
+  return removed;
+}
+
+function updateAuthProfilesWithSync(paths, providerName, apiKey) {
+  updateAuthProfiles(paths.authProfiles, providerName, apiKey);
+  syncMirroredAuthStores(paths);
+}
+
 function pruneAuthProfilesByPrefix(authProfilesPath, prefixBase, keepProviders = []) {
   const keepSet = new Set(keepProviders);
   const store = readAuthStore(authProfilesPath);
@@ -2313,7 +2409,7 @@ async function quickSetup(paths, args = {}) {
 
   if (toRemove.length > 0) {
     pruneProvidersExcept(config, [providerName]);
-    pruneAuthProfilesExcept(paths.authProfiles, [providerName]);
+    pruneAuthProfilesExceptWithSync(paths, [providerName]);
   }
 
   config.models.providers[providerName] = {
@@ -2351,7 +2447,7 @@ async function quickSetup(paths, args = {}) {
   ensureGatewaySettings(config);
   if (apiConfig.api.startsWith('openai')) cleanupConflictingEnvVars(config, normalizedBaseUrl, apiKey);
   writeConfigWithSync(paths, config);
-  updateAuthProfiles(paths.authProfiles, providerName, apiKey);
+  updateAuthProfilesWithSync(paths, providerName, apiKey);
   ws.succeed('配置写入完成');
 
   console.log(chalk.green(`\n✅ ${typeLabel} 中转已配置完成！`));
@@ -2431,7 +2527,7 @@ async function presetClaude(paths, args = {}) {
     ? pruneProvidersExcept(config, [providerName])
     : [];
   if (removedProviders.length > 0) {
-    pruneAuthProfilesExcept(paths.authProfiles, [providerName]);
+    pruneAuthProfilesExceptWithSync(paths, [providerName]);
   }
 
   const baseUrl = buildFullUrl(selectedEndpoint.url, 'claude');
@@ -2535,7 +2631,7 @@ async function presetClaude(paths, args = {}) {
   createTimestampedBackup(paths.openclawConfig, paths.configDir, 'claude');
   ensureGatewaySettings(config);
   writeConfigWithSync(paths, config);
-  updateAuthProfiles(paths.authProfiles, providerName, apiKey);
+  updateAuthProfilesWithSync(paths, providerName, apiKey);
   const extSynced = syncExternalTools('claude', baseUrl, apiKey);
   writeSpinner.succeed('配置写入完成');
 
@@ -2625,7 +2721,7 @@ async function presetCodex(paths, args = {}) {
     ? pruneProvidersExcept(config, [providerName])
     : [];
   if (removedProviders.length > 0) {
-    pruneAuthProfilesExcept(paths.authProfiles, [providerName]);
+    pruneAuthProfilesExceptWithSync(paths, [providerName]);
   }
 
   const baseUrl = buildFullUrl(selectedEndpoint.url, 'codex');
@@ -2729,7 +2825,7 @@ async function presetCodex(paths, args = {}) {
   ensureGatewaySettings(config);
   cleanupConflictingEnvVars(config, baseUrl, apiKey);
   writeConfigWithSync(paths, config);
-  updateAuthProfiles(paths.authProfiles, providerName, apiKey);
+  updateAuthProfilesWithSync(paths, providerName, apiKey);
   const extSynced2 = syncExternalTools('codex', baseUrl, apiKey);
   writeSpinner2.succeed('配置写入完成');
 
@@ -2913,8 +3009,8 @@ async function autoActivate(paths, args = {}) {
   ensureGatewaySettings(config);
   cleanupConflictingEnvVars(config, codexBaseUrl, apiKey);
   writeConfigWithSync(paths, config);
-  updateAuthProfiles(paths.authProfiles, claudeProviderName, apiKey);
-  updateAuthProfiles(paths.authProfiles, codexProviderName, apiKey);
+  updateAuthProfilesWithSync(paths, claudeProviderName, apiKey);
+  updateAuthProfilesWithSync(paths, codexProviderName, apiKey);
   const extSynced = [];
   try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl }); extSynced.push('Claude Code settings'); } catch { /* ignore */ }
   try { syncExternalTools('codex', codexBaseUrl, apiKey); extSynced.push('Codex CLI config'); } catch { /* ignore */ }
@@ -3348,8 +3444,8 @@ async function yycodeQuickSetup(paths) {
   ensureGatewaySettings(config);
   cleanupConflictingEnvVars(config, codexBaseUrl, apiKey);
   writeConfigWithSync(paths, config);
-  updateAuthProfiles(paths.authProfiles, claudeProviderName, apiKey);
-  updateAuthProfiles(paths.authProfiles, codexProviderName, apiKey);
+  updateAuthProfilesWithSync(paths, claudeProviderName, apiKey);
+  updateAuthProfilesWithSync(paths, codexProviderName, apiKey);
   try { syncExternalTools('claude', claudeBaseUrl, apiKey, { codexBaseUrl }); } catch { /* ignore */ }
   try { syncExternalTools('codex', codexBaseUrl, apiKey); } catch { /* ignore */ }
   writeSpinner.succeed('配置写入完成');
@@ -3943,6 +4039,7 @@ async function manageToolsProfile(paths) {
 // ============ 测试连接 ============
 async function testConnection(paths, args = {}) {
   console.log(chalk.cyan('🧪 测试 OpenClaw Gateway 连接\n'));
+  invalidateGatewayEnvCache();
 
   const config = readConfig(paths.openclawConfig);
 
@@ -4079,6 +4176,15 @@ async function testConnection(paths, args = {}) {
             console.log(chalk.red(`   期望: ${primary}`));
             console.log(chalk.cyan(`   实际: ${actualModelKey}`));
             console.log(chalk.gray(`   这意味着 ${primary} 无法正常工作，请检查该模型的中转配置`));
+            const configuredFallbacks = config.agents?.defaults?.model?.fallbacks || [];
+            if (configuredFallbacks.length > 0 && !configuredFallbacks.includes(actualModelKey)) {
+              console.log(chalk.yellow(`   ⚠️ 实际回退模型不在当前配置的 fallbacks 中，疑似读到了另一份配置`));
+              console.log(chalk.gray(`   当前 fallbacks: ${configuredFallbacks.join(', ')}`));
+              console.log(chalk.gray(`   当前配置文件: ${paths.openclawConfig}`));
+              if (process.platform === 'win32') {
+                console.log(chalk.gray('   Windows 请重点检查: %USERPROFILE%\\.openclaw、%USERPROFILE%\\.clawdbot、WSL ~/.openclaw'));
+              }
+            }
             // 检查是否可能是 api 字段错误导致的 502
             const expectedProvider = primary.split('/')[0];
             const providerCfg = config.models?.providers?.[expectedProvider];
@@ -4200,6 +4306,7 @@ async function testConnection(paths, args = {}) {
 // ============ 重启 Gateway ============
 async function restartGateway({ silent = false } = {}) {
   if (!silent) console.log(chalk.cyan('\n正在重启 OpenClaw Gateway...'));
+  invalidateGatewayEnvCache();
 
   const gwEnv = detectGatewayEnv();
   const configPaths = getConfigPath();

package/package.json

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