yymaxapi 1.0.23 → 1.0.24

package/bin/yymaxapi.js

@@ -2561,7 +2561,7 @@ async function restartGateway() {
     const wslCli = getWslCliBinary();
     return new Promise((resolve) => {
       const wslCmds = wslCli
-        ? [`wsl -- bash -c "${wslCli} gateway restart"`]
+        ? [`wsl -- bash -lc "${wslCli} gateway restart"`]
         : [
           'wsl -- bash -lc "openclaw gateway restart"',
           'wsl -- bash -lc "clawdbot gateway restart"',
@@ -2612,6 +2612,13 @@ async function forceRestartGateway(resolved, nodeInfo, useNode, env, gatewayPort
           }
         }
       }
+      // Windows + WSL: 也清理 WSL 内的 gateway 进程
+      if (isWslAvailable()) {
+        for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+          safeExec(`wsl -- bash -c "pkill -f '${name}.*gateway' 2>/dev/null || true"`, { timeout: 5000 });
+        }
+        safeExec(`wsl -- bash -c "lsof -ti :${gatewayPort} 2>/dev/null | xargs -r kill -9 2>/dev/null || true"`, { timeout: 5000 });
+      }
     } else {
       // Linux/macOS: pkill gateway 相关进程
       for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
@@ -2651,7 +2658,18 @@ async function forceRestartGateway(resolved, nodeInfo, useNode, env, gatewayPort
       startCmds.push(`bash -lc '${name} gateway'`);
     }
   } else {
+    // Windows: 先尝试原生命令
     startCmds.push('openclaw gateway', 'clawdbot gateway', 'moltbot gateway');
+    // Windows + WSL: 也尝试通过 WSL 启动 gateway
+    if (isWslAvailable()) {
+      const wslCli = getWslCliBinary();
+      if (wslCli) {
+        startCmds.push(`wsl -- bash -lc "${wslCli} gateway"`);
+      }
+      for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+        startCmds.push(`wsl -- bash -lc "${name} gateway"`);
+      }
+    }
   }
 
   for (const cmd of [...new Set(startCmds)].filter(Boolean)) {
@@ -2693,6 +2711,17 @@ async function restartGatewayNative() {
       'npx moltbot gateway restart'
     ];
 
+  // Windows + WSL: 追加 WSL 命令作为额外回退
+  if (process.platform === 'win32' && isWslAvailable()) {
+    const wslCli = getWslCliBinary();
+    if (wslCli) {
+      commands.push(`wsl -- bash -lc "${wslCli} gateway restart"`);
+    }
+    for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+      commands.push(`wsl -- bash -lc "${name} gateway restart"`);
+    }
+  }
+
   return new Promise((resolve) => {
     let tried = 0;
 

package/package.json

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