yymaxapi 1.0.14 → 1.0.16

package/bin/yymaxapi.js

@@ -587,6 +587,24 @@ function getWslHome() {
   return _wslHomeCache;
 }
 
+// 获取 WSL 内 openclaw CLI 的完整路径（缓存）
+let _wslCliBinaryCache = undefined;
+
+function getWslCliBinary() {
+  if (_wslCliBinaryCache !== undefined) return _wslCliBinaryCache;
+  for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+    try {
+      const result = execFileSync('wsl', ['bash', '-c', `which ${name} 2>/dev/null`], { encoding: 'utf8', timeout: 5000 }).trim();
+      if (result && result.startsWith('/')) {
+        _wslCliBinaryCache = result;
+        return _wslCliBinaryCache;
+      }
+    } catch {}
+  }
+  _wslCliBinaryCache = null;
+  return null;
+}
+
 function detectGatewayEnv(port = 18789) {
   if (_gwEnvCache !== null) return _gwEnvCache;
   if (process.platform !== 'win32' || !isWslAvailable()) {
@@ -980,8 +998,16 @@ function resolveCliBinary() {
   // Validate that a found binary is a real gateway CLI, not yymaxapi itself
   function isRealCli(filePath) {
     try {
+      // Windows 上跳过 Linux 路径（WSL 路径在 Windows cmd.exe 下无法执行）
+      if (process.platform === 'win32' && filePath.startsWith('/')) {
+        return false;
+      }
       // Resolve symlinks to get the real target
       const realPath = fs.realpathSync(filePath);
+      // Windows 上再次检查解析后的路径
+      if (process.platform === 'win32' && realPath.startsWith('/')) {
+        return false;
+      }
       const baseName = path.basename(realPath).toLowerCase();
       // Skip if it points to yymaxapi/openclawapi (our own config tool, not the gateway CLI)
       if (baseName === 'yymaxapi' || baseName === 'yymaxapi.js' || realPath.includes('yymaxapi') || baseName === 'openclawapi' || baseName === 'openclawapi.js' || realPath.includes('openclawapi')) {
@@ -1139,6 +1165,8 @@ function findCompatibleNode(minMajor = 22) {
   const seen = new Set();
   for (const candidate of candidates) {
     if (!candidate || seen.has(candidate)) continue;
+    // Windows 上跳过 Linux 路径（WSL 路径无法直接执行）
+    if (process.platform === 'win32' && candidate.startsWith('/')) continue;
     seen.add(candidate);
     try {
       if (!fs.existsSync(candidate)) continue;
@@ -2479,12 +2507,15 @@ async function restartGateway() {
   // 如果 Gateway 在 WSL 里，优先用 wsl -- 重启
   if (gwEnv === 'wsl') {
     console.log(chalk.gray('   [检测] Gateway 运行在 WSL 中'));
+    const wslCli = getWslCliBinary();
     return new Promise((resolve) => {
-      const wslCmds = [
-        'wsl -- bash -lc "openclaw gateway restart"',
-        'wsl -- bash -lc "clawdbot gateway restart"',
-        'wsl -- bash -lc "moltbot gateway restart"',
-      ];
+      const wslCmds = wslCli
+        ? [`wsl -- bash -c "${wslCli} gateway restart"`]
+        : [
+            'wsl -- bash -lc "openclaw gateway restart"',
+            'wsl -- bash -lc "clawdbot gateway restart"',
+            'wsl -- bash -lc "moltbot gateway restart"',
+          ];
       let tried = 0;
       const tryNext = () => {
         if (tried >= wslCmds.length) {
@@ -2660,8 +2691,14 @@ function testGatewayViaAgent(model) {
 
     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 -lc '${agentCmd.replace(/'/g, "'\\''")}'`;
+      const wslCli = getWslCliBinary();
+      if (wslCli) {
+        const agentCmd = `${wslCli} agent --session-id ${sessionId} --message "请回复你的模型名称" --json --timeout 120`;
+        cmd = `wsl -- bash -c '${agentCmd.replace(/'/g, "'\\''")}'`;
+      } else {
+        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 -lc '${agentCmd.replace(/'/g, "'\\''")}'`;
+      }
       execOpts = { timeout: 120000 };
     } else {
       const { cliBinary, nodeMajor } = getCliMeta();

package/package.json

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