openclawsetup 2.8.1 → 2.8.3

package/bin/cli.mjs

@@ -83,6 +83,9 @@ const log = {
 
 const DEFAULT_GATEWAY_PORT = 18789;
 const STRONG_FIX_MAX_PASSES = 3;
+const STATUS_CMD_TIMEOUT_MS = platform() === 'win32' ? 8000 : 5000;
+const PORT_CHECK_TIMEOUT_MS = platform() === 'win32' ? 6000 : 4000;
+const MODEL_CHAT_TIMEOUT_MS = platform() === 'win32' ? 25000 : 18000;
 const STRONG_PORT_CANDIDATES = [
   18789,
   18790,
@@ -855,26 +858,81 @@ function getDashboardToken(config) {
 
 function parseStatusOutput(statusOutput) {
   const text = (statusOutput || '').toLowerCase();
-  const runningKeywords = ['running', 'active', '已运行', '运行中', '在线'];
-  const stoppedKeywords = ['stopped', 'inactive', 'not running', '未运行', '停止'];
+  const stoppedRegex = [
+    /\bnot\s+running\b/,
+    /\bstopped\b/,
+    /\binactive\b/,
+    /\boffline\b/,
+  ];
+  const runningRegex = [
+    /\brunning\b/,
+    /\bactive\b/,
+    /\bonline\b/,
+  ];
+  const stoppedKeywords = ['未运行', '已停止', '停止', '离线'];
+  const runningKeywords = ['已运行', '运行中', '在线'];
 
-  if (runningKeywords.some((word) => text.includes(word))) return 'running';
+  if (stoppedRegex.some((pattern) => pattern.test(text))) return 'stopped';
   if (stoppedKeywords.some((word) => text.includes(word))) return 'stopped';
+  if (runningRegex.some((pattern) => pattern.test(text))) return 'running';
+  if (runningKeywords.some((word) => text.includes(word))) return 'running';
   return 'unknown';
 }
 
-function getPortCheckOutput(port) {
+function isCommandTimeout(result) {
+  if (!result || result.ok) return false;
+  const raw = `${result.error || ''} ${result.stderr || ''}`.toLowerCase();
+  return raw.includes('timed out') || raw.includes('etimedout') || raw.includes('sigterm') || raw.includes('killed');
+}
+
+function probeGatewayStatus(cliName, timeout = STATUS_CMD_TIMEOUT_MS) {
+  const attempts = [
+    `${cliName} status`,
+    `${cliName} gateway status`,
+  ];
+
+  let state = 'unknown';
+  let output = '';
+  let timedOut = false;
+  let error = '';
+
+  for (const cmd of attempts) {
+    const result = safeExec(cmd, { timeout });
+    if (isCommandTimeout(result)) {
+      timedOut = true;
+      continue;
+    }
+    if (!result.ok) {
+      if (!error) error = result.stderr || result.error || '';
+      continue;
+    }
+    if (!result.output) continue;
+
+    output = result.output;
+    const parsed = parseStatusOutput(result.output);
+    if (parsed === 'running') {
+      return { state: 'running', output, timedOut, error };
+    }
+    if (parsed === 'stopped') {
+      state = 'stopped';
+    }
+  }
+
+  return { state, output, timedOut, error };
+}
+
+function getPortCheckOutput(port, timeout = PORT_CHECK_TIMEOUT_MS) {
   const cmd = platform() === 'win32'
     ? `netstat -ano | findstr :${port}`
     : `lsof -nP -iTCP:${port} -sTCP:LISTEN 2>/dev/null || netstat -tlnp 2>/dev/null | grep :${port}`;
-  return safeExec(cmd);
+  return safeExec(cmd, { timeout });
 }
 
-function getPortConflictDetail(port) {
+function getPortConflictDetail(port, timeout = PORT_CHECK_TIMEOUT_MS) {
   const cmd = platform() === 'win32'
     ? `netstat -ano | findstr :${port} | findstr LISTENING`
     : `lsof -nP -iTCP:${port} -sTCP:LISTEN 2>/dev/null | head -8`;
-  return safeExec(cmd);
+  return safeExec(cmd, { timeout });
 }
 
 function isLikelyOpenClawProcess(output = '') {
@@ -1372,12 +1430,18 @@ function getOnboardHelp(cliName) {
   return '';
 }
 
+function extractOnboardFlags(helpText = '') {
+  const matches = helpText.toLowerCase().match(/--[a-z0-9][a-z0-9-]*/g) || [];
+  return new Set(matches);
+}
+
 function buildOnboardArgsFromHelp(helpText, options) {
   const help = helpText.toLowerCase();
+  const flagSet = extractOnboardFlags(helpText);
   const args = [];
   const enabled = [];
 
-  const pickFlag = (flags) => flags.find((flag) => help.includes(flag));
+  const pickFlag = (flags) => flags.find((flag) => flagSet.has(flag));
 
   const yesFlag = pickFlag(['--yes', '--assume-yes', '--accept', '--agree']);
   if (yesFlag) {
@@ -1390,10 +1454,10 @@ function buildOnboardArgsFromHelp(helpText, options) {
     args.push(installDaemonFlag);
   }
 
-  if (help.includes('--quickstart')) {
+  if (flagSet.has('--quickstart')) {
     args.push('--quickstart');
     enabled.push('quickstart');
-  } else if (help.includes('--mode') && (help.includes('quickstart') || help.includes('quick start'))) {
+  } else if (flagSet.has('--mode') && (help.includes('quickstart') || help.includes('quick start'))) {
     args.push('--mode', 'quickstart');
     enabled.push('quickstart');
   }
@@ -1414,10 +1478,10 @@ function buildOnboardArgsFromHelp(helpText, options) {
     }
   }
 
-  if (help.includes('--ui') && (help.includes('web') || help.includes('dashboard'))) {
+  if (flagSet.has('--ui') && (help.includes('web') || help.includes('dashboard'))) {
     args.push('--ui', 'web');
     enabled.push('ui-web');
-  } else if (help.includes('--web')) {
+  } else if (flagSet.has('--web')) {
     args.push('--web');
     enabled.push('ui-web');
   }
@@ -2023,16 +2087,26 @@ async function runHealthCheck(cliName, autoFix = false, strongMode = false) {
 
     // 3. 检查 Gateway 进程
     console.log(colors.cyan('检查 Gateway 进程...'));
-    const statusResult = safeExec(`${activeCli} status`);
-    const statusState = statusResult.ok ? parseStatusOutput(statusResult.output) : 'unknown';
+    const statusProbe = probeGatewayStatus(activeCli, STATUS_CMD_TIMEOUT_MS);
+    const statusState = statusProbe.state;
+    const portForStatus = selectHealthPort(config, strongMode);
+    const statusPortResult = getPortCheckOutput(portForStatus, PORT_CHECK_TIMEOUT_MS);
+    const statusPortListening = Boolean(statusPortResult.ok && statusPortResult.output);
 
-    if (statusResult.ok && statusState === 'running') {
+    if (statusState === 'running' || (statusState !== 'running' && statusPortListening)) {
       log.success('Gateway 进程正在运行');
+      if (statusProbe.timedOut) {
+        log.hint('状态命令超时，已按端口监听判定为运行中');
+      } else if (statusState !== 'running' && statusPortListening) {
+        log.hint('状态命令返回非运行，但端口可访问（兼容判定）');
+      }
     } else {
       const issue = summarizeIssue(
         'error',
         'Gateway 未运行',
-        statusResult.ok ? 'Gateway 状态为停止/未知' : (statusResult.stderr || statusResult.error || '状态检查失败'),
+        statusProbe.output
+          ? 'Gateway 状态为停止/未知'
+          : (statusProbe.error || '状态检查失败'),
         `运行 ${activeCli} gateway start 启动服务`,
         `${activeCli} gateway start`,
       );
@@ -2288,10 +2362,12 @@ async function runHealthCheck(cliName, autoFix = false, strongMode = false) {
 
 // ============ 交互式菜单 ============
 
-function testModelChat(cliName) {
+function testModelChat(cliName, timeoutMs = MODEL_CHAT_TIMEOUT_MS) {
   return new Promise((resolve) => {
-    const cmd = `${cliName} agent --session-id openclawsetup-test --message "请用一句话回复你的模型名称" --json --timeout 60`;
-    exec(cmd, { timeout: 65000 }, (error, stdout, stderr) => {
+    const agentTimeoutSec = Math.max(12, Math.floor(timeoutMs / 1000));
+    const execTimeoutMs = Math.max(15000, timeoutMs + 5000);
+    const cmd = `${cliName} agent --session-id openclawsetup-test --message "请用一句话回复你的模型名称" --json --timeout ${agentTimeoutSec}`;
+    exec(cmd, { timeout: execTimeoutMs }, (error, stdout, stderr) => {
       if (error) {
         const errMsg = (stderr || stdout || error.message || '').trim();
         // 提取关键错误信息
@@ -2337,6 +2413,7 @@ async function showStatusInfo(cliName) {
   const dashboardUrl = `http://127.0.0.1:${port}/?token=${token}`;
 
   console.log(colors.bold(colors.cyan('\n📊 OpenClaw 状态信息\n')));
+  console.log(colors.gray('  … 正在检查服务状态（超时自动跳过）...'));
 
   // 服务状态（兼容不同 CLI 版本，避免 Windows 下误判）
   const statusAttempts = [
@@ -2345,9 +2422,14 @@ async function showStatusInfo(cliName) {
   ];
   let statusState = 'unknown';
   let statusOutput = '';
+  let statusTimedOut = false;
 
   for (const attempt of statusAttempts) {
-    const statusResult = safeExec(attempt.cmd);
+    const statusResult = safeExec(attempt.cmd, { timeout: STATUS_CMD_TIMEOUT_MS });
+    if (!statusResult.ok && /timed out|etimedout|SIGTERM|killed/i.test(`${statusResult.error || ''} ${statusResult.stderr || ''}`)) {
+      statusTimedOut = true;
+      continue;
+    }
     if (!statusResult.ok || !statusResult.output) continue;
     statusOutput = statusResult.output;
     const parsed = parseStatusOutput(statusResult.output);
@@ -2361,9 +2443,13 @@ async function showStatusInfo(cliName) {
   }
 
   // 端口检查（作为状态命令兜底）
-  const portResult = getPortCheckOutput(port);
+  const portResult = getPortCheckOutput(port, PORT_CHECK_TIMEOUT_MS);
   const portListening = Boolean(portResult.ok && portResult.output);
 
+  if (statusTimedOut) {
+    console.log(colors.yellow('  ⚠ 状态命令超时，已自动切换端口探测模式'));
+  }
+
   if (statusState === 'running') {
     console.log(colors.green('  ✓ Gateway 服务正在运行'));
   } else if (portListening) {
@@ -2413,8 +2499,8 @@ async function showStatusInfo(cliName) {
 
   // 模型对话测试
   if (primaryModel) {
-    console.log(colors.gray('  … 正在测试模型对话...'));
-    const testResult = await testModelChat(cliName);
+    console.log(colors.gray(`  … 正在测试模型对话（最长 ${Math.floor(MODEL_CHAT_TIMEOUT_MS / 1000)} 秒）...`));
+    const testResult = await testModelChat(cliName, MODEL_CHAT_TIMEOUT_MS);
     if (testResult.success) {
       console.log(colors.green('  ✓ 模型对话正常'));
       if (testResult.message) {

package/package.json

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