yymaxapi 1.0.12 → 1.0.13

package/bin/yymaxapi.js

@@ -552,70 +552,126 @@ function syncClawdbotConfigs(paths, config) {
 function writeConfigWithSync(paths, config) {
   writeConfig(paths.openclawConfig, config);
   syncClawdbotConfigs(paths, config);
-  syncToWsl(paths.openclawConfig);
+  // 如果 Gateway 在 WSL，自动同步配置过去
+  const gwEnv = detectGatewayEnv();
+  if (gwEnv === 'wsl') {
+    syncConfigToWsl(paths.openclawConfig);
+  }
 }
 
-// ============ WSL 检测与同步 ============
-let _wslDetected = null;
+// ============ Gateway 环境检测（集中化） ============
+// 所有 WSL 相关逻辑统一通过 detectGatewayEnv() 路由
+// 返回 'native' | 'wsl'，结果缓存，整个进程生命周期只检测一次
+
+let _gwEnvCache = null;
+let _wslAvailCache = null;
+let _wslHomeCache = undefined; // undefined = 未检测, null = 检测失败
 
 function isWslAvailable() {
   if (process.platform !== 'win32') return false;
-  if (_wslDetected !== null) return _wslDetected;
+  if (_wslAvailCache !== null) return _wslAvailCache;
   try {
-    const r = execFileSync('wsl', ['--status'], { encoding: 'utf8', timeout: 5000, stdio: 'pipe' });
-    _wslDetected = true;
+    execFileSync('wsl', ['echo', 'ok'], { encoding: 'utf8', timeout: 5000, stdio: 'pipe' });
+    _wslAvailCache = true;
   } catch {
-    // wsl --status 可能返回非零但 WSL 仍可用，检查 wsl.exe 是否存在
-    try {
-      execFileSync('wsl', ['echo', 'ok'], { encoding: 'utf8', timeout: 5000, stdio: 'pipe' });
-      _wslDetected = true;
-    } catch {
-      _wslDetected = false;
-    }
+    _wslAvailCache = false;
   }
-  return _wslDetected;
+  return _wslAvailCache;
 }
 
 function getWslHome() {
+  if (_wslHomeCache !== undefined) return _wslHomeCache;
   try {
-    const home = execFileSync('wsl', ['bash', '-c', 'echo $HOME'], { encoding: 'utf8', timeout: 5000 }).trim();
-    return home || null;
-  } catch { return null; }
+    _wslHomeCache = execFileSync('wsl', ['bash', '-c', 'echo $HOME'], { encoding: 'utf8', timeout: 5000 }).trim() || null;
+  } catch { _wslHomeCache = null; }
+  return _wslHomeCache;
 }
 
-function isGatewayInWsl(port = 18789) {
-  if (!isWslAvailable()) return false;
+function detectGatewayEnv(port = 18789) {
+  if (_gwEnvCache !== null) return _gwEnvCache;
+  if (process.platform !== 'win32' || !isWslAvailable()) {
+    _gwEnvCache = 'native';
+    return 'native';
+  }
+  // 检查占用 gateway 端口的进程是否是 wslrelay
   try {
-    // 检查占用 gateway 端口的进程是否是 wslrelay
     const r = safeExec(`netstat -ano | findstr ":${port}"`, { timeout: 5000 });
-    if (!r.ok || !r.output) return false;
-    const lines = r.output.split('\n').filter(l => l.includes('LISTENING'));
-    for (const line of lines) {
-      const pid = line.trim().split(/\s+/).pop();
-      if (pid) {
-        const taskR = safeExec(`tasklist /FI "PID eq ${pid}" /FO CSV /NH`, { timeout: 5000 });
-        if (taskR.ok && taskR.output && taskR.output.toLowerCase().includes('wslrelay')) {
-          return true;
+    if (r.ok && r.output) {
+      const lines = r.output.split('\n').filter(l => l.includes('LISTENING'));
+      for (const line of lines) {
+        const pid = line.trim().split(/\s+/).pop();
+        if (pid) {
+          const taskR = safeExec(`tasklist /FI "PID eq ${pid}" /FO CSV /NH`, { timeout: 5000 });
+          if (taskR.ok && taskR.output && taskR.output.toLowerCase().includes('wslrelay')) {
+            _gwEnvCache = 'wsl';
+            return 'wsl';
+          }
         }
       }
     }
   } catch {}
-  return false;
+  _gwEnvCache = 'native';
+  return 'native';
 }
 
-function syncToWsl(windowsConfigPath) {
-  if (!isWslAvailable()) return;
+// 在 Gateway 环境中执行命令（WSL 自动包裹 wsl -- bash -c）
+function execInGatewayEnv(cmd, options = {}) {
+  if (detectGatewayEnv() === 'wsl') {
+    const escaped = cmd.replace(/'/g, "'\\''");
+    return safeExec(`wsl -- bash -c '${escaped}'`, options);
+  }
+  return safeExec(cmd, options);
+}
+
+// 在 Gateway 环境中执行命令（异步 exec 版本）
+function execAsyncInGatewayEnv(cmd, options = {}) {
+  if (detectGatewayEnv() === 'wsl') {
+    const escaped = cmd.replace(/'/g, "'\\''");
+    return { cmd: `wsl -- bash -c '${escaped}'`, options };
+  }
+  return { cmd, options };
+}
+
+// 同步配置到 WSL（仅在 Gateway 环境为 WSL 时调用）
+function syncConfigToWsl(windowsConfigPath) {
   try {
     const wslHome = getWslHome();
     if (!wslHome) return;
-    // 将 Windows 路径转为 WSL /mnt/c/ 路径
     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: 'ignore' });
-  } catch { /* ignore - WSL sync is best-effort */ }
+  } catch { /* best-effort */ }
+}
+
+// 清理 Gateway 环境中的 agent 进程
+function cleanupAgentProcesses() {
+  try {
+    const { execSync } = require('child_process');
+    if (process.platform === 'win32') {
+      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+        try {
+          execSync(`wmic process where "commandline like '%${name}%agent%' and not commandline like '%gateway%'" call terminate 2>nul`, { stdio: 'ignore', timeout: 10000 });
+        } catch { /* ignore */ }
+      }
+      try {
+        execSync('taskkill /F /FI "IMAGENAME eq node.exe" /FI "STATUS eq Not Responding" 2>nul', { stdio: 'ignore' });
+      } catch { /* ignore */ }
+      // WSL 内的 agent 也要清理
+      if (detectGatewayEnv() === 'wsl') {
+        try {
+          execSync('wsl -- bash -c "pkill -f \'openclaw.*agent\' 2>/dev/null; pkill -f \'clawdbot.*agent\' 2>/dev/null; pkill -f \'moltbot.*agent\' 2>/dev/null; true"', { stdio: 'ignore', timeout: 10000 });
+        } catch { /* ignore */ }
+      }
+    } else {
+      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+        execSync(`pkill -f '${name}.*agent' 2>/dev/null || true`, { stdio: 'ignore' });
+      }
+    }
+    console.log(chalk.gray('已清理残留 agent 进程'));
+  } catch { /* ignore */ }
 }
 
 function coerceModelsRecord(value) {
@@ -2077,7 +2133,9 @@ function getConfigStatusLine(paths) {
       return chalk.gray('当前状态: 未配置任何模型');
     }
 
-    return chalk.gray('当前状态: ') + parts.join('  ') + chalk.gray('  (✓ 主模型  ○ 已配置)');
+    const gwEnv = detectGatewayEnv();
+    const envTag = gwEnv === 'wsl' ? chalk.cyan(' [WSL]') : '';
+    return chalk.gray('当前状态: ') + parts.join('  ') + chalk.gray('  (✓ 主模型  ○ 已配置)') + envTag;
   } catch {
     return null;
   }
@@ -2269,35 +2327,8 @@ async function testConnection(paths, args = {}) {
 
   const allowAutoDaemon = !(args['no-daemon'] || args.noDaemon);
 
-  // 步骤0: 清理所有挂死的 agent 进程（不限于 yymaxapi-test）
-  try {
-    const { execSync } = require('child_process');
-    const platform = process.platform;
-    if (platform === 'win32') {
-      // Windows: 用 wmic 精确匹配 agent 子进程（排除 gateway）
-      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
-        try {
-          execSync(`wmic process where "commandline like '%${name}%agent%' and not commandline like '%gateway%'" call terminate 2>nul`, { stdio: 'ignore', timeout: 10000 });
-        } catch { /* ignore */ }
-      }
-      // fallback: 杀掉所有 Not Responding 的 node 进程
-      try {
-        execSync('taskkill /F /FI "IMAGENAME eq node.exe" /FI "STATUS eq Not Responding" 2>nul', { stdio: 'ignore' });
-      } catch { /* ignore */ }
-      // WSL 内的 agent 进程也要清理
-      if (isWslAvailable()) {
-        try {
-          execSync('wsl -- bash -c "pkill -f \'openclaw.*agent\' 2>/dev/null; pkill -f \'clawdbot.*agent\' 2>/dev/null; pkill -f \'moltbot.*agent\' 2>/dev/null; true"', { stdio: 'ignore', timeout: 10000 });
-        } catch { /* ignore */ }
-      }
-    } else {
-      // Unix: 杀掉所有 openclaw/clawdbot/moltbot agent 子进程（排除 gateway）
-      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
-        execSync(`pkill -f '${name}.*agent' 2>/dev/null || true`, { stdio: 'ignore' });
-      }
-    }
-    console.log(chalk.gray('已清理残留 agent 进程'));
-  } catch { /* ignore */ }
+  // 步骤0: 清理所有挂死的 agent 进程
+  cleanupAgentProcesses();
 
   // 步骤1: 先重启 Gateway 使配置生效
   console.log(chalk.cyan('步骤 1/2: 重启 Gateway 使配置生效...'));
@@ -2443,11 +2474,10 @@ async function testConnection(paths, args = {}) {
 async function restartGateway() {
   console.log(chalk.cyan('\n正在重启 OpenClaw Gateway...'));
 
-  const gatewayPort = 18789;
-  const gwInWsl = isGatewayInWsl(gatewayPort);
+  const gwEnv = detectGatewayEnv();
 
   // 如果 Gateway 在 WSL 里，优先用 wsl -- 重启
-  if (gwInWsl) {
+  if (gwEnv === 'wsl') {
     console.log(chalk.gray('   [检测] Gateway 运行在 WSL 中'));
     return new Promise((resolve) => {
       const wslCmds = [
@@ -2458,7 +2488,7 @@ async function restartGateway() {
       let tried = 0;
       const tryNext = () => {
         if (tried >= wslCmds.length) {
-          console.log(chalk.yellow('⚠ WSL 内 Gateway 重启失败，尝试 Windows 原生重启...'));
+          console.log(chalk.yellow('WSL 内 Gateway 重启失败，尝试 Windows 原生重启...'));
           restartGatewayNative().then(resolve);
           return;
         }
@@ -2466,7 +2496,7 @@ async function restartGateway() {
         exec(cmd, { timeout: 30000 }, (error) => {
           if (error) { tryNext(); }
           else {
-            console.log(chalk.green('✅ Gateway 已重启 (WSL)'));
+            console.log(chalk.green('Gateway 已重启 (WSL)'));
             resolve();
           }
         });
@@ -2622,27 +2652,38 @@ function testGatewayApi(port, token, model, endpoint = '/v1/responses') {
 
 function testGatewayViaAgent(model) {
   return new Promise((resolve) => {
-    const { cliBinary, nodeMajor } = getCliMeta();
-    if (!cliBinary) {
-      resolve({ success: false, usedCli: false, error: '未找到 openclaw/clawdbot/moltbot 命令' });
-      return;
-    }
-
-    const nodeInfo = findCompatibleNode(nodeMajor);
-    // 清除可能覆盖配置文件 apiKey 的环境变量，避免 Gateway 使用错误的 key
-    const env = { ...process.env, PATH: extendPathEnv(nodeInfo ? nodeInfo.path : null), NODE_NO_WARNINGS: '1' };
-    delete env.CLAUDE_API_KEY;
-    delete env.OPENCLAW_CLAUDE_KEY;
-    delete env.OPENCLAW_API_KEY;
-    delete env.OPENAI_API_KEY;
-    delete env.OPENCLAW_CODEX_KEY;
-    const useNode = nodeInfo && isNodeShebang(cliBinary);
+    const gwEnv = detectGatewayEnv();
     const sessionId = `yymaxapi-test-${Date.now()}`;
-    const cmd = useNode
-      ? `"${nodeInfo.path}" "${cliBinary}" agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`
-      : `"${cliBinary}" agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`;
 
-    exec(cmd, { timeout: 120000, env }, (error, stdout, stderr) => {
+    let cmd;
+    let execOpts;
+
+    if (gwEnv === 'wsl') {
+      // Gateway 在 WSL 中，agent 也要在 WSL 中执行
+      const agentCmd = `openclaw agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120 2>/dev/null || clawdbot agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120 2>/dev/null || moltbot agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`;
+      cmd = `wsl -- bash -c '${agentCmd.replace(/'/g, "'\\''")}'`;
+      execOpts = { timeout: 120000 };
+    } else {
+      const { cliBinary, nodeMajor } = getCliMeta();
+      if (!cliBinary) {
+        resolve({ success: false, usedCli: false, error: '未找到 openclaw/clawdbot/moltbot 命令' });
+        return;
+      }
+      const nodeInfo = findCompatibleNode(nodeMajor);
+      const env = { ...process.env, PATH: extendPathEnv(nodeInfo ? nodeInfo.path : null), NODE_NO_WARNINGS: '1' };
+      delete env.CLAUDE_API_KEY;
+      delete env.OPENCLAW_CLAUDE_KEY;
+      delete env.OPENCLAW_API_KEY;
+      delete env.OPENAI_API_KEY;
+      delete env.OPENCLAW_CODEX_KEY;
+      const useNode = nodeInfo && isNodeShebang(cliBinary);
+      cmd = useNode
+        ? `"${nodeInfo.path}" "${cliBinary}" agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`
+        : `"${cliBinary}" agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`;
+      execOpts = { timeout: 120000, env };
+    }
+
+    exec(cmd, execOpts, (error, stdout, stderr) => {
       // 过滤 stderr 中的 Node.js DeprecationWarning 噪音
       const cleanStderr = (stderr || '').replace(/\(node:\d+\) \[DEP\d+\] DeprecationWarning:.*(\n.*trace-deprecation.*)?/g, '').trim();
 

package/package.json

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