openclawsetup 2.8.3 → 2.8.4

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 = [
@@ -1149,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) {
@@ -1909,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>';
@@ -2089,7 +2130,8 @@ 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);
 
@@ -2127,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;
 
@@ -2408,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}`;
 
@@ -2449,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.3",
+  "version": "2.8.4",
   "description": "OpenClaw 安装向导 - 智能安装、诊断、自动修复",
   "type": "module",
   "bin": {