openclawsetup 2.8.4 → 2.8.6

package/bin/cli.mjs

@@ -930,7 +930,7 @@ function probeGatewayStatus(cliName, timeout = STATUS_CMD_TIMEOUT_MS) {
 
 function getPortCheckOutput(port, timeout = PORT_CHECK_TIMEOUT_MS) {
   const cmd = platform() === 'win32'
-    ? `netstat -ano | findstr :${port}`
+    ? `netstat -ano -p tcp | findstr LISTENING | findstr :${port}`
     : `lsof -nP -iTCP:${port} -sTCP:LISTEN 2>/dev/null || netstat -tlnp 2>/dev/null | grep :${port}`;
   return safeExec(cmd, { timeout });
 }
@@ -953,12 +953,33 @@ function isLikelyOpenClawProcess(output = '') {
   );
 }
 
+function hasListeningState(output = '') {
+  if (!output) return false;
+  if (platform() !== 'win32') return Boolean(output.trim());
+  return output.toLowerCase().includes('listening');
+}
+
 function gatewayHealthRequest(port, path = '/health') {
   const endpoint = `http://127.0.0.1:${port}${path}`;
   const curlCmd = `curl -sS --max-time 5 --connect-timeout 2 ${endpoint}`;
   return safeExec(curlCmd, { timeout: 7000 });
 }
 
+function gatewayHttpStatusProbe(port, path = '/v1/responses') {
+  const endpoint = `http://127.0.0.1:${port}${path}`;
+  const cmd = `curl -sS -o /dev/null -w "%{http_code}" --max-time 5 --connect-timeout 2 ${endpoint}`;
+  const result = safeExec(cmd, { timeout: 7000 });
+  if (!result.ok || !result.output) {
+    return { ok: false, status: 0 };
+  }
+  const match = String(result.output).match(/\d{3}/);
+  const status = match ? Number(match[0]) : 0;
+  if (!Number.isInteger(status) || status <= 0) {
+    return { ok: false, status: 0 };
+  }
+  return { ok: true, status };
+}
+
 function parseHealthOutput(raw = '') {
   if (!raw) return { healthy: false, detail: '空响应' };
 
@@ -1280,6 +1301,7 @@ async function runOfficialDoctor(cliName, autoFix = false, strongMode = false) {
 
 async function verifyGatewayApi(port, cliName, autoFix = false, strongMode = false) {
   const paths = ['/health', '/api/health', '/status'];
+  const probePaths = ['/v1/responses', '/v1/models', '/'];
 
   for (const path of paths) {
     const healthResult = gatewayHealthRequest(port, path);
@@ -1290,6 +1312,14 @@ async function verifyGatewayApi(port, cliName, autoFix = false, strongMode = fal
     }
   }
 
+  for (const path of probePaths) {
+    const probe = gatewayHttpStatusProbe(port, path);
+    if (!probe.ok) continue;
+    if (probe.status >= 200 && probe.status < 500) {
+      return { ok: true, issue: null };
+    }
+  }
+
   const issue = summarizeIssue(
     'error',
     'API 无响应',
@@ -1318,6 +1348,14 @@ async function verifyGatewayApi(port, cliName, autoFix = false, strongMode = fal
     }
   }
 
+  for (const path of probePaths) {
+    const probe = gatewayHttpStatusProbe(port, path);
+    if (!probe.ok) continue;
+    if (probe.status >= 200 && probe.status < 500) {
+      return { ok: true, issue: null, fixed: true };
+    }
+  }
+
   return { ok: false, issue, fixed: false };
 }
 
@@ -1921,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) {
@@ -2135,11 +2230,12 @@ async function runHealthCheck(cliName, autoFix = false, strongMode = false) {
     const statusPortResult = getPortCheckOutput(portForStatus, PORT_CHECK_TIMEOUT_MS);
     const statusPortListening = Boolean(statusPortResult.ok && statusPortResult.output);
 
-    if (statusState === 'running' || (statusState !== 'running' && statusPortListening)) {
+    const canUsePortFallback = statusState === 'unknown' || statusProbe.timedOut;
+    if (statusState === 'running' || (canUsePortFallback && statusPortListening)) {
       log.success('Gateway 进程正在运行');
       if (statusProbe.timedOut) {
         log.hint('状态命令超时，已按端口监听判定为运行中');
-      } else if (statusState !== 'running' && statusPortListening) {
+      } else if (canUsePortFallback && statusPortListening) {
         log.hint('状态命令返回非运行，但端口可访问（兼容判定）');
       }
     } else {
@@ -2175,7 +2271,12 @@ async function runHealthCheck(cliName, autoFix = false, strongMode = false) {
 
     const portResult = getPortCheckOutput(port);
     if (portResult.ok && portResult.output) {
-      if (isLikelyOpenClawProcess(portResult.output)) {
+      const listening = hasListeningState(portResult.output);
+      const winLikelyGateway = platform() === 'win32'
+        && listening
+        && (statusState === 'running' || statusProbe.timedOut || statusState === 'unknown');
+
+      if (winLikelyGateway || isLikelyOpenClawProcess(portResult.output)) {
         log.success(`端口 ${port} 正在监听`);
         portHealthy = true;
       } else {
@@ -2220,7 +2321,7 @@ async function runHealthCheck(cliName, autoFix = false, strongMode = false) {
         if (recovered.ok) {
           await sleep(2500);
           const recheck = getPortCheckOutput(port);
-          if (recheck.ok && recheck.output) {
+          if (recheck.ok && recheck.output && hasListeningState(recheck.output)) {
             log.success(`端口 ${port} 已恢复监听`);
             fixed.push(`端口监听已恢复（${port}）`);
             portHealthy = true;
@@ -2836,6 +2937,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.4",
+  "version": "2.8.6",
   "description": "OpenClaw 安装向导 - 智能安装、诊断、自动修复",
   "type": "module",
   "bin": {