openclawsetup 2.8.12 → 2.8.13

package/bin/cli.mjs

@@ -521,7 +521,7 @@ async function collectEvidencePackage(options = {}) {
 
   const snapshot = gatherEnvironmentSnapshot();
   const tokenOptimizationPreview = createTokenOptimizationPlan();
-  const cliName = snapshot.openclaw.detectedInstall?.name || findWorkingCliName() || 'openclaw';
+  const cliName = snapshot.openclaw.detectedInstall?.name || findWorkingCliName(snapshot.openclaw.configDir?.includes('.clawdbot') ? 'clawdbot' : undefined) || 'openclaw';
 
   const captures = {
     doctor: runCmdCapture(`${cliName} doctor`, quick ? 20000 : 90000),
@@ -697,9 +697,9 @@ ${colors.cyan('安装后配置模型:')}
   npx openclawapi@latest                  # 交互式配置
 
 ${colors.cyan('常见问题快速修复:')}
-  Gateway 未启动:  openclaw gateway start
+  Gateway 未启动:  openclaw gateway start (或 clawdbot gateway start)
   端口被占用:      openclaw config set gateway.port 18790
-  配置文件损坏:    rm ~/.openclaw/openclaw.json && openclaw onboard
+  配置文件损坏:    重新运行 npx openclawsetup@latest
 `);
 }
 
@@ -796,8 +796,17 @@ function isRealGatewayCli(name) {
   return true;
 }
 
-function findWorkingCliName() {
-  for (const name of ['openclaw', 'clawdbot', 'moltbot']) {
+function findWorkingCliName(preferredName) {
+  const candidates = ['openclaw', 'clawdbot', 'moltbot'];
+  // If a preferred name is given (e.g. matching the config dir), check it first
+  if (preferredName) {
+    const reordered = [preferredName, ...candidates.filter(n => n !== preferredName)];
+    for (const name of reordered) {
+      if (isRealGatewayCli(name)) return name;
+    }
+    return null;
+  }
+  for (const name of candidates) {
     if (isRealGatewayCli(name)) return name;
   }
   return null;
@@ -809,13 +818,17 @@ function detectExistingInstall() {
   const clawdbotDir = join(home, '.clawdbot');
 
   if (existsSync(openclawDir) || existsSync(clawdbotDir)) {
+    // Prefer the CLI that matches the config directory to avoid cross-config issues
+    // e.g. if config is in ~/.clawdbot, prefer 'clawdbot' CLI (reads ~/.clawdbot/clawdbot.json)
+    //      if config is in ~/.openclaw, prefer 'openclaw' CLI (reads ~/.openclaw/openclaw.json)
     const configDir = existsSync(openclawDir) ? openclawDir : clawdbotDir;
-    const cliName = findWorkingCliName();
+    const preferredCli = existsSync(openclawDir) ? 'openclaw' : 'clawdbot';
+    const cliName = findWorkingCliName(preferredCli);
     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 };
+    return { installed: true, configDir, name: preferredCli, cliMissing: true };
   }
 
   const cliName = findWorkingCliName();
@@ -1696,7 +1709,7 @@ function showInstallGuide() {
   console.log(colors.bold(colors.cyan('  📖 OpenClaw 安装指引')));
   console.log(colors.bold(colors.cyan('='.repeat(60))));
 
-  console.log(colors.yellow('\n接下来会运行官方 openclaw onboard 命令'));
+  console.log(colors.yellow('\n接下来会运行官方 onboard 命令'));
   console.log(colors.yellow('自动模式会按以下推荐选择（可随时接管）：\n'));
 
   console.log(colors.cyan('┌─────────────────────────────────────────────────────────┐'));
@@ -1910,7 +1923,7 @@ async function runOnboard(cliName) {
   console.log(colors.bold(colors.cyan('\n[2/2] 运行配置向导\n')));
 
   console.log(colors.gray('-'.repeat(60)));
-  console.log(colors.gray('以下是官方 openclaw onboard 界面：'));
+  console.log(colors.gray('以下是官方 onboard 界面：'));
   console.log(colors.gray('-'.repeat(60) + '\n'));
 
   const manualResult = runOnboardManual(cliName);
@@ -2269,7 +2282,7 @@ function showCompletionInfo(cliName) {
   console.log(colors.cyan('\n下一步 - 配置 AI 模型（必须）:'));
   console.log(`  ${colors.yellow('npx openclawapi@latest preset-claude')}`);
 
-  showDashboardAccessInfo();
+  showDashboardAccessInfo(cliName);
 
   console.log(colors.cyan('\n常用命令:'));
   console.log(`  查看状态: ${colors.yellow(`${cliName} status`)}`);
@@ -2284,12 +2297,14 @@ function showCompletionInfo(cliName) {
   console.log('');
 }
 
-function showDashboardAccessInfo() {
+function showDashboardAccessInfo(cliName) {
   const config = getConfigInfo();
   const port = config.port || 18789;
   const tokenRaw = getDashboardToken(config) || '<你的token>';
   const tokenMasked = maskToken(tokenRaw);
   const dashboardUrl = `http://127.0.0.1:${port}/?token=${tokenMasked}`;
+  const activeCli = cliName || (config.configPath?.includes('.clawdbot') ? 'clawdbot' : 'openclaw');
+  const configFileName = config.configPath || `~/.${activeCli}/${activeCli}.json`;
 
   if (detectVps()) {
     const serverIp = getServerIp() || '<服务器IP>';
@@ -2305,10 +2320,10 @@ function showDashboardAccessInfo() {
     console.log(`    ${colors.green(dashboardUrl)}`);
     console.log('');
     console.log(colors.yellow('  方式二：直接暴露端口（不推荐，有安全风险）'));
-    console.log(colors.gray('  1. 修改配置文件 ~/.openclaw/openclaw.json'));
+    console.log(colors.gray(`  1. 修改配置文件 ${configFileName}`));
     console.log(colors.gray('     将 "bind": "loopback" 改为 "bind": "all"'));
     console.log(colors.gray(`  2. 在云服务器控制台开放端口 ${port}`));
-    console.log(colors.gray('  3. 重启 Gateway：openclaw gateway restart'));
+    console.log(colors.gray(`  3. 重启 Gateway：${activeCli} gateway restart`));
     console.log(colors.gray(`  4. 访问：http://${serverIp}:${port}/?token=...`));
   } else {
     console.log(colors.cyan('\nDashboard 访问:'));
@@ -2960,7 +2975,7 @@ async function showInteractiveMenu(existing) {
     console.log(colors.bold(colors.cyan('  🦞 OpenClaw 管理菜单')));
     console.log(colors.bold(colors.cyan('='.repeat(50))));
 
-    showDashboardAccessInfo();
+    showDashboardAccessInfo(cliName);
 
     console.log(colors.cyan('\n请选择操作：'));
     console.log(`  ${colors.yellow('1')}. 状态信息`);

package/package.json

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