yymaxapi 1.0.29 → 1.0.32

package/bin/yymaxapi.js

@@ -979,7 +979,7 @@ function detectGatewayEnv(port = 18789) {
       }
     }
   } catch { }
-  // Fallback: Windows 没有原生 OpenClaw CLI，但 WSL 里有 → 判定为 WSL
+  // Fallback: Windows 没有原生 OpenClaw CLI → 检查 WSL / Docker
   const nativeCli = resolveCliBinary();
   if (!nativeCli) {
     const wslCli = getWslCliBinary();
@@ -993,6 +993,12 @@ function detectGatewayEnv(port = 18789) {
       _gwEnvCache = 'docker';
       return 'docker';
     }
+    // Windows 没有原生 CLI，WSL 可用但未找到具体 CLI 路径
+    // 仍然判定为 WSL（Gateway 大概率在 WSL 里，CLI 可能不在 bash -l 的 PATH 中）
+    if (isWslAvailable()) {
+      _gwEnvCache = 'wsl';
+      return 'wsl';
+    }
   }
   _gwEnvCache = 'native';
   return 'native';
@@ -2903,9 +2909,21 @@ async function testConnection(paths, args = {}) {
 
   // 等待 Gateway 启动
   const gwSpinner = ora({ text: '等待 Gateway 启动...', spinner: 'dots' }).start();
-  await new Promise(resolve => setTimeout(resolve, 3000));
 
-  let gatewayRunning = await waitForGateway(gatewayPort, '127.0.0.1', 15000);
+  let gatewayRunning = false;
+
+  if (restartOk) {
+    // restartGateway 内部已经验证过端口可达，只需短暂确认
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    gatewayRunning = await waitForGateway(gatewayPort, '127.0.0.1', 5000);
+  }
+
+  if (!gatewayRunning) {
+    // restart 失败或未就绪，先等待更长时间（macOS LaunchAgent 启动较慢）
+    await new Promise(resolve => setTimeout(resolve, 3000));
+    gatewayRunning = await waitForGateway(gatewayPort, '127.0.0.1', 20000);
+  }
+
   if (!gatewayRunning) {
     gwSpinner.text = '尝试自动启动 Gateway...';
     const autoResult = await tryAutoStartGateway(gatewayPort, allowAutoDaemon);

package/package.json

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