openclawsetup 2.4.3 → 2.4.5

package/bin/cli.mjs

@@ -200,9 +200,9 @@ function getConfigInfo() {
     try {
       const raw = readFileSync(configPath, 'utf8');
       const json = JSON.parse(raw);
-      const token = json.token || json.gatewayToken || '';
-      const port = Number(json.port || json.gatewayPort || 18789);
-      const bind = json.bind || json.gatewayBind || '';
+      const token = json.gateway?.auth?.token || json.token || json.gatewayToken || '';
+      const port = Number(json.gateway?.port || json.port || json.gatewayPort || 18789);
+      const bind = json.gateway?.bind || json.bind || json.gatewayBind || '';
       return { configDir: cfg.dir, configPath, token, port, bind, raw };
     } catch {
       try {
@@ -227,7 +227,17 @@ function getConfigInfo() {
 }
 
 function detectVps() {
-  return existsSync('/etc/cloud') || existsSync('/var/lib/cloud') || existsSync('/sys/hypervisor');
+  if (platform() !== 'linux') return false;
+  // Cloud provider markers
+  if (existsSync('/etc/cloud') || existsSync('/var/lib/cloud') || existsSync('/sys/hypervisor')) return true;
+  // SSH session = remote server
+  if (process.env.SSH_CLIENT || process.env.SSH_TTY || process.env.SSH_CONNECTION) return true;
+  // systemd-detect-virt
+  const virt = safeExec('systemd-detect-virt 2>/dev/null');
+  if (virt.ok && virt.output.trim() && virt.output.trim() !== 'none') return true;
+  // Headless Linux (no display) likely a server
+  if (!process.env.DISPLAY && !process.env.WAYLAND_DISPLAY) return true;
+  return false;
 }
 
 function getServerIp() {
@@ -1168,6 +1178,98 @@ async function runHealthCheck(cliName, autoFix = false) {
 
 // ============ 交互式菜单 ============
 
+async function showStatusInfo(cliName) {
+  const config = getConfigInfo();
+  const port = config.port || 18789;
+  const token = config.token || '<未配置>';
+  const dashboardUrl = `http://127.0.0.1:${port}/?token=${token}`;
+
+  console.log(colors.bold(colors.cyan('\n📊 OpenClaw 状态信息\n')));
+
+  // 服务状态
+  const statusResult = safeExec(`${cliName} status`);
+  const output = statusResult.ok ? statusResult.output : '';
+  const isRunning = output.toLowerCase().includes('running') || output.toLowerCase().includes('active');
+
+  if (isRunning) {
+    console.log(colors.green('  ✓ Gateway 服务正在运行'));
+  } else {
+    console.log(colors.red('  ✗ Gateway 服务未运行'));
+    console.log(colors.yellow('    → 请先选择「检查修复」自动修复此问题\n'));
+    return;
+  }
+
+  // 端口检查
+  const portCmd = platform() === 'win32'
+    ? `netstat -an | findstr :${port}`
+    : `lsof -i :${port} 2>/dev/null || netstat -tlnp 2>/dev/null | grep :${port}`;
+  const portResult = safeExec(portCmd);
+  if (portResult.ok && portResult.output) {
+    console.log(colors.green(`  ✓ 端口 ${port} 正在监听`));
+  } else {
+    console.log(colors.red(`  ✗ 端口 ${port} 未监听`));
+    console.log(colors.yellow('    → 请先选择「检查修复」自动修复此问题\n'));
+    return;
+  }
+
+  // 模型配置
+  if (config.raw) {
+    const hasProviders = config.raw.includes('"providers"');
+    if (hasProviders) {
+      console.log(colors.green('  ✓ 已配置 AI 模型'));
+    } else {
+      console.log(colors.yellow('  ⚠ 未配置模型，请先选择「配置模型」'));
+    }
+  }
+
+  // Dashboard 访问指南
+  console.log(colors.bold(colors.cyan('\n' + '─'.repeat(46))));
+  console.log(colors.bold(colors.cyan('  🌐 Web Dashboard 访问方法')));
+  console.log(colors.bold(colors.cyan('─'.repeat(46))));
+
+  if (detectVps()) {
+    const serverIp = getServerIp() || '<服务器IP>';
+    const user = process.env.USER || 'root';
+
+    console.log(colors.gray('\n  Gateway 绑定在 127.0.0.1（安全设计），需要通过'));
+    console.log(colors.gray('  SSH 隧道从本地电脑访问。\n'));
+
+    console.log(colors.bold('  第 1 步：在本地电脑打开终端，执行：\n'));
+
+    console.log(colors.yellow('    macOS / Linux:'));
+    console.log(colors.green(`    ssh -N -L ${port}:127.0.0.1:${port} ${user}@${serverIp}`));
+    console.log('');
+    console.log(colors.yellow('    Windows PowerShell:'));
+    console.log(colors.green(`    ssh -N -L ${port}:127.0.0.1:${port} ${user}@${serverIp}`));
+    console.log('');
+    console.log(colors.gray('    保持这个终端窗口不要关闭。'));
+
+    console.log(colors.bold('\n  第 2 步：在本地浏览器打开：\n'));
+    console.log(colors.green(`    ${dashboardUrl}`));
+
+    console.log(colors.bold('\n  注意事项：'));
+    console.log(colors.gray('    • SSH 窗口关闭后 Dashboard 无法访问，需重新执行第 1 步'));
+    console.log(colors.gray('    • 如果连接断开，重新执行 SSH 命令即可'));
+    console.log(colors.gray('    • 不建议将端口直接暴露到公网'));
+  } else if (platform() === 'win32') {
+    console.log(colors.gray('\n  OpenClaw 运行在本机，直接用浏览器访问即可。\n'));
+    console.log(colors.bold('  在浏览器打开：\n'));
+    console.log(colors.green(`    ${dashboardUrl}`));
+    console.log(colors.bold('\n  注意事项：'));
+    console.log(colors.gray('    • 确保 Gateway 服务正在运行'));
+    console.log(colors.gray('    • 如果无法访问，选择「检查修复」排查问题'));
+  } else {
+    console.log(colors.gray('\n  OpenClaw 运行在本机，直接用浏览器访问即可。\n'));
+    console.log(colors.bold('  在浏览器打开：\n'));
+    console.log(colors.green(`    ${dashboardUrl}`));
+    console.log(colors.bold('\n  注意事项：'));
+    console.log(colors.gray('    • 确保 Gateway 服务正在运行'));
+    console.log(colors.gray('    • 如果无法访问，选择「检查修复」排查问题'));
+  }
+
+  console.log('');
+}
+
 async function showInteractiveMenu(existing) {
   const cliName = existing.name || 'openclaw';
 
@@ -1179,27 +1281,32 @@ async function showInteractiveMenu(existing) {
     showDashboardAccessInfo();
 
     console.log(colors.cyan('\n请选择操作：'));
-    console.log(`  ${colors.yellow('1')}. 检查修复`);
-    console.log(`  ${colors.yellow('2')}. 检查更新`);
-    console.log(`  ${colors.yellow('3')}. 配置模型`);
-    console.log(`  ${colors.yellow('4')}. 配置 Chat`);
-    console.log(`  ${colors.yellow('5')}. 配置技能`);
-    console.log(`  ${colors.yellow('6')}. 重新安装`);
-    console.log(`  ${colors.yellow('7')}. 完全卸载`);
+    console.log(`  ${colors.yellow('1')}. 状态信息`);
+    console.log(`  ${colors.yellow('2')}. 检查修复`);
+    console.log(`  ${colors.yellow('3')}. 检查更新`);
+    console.log(`  ${colors.yellow('4')}. 配置模型`);
+    console.log(`  ${colors.yellow('5')}. 配置 Chat`);
+    console.log(`  ${colors.yellow('6')}. 配置技能`);
+    console.log(`  ${colors.yellow('7')}. 重新安装`);
+    console.log(`  ${colors.yellow('8')}. 完全卸载`);
     console.log(`  ${colors.yellow('0')}. 退出`);
 
-    const choice = await askQuestion('\n请输入选项 (0-7): ');
+    const choice = await askQuestion('\n请输入选项 (0-8): ');
 
     switch (choice.trim()) {
       case '1':
-        await runHealthCheck(cliName, true);
+        await showStatusInfo(cliName);
         await waitForEnter('\n按回车返回菜单...');
         break;
       case '2':
-        await updateOpenClaw(cliName);
+        await runHealthCheck(cliName, true);
         await waitForEnter('\n按回车返回菜单...');
         break;
       case '3':
+        await updateOpenClaw(cliName);
+        await waitForEnter('\n按回车返回菜单...');
+        break;
+      case '4':
         console.log(colors.cyan('\n启动模型配置...'));
         spawnSync('npx', ['openclawapi@latest'], {
           stdio: 'inherit',
@@ -1207,7 +1314,7 @@ async function showInteractiveMenu(existing) {
         });
         await waitForEnter('\n按回车返回菜单...');
         break;
-      case '4':
+      case '5':
         console.log(colors.cyan('\n选择聊天渠道：'));
         console.log(`  ${colors.yellow('a')}. Discord`);
         console.log(`  ${colors.yellow('b')}. 飞书`);
@@ -1227,13 +1334,13 @@ async function showInteractiveMenu(existing) {
         }
         await waitForEnter('\n按回车返回菜单...');
         break;
-      case '5':
+      case '6':
         console.log(colors.cyan('\n配置技能（即将支持）...'));
         // TODO: 等待技能地址提供后实现
         log.warn('技能配置功能即将上线，请稍后再试');
         await waitForEnter('\n按回车返回菜单...');
         break;
-      case '6':
+      case '7':
         console.log(colors.yellow('\n即将重新安装 OpenClaw...'));
         const confirmReinstall = await askQuestion('确认重新安装？(y/N): ');
         if (confirmReinstall.toLowerCase() === 'y') {
@@ -1243,7 +1350,7 @@ async function showInteractiveMenu(existing) {
           showCompletionInfo(newCliName);
         }
         break;
-      case '7':
+      case '8':
         console.log(colors.red('\n⚠ 警告：卸载将删除所有配置！'));
         const confirmUninstall = await askQuestion('确认卸载？(y/N): ');
         if (confirmUninstall.toLowerCase() === 'y') {
@@ -1257,7 +1364,7 @@ async function showInteractiveMenu(existing) {
         console.log(colors.gray('\n再见！'));
         process.exit(0);
       default:
-        log.warn('无效选项，请输入 0-7');
+        log.warn('无效选项，请输入 0-8');
     }
   }
 }

package/package.json

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