openclawsetup 2.8.13 → 2.8.15

package/bin/cli.mjs

@@ -21,6 +21,7 @@ import {
   renameSync,
   mkdirSync,
   writeFileSync,
+  statSync,
 } from 'fs';
 import { createServer } from 'net';
 import { homedir, platform, arch, release, hostname } from 'os';
@@ -818,11 +819,43 @@ 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 preferredCli = existsSync(openclawDir) ? 'openclaw' : 'clawdbot';
+    // Determine which config dir has an actual config file (not just an empty directory)
+    const hasOpenclawConfig = existsSync(join(openclawDir, 'openclaw.json'));
+    const hasClawdbotConfig = existsSync(join(clawdbotDir, 'clawdbot.json'));
+
+    let configDir;
+    let preferredCli;
+
+    if (hasClawdbotConfig && !hasOpenclawConfig) {
+      // Only clawdbot has a real config — prefer clawdbot
+      configDir = clawdbotDir;
+      preferredCli = 'clawdbot';
+    } else if (hasOpenclawConfig && !hasClawdbotConfig) {
+      // Only openclaw has a real config — prefer openclaw
+      configDir = openclawDir;
+      preferredCli = 'openclaw';
+    } else if (hasClawdbotConfig && hasOpenclawConfig) {
+      // Both have configs — prefer the one modified more recently
+      try {
+        const ocStat = statSync(join(openclawDir, 'openclaw.json'));
+        const cbStat = statSync(join(clawdbotDir, 'clawdbot.json'));
+        if (cbStat.mtimeMs >= ocStat.mtimeMs) {
+          configDir = clawdbotDir;
+          preferredCli = 'clawdbot';
+        } else {
+          configDir = openclawDir;
+          preferredCli = 'openclaw';
+        }
+      } catch {
+        configDir = clawdbotDir;
+        preferredCli = 'clawdbot';
+      }
+    } else {
+      // Neither has a config file — just pick whichever dir exists
+      configDir = existsSync(openclawDir) ? openclawDir : clawdbotDir;
+      preferredCli = existsSync(openclawDir) ? 'openclaw' : 'clawdbot';
+    }
+
     const cliName = findWorkingCliName(preferredCli);
     if (cliName) {
       return { installed: true, configDir, name: cliName };
@@ -936,10 +969,7 @@ function getDashboardToken(config) {
 }
 
 function maskToken(token = '') {
-  if (!token || token === '<未配置>' || token === '<你的token>') return token;
-  const text = String(token);
-  if (text.length <= 8) return '***';
-  return `${text.slice(0, 4)}...${text.slice(-4)}`;
+  return token;
 }
 
 function parseStatusOutput(statusOutput) {
@@ -1110,13 +1140,34 @@ function hasListeningState(output = '') {
 
 function gatewayHealthRequest(port, path = '/health') {
   const endpoint = `http://127.0.0.1:${port}${path}`;
+  // Try Node.js native fetch first (available in Node 18+), then fall back to curl
+  try {
+    const result = execSync(
+      `node -e "fetch('${endpoint}',{signal:AbortSignal.timeout(4000)}).then(r=>r.text()).then(t=>process.stdout.write(t)).catch(()=>process.exit(1))"`,
+      { timeout: 7000, encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] },
+    );
+    if (result) return { ok: true, output: result };
+  } catch { /* fall through to curl */ }
   const curlCmd = `curl -sS --max-time 5 --connect-timeout 2 ${endpoint}`;
   return safeExec(curlCmd, { timeout: 7000 });
 }
 
 function gatewayHttpStatusProbe(port, path = '/v1/responses') {
   const endpoint = `http://127.0.0.1:${port}${path}`;
-  const cmd = `curl -sS -o /dev/null -w "%{http_code}" --max-time 5 --connect-timeout 2 ${endpoint}`;
+  // Try Node.js native fetch first (avoids Windows cmd.exe % escaping issues with curl)
+  try {
+    const result = execSync(
+      `node -e "fetch('${endpoint}',{signal:AbortSignal.timeout(4000)}).then(r=>{process.stdout.write(String(r.status));process.exit(0)}).catch(()=>process.exit(1))"`,
+      { timeout: 7000, encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] },
+    );
+    const status = Number(result);
+    if (Number.isInteger(status) && status > 0) {
+      return { ok: true, status };
+    }
+  } catch { /* fall through to curl */ }
+  // Fallback: curl (on Windows, escape % for cmd.exe)
+  const fmt = platform() === 'win32' ? '%%{http_code}' : '%{http_code}';
+  const cmd = `curl -sS -o ${platform() === 'win32' ? 'NUL' : '/dev/null'} -w "${fmt}" --max-time 5 --connect-timeout 2 ${endpoint}`;
   const result = safeExec(cmd, { timeout: 7000 });
   if (!result.ok || !result.output) {
     return { ok: false, status: 0 };
@@ -1824,7 +1875,7 @@ function buildOnboardArgsFromHelp(helpText, options) {
   return { args, enabled, autoCapable };
 }
 
-function getOnboardCommand(cliName, onboardArgs = ['onboard', '--install-daemon']) {
+function getOnboardCommand(cliName, onboardArgs = ['onboard']) {
   if (platform() === 'win32') {
     return { file: 'cmd.exe', args: ['/c', cliName, ...onboardArgs] };
   }
@@ -2324,7 +2375,7 @@ function showDashboardAccessInfo(cliName) {
     console.log(colors.gray('     将 "bind": "loopback" 改为 "bind": "all"'));
     console.log(colors.gray(`  2. 在云服务器控制台开放端口 ${port}`));
     console.log(colors.gray(`  3. 重启 Gateway：${activeCli} gateway restart`));
-    console.log(colors.gray(`  4. 访问：http://${serverIp}:${port}/?token=...`));
+    console.log(colors.gray(`  4. 访问：http://${serverIp}:${port}/?token=${tokenRaw}`));
   } else {
     console.log(colors.cyan('\nDashboard 访问:'));
     console.log(`  ${colors.yellow(dashboardUrl)}`);

package/package.json

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