openclawsetup 2.8.2 → 2.8.4

package/bin/cli.mjs

@@ -856,16 +856,78 @@ function getDashboardToken(config) {
   return extractAuthToken(config?.raw || '') || '';
 }
 
+function maskToken(token = '') {
+  if (!token || token === '<未配置>' || token === '<你的token>') return token;
+  const text = String(token);
+  if (text.length <= 8) return '***';
+  return `${text.slice(0, 4)}...${text.slice(-4)}`;
+}
+
 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 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}`
@@ -1094,6 +1156,39 @@ function selectHealthPort(config, strongMode = false) {
   return strongMode ? STRONG_PORT_CANDIDATES[0] : DEFAULT_GATEWAY_PORT;
 }
 
+function parsePortFromText(raw = '') {
+  const matches = String(raw).match(/\b(\d{2,5})\b/g) || [];
+  for (const item of matches) {
+    const port = Number(item);
+    if (Number.isInteger(port) && port > 0 && port <= 65535) {
+      return port;
+    }
+  }
+  return null;
+}
+
+function getRuntimeGatewayPort(cliName, timeout = STATUS_CMD_TIMEOUT_MS) {
+  if (!cliName) return null;
+  const result = safeExec(`${cliName} config get gateway.port`, { timeout });
+  if (!result.ok || !result.output) return null;
+  return parsePortFromText(result.output);
+}
+
+function resolveHealthPort(cliName, config, strongMode = false) {
+  const runtimePort = getRuntimeGatewayPort(cliName);
+  if (runtimePort) return { port: runtimePort, source: 'runtime' };
+
+  const candidate = Number(config?.port || DEFAULT_GATEWAY_PORT);
+  if (Number.isInteger(candidate) && candidate > 0) {
+    return { port: candidate, source: 'config' };
+  }
+
+  return {
+    port: strongMode ? STRONG_PORT_CANDIDATES[0] : DEFAULT_GATEWAY_PORT,
+    source: 'default',
+  };
+}
+
 async function tryFixPortConflict(cliName, currentPort) {
   const availablePort = await findAvailablePort(currentPort);
   if (!availablePort || availablePort === currentPort) {
@@ -1375,12 +1470,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) {
@@ -1393,10 +1494,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');
   }
@@ -1417,10 +1518,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');
   }
@@ -1848,8 +1949,9 @@ function showCompletionInfo(cliName) {
 function showDashboardAccessInfo() {
   const config = getConfigInfo();
   const port = config.port || 18789;
-  const token = getDashboardToken(config) || '<你的token>';
-  const dashboardUrl = `http://127.0.0.1:${port}/?token=${token}`;
+  const tokenRaw = getDashboardToken(config) || '<你的token>';
+  const tokenMasked = maskToken(tokenRaw);
+  const dashboardUrl = `http://127.0.0.1:${port}/?token=${tokenMasked}`;
 
   if (detectVps()) {
     const serverIp = getServerIp() || '<服务器IP>';
@@ -2026,16 +2128,27 @@ 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';
-
-    if (statusResult.ok && statusState === 'running') {
+    const statusProbe = probeGatewayStatus(activeCli, STATUS_CMD_TIMEOUT_MS);
+    const statusState = statusProbe.state;
+    const statusPortResolved = resolveHealthPort(activeCli, config, strongMode);
+    const portForStatus = statusPortResolved.port;
+    const statusPortResult = getPortCheckOutput(portForStatus, PORT_CHECK_TIMEOUT_MS);
+    const statusPortListening = Boolean(statusPortResult.ok && statusPortResult.output);
+
+    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`,
       );
@@ -2056,7 +2169,7 @@ async function runHealthCheck(cliName, autoFix = false, strongMode = false) {
 
     // 4. 检查端口监听
     config = getConfigInfo();
-    let port = selectHealthPort(config, strongMode);
+    let port = resolveHealthPort(activeCli, config, strongMode).port;
     console.log(colors.cyan(`检查端口监听 (${port})...`));
     let portHealthy = false;
 
@@ -2337,7 +2450,8 @@ function testModelChat(cliName, timeoutMs = MODEL_CHAT_TIMEOUT_MS) {
 
 async function showStatusInfo(cliName) {
   const config = getConfigInfo();
-  const port = config.port || 18789;
+  const portResolved = resolveHealthPort(cliName, config, false);
+  const port = portResolved.port;
   const token = getDashboardToken(config) || '<未配置>';
   const dashboardUrl = `http://127.0.0.1:${port}/?token=${token}`;
 
@@ -2378,6 +2492,9 @@ async function showStatusInfo(cliName) {
   if (statusTimedOut) {
     console.log(colors.yellow('  ⚠ 状态命令超时，已自动切换端口探测模式'));
   }
+  if (portResolved.source === 'runtime' && Number(config?.port) !== Number(port)) {
+    console.log(colors.gray(`  … 运行时端口为 ${port}（与本地配置文件不一致）`));
+  }
 
   if (statusState === 'running') {
     console.log(colors.green('  ✓ Gateway 服务正在运行'));

package/package.json

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