openclawsetup 2.8.5 → 2.8.7

package/bin/cli.mjs

@@ -1127,7 +1127,7 @@ function ensureConfigFilePresent(config, cliName) {
   }
   const result = safeExec(`${cliName} onboard --install-daemon`, { timeout: 240000 });
   if (!result.ok && process.stdin.isTTY && process.stdout.isTTY) {
-    spawnSync(cliName, ['onboard'], { stdio: 'inherit', shell: true });
+    spawnSync(`${cliName} onboard`, { stdio: 'inherit', shell: true });
   }
   const recheck = getConfigInfo();
   if (recheck.configPath && existsSync(recheck.configPath)) {
@@ -1153,8 +1153,8 @@ async function repairBrokenConfig(config, cliName, strongMode = false) {
   } catch {
     try {
       const backupPath = backupBrokenConfig(config.configPath);
-      const onboardArgs = strongMode ? ['onboard', '--install-daemon'] : ['onboard'];
-      spawnSync(cliName, onboardArgs, { stdio: 'inherit', shell: true });
+      const onboardCmd = strongMode ? `${cliName} onboard --install-daemon` : `${cliName} onboard`;
+      spawnSync(onboardCmd, { stdio: 'inherit', shell: true });
       const recheck = getConfigInfo();
       if (recheck.configPath && existsSync(recheck.configPath)) {
         return {
@@ -1404,7 +1404,7 @@ async function validateModelConfig(autoFix = false, strongMode = false) {
     }
   }
 
-  spawnSync('npx', ['openclawapi@latest'], { stdio: 'inherit', shell: true });
+  spawnSync('npx openclawapi@latest', { stdio: 'inherit', shell: true });
   const recheck = getConfigInfo();
   const recheckHasModels = recheck.raw.includes('"models"') || recheck.raw.includes('"providers"');
   const recheckHasApiKey = recheck.raw.includes('"apiKey"') || recheck.raw.includes('"api_key"');
@@ -1614,7 +1614,7 @@ async function installOpenClaw() {
   // 有权限：直接安装
   console.log(colors.gray('正在安装 openclaw...\n'));
 
-  const result = spawnSync('npm', ['install', '-g', 'openclaw@latest'], {
+  const result = spawnSync('npm install -g openclaw@latest', {
     stdio: 'inherit',
     shell: true,
   });
@@ -1627,7 +1627,7 @@ async function installOpenClaw() {
   // 安装失败，可能是权限问题，尝试 sudo（非 Windows）
   if (platform() !== 'win32') {
     log.warn('安装失败，可能是权限不足，尝试使用 sudo...');
-    const sudoResult = spawnSync('sudo', ['npm', 'install', '-g', 'openclaw@latest'], {
+    const sudoResult = spawnSync('sudo npm install -g openclaw@latest', {
       stdio: 'inherit',
       shell: true,
     });
@@ -1640,7 +1640,7 @@ async function installOpenClaw() {
 
   // 尝试 clawdbot
   log.warn('openclaw 安装失败，尝试 clawdbot...');
-  const fallback = spawnSync('npm', ['install', '-g', 'clawdbot@latest'], {
+  const fallback = spawnSync('npm install -g clawdbot@latest', {
     stdio: 'inherit',
     shell: true,
   });
@@ -1939,7 +1939,7 @@ async function updateOpenClaw(cliName) {
     console.log(colors.green(`  ${cliName} gateway restart\n`));
   } else {
     console.log(colors.gray('\n正在更新...\n'));
-    spawnSync('npm', ['install', '-g', `${cliName}@latest`], {
+    spawnSync(`npm install -g ${cliName}@latest`, {
       stdio: 'inherit',
       shell: true,
     });
@@ -1959,6 +1959,63 @@ async function updateOpenClaw(cliName) {
   }
 }
 
+// ============ 安装后 Gateway 验证 ============
+
+async function verifyAndStartGateway(cliName) {
+  const config = getConfigInfo();
+  const port = config.port || DEFAULT_GATEWAY_PORT;
+
+  console.log(colors.cyan('\n验证 Gateway 服务...'));
+
+  // 等待 Gateway 启动（onboard 可能刚启动 daemon，需要时间）
+  await sleep(3000);
+
+  // 检查端口是否在监听
+  const portCheck = getPortCheckOutput(port);
+  if (portCheck.ok && hasListeningState(portCheck.output)) {
+    // 端口在监听，再验证 health
+    const health = gatewayHealthRequest(port);
+    if (health.ok) {
+      log.success('Gateway 运行正常');
+      return;
+    }
+  }
+
+  // Gateway 未启动，尝试手动启动
+  log.warn('Gateway 未就绪，正在尝试启动...');
+
+  const startResult = await ensureGatewayRunning(cliName, 'start');
+  if (startResult.ok) {
+    // 再次验证端口
+    await sleep(2000);
+    const recheck = getPortCheckOutput(port);
+    if (recheck.ok && hasListeningState(recheck.output)) {
+      log.success('Gateway 已启动');
+      return;
+    }
+  }
+
+  // 仍然失败，尝试 restart
+  log.warn('启动失败，尝试重启...');
+  const restartResult = await ensureGatewayRunning(cliName, 'restart');
+  if (restartResult.ok) {
+    await sleep(2000);
+    const recheck2 = getPortCheckOutput(port);
+    if (recheck2.ok && hasListeningState(recheck2.output)) {
+      log.success('Gateway 已重启成功');
+      return;
+    }
+  }
+
+  // 所有尝试失败
+  log.error(`Gateway 未能在端口 ${port} 上启动`);
+  console.log(colors.yellow('\n请手动排查:'));
+  console.log(`  1. 运行: ${colors.green(`${cliName} gateway start`)}`);
+  console.log(`  2. 查看日志: ${colors.green(`${cliName} gateway logs`)}`);
+  console.log(`  3. 检查端口: ${colors.green(`${cliName} status`)}`);
+  console.log(`  4. 运行诊断: ${colors.green(`npx openclawsetup@latest --fix`)}`);
+}
+
 // ============ 完成信息 ============
 
 function showCompletionInfo(cliName) {
@@ -2030,7 +2087,7 @@ async function uninstallOpenClaw(existing) {
     console.log(colors.green('  rm -rf ~/.openclaw ~/.clawdbot\n'));
     await waitForEnter('卸载完成后按回车继续...');
   } else {
-    spawnSync('npm', ['uninstall', '-g', cliName], { stdio: 'inherit', shell: true });
+    spawnSync(`npm uninstall -g ${cliName}`, { stdio: 'inherit', shell: true });
   }
 
   const config = getConfigInfo();
@@ -2262,9 +2319,21 @@ async function runHealthCheck(cliName, autoFix = false, strongMode = false) {
         console.log(colors.yellow('  尝试重启并恢复端口监听...'));
         const recovered = await ensureGatewayRunning(activeCli, 'restart');
         if (recovered.ok) {
-          await sleep(2500);
-          const recheck = getPortCheckOutput(port);
-          if (recheck.ok && recheck.output && hasListeningState(recheck.output)) {
+          // Windows 上 Gateway 启动较慢，轮询等待端口就绪
+          const maxWait = platform() === 'win32' ? 15000 : 8000;
+          const interval = 1500;
+          let waited = 0;
+          let portReady = false;
+          while (waited < maxWait) {
+            await sleep(interval);
+            waited += interval;
+            const recheck = getPortCheckOutput(port);
+            if (recheck.ok && recheck.output && hasListeningState(recheck.output)) {
+              portReady = true;
+              break;
+            }
+          }
+          if (portReady) {
             log.success(`端口 ${port} 已恢复监听`);
             fixed.push(`端口监听已恢复（${port}）`);
             portHealthy = true;
@@ -2706,7 +2775,7 @@ async function showInteractiveMenu(existing) {
         break;
       case '7':
         console.log(colors.cyan('\n启动模型配置...'));
-        spawnSync('npx', ['openclawapi@latest'], {
+        spawnSync('npx openclawapi@latest', {
           stdio: 'inherit',
           shell: true,
         });
@@ -2721,13 +2790,13 @@ async function showInteractiveMenu(existing) {
         const chatChoice = await askQuestion('\n请选择 (a/b/c/0): ');
         switch (chatChoice.trim().toLowerCase()) {
           case 'a':
-            spawnSync('npx', ['openclawdc@latest'], { stdio: 'inherit', shell: true });
+            spawnSync('npx openclawdc@latest', { stdio: 'inherit', shell: true });
             break;
           case 'b':
-            spawnSync('npx', ['openclaw-chat-cn@latest', 'feishu'], { stdio: 'inherit', shell: true });
+            spawnSync('npx openclaw-chat-cn@latest feishu', { stdio: 'inherit', shell: true });
             break;
           case 'c':
-            spawnSync(cliName, ['onboard'], { stdio: 'inherit', shell: true });
+            spawnSync(`${cliName} onboard`, { stdio: 'inherit', shell: true });
             break;
         }
         await waitForEnter('\n按回车返回菜单...');
@@ -2792,10 +2861,8 @@ async function main() {
       if (latestVersion && compareSemver(currentVersion, latestVersion) < 0) {
         console.log(colors.yellow(`\n⚠ 当前版本 ${currentVersion}，最新版本 ${latestVersion}`));
         console.log(colors.yellow('  正在更新到最新版本...\n'));
-        const updateCmd = platform() === 'win32'
-          ? `npx --yes openclawsetup@${latestVersion}`
-          : `npx --yes openclawsetup@${latestVersion}`;
-        spawnSync(updateCmd.split(' ')[0], updateCmd.split(' ').slice(1), {
+        const updateCmd = `npx --yes openclawsetup@${latestVersion}`;
+        spawnSync(updateCmd, {
           stdio: 'inherit',
           shell: true,
         });
@@ -2880,6 +2947,9 @@ async function main() {
   // 运行 onboard
   await runOnboard(cliName);
 
+  // 验证 Gateway 是否启动，未启动则尝试启动
+  await verifyAndStartGateway(cliName);
+
   // 显示完成信息
   showCompletionInfo(cliName);
 }

package/package.json

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