openclawsetup 2.5.1 → 2.5.3

package/bin/cli.mjs

@@ -512,48 +512,15 @@ async function installOpenClaw() {
 async function runOnboard(cliName) {
   console.log(colors.bold(colors.cyan('\n[2/2] 运行配置向导\n')));
 
-  const options = parseArgs();
-
-  // 让用户选择安装模式
-  let mode = options.manual ? '2' : options.auto ? '1' : '';
-  if (!mode) {
-    console.log(colors.cyan('请选择安装模式：'));
-    console.log(`  ${colors.yellow('1')}. 自动安装（跳过所有配置，后续单独配置模型和渠道）`);
-    console.log(`  ${colors.yellow('2')}. 手动安装（走官方 onboard 完整流程）`);
-    mode = await askQuestion('\n请选择 (1/2): ');
-  }
-
-  if (mode.trim() === '2') {
-    // 手动模式：直接运行官方 onboard
-    console.log(colors.gray('\n' + '-'.repeat(60)));
-    console.log(colors.gray('以下是官方 openclaw onboard 界面：'));
-    console.log(colors.gray('-'.repeat(60) + '\n'));
-
-    const manualResult = runOnboardManual(cliName);
-    console.log(colors.gray('\n' + '-'.repeat(60)));
-    if (manualResult.status !== 0) {
-      log.warn(`onboard 退出码: ${manualResult.status}`);
-      log.hint('如果配置未完成，可以手动运行: ' + cliName + ' onboard');
-    }
-  } else {
-    // 自动模式：只用最安全的参数
-    console.log(colors.gray('\n正在自动安装（跳过模型和渠道配置）...\n'));
-
-    const { file, args } = getOnboardCommand(cliName, ['onboard', '--install-daemon']);
-    const result = spawnSync(file, args, { stdio: 'inherit' });
-
-    if (result.status !== 0) {
-      // 自动模式失败，回退到手动
-      log.warn('自动安装未完成，切换到手动模式...');
-      console.log(colors.gray('\n' + '-'.repeat(60)));
-      console.log(colors.gray('以下是官方 openclaw onboard 界面：'));
-      console.log(colors.gray('-'.repeat(60) + '\n'));
-      const manualResult = runOnboardManual(cliName);
-      if (manualResult.status !== 0) {
-        log.warn(`onboard 退出码: ${manualResult.status}`);
-        log.hint('如果配置未完成，可以手动运行: ' + cliName + ' onboard');
-      }
-    }
+  console.log(colors.gray('-'.repeat(60)));
+  console.log(colors.gray('以下是官方 openclaw onboard 界面：'));
+  console.log(colors.gray('-'.repeat(60) + '\n'));
+
+  const manualResult = runOnboardManual(cliName);
+  console.log(colors.gray('\n' + '-'.repeat(60)));
+  if (manualResult.status !== 0) {
+    log.warn(`onboard 退出码: ${manualResult.status}`);
+    log.hint('如果配置未完成，可以手动运行: ' + cliName + ' onboard');
   }
 }
 
@@ -1010,6 +977,8 @@ async function runHealthCheck(cliName, autoFix = false) {
         console.log(colors.yellow('  尝试启动 Gateway...'));
         const startResult = safeExec(`${cliName} gateway start`);
         if (startResult.ok) {
+          console.log(colors.gray('  等待 Gateway 启动...'));
+          await new Promise(r => setTimeout(r, 5000));
           log.success('Gateway 已启动');
           fixed.push('Gateway 已自动启动');
         } else {
@@ -1040,7 +1009,10 @@ async function runHealthCheck(cliName, autoFix = false) {
     log.success(`端口 ${port} 正在监听`);
   } else {
     // 检查是否有其他进程占用端口
-    const conflictCheck = safeExec(`lsof -i :${port} 2>/dev/null | head -5`);
+    const conflictCmd = platform() === 'win32'
+      ? `netstat -ano | findstr :${port} | findstr LISTENING`
+      : `lsof -i :${port} 2>/dev/null | head -5`;
+    const conflictCheck = safeExec(conflictCmd);
     if (conflictCheck.ok && conflictCheck.output && !conflictCheck.output.includes('openclaw') && !conflictCheck.output.includes('node')) {
       const issue = {
         level: 'error',
@@ -1074,8 +1046,18 @@ async function runHealthCheck(cliName, autoFix = false) {
         console.log(colors.yellow('  尝试重启 Gateway...'));
         const restartResult = safeExec(`${cliName} gateway restart`);
         if (restartResult.ok) {
-          log.success('Gateway 已重启');
-          fixed.push('Gateway 已自动重启');
+          // 等待 Gateway 绑定端口
+          console.log(colors.gray('  等待 Gateway 启动...'));
+          await new Promise(r => setTimeout(r, 5000));
+          // 重新检查端口
+          const recheck = safeExec(portCheckCmd);
+          if (recheck.ok && recheck.output) {
+            log.success('Gateway 已重启，端口正常');
+            fixed.push('Gateway 已自动重启');
+          } else {
+            log.warn('Gateway 已重启但端口仍未监听');
+            issues.push({ ...issue, detail: 'Gateway 重启后端口仍未监听，可能配置有问题' });
+          }
         } else {
           issues.push(issue);
         }
@@ -1120,6 +1102,8 @@ async function runHealthCheck(cliName, autoFix = false) {
       console.log(colors.yellow('  尝试重启 Gateway...'));
       const restartResult = safeExec(`${cliName} gateway restart`);
       if (restartResult.ok) {
+        console.log(colors.gray('  等待 Gateway 启动...'));
+        await new Promise(r => setTimeout(r, 5000));
         log.success('Gateway 已重启');
         fixed.push('Gateway 已自动重启（API 无响应）');
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclawsetup",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "OpenClaw 安装向导 - 智能安装、诊断、自动修复",
   "type": "module",
   "bin": {