openclawsetup 2.5.2 → 2.5.4

package/bin/cli.mjs

@@ -11,7 +11,7 @@
  */
 
 import { exec, execSync, spawnSync } from 'child_process';
-import { existsSync, accessSync, constants as fsConstants, rmSync, readFileSync } from 'fs';
+import { existsSync, accessSync, constants as fsConstants, rmSync, readFileSync, realpathSync } from 'fs';
 import { homedir, platform } from 'os';
 import { join } from 'path';
 import { createInterface } from 'readline';
@@ -209,21 +209,45 @@ function detectExistingInstall() {
   const openclawDir = join(home, '.openclaw');
   const clawdbotDir = join(home, '.clawdbot');
 
-  if (existsSync(openclawDir)) {
-    return { installed: true, configDir: openclawDir, name: 'openclaw' };
+  // Verify a CLI command is the real gateway CLI (not openclawapi symlink)
+  function isRealGatewayCli(name) {
+    // Check if the command has 'gateway' or 'status' subcommand (openclawapi doesn't)
+    const result = safeExec(`${name} --version`);
+    if (!result.ok) return false;
+    // If the version output contains 'openclawapi', it's our config tool, not the gateway
+    if (result.output && result.output.toLowerCase().includes('openclawapi')) return false;
+    // Also check: if the binary resolves to openclawapi, skip it
+    const whichResult = safeExec(platform() === 'win32' ? `where ${name}` : `command -v ${name}`);
+    if (whichResult.ok && whichResult.output) {
+      try {
+        const realPath = realpathSync(whichResult.output.trim());
+        if (realPath.includes('openclawapi')) return false;
+      } catch {}
+    }
+    return true;
   }
-  if (existsSync(clawdbotDir)) {
-    return { installed: true, configDir: clawdbotDir, name: 'clawdbot' };
+
+  // Determine the working CLI name
+  function findWorkingCli() {
+    for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+      if (isRealGatewayCli(name)) return name;
+    }
+    return null;
   }
 
-  const openclawResult = safeExec('openclaw --version');
-  if (openclawResult.ok) {
-    return { installed: true, name: 'openclaw', version: openclawResult.output };
+  if (existsSync(openclawDir) || existsSync(clawdbotDir)) {
+    const configDir = existsSync(openclawDir) ? openclawDir : clawdbotDir;
+    const cliName = findWorkingCli();
+    if (cliName) {
+      return { installed: true, configDir, name: cliName };
+    }
+    // Config dir exists but no working CLI found
+    return { installed: true, configDir, name: existsSync(openclawDir) ? 'openclaw' : 'clawdbot', cliMissing: true };
   }
 
-  const clawdbotResult = safeExec('clawdbot --version');
-  if (clawdbotResult.ok) {
-    return { installed: true, name: 'clawdbot', version: clawdbotResult.output };
+  const cliName = findWorkingCli();
+  if (cliName) {
+    return { installed: true, name: cliName };
   }
 
   return { installed: false };
@@ -512,48 +536,15 @@ async function installOpenClaw() {
 async function runOnboard(cliName) {
   console.log(colors.bold(colors.cyan('\n[2/2] 运行配置向导\n')));
 
-  const options = parseArgs();
+  console.log(colors.gray('-'.repeat(60)));
+  console.log(colors.gray('以下是官方 openclaw onboard 界面：'));
+  console.log(colors.gray('-'.repeat(60) + '\n'));
 
-  // 让用户选择安装模式
-  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 (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');
-      }
-    }
+  const manualResult = runOnboardManual(cliName);
+  console.log(colors.gray('\n' + '-'.repeat(60)));
+  if (manualResult.status !== 0) {
+    log.warn(`onboard 退出码: ${manualResult.status}`);
+    log.hint('如果配置未完成，可以手动运行: ' + cliName + ' onboard');
   }
 }
 

package/package.json

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