openclawsetup 2.8.3 → 2.8.5

package/bin/cli.mjs

@@ -856,6 +856,13 @@ 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 stoppedRegex = [
@@ -923,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 });
 }
@@ -946,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: '空响应' };
 
@@ -1149,6 +1177,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) {
@@ -1240,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);
@@ -1250,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 无响应',
@@ -1278,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 };
 }
 
@@ -1909,8 +1987,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>';
@@ -2089,15 +2168,17 @@ async function runHealthCheck(cliName, autoFix = false, strongMode = false) {
     console.log(colors.cyan('检查 Gateway 进程...'));
     const statusProbe = probeGatewayStatus(activeCli, STATUS_CMD_TIMEOUT_MS);
     const statusState = statusProbe.state;
-    const portForStatus = selectHealthPort(config, strongMode);
+    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)) {
+    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 {
@@ -2127,13 +2208,18 @@ 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;
 
     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 {
@@ -2178,7 +2264,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;
@@ -2408,7 +2494,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}`;
 
@@ -2449,6 +2536,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.3",
+  "version": "2.8.5",
   "description": "OpenClaw 安装向导 - 智能安装、诊断、自动修复",
   "type": "module",
   "bin": {