yymaxapi 1.0.10 → 1.0.12

package/bin/yymaxapi.js

@@ -552,6 +552,70 @@ function syncClawdbotConfigs(paths, config) {
 function writeConfigWithSync(paths, config) {
   writeConfig(paths.openclawConfig, config);
   syncClawdbotConfigs(paths, config);
+  syncToWsl(paths.openclawConfig);
+}
+
+// ============ WSL 检测与同步 ============
+let _wslDetected = null;
+
+function isWslAvailable() {
+  if (process.platform !== 'win32') return false;
+  if (_wslDetected !== null) return _wslDetected;
+  try {
+    const r = execFileSync('wsl', ['--status'], { encoding: 'utf8', timeout: 5000, stdio: 'pipe' });
+    _wslDetected = true;
+  } catch {
+    // wsl --status 可能返回非零但 WSL 仍可用，检查 wsl.exe 是否存在
+    try {
+      execFileSync('wsl', ['echo', 'ok'], { encoding: 'utf8', timeout: 5000, stdio: 'pipe' });
+      _wslDetected = true;
+    } catch {
+      _wslDetected = false;
+    }
+  }
+  return _wslDetected;
+}
+
+function getWslHome() {
+  try {
+    const home = execFileSync('wsl', ['bash', '-c', 'echo $HOME'], { encoding: 'utf8', timeout: 5000 }).trim();
+    return home || null;
+  } catch { return null; }
+}
+
+function isGatewayInWsl(port = 18789) {
+  if (!isWslAvailable()) return false;
+  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;
+        }
+      }
+    }
+  } catch {}
+  return false;
+}
+
+function syncToWsl(windowsConfigPath) {
+  if (!isWslAvailable()) return;
+  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 */ }
 }
 
 function coerceModelsRecord(value) {
@@ -874,16 +938,21 @@ function resolveCliBinary() {
   }
 
   const candidates = ['openclaw', 'clawdbot', 'moltbot'];
+  const isWin = process.platform === 'win32';
   const searchDirs = (process.env.PATH || '').split(path.delimiter).concat(EXTRA_BIN_DIRS);
   for (const name of candidates) {
-    for (const dir of searchDirs) {
-      if (!dir) continue;
-      const full = path.join(dir, name);
-      try {
-        if (fs.existsSync(full) && fs.statSync(full).isFile() && isRealCli(full)) {
-          return full;
-        }
-      } catch {}
+    // Windows: 优先找 .cmd 版本（原生可执行），再找无扩展名版本
+    const nameVariants = isWin ? [`${name}.cmd`, name] : [name];
+    for (const variant of nameVariants) {
+      for (const dir of searchDirs) {
+        if (!dir) continue;
+        const full = path.join(dir, variant);
+        try {
+          if (fs.existsSync(full) && fs.statSync(full).isFile() && isRealCli(full)) {
+            return full;
+          }
+        } catch {}
+      }
     }
   }
 
@@ -2215,6 +2284,12 @@ async function testConnection(paths, args = {}) {
       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']) {
@@ -2366,8 +2441,44 @@ async function testConnection(paths, args = {}) {
 
 // ============ 重启 Gateway ============
 async function restartGateway() {
-  console.log(chalk.cyan('\n🔄 正在重启 OpenClaw Gateway...'));
+  console.log(chalk.cyan('\n正在重启 OpenClaw Gateway...'));
+
+  const gatewayPort = 18789;
+  const gwInWsl = isGatewayInWsl(gatewayPort);
+
+  // 如果 Gateway 在 WSL 里，优先用 wsl -- 重启
+  if (gwInWsl) {
+    console.log(chalk.gray('   [检测] Gateway 运行在 WSL 中'));
+    return new Promise((resolve) => {
+      const wslCmds = [
+        'wsl -- bash -c "openclaw gateway restart"',
+        'wsl -- bash -c "clawdbot gateway restart"',
+        'wsl -- bash -c "moltbot gateway restart"',
+      ];
+      let tried = 0;
+      const tryNext = () => {
+        if (tried >= wslCmds.length) {
+          console.log(chalk.yellow('⚠ WSL 内 Gateway 重启失败，尝试 Windows 原生重启...'));
+          restartGatewayNative().then(resolve);
+          return;
+        }
+        const cmd = wslCmds[tried++];
+        exec(cmd, { timeout: 30000 }, (error) => {
+          if (error) { tryNext(); }
+          else {
+            console.log(chalk.green('✅ Gateway 已重启 (WSL)'));
+            resolve();
+          }
+        });
+      };
+      tryNext();
+    });
+  }
+
+  return restartGatewayNative();
+}
 
+async function restartGatewayNative() {
   const { cliBinary: resolved, nodeMajor } = getCliMeta();
   const nodeInfo = findCompatibleNode(nodeMajor);
   const env = { ...process.env, PATH: extendPathEnv(nodeInfo ? nodeInfo.path : null) };

package/package.json

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