create-openclaw-bot 5.0.5 → 5.0.6

package/cli.js

@@ -50,14 +50,95 @@ function isPm2Installed() {
   }
 }
 
+function getUserNpmPrefixInfo() {
+  if (process.platform === 'win32') {
+    return null;
+  }
+
+  const prefixDir = path.join(os.homedir(), '.local');
+  return {
+    prefixDir,
+    binDir: path.join(prefixDir, 'bin')
+  };
+}
+
+function ensureBinDirOnPath(binDir) {
+  const delimiter = path.delimiter;
+  const pathParts = String(process.env.PATH || '').split(delimiter).filter(Boolean);
+  if (!pathParts.includes(binDir)) {
+    process.env.PATH = [binDir, ...pathParts].join(delimiter);
+  }
+}
+
+function appendLineIfMissing(filePath, line) {
+  let content = '';
+  if (fs.existsSync(filePath)) {
+    content = fs.readFileSync(filePath, 'utf8');
+  }
+
+  if (!content.includes(line)) {
+    const prefix = content && !content.endsWith('\n') ? '\n' : '';
+    fs.appendFileSync(filePath, `${prefix}${line}\n`);
+  }
+}
+
+function ensureUserWritableGlobalNpm({ isVi, osChoice }) {
+  if (process.platform === 'win32') {
+    return true;
+  }
+
+  const npmInfo = getUserNpmPrefixInfo();
+  if (!npmInfo) {
+    return true;
+  }
+
+  try {
+    fs.ensureDirSync(npmInfo.binDir);
+    process.env.npm_config_prefix = npmInfo.prefixDir;
+    ensureBinDirOnPath(npmInfo.binDir);
+
+    execSync(`npm config set prefix "${npmInfo.prefixDir.replace(/"/g, '\\"')}"`, {
+      stdio: 'ignore',
+      shell: true,
+      env: process.env
+    });
+
+    appendLineIfMissing(path.join(os.homedir(), '.profile'), 'export PATH="$HOME/.local/bin:$PATH"');
+    appendLineIfMissing(
+      path.join(os.homedir(), osChoice === 'macos' ? '.zshrc' : '.bashrc'),
+      'export PATH="$HOME/.local/bin:$PATH"'
+    );
+    return true;
+  } catch {
+    console.log(chalk.yellow(isVi
+      ? '⚠️  Không thể cấu hình npm global prefix trong ~/.local. Tiếp tục thử cài đặt trực tiếp.'
+      : '⚠️  Could not configure npm global prefix in ~/.local. Falling back to direct install.'));
+    return false;
+  }
+}
+
+const userNpmInfo = getUserNpmPrefixInfo();
+if (userNpmInfo) {
+  ensureBinDirOnPath(userNpmInfo.binDir);
+}
+
 function installGlobalPackage(pkg, { isVi, osChoice, displayName }) {
-  const installCommands = osChoice === 'windows'
-    ? [`npm install -g ${pkg}`]
-    : [`npm install -g ${pkg}`, `sudo npm install -g ${pkg}`];
+  const installCommands = [];
+
+  if (osChoice === 'windows') {
+    installCommands.push(`npm install -g ${pkg}`);
+  } else {
+    ensureUserWritableGlobalNpm({ isVi, osChoice });
+    installCommands.push(`npm install -g ${pkg}`);
+    const npmInfo = getUserNpmPrefixInfo();
+    if (npmInfo) {
+      installCommands.push(`npm install -g --prefix "${npmInfo.prefixDir.replace(/"/g, '\\"')}" ${pkg}`);
+    }
+  }
 
   for (const cmd of installCommands) {
     try {
-      execSync(cmd, { stdio: 'inherit', shell: true });
+      execSync(cmd, { stdio: 'inherit', shell: true, env: process.env });
       return true;
     } catch {
       // try next candidate
@@ -65,8 +146,8 @@ function installGlobalPackage(pkg, { isVi, osChoice, displayName }) {
   }
 
   console.log(chalk.yellow(isVi
-    ? `⚠️  Không thể tự cài ${displayName}. Chạy thủ công: ${osChoice === 'windows' ? `npm install -g ${pkg}` : `sudo npm install -g ${pkg}`}`
-    : `⚠️  Could not auto-install ${displayName}. Run manually: ${osChoice === 'windows' ? `npm install -g ${pkg}` : `sudo npm install -g ${pkg}`}`));
+    ? `⚠️  Không thể tự cài ${displayName}. Chạy thủ công: ${osChoice === 'windows' ? `npm install -g ${pkg}` : `npm config set prefix ~/.local && npm install -g ${pkg}`}`
+    : `⚠️  Could not auto-install ${displayName}. Run manually: ${osChoice === 'windows' ? `npm install -g ${pkg}` : `npm config set prefix ~/.local && npm install -g ${pkg}`}`));
   return false;
 }
 
@@ -1712,7 +1793,7 @@ fi
         : `Could not auto-sync config. Run manually:\n   cp -rn ${localClawDir}/. ${globalClawDir}/`}`));
     }
 
-    console.log(chalk.cyan(`\n👉 ${isVi ? 'Đã tạo xong file cấu hình native.' : 'Native config files are ready.'}`));
+    console.log(chalk.cyan(`\n👉 ${isVi ? 'Đã tạo xong file cấu hình Docker.' : 'Docker config files are ready.'}`));
     console.log(chalk.gray(isVi
       ? `   Cấu trúc config: ${isMultiBot && channelKey === 'telegram' ? '.openclaw/ dùng chung + agents/workspace-*' : (isMultiBot ? 'bot1/, bot2/, ...' : '.openclaw/')}`
       : `   Config layout: ${isMultiBot && channelKey === 'telegram' ? 'shared .openclaw/ with agents/workspace-*' : (isMultiBot ? 'bot1/, bot2/, ...' : '.openclaw/')}`));
@@ -1736,7 +1817,7 @@ fi
       console.log(chalk.cyan(isVi
         ? '\n📦 Dang cai openclaw binary (npm install -g openclaw)...'
         : '\n📦 Installing openclaw binary (npm install -g openclaw)...'));
-      if (!installGlobalPackage('openclaw', { isVi, osChoice, displayName: 'openclaw' })) {
+      if (!installGlobalPackage('openclaw@latest', { isVi, osChoice, displayName: 'openclaw' })) {
         process.exit(1);
       }
       console.log(chalk.green(isVi ? '✅ openclaw da cai xong!' : '✅ openclaw installed!'));
@@ -1751,7 +1832,7 @@ fi
     if (osChoice === 'vps') {
       if (!isPm2Installed()) {
         console.log(chalk.cyan(isVi ? '\n📦 Dang cai PM2...' : '\n📦 Installing PM2...'));
-        if (!installGlobalPackage('pm2', { isVi, osChoice, displayName: 'PM2' })) {
+        if (!installGlobalPackage('pm2@latest', { isVi, osChoice, displayName: 'PM2' })) {
           process.exit(1);
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-openclaw-bot",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "Interactive CLI installer for OpenClaw Bot",
   "main": "cli.js",
   "bin": {

package/setup.js

@@ -3452,12 +3452,17 @@ ${selectedSkillNames.length ? selectedSkillNames.join('\n') : '- _(No skills ins
     } else if (state.nativeOs === 'linux') {
       const isDocker = state.deployMode === 'docker';
       scriptName = isDocker ? 'setup-openclaw-docker-macos.sh' : 'setup-openclaw-macos.sh';
-      const sh = [
-        '#!/usr/bin/env bash', 'set -e',
-        `echo "=== OpenClaw Setup — macOS${isDocker ? ' Docker' : ' Native'} ==="`,
-        'command -v node > /dev/null 2>&1 || { echo "ERROR: Node.js chua cai! https://nodejs.org"; exit 1; }',
-        'npm install -g openclaw@latest',
-      ];
+      const sh = [
+        '#!/usr/bin/env bash', 'set -e',
+        `echo "=== OpenClaw Setup — macOS${isDocker ? ' Docker' : ' Native'} ==="`,
+        'command -v node > /dev/null 2>&1 || { echo "ERROR: Node.js chua cai! https://nodejs.org"; exit 1; }',
+        'mkdir -p "$HOME/.local/bin"',
+        'npm config set prefix "$HOME/.local"',
+        'export PATH="$HOME/.local/bin:$PATH"',
+        'grep -Fqx \'export PATH="$HOME/.local/bin:$PATH"\' "$HOME/.zshrc" 2>/dev/null || echo \'export PATH="$HOME/.local/bin:$PATH"\' >> "$HOME/.zshrc"',
+        'grep -Fqx \'export PATH="$HOME/.local/bin:$PATH"\' "$HOME/.profile" 2>/dev/null || echo \'export PATH="$HOME/.local/bin:$PATH"\' >> "$HOME/.profile"',
+        'npm install -g openclaw@latest',
+      ];
       providerLines(sh, 'sh');
       if (pluginCmd) sh.push(pluginCmd);
 
@@ -3474,16 +3479,21 @@ ${selectedSkillNames.length ? selectedSkillNames.join('\n') : '- _(No skills ins
     // ─── VPS/Ubuntu PM2 .SH ──────────────────────────────────────────────────
     } else if (state.nativeOs === 'vps') {
       scriptName = 'setup-openclaw-vps.sh';
-      const vps = [
-        '#!/usr/bin/env bash', 'set -e',
-        `echo "=== OpenClaw Setup — Ubuntu/VPS${isMultiBot ? ` Multi-Bot (${state.botCount} bots)` : ''} ==="`,
-        '# Auto-install Node.js 20 LTS if missing',
-        'if ! command -v node > /dev/null 2>&1; then',
-        '  curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -',
-        '  sudo apt-get install -y nodejs',
-        'fi',
-        'npm install -g openclaw@latest pm2',
-      ];
+      const vps = [
+        '#!/usr/bin/env bash', 'set -e',
+        `echo "=== OpenClaw Setup — Ubuntu/VPS${isMultiBot ? ` Multi-Bot (${state.botCount} bots)` : ''} ==="`,
+        '# Auto-install Node.js 20 LTS if missing',
+        'if ! command -v node > /dev/null 2>&1; then',
+        '  curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -',
+        '  sudo apt-get install -y nodejs',
+        'fi',
+        'mkdir -p "$HOME/.local/bin"',
+        'npm config set prefix "$HOME/.local"',
+        'export PATH="$HOME/.local/bin:$PATH"',
+        'grep -Fqx \'export PATH="$HOME/.local/bin:$PATH"\' "$HOME/.bashrc" 2>/dev/null || echo \'export PATH="$HOME/.local/bin:$PATH"\' >> "$HOME/.bashrc"',
+        'grep -Fqx \'export PATH="$HOME/.local/bin:$PATH"\' "$HOME/.profile" 2>/dev/null || echo \'export PATH="$HOME/.local/bin:$PATH"\' >> "$HOME/.profile"',
+        'npm install -g openclaw@latest pm2@latest',
+      ];
       providerLines(vps, 'sh');
       if (pluginCmd) vps.push(pluginCmd);
 
@@ -3509,15 +3519,20 @@ ${selectedSkillNames.length ? selectedSkillNames.join('\n') : '- _(No skills ins
     // ─── Linux Desktop .SH ───────────────────────────────────────────────────
     } else if (state.nativeOs === 'linux-desktop') {
       scriptName = 'setup-openclaw-linux.sh';
-      const lnx = [
-        '#!/usr/bin/env bash', 'set -e',
-        `echo "=== OpenClaw Setup — Linux Desktop${isMultiBot ? ' Multi-Bot' : ''} ==="`,
-        'if ! command -v node > /dev/null 2>&1; then',
-        '  curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -',
-        '  sudo apt-get install -y nodejs',
-        'fi',
-        'npm install -g openclaw@latest',
-      ];
+      const lnx = [
+        '#!/usr/bin/env bash', 'set -e',
+        `echo "=== OpenClaw Setup — Linux Desktop${isMultiBot ? ' Multi-Bot' : ''} ==="`,
+        'if ! command -v node > /dev/null 2>&1; then',
+        '  curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -',
+        '  sudo apt-get install -y nodejs',
+        'fi',
+        'mkdir -p "$HOME/.local/bin"',
+        'npm config set prefix "$HOME/.local"',
+        'export PATH="$HOME/.local/bin:$PATH"',
+        'grep -Fqx \'export PATH="$HOME/.local/bin:$PATH"\' "$HOME/.bashrc" 2>/dev/null || echo \'export PATH="$HOME/.local/bin:$PATH"\' >> "$HOME/.bashrc"',
+        'grep -Fqx \'export PATH="$HOME/.local/bin:$PATH"\' "$HOME/.profile" 2>/dev/null || echo \'export PATH="$HOME/.local/bin:$PATH"\' >> "$HOME/.profile"',
+        'npm install -g openclaw@latest',
+      ];
       providerLines(lnx, 'sh');
       if (pluginCmd) lnx.push(pluginCmd);
 

package/tests/smoke-cli-logic.mjs

@@ -40,16 +40,22 @@ checks.push(() => expectMatch(
 
 checks.push(() => expectMatch(
   cli,
-  /if \(!isOpenClawInstalled\(\)\) \{[\s\S]*installGlobalPackage\('openclaw', \{ isVi, osChoice, displayName: 'openclaw' \}\)/,
+  /if \(!isOpenClawInstalled\(\)\) \{[\s\S]*installGlobalPackage\('openclaw@latest', \{ isVi, osChoice, displayName: 'openclaw' \}\)/,
   'Native branch must auto-install openclaw'
 ));
 
 checks.push(() => expectMatch(
   cli,
-  /if \(osChoice === 'vps'\) \{[\s\S]*installGlobalPackage\('pm2', \{ isVi, osChoice, displayName: 'PM2' \}\)/,
+  /if \(osChoice === 'vps'\) \{[\s\S]*installGlobalPackage\('pm2@latest', \{ isVi, osChoice, displayName: 'PM2' \}\)/,
   'VPS native branch must auto-install PM2'
 ));
 
+checks.push(() => expectMatch(
+  cli,
+  /function ensureUserWritableGlobalNpm\(\{ isVi, osChoice \}\) \{[\s\S]*process\.env\.npm_config_prefix = npmInfo\.prefixDir[\s\S]*npm config set prefix "\$\{npmInfo\.prefixDir\.replace/s,
+  'Native CLI must configure a user-writable npm global prefix for non-Windows installs'
+));
+
 checks.push(() => expectMatch(
   cli,
   /execSync\('pm2 start ecosystem\.config\.js && pm2 save'/,
@@ -107,13 +113,13 @@ checks.push(() => expectMatch(
 
 checks.push(() => expectMatch(
   setup,
-  /else if \(state\.nativeOs === 'linux'\) \{[\s\S]*scriptName = isDocker \? 'setup-openclaw-docker-macos\.sh' : 'setup-openclaw-macos\.sh';[\s\S]*npm install -g openclaw@latest[\s\S]*openclaw gateway run/s,
+  /else if \(state\.nativeOs === 'linux'\) \{[\s\S]*scriptName = isDocker \? 'setup-openclaw-docker-macos\.sh' : 'setup-openclaw-macos\.sh';[\s\S]*npm config set prefix "\$HOME\/\.local"[\s\S]*npm install -g openclaw@latest[\s\S]*openclaw gateway run/s,
   'macOS script generation must use the correct file name and start command'
 ));
 
 checks.push(() => expectMatch(
   setup,
-  /else if \(state\.nativeOs === 'vps'\) \{[\s\S]*scriptName = 'setup-openclaw-vps\.sh';[\s\S]*npm install -g openclaw@latest pm2[\s\S]*pm2 save && pm2 startup/s,
+  /else if \(state\.nativeOs === 'vps'\) \{[\s\S]*scriptName = 'setup-openclaw-vps\.sh';[\s\S]*npm config set prefix "\$HOME\/\.local"[\s\S]*npm install -g openclaw@latest pm2@latest[\s\S]*pm2 save && pm2 startup/s,
   'VPS native script generation must install openclaw+pm2 and persist PM2 startup'
 ));
 
@@ -131,7 +137,7 @@ checks.push(() => expectMatch(
 
 checks.push(() => expectMatch(
   setup,
-  /else if \(state\.nativeOs === 'linux-desktop'\) \{[\s\S]*scriptName = 'setup-openclaw-linux\.sh';[\s\S]*npm install -g openclaw@latest[\s\S]*openclaw gateway run/s,
+  /else if \(state\.nativeOs === 'linux-desktop'\) \{[\s\S]*scriptName = 'setup-openclaw-linux\.sh';[\s\S]*npm config set prefix "\$HOME\/\.local"[\s\S]*npm install -g openclaw@latest[\s\S]*openclaw gateway run/s,
   'Linux Desktop native script generation must install openclaw and run the gateway'
 ));