openclawsetup 2.4.8 → 2.5.0

package/bin/cli.mjs

@@ -10,9 +10,8 @@
  *   npx openclawsetup --update  # 更新已安装的 OpenClaw
  */
 
-import { execSync, spawnSync } from 'child_process';
+import { exec, execSync, spawnSync } from 'child_process';
 import { existsSync, accessSync, constants as fsConstants, rmSync, readFileSync } from 'fs';
-import http from 'http';
 import { homedir, platform } from 'os';
 import { join } from 'path';
 import { createInterface } from 'readline';
@@ -513,64 +512,48 @@ async function installOpenClaw() {
 async function runOnboard(cliName) {
   console.log(colors.bold(colors.cyan('\n[2/2] 运行配置向导\n')));
 
-  // 显示指引
-  showInstallGuide();
-
-  await waitForEnter('准备好了吗？按回车开始配置...');
-
-  console.log(colors.gray('\n' + '-'.repeat(60)));
-  console.log(colors.gray('以下是官方 openclaw onboard 界面：'));
-  console.log(colors.gray('-'.repeat(60) + '\n'));
-
   const options = parseArgs();
-  const preferAuto = !options.manual;
-  let usedAuto = false;
-
-  if (preferAuto) {
-    const flagResult = runOnboardFlags(cliName, options);
-    if (flagResult.ran) {
-      usedAuto = true;
-      console.log(colors.gray('\n' + '-'.repeat(60)));
-      if (!flagResult.ok) {
-        log.warn(`onboard 退出码: ${flagResult.exitCode}`);
-        log.hint('如果配置未完成，可以手动运行: ' + cliName + ' onboard');
-      }
-    } else {
-      const autoResult = await runOnboardAuto(cliName, options);
-      if (autoResult.ok) {
-        usedAuto = true;
-        console.log(colors.gray('\n' + '-'.repeat(60)));
-        if (autoResult.exitCode !== 0) {
-          log.warn(`onboard 退出码: ${autoResult.exitCode}`);
-          log.hint('如果配置未完成，可以手动运行: ' + cliName + ' onboard');
-        }
-      } else if (options.auto) {
-        exitWithError('PTY_UNAVAILABLE', `
-原因: ${autoResult.reason || '未能启用自动应答'}
 
-解决方案:
-  1. 使用手动模式:
-     npx openclawsetup@latest --manual
-  2. 在 Linux 服务器上补齐编译依赖后再试:
-     sudo apt-get install -y build-essential python3 make g++
-     npx openclawsetup@latest --auto
-  3. 或直接运行官方命令:
-     npm install -g openclaw@latest
-     openclaw onboard --install-daemon`);
-      } else {
-        log.warn('自动模式不可用，已切换为手动模式');
-        log.hint(autoResult.reason || '未能启用自动应答');
-      }
-    }
+  // 让用户选择安装模式
+  let mode = options.manual ? '2' : options.auto ? '1' : '';
+  if (!mode) {
+    console.log(colors.cyan('请选择安装模式：'));
+    console.log(`  ${colors.yellow('1')}. 自动安装（跳过所有配置，后续单独配置模型和渠道）`);
+    console.log(`  ${colors.yellow('2')}. 手动安装（走官方 onboard 完整流程）`);
+    mode = await askQuestion('\n请选择 (1/2): ');
   }
 
-  if (!usedAuto) {
+  if (mode.trim() === '2') {
+    // 手动模式：直接运行官方 onboard
+    console.log(colors.gray('\n' + '-'.repeat(60)));
+    console.log(colors.gray('以下是官方 openclaw onboard 界面：'));
+    console.log(colors.gray('-'.repeat(60) + '\n'));
+
     const manualResult = runOnboardManual(cliName);
     console.log(colors.gray('\n' + '-'.repeat(60)));
     if (manualResult.status !== 0) {
       log.warn(`onboard 退出码: ${manualResult.status}`);
       log.hint('如果配置未完成，可以手动运行: ' + cliName + ' onboard');
     }
+  } else {
+    // 自动模式：只用最安全的参数
+    console.log(colors.gray('\n正在自动安装（跳过模型和渠道配置）...\n'));
+
+    const { file, args } = getOnboardCommand(cliName, ['onboard', '--install-daemon']);
+    const result = spawnSync(file, args, { stdio: 'inherit' });
+
+    if (result.status !== 0) {
+      // 自动模式失败，回退到手动
+      log.warn('自动安装未完成，切换到手动模式...');
+      console.log(colors.gray('\n' + '-'.repeat(60)));
+      console.log(colors.gray('以下是官方 openclaw onboard 界面：'));
+      console.log(colors.gray('-'.repeat(60) + '\n'));
+      const manualResult = runOnboardManual(cliName);
+      if (manualResult.status !== 0) {
+        log.warn(`onboard 退出码: ${manualResult.status}`);
+        log.hint('如果配置未完成，可以手动运行: ' + cliName + ' onboard');
+      }
+    }
   }
 }
 
@@ -1237,45 +1220,45 @@ async function runHealthCheck(cliName, autoFix = false) {
 
 // ============ 交互式菜单 ============
 
-function testModelChat(port, token, model) {
+function testModelChat(cliName) {
   return new Promise((resolve) => {
-    const postData = JSON.stringify({ model, input: '请用一句话回复你的模型名称' });
-    const req = http.request({
-      hostname: '127.0.0.1',
-      port,
-      path: '/v1/responses',
-      method: 'POST',
-      timeout: 30000,
-      headers: {
-        'Content-Type': 'application/json',
-        'Authorization': `Bearer ${token}`,
-        'Content-Length': Buffer.byteLength(postData),
-      },
-    }, (res) => {
-      let data = '';
-      res.on('data', chunk => data += chunk);
-      res.on('end', () => {
-        try {
-          const json = JSON.parse(data);
-          const text = json.output?.[0]?.content?.[0]?.text;
-          if (text) {
-            resolve({ success: true, message: text });
-          } else if (json.error) {
-            resolve({ success: false, error: json.error.message || JSON.stringify(json.error) });
-          } else {
-            resolve({ success: false, error: `HTTP ${res.statusCode}: ${data.substring(0, 200)}` });
-          }
-        } catch {
-          resolve({ success: false, error: `HTTP ${res.statusCode}: ${data.substring(0, 200)}` });
+    const cmd = `${cliName} agent --session-id openclawsetup-test --message "请用一句话回复你的模型名称" --json --timeout 60`;
+    exec(cmd, { timeout: 65000 }, (error, stdout, stderr) => {
+      if (error) {
+        const errMsg = (stderr || stdout || error.message || '').trim();
+        // 提取关键错误信息
+        if (errMsg.includes('401')) {
+          resolve({ success: false, error: 'API Key 无效 (401)' });
+        } else if (errMsg.includes('403')) {
+          resolve({ success: false, error: 'API 访问被拒绝 (403)' });
+        } else if (errMsg.includes('timeout') || errMsg.includes('ETIMEDOUT')) {
+          resolve({ success: false, error: '请求超时，节点可能不可达' });
+        } else {
+          resolve({ success: false, error: errMsg.substring(0, 200) || 'CLI 执行失败' });
         }
-      });
-    });
-    req.on('timeout', () => { req.destroy(); resolve({ success: false, error: '请求超时 (30s)' }); });
-    req.on('error', (e) => {
-      resolve({ success: false, error: e.code === 'ECONNREFUSED' ? 'Gateway 未响应' : e.message });
+        return;
+      }
+      const output = (stdout || '').trim();
+      const jsonStart = output.indexOf('{');
+      const jsonEnd = output.lastIndexOf('}');
+      if (jsonStart === -1 || jsonEnd === -1 || jsonEnd <= jsonStart) {
+        resolve({ success: false, error: '返回格式异常' });
+        return;
+      }
+      try {
+        const parsed = JSON.parse(output.slice(jsonStart, jsonEnd + 1));
+        const message = parsed?.result?.payloads?.[0]?.text || '';
+        const provider = parsed?.result?.meta?.agentMeta?.provider || '';
+        const modelId = parsed?.result?.meta?.agentMeta?.model || '';
+        if (message || (provider && modelId)) {
+          resolve({ success: true, message, provider, model: modelId });
+        } else {
+          resolve({ success: false, error: '模型未返回内容' });
+        }
+      } catch {
+        resolve({ success: false, error: '返回 JSON 解析失败' });
+      }
     });
-    req.write(postData);
-    req.end();
   });
 }
 
@@ -1339,9 +1322,9 @@ async function showStatusInfo(cliName) {
   }
 
   // 模型对话测试
-  if (config.token && config.token !== '<未配置>' && primaryModel) {
+  if (primaryModel) {
     console.log(colors.gray('  … 正在测试模型对话...'));
-    const testResult = await testModelChat(port, config.token, primaryModel);
+    const testResult = await testModelChat(cliName);
     if (testResult.success) {
       console.log(colors.green('  ✓ 模型对话正常'));
       if (testResult.message) {

package/package.json

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