openclawsetup 2.4.4 → 2.4.6

package/bin/cli.mjs

@@ -148,16 +148,41 @@ function checkNodeVersion() {
 
 function needsSudo() {
   const os = platform();
-  if (os === 'win32' || os === 'darwin') return false;
+  if (os === 'win32') return false;
 
-  try {
-    const testDir = '/usr/lib/node_modules';
-    if (existsSync(testDir)) {
-      accessSync(testDir, fsConstants.W_OK);
-      return false;
+  // 获取 npm 全局安装目录并检查写权限
+  const npmPrefixResult = safeExec('npm prefix -g');
+  if (npmPrefixResult.ok && npmPrefixResult.output) {
+    const globalDir = join(npmPrefixResult.output.trim(), 'lib', 'node_modules');
+    try {
+      if (existsSync(globalDir)) {
+        accessSync(globalDir, fsConstants.W_OK);
+        return false;
+      }
+      // 目录不存在，检查父目录
+      const parentDir = npmPrefixResult.output.trim();
+      if (existsSync(parentDir)) {
+        accessSync(parentDir, fsConstants.W_OK);
+        return false;
+      }
+    } catch {
+      return true;
+    }
+  }
+
+  // 回退检查
+  const testDirs = os === 'darwin'
+    ? ['/usr/local/lib/node_modules', '/opt/homebrew/lib/node_modules']
+    : ['/usr/lib/node_modules'];
+  for (const testDir of testDirs) {
+    try {
+      if (existsSync(testDir)) {
+        accessSync(testDir, fsConstants.W_OK);
+        return false;
+      }
+    } catch {
+      return true;
     }
-  } catch {
-    return true;
   }
   return true;
 }
@@ -200,9 +225,9 @@ function getConfigInfo() {
     try {
       const raw = readFileSync(configPath, 'utf8');
       const json = JSON.parse(raw);
-      const token = json.token || json.gatewayToken || '';
-      const port = Number(json.port || json.gatewayPort || 18789);
-      const bind = json.bind || json.gatewayBind || '';
+      const token = json.gateway?.auth?.token || json.token || json.gatewayToken || '';
+      const port = Number(json.gateway?.port || json.port || json.gatewayPort || 18789);
+      const bind = json.gateway?.bind || json.bind || json.gatewayBind || '';
       return { configDir: cfg.dir, configPath, token, port, bind, raw };
     } catch {
       try {
@@ -227,7 +252,17 @@ function getConfigInfo() {
 }
 
 function detectVps() {
-  return existsSync('/etc/cloud') || existsSync('/var/lib/cloud') || existsSync('/sys/hypervisor');
+  if (platform() !== 'linux') return false;
+  // Cloud provider markers
+  if (existsSync('/etc/cloud') || existsSync('/var/lib/cloud') || existsSync('/sys/hypervisor')) return true;
+  // SSH session = remote server
+  if (process.env.SSH_CLIENT || process.env.SSH_TTY || process.env.SSH_CONNECTION) return true;
+  // systemd-detect-virt
+  const virt = safeExec('systemd-detect-virt 2>/dev/null');
+  if (virt.ok && virt.output.trim() && virt.output.trim() !== 'none') return true;
+  // Headless Linux (no display) likely a server
+  if (!process.env.DISPLAY && !process.env.WAYLAND_DISPLAY) return true;
+  return false;
 }
 
 function getServerIp() {
@@ -387,7 +422,8 @@ async function installOpenClaw() {
   console.log(colors.bold(colors.cyan('\n[1/2] 安装 OpenClaw CLI\n')));
 
   if (useSudo) {
-    log.hint('Linux 系统需要 sudo 权限安装全局包');
+    const osName = platform() === 'darwin' ? 'macOS' : 'Linux';
+    log.hint(`${osName} 系统需要 sudo 权限安装全局包`);
     console.log(colors.yellow('\n请运行以下命令：'));
     console.log(colors.green('  sudo npm install -g openclaw@latest\n'));
 
@@ -403,7 +439,7 @@ async function installOpenClaw() {
     return 'openclaw';
   }
 
-  // macOS 或有权限的 Linux：直接安装
+  // 有权限：直接安装
   console.log(colors.gray('正在安装 openclaw...\n'));
 
   const result = spawnSync('npm', ['install', '-g', 'openclaw@latest'], {
@@ -416,6 +452,19 @@ async function installOpenClaw() {
     return 'openclaw';
   }
 
+  // 安装失败，可能是权限问题，尝试 sudo（非 Windows）
+  if (platform() !== 'win32') {
+    log.warn('安装失败，可能是权限不足，尝试使用 sudo...');
+    const sudoResult = spawnSync('sudo', ['npm', 'install', '-g', 'openclaw@latest'], {
+      stdio: 'inherit',
+      shell: true,
+    });
+    if (sudoResult.status === 0) {
+      log.success('OpenClaw CLI 安装完成（sudo）');
+      return 'openclaw';
+    }
+  }
+
   // 尝试 clawdbot
   log.warn('openclaw 安装失败，尝试 clawdbot...');
   const fallback = spawnSync('npm', ['install', '-g', 'clawdbot@latest'], {

package/package.json

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