openclawsetup 2.2.0 → 2.3.0

package/bin/cli.mjs

@@ -28,9 +28,12 @@ const ERROR_CODES = {
   PERMISSION_DENIED: { code: 7, message: '权限不足' },
   NETWORK_ERROR: { code: 8, message: '网络错误' },
   PTY_UNAVAILABLE: { code: 9, message: '自动模式不可用' },
+  PORT_CONFLICT: { code: 10, message: '端口冲突' },
+  CONFIG_ERROR: { code: 11, message: '配置文件错误' },
+  GATEWAY_NOT_READY: { code: 12, message: 'Gateway 未就绪' },
 };
 
-function exitWithError(errorType, details = '') {
+function exitWithError(errorType, details = '', autoFix = null) {
   const err = ERROR_CODES[errorType] || { code: 99, message: '未知错误' };
   console.log('\n' + '='.repeat(40));
   console.log(`\x1b[31m❌ 错误: ${err.message}\x1b[0m`);
@@ -38,6 +41,10 @@ function exitWithError(errorType, details = '') {
   if (details) {
     console.log(details);
   }
+  if (autoFix) {
+    console.log(`\n\x1b[33m💡 自动修复命令:\x1b[0m`);
+    console.log(`   ${autoFix}`);
+  }
   console.log(`\n错误码: ${err.code}`);
   process.exit(err.code);
 }
@@ -79,37 +86,45 @@ function parseArgs() {
     reinstall: args.includes('--reinstall'),
     uninstall: args.includes('--uninstall'),
     check: args.includes('--check'),
+    fix: args.includes('--fix'),
     manual: args.includes('--manual'),
     auto: args.includes('--auto'),
     withModel: args.includes('--with-model'),
     withChannel: args.includes('--with-channel'),
+    quiet: args.includes('--quiet') || args.includes('-q'),
     help: args.includes('--help') || args.includes('-h'),
   };
 }
 
 function showHelp() {
   console.log(`
-${colors.bold('OpenClaw 安装向导')}
+${colors.bold('OpenClaw 安装向导 v2.3')}
 
-${colors.cyan('用法:')}
+${colors.cyan('基础用法:')}
   npx openclawsetup              交互式菜单（已安装）/ 安装向导（未安装）
   npx openclawsetup --check      检查配置和服务状态
+  npx openclawsetup --fix        检查并自动修复常见问题
   npx openclawsetup --update     更新已安装的 OpenClaw
   npx openclawsetup --reinstall  卸载后重新安装
   npx openclawsetup --uninstall  卸载 OpenClaw
-  npx openclawsetup --manual     完全手动模式
-  npx openclawsetup --auto       强制自动模式
 
-${colors.cyan('说明:')}
-  本工具会调用官方 openclaw onboard 命令
-  自动选择推荐配置，按任意键可随时接管
+${colors.cyan('安装模式:')}
+  npx openclawsetup --manual     完全手动模式（自己选择每个选项）
+  npx openclawsetup --auto       强制自动模式（脚本化场景）
+  npx openclawsetup -q           静默模式（减少输出）
 
 ${colors.cyan('高级选项:')}
   --with-model    检测到模型配置时暂停自动选择
   --with-channel  检测到渠道配置时暂停自动选择
 
 ${colors.cyan('安装后配置模型:')}
-  npx openclawapi@latest preset-claude
+  npx openclawapi@latest preset-claude    # 一键配置 Claude
+  npx openclawapi@latest                  # 交互式配置
+
+${colors.cyan('常见问题快速修复:')}
+  Gateway 未启动:  openclaw gateway start
+  端口被占用:      openclaw config set gateway.port 18790
+  配置文件损坏:    rm ~/.openclaw/openclaw.json && openclaw onboard
 `);
 }
 
@@ -870,10 +885,11 @@ async function uninstallOpenClaw(existing) {
 
 // ============ 健康检查 ============
 
-async function runHealthCheck(cliName) {
+async function runHealthCheck(cliName, autoFix = false) {
   console.log(colors.bold(colors.cyan('\n🔍 OpenClaw 健康检查\n')));
 
   const issues = [];
+  const fixed = [];
   const config = getConfigInfo();
 
   // 1. 检查配置文件
@@ -884,6 +900,7 @@ async function runHealthCheck(cliName) {
       title: '配置文件不存在',
       detail: '未找到 openclaw.json 配置文件',
       solution: '运行 openclaw onboard 重新配置',
+      fixCmd: `${cliName} onboard`,
     });
   } else {
     try {
@@ -891,12 +908,27 @@ async function runHealthCheck(cliName) {
       JSON.parse(raw);
       log.success('配置文件格式正确');
     } catch (e) {
-      issues.push({
+      const issue = {
         level: 'error',
         title: '配置文件 JSON 格式错误',
         detail: `解析失败: ${e.message}`,
-        solution: '检查 ~/.openclaw/openclaw.json 的 JSON 语法，或删除后重新运行 openclaw onboard',
-      });
+        solution: '备份并重新生成配置文件',
+        fixCmd: `mv ${config.configPath} ${config.configPath}.bak && ${cliName} onboard`,
+      };
+      if (autoFix) {
+        console.log(colors.yellow('  尝试修复配置文件...'));
+        const backupPath = `${config.configPath}.bak.${Date.now()}`;
+        try {
+          const { renameSync } = await import('fs');
+          renameSync(config.configPath, backupPath);
+          log.success(`已备份损坏的配置到 ${backupPath}`);
+          fixed.push('配置文件已备份，请重新运行 onboard');
+        } catch {
+          issues.push(issue);
+        }
+      } else {
+        issues.push(issue);
+      }
     }
   }
 
@@ -908,12 +940,25 @@ async function runHealthCheck(cliName) {
     if (output.includes('running') || output.includes('active')) {
       log.success('Gateway 进程正在运行');
     } else if (output.includes('stopped') || output.includes('inactive') || output.includes('not running')) {
-      issues.push({
+      const issue = {
         level: 'error',
         title: 'Gateway 未运行',
         detail: 'Gateway 服务已停止',
         solution: `运行 ${cliName} gateway start 启动服务`,
-      });
+        fixCmd: `${cliName} gateway start`,
+      };
+      if (autoFix) {
+        console.log(colors.yellow('  尝试启动 Gateway...'));
+        const startResult = safeExec(`${cliName} gateway start`);
+        if (startResult.ok) {
+          log.success('Gateway 已启动');
+          fixed.push('Gateway 已自动启动');
+        } else {
+          issues.push(issue);
+        }
+      } else {
+        issues.push(issue);
+      }
     }
   } else {
     issues.push({
@@ -935,12 +980,25 @@ async function runHealthCheck(cliName) {
   if (portResult.ok && portResult.output) {
     log.success(`端口 ${port} 正在监听`);
   } else {
-    issues.push({
-      level: 'error',
-      title: `端口 ${port} 未监听`,
-      detail: 'Gateway 端口未开放，服务可能未正常启动',
-      solution: `1. 运行 ${cliName} gateway restart\n     2. 检查是否有其他程序占用端口 ${port}`,
-    });
+    // 检查是否有其他进程占用端口
+    const conflictCheck = safeExec(`lsof -i :${port} 2>/dev/null | head -5`);
+    if (conflictCheck.ok && conflictCheck.output && !conflictCheck.output.includes('openclaw') && !conflictCheck.output.includes('node')) {
+      issues.push({
+        level: 'error',
+        title: `端口 ${port} 被其他程序占用`,
+        detail: conflictCheck.output.slice(0, 100),
+        solution: `更换端口: ${cliName} config set gateway.port 18790`,
+        fixCmd: `${cliName} config set gateway.port 18790 && ${cliName} gateway restart`,
+      });
+    } else {
+      issues.push({
+        level: 'error',
+        title: `端口 ${port} 未监听`,
+        detail: 'Gateway 端口未开放，服务可能未正常启动',
+        solution: `运行 ${cliName} gateway restart`,
+        fixCmd: `${cliName} gateway restart`,
+      });
+    }
   }
 
   // 4. 检查 API 健康
@@ -971,7 +1029,8 @@ async function runHealthCheck(cliName) {
       level: 'error',
       title: 'API 无响应',
       detail: '无法连接到 Gateway API',
-      solution: `1. 确认 Gateway 正在运行: ${cliName} status\n     2. 重启服务: ${cliName} gateway restart`,
+      solution: `重启服务: ${cliName} gateway restart`,
+      fixCmd: `${cliName} gateway restart`,
     });
   }
 
@@ -986,6 +1045,7 @@ async function runHealthCheck(cliName) {
         title: '未配置 AI 模型',
         detail: '配置文件中未找到模型或 API Key 配置',
         solution: '运行 npx openclawapi@latest 配置模型',
+        fixCmd: 'npx openclawapi@latest',
       });
     } else {
       log.success('已配置模型');
@@ -998,12 +1058,24 @@ async function runHealthCheck(cliName) {
   if (doctorResult.ok) {
     const output = doctorResult.output.toLowerCase();
     if (output.includes('error') || output.includes('fail') || output.includes('问题')) {
-      issues.push({
+      const issue = {
         level: 'warning',
         title: '官方诊断发现问题',
         detail: doctorResult.output.slice(0, 200),
-        solution: `运行 ${cliName} doctor 查看完整诊断`,
-      });
+        solution: `运行 ${cliName} doctor --fix 尝试自动修复`,
+        fixCmd: `${cliName} doctor --fix`,
+      };
+      if (autoFix) {
+        console.log(colors.yellow('  运行官方自动修复...'));
+        const fixResult = safeExec(`${cliName} doctor --fix`);
+        if (fixResult.ok) {
+          fixed.push('官方诊断问题已尝试修复');
+        } else {
+          issues.push(issue);
+        }
+      } else {
+        issues.push(issue);
+      }
     } else {
       log.success('官方诊断通过');
     }
@@ -1011,6 +1083,13 @@ async function runHealthCheck(cliName) {
 
   // 输出结果
   console.log('\n' + '='.repeat(50));
+
+  if (fixed.length > 0) {
+    console.log(colors.bold(colors.green(`🔧 已自动修复 ${fixed.length} 个问题：`)));
+    fixed.forEach((f, i) => console.log(colors.green(`   ${i + 1}. ${f}`)));
+    console.log('');
+  }
+
   if (issues.length === 0) {
     console.log(colors.bold(colors.green('✅ 所有检查通过，OpenClaw 运行正常！')));
   } else {
@@ -1022,9 +1101,18 @@ async function runHealthCheck(cliName) {
       console.log(`\n${icon} ${colors.bold(`问题 ${i + 1}: ${issue.title}`)}`);
       console.log(colors.gray(`   ${issue.detail}`));
       console.log(colors.cyan(`   解决方案: ${issue.solution}`));
+      if (issue.fixCmd) {
+        console.log(colors.yellow(`   快速修复: ${issue.fixCmd}`));
+      }
     });
+
+    if (!autoFix && issues.some(i => i.fixCmd)) {
+      console.log(colors.cyan('\n💡 提示: 运行 npx openclawsetup --fix 尝试自动修复'));
+    }
   }
   console.log('');
+
+  return { issues, fixed };
 }
 
 // ============ 交互式菜单 ============
@@ -1034,31 +1122,64 @@ async function showInteractiveMenu(existing) {
 
   while (true) {
     console.log(colors.bold(colors.cyan('\n' + '='.repeat(50))));
-    console.log(colors.bold(colors.cyan('  OpenClaw 管理菜单')));
+    console.log(colors.bold(colors.cyan('  🦞 OpenClaw 管理菜单')));
     console.log(colors.bold(colors.cyan('='.repeat(50))));
 
     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')}. 卸载 - 完全卸载 OpenClaw`);
-    console.log(`  ${colors.yellow('5')}. 配置模型 - 配置 AI 模型`);
+    console.log(`  ${colors.yellow('1')}. 检查    - 诊断配置和服务状态`);
+    console.log(`  ${colors.yellow('2')}. 修复    - 自动修复常见问题`);
+    console.log(`  ${colors.yellow('3')}. 更新    - 更新到最新版本`);
+    console.log(`  ${colors.yellow('4')}. 重启    - 重启 Gateway 服务`);
+    console.log(`  ${colors.yellow('5')}. 日志    - 查看 Gateway 日志`);
+    console.log(`  ${colors.yellow('6')}. 配置模型 - 配置 AI 模型`);
+    console.log(`  ${colors.yellow('7')}. 重新安装 - 完全重新安装`);
+    console.log(`  ${colors.yellow('8')}. 卸载    - 完全卸载 OpenClaw`);
     console.log(`  ${colors.yellow('0')}. 退出`);
 
-    const choice = await askQuestion('\n请输入选项 (0-5): ');
+    const choice = await askQuestion('\n请输入选项 (0-8): ');
 
     switch (choice.trim()) {
       case '1':
-        await runHealthCheck(cliName);
+        await runHealthCheck(cliName, false);
         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重启 Gateway...'));
+        const restartResult = safeExec(`${cliName} gateway restart`);
+        if (restartResult.ok) {
+          log.success('Gateway 已重启');
+        } else {
+          log.error('重启失败: ' + (restartResult.error || ''));
+        }
+        await waitForEnter('\n按回车返回菜单...');
+        break;
+      case '5':
+        console.log(colors.cyan('\n显示最近日志（按 Ctrl+C 退出）...\n'));
+        spawnSync(cliName, ['gateway', 'logs', '--tail', '50'], {
+          stdio: 'inherit',
+          shell: true,
+        });
+        await waitForEnter('\n按回车返回菜单...');
+        break;
+      case '6':
+        console.log(colors.cyan('\n启动模型配置...'));
+        spawnSync('npx', ['openclawapi@latest'], {
+          stdio: 'inherit',
+          shell: true,
+        });
+        await waitForEnter('\n按回车返回菜单...');
+        break;
+      case '7':
         console.log(colors.yellow('\n即将重新安装 OpenClaw...'));
         const confirmReinstall = await askQuestion('确认重新安装？(y/N): ');
         if (confirmReinstall.toLowerCase() === 'y') {
@@ -1068,7 +1189,7 @@ async function showInteractiveMenu(existing) {
           showCompletionInfo(newCliName);
         }
         break;
-      case '4':
+      case '8':
         console.log(colors.red('\n⚠ 警告：卸载将删除所有配置！'));
         const confirmUninstall = await askQuestion('确认卸载？(y/N): ');
         if (confirmUninstall.toLowerCase() === 'y') {
@@ -1077,20 +1198,12 @@ async function showInteractiveMenu(existing) {
           process.exit(0);
         }
         break;
-      case '5':
-        console.log(colors.cyan('\n启动模型配置...'));
-        spawnSync('npx', ['openclawapi@latest'], {
-          stdio: 'inherit',
-          shell: true,
-        });
-        await waitForEnter('\n按回车返回菜单...');
-        break;
       case '0':
       case '':
         console.log(colors.gray('\n再见！'));
         process.exit(0);
       default:
-        log.warn('无效选项，请输入 0-5');
+        log.warn('无效选项，请输入 0-8');
     }
   }
 }
@@ -1128,7 +1241,12 @@ async function main() {
     console.log(colors.green(`\n✓ 检测到已安装: ${existing.name}`));
 
     if (options.check) {
-      await runHealthCheck(existing.name);
+      await runHealthCheck(existing.name, false);
+      process.exit(0);
+    }
+
+    if (options.fix) {
+      await runHealthCheck(existing.name, true);
       process.exit(0);
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "openclawsetup",
-  "version": "2.2.0",
-  "description": "OpenClaw 安装向导 - 带中文指引的官方安装流程",
+  "version": "2.3.0",
+  "description": "OpenClaw 安装向导 - 智能安装、诊断、自动修复",
   "type": "module",
   "bin": {
     "openclawsetup": "bin/cli.mjs"