yymaxapi 1.0.9 → 1.0.11

package/bin/yymaxapi.js

@@ -874,16 +874,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 {}
+      }
     }
   }
 
@@ -2200,19 +2205,28 @@ async function testConnection(paths, args = {}) {
 
   const allowAutoDaemon = !(args['no-daemon'] || args.noDaemon);
 
-  // 步骤0: 清理可能挂死的 agent 进程
+  // 步骤0: 清理所有挂死的 agent 进程（不限于 yymaxapi-test）
   try {
     const { execSync } = require('child_process');
     const platform = process.platform;
     if (platform === 'win32') {
-      execSync('taskkill /F /FI "WINDOWTITLE eq openclaw*" /FI "STATUS eq Not Responding" 2>nul', { stdio: 'ignore' });
+      // 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 */ }
     } else {
-      // 杀掉所有挂死的 openclaw agent 子进程（排除 gateway 主进程）
-      execSync("pkill -f 'openclaw.*agent.*yymaxapi-test' 2>/dev/null || true", { stdio: 'ignore' });
-      execSync("pkill -f 'clawdbot.*agent.*yymaxapi-test' 2>/dev/null || true", { stdio: 'ignore' });
-      execSync("pkill -f 'moltbot.*agent.*yymaxapi-test' 2>/dev/null || true", { stdio: 'ignore' });
+      // 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 进程'));
+    console.log(chalk.gray('已清理残留 agent 进程'));
   } catch { /* ignore */ }
 
   // 步骤1: 先重启 Gateway 使配置生效
@@ -2952,10 +2966,57 @@ async function installOrUpdateOpenClaw() {
     spinner.succeed(`OpenClaw ${actionLabel}完成`);
 
     // 显示新版本
-    const newV = safeExec(`${cliBinary || 'openclaw'} --version`);
+    const cliBin = cliBinary || (process.platform === 'win32' ? 'openclaw.cmd' : 'openclaw');
+    const newV = safeExec(`"${cliBin}" --version`);
     if (newV.ok) {
       console.log(chalk.green(`   版本: ${newV.output.trim()}`));
     }
+
+    // 安装后自动 onboard — 初始化数据目录和配置
+    const homeDir = os.homedir();
+    const configFile = path.join(homeDir, '.openclaw', 'openclaw.json');
+
+    // 如果配置文件存在但内容无效，先备份移除
+    if (fs.existsSync(configFile)) {
+      try {
+        const raw = fs.readFileSync(configFile, 'utf8').trim();
+        if (raw && !raw.startsWith('{') && !raw.startsWith('[')) {
+          const badBak = configFile + '.bad.' + Date.now();
+          fs.renameSync(configFile, badBak);
+          console.log(chalk.yellow(`\n⚠ 配置文件格式异常，已备份到: ${path.basename(badBak)}`));
+        } else if (raw) {
+          JSON5.parse(raw); // 验证 JSON 合法性
+        }
+      } catch {
+        const badBak = configFile + '.bad.' + Date.now();
+        try { fs.renameSync(configFile, badBak); } catch { /* ignore */ }
+        console.log(chalk.yellow(`\n⚠ 配置文件解析失败，已备份移除`));
+      }
+    }
+
+    // 运行 onboard 初始化
+    console.log(chalk.cyan('\n正在初始化 OpenClaw...'));
+    const onboardCmd = process.platform === 'win32'
+      ? `"${cliBin}" onboard --non-interactive --accept-risk`
+      : `"${cliBin}" onboard --non-interactive --accept-risk 2>/dev/null || true`;
+    const onboardResult = safeExec(onboardCmd, { timeout: 60000 });
+    if (onboardResult.ok) {
+      console.log(chalk.green('✅ OpenClaw 初始化完成'));
+      // 显示数据目录位置
+      const dataDirs = [
+        path.join(homeDir, '.openclaw'),
+        path.join(homeDir, '.clawdbot'),
+        path.join(homeDir, '.moltbot'),
+      ].filter(d => fs.existsSync(d));
+      if (dataDirs.length > 0) {
+        console.log(chalk.gray(`   数据目录: ${dataDirs[0]}`));
+      }
+    } else {
+      console.log(chalk.yellow('⚠ 自动初始化未成功，请手动运行: openclaw onboard'));
+      if (onboardResult.output) {
+        console.log(chalk.gray(`   ${onboardResult.output.split('\n')[0]}`));
+      }
+    }
   } catch (error) {
     spinner.fail(`${actionLabel}失败`);
     console.log(chalk.red(`   错误: ${error.message}`));

package/package.json

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