@beeos-ai/cli 1.1.1 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beeos-ai/cli",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "type": "module",
   "description": "BeeOS CLI — run AI agents from your desktop",
   "bin": {

package/scripts/install.sh

@@ -419,8 +419,8 @@ try_install_node() {
     fi
   fi
 
-  # 4. macOS Homebrew (last resort — already-installed brew only,
-  # we don't try to install brew itself).
+  # 4. macOS Homebrew (already-installed brew only — we don't install
+  # brew itself).
   if [[ "$OS_KIND" == "darwin" ]] && command -v brew &>/dev/null; then
     info "Trying Homebrew..."
     if brew install node >> "$BEEOS_INSTALL_LOG" 2>&1; then
@@ -429,6 +429,91 @@ try_install_node() {
     fi
   fi
 
+  # 5. Linux distro package manager (last resort).
+  #
+  # nvm + fnm both depend on `curl` to fetch the Node tarball from
+  # nodejs.org. Locked-down corporate networks frequently block
+  # `nodejs.org` while still allowing the distro mirror, so a system
+  # package install is the only way through. We deliberately put this
+  # AFTER nvm/fnm because:
+  #
+  #   1. distro Node LTS versions lag — Debian stable was on Node 18
+  #      well into the Node 20 era, breaking device-agent's engines
+  #      requirement. nvm/fnm pull current LTS regardless.
+  #   2. apt/dnf/pacman normally need root, which is a different
+  #      security posture than user-scope nvm. We require sudo -n
+  #      (non-interactive) to detect "user is already root or has
+  #      passwordless sudo" — anything else falls through to the
+  #      hint block.
+  #
+  # Operators on hardened systems can disable this branch entirely
+  # with BEEOS_NO_PKG_MANAGER_NODE=1 and rely on their own provisioning.
+  if [[ "$OS_KIND" == "linux" ]] \
+     && [[ "${BEEOS_NO_PKG_MANAGER_NODE:-}" != "1" ]]; then
+    # `sudo -n true` returns 0 only when sudo is configured to skip the
+    # password prompt for the current user, OR when we're already root.
+    # No prompt = no surprise password dialog mid-install.
+    local sudo_cmd=""
+    if [[ $EUID -eq 0 ]]; then
+      sudo_cmd=""
+    elif command -v sudo &>/dev/null && sudo -n true 2>/dev/null; then
+      sudo_cmd="sudo -n"
+    else
+      info "Linux package managers require root and sudo is not passwordless — skipping."
+    fi
+
+    if [[ -n "$sudo_cmd" || $EUID -eq 0 ]]; then
+      # Probe in order of decreasing prevalence. Each branch is
+      # idempotent and short-circuits the chain on success.
+      if command -v apt-get &>/dev/null; then
+        info "Trying apt-get (Debian / Ubuntu)..."
+        # NodeSource setup script is the canonical way to get a
+        # current Node LTS on Debian-family distros. Same retry/log
+        # discipline as nvm above.
+        if curl -fsSL https://deb.nodesource.com/setup_lts.x \
+              | $sudo_cmd bash >> "$BEEOS_INSTALL_LOG" 2>&1 \
+           && $sudo_cmd apt-get install -y nodejs >> "$BEEOS_INSTALL_LOG" 2>&1; then
+          success "Node.js installed via apt-get"
+          return 0
+        fi
+      elif command -v dnf &>/dev/null; then
+        info "Trying dnf (Fedora / RHEL)..."
+        if curl -fsSL https://rpm.nodesource.com/setup_lts.x \
+              | $sudo_cmd bash >> "$BEEOS_INSTALL_LOG" 2>&1 \
+           && $sudo_cmd dnf install -y nodejs >> "$BEEOS_INSTALL_LOG" 2>&1; then
+          success "Node.js installed via dnf"
+          return 0
+        fi
+      elif command -v yum &>/dev/null; then
+        info "Trying yum (CentOS / Amazon Linux)..."
+        if curl -fsSL https://rpm.nodesource.com/setup_lts.x \
+              | $sudo_cmd bash >> "$BEEOS_INSTALL_LOG" 2>&1 \
+           && $sudo_cmd yum install -y nodejs >> "$BEEOS_INSTALL_LOG" 2>&1; then
+          success "Node.js installed via yum"
+          return 0
+        fi
+      elif command -v pacman &>/dev/null; then
+        info "Trying pacman (Arch)..."
+        if $sudo_cmd pacman -Sy --noconfirm nodejs npm >> "$BEEOS_INSTALL_LOG" 2>&1; then
+          success "Node.js installed via pacman"
+          return 0
+        fi
+      elif command -v zypper &>/dev/null; then
+        info "Trying zypper (openSUSE)..."
+        if $sudo_cmd zypper --non-interactive install nodejs npm >> "$BEEOS_INSTALL_LOG" 2>&1; then
+          success "Node.js installed via zypper"
+          return 0
+        fi
+      elif command -v apk &>/dev/null; then
+        info "Trying apk (Alpine)..."
+        if $sudo_cmd apk add --no-cache nodejs npm >> "$BEEOS_INSTALL_LOG" 2>&1; then
+          success "Node.js installed via apk"
+          return 0
+        fi
+      fi
+    fi
+  fi
+
   return 1
 }
 
@@ -541,12 +626,16 @@ test_vnc_server() {
 # automate from a curl|bash one-liner.
 
 # Detect the user's preferred shell init file so that an `export
-# PATH=...` write survives a new terminal. We support zsh + bash
-# (~95% of macOS / Linux users); fish / tcsh / nushell users get a
-# printed hint instead of a silent edit to a file we don't fully
-# understand. `$SHELL` is the login shell as recorded in /etc/passwd,
-# NOT the currently-running interpreter — that's exactly what we want
-# for "what does the user's NEXT terminal source?".
+# PATH=...` write survives a new terminal. We support zsh, bash, fish,
+# and pwsh-on-Unix (~99% of macOS / Linux users); tcsh / nushell users
+# still get the printed hint instead of a silent edit to a file we
+# don't fully understand. `$SHELL` is the login shell as recorded in
+# /etc/passwd, NOT the currently-running interpreter — that's exactly
+# what we want for "what does the user's NEXT terminal source?".
+#
+# fish + pwsh emit different PATH syntaxes. The persisted block in
+# `recover_eacces_prefix` below picks the right form by checking the
+# rc path's basename, keeping shell detection isolated to this helper.
 detect_shell_rc() {
   local shell_name
   shell_name="$(basename "${SHELL:-}")"
@@ -568,6 +657,22 @@ detect_shell_rc() {
         printf '%s' "$HOME/.bashrc"
       fi
       ;;
+    fish)
+      # fish auto-sources every *.fish under ~/.config/fish/conf.d/,
+      # so a single dropped-in file is the idiomatic way to add PATH
+      # without touching the user's main config.fish. mkdir is
+      # idempotent and ignored on permission errors.
+      mkdir -p "$HOME/.config/fish/conf.d" 2>/dev/null || true
+      printf '%s' "$HOME/.config/fish/conf.d/beeos.fish"
+      ;;
+    pwsh)
+      # PowerShell on Linux / macOS reads
+      # ~/.config/powershell/Microsoft.PowerShell_profile.ps1 by
+      # default for the current user, all hosts. The exact filename
+      # is case-sensitive on Linux — preserve it.
+      mkdir -p "$HOME/.config/powershell" 2>/dev/null || true
+      printf '%s' "$HOME/.config/powershell/Microsoft.PowerShell_profile.ps1"
+      ;;
     *)
       # Empty string ⇒ caller falls back to a manual-paste hint.
       printf '%s' ""
@@ -643,6 +748,30 @@ recover_eacces_prefix() {
     return 0
   fi
 
+  # Pick PATH-export syntax based on the rc file's basename. fish and
+  # pwsh need different forms; sh-family rcs all share `export PATH=...`.
+  local rc_base
+  rc_base="$(basename "$rc")"
+  local export_line
+  case "$rc_base" in
+    *.fish)
+      # `fish_add_path -g` prepends to the global PATH list and is the
+      # idiomatic way fish persists PATH (universal fish_user_paths).
+      export_line="fish_add_path -g \"${prefix}/bin\""
+      ;;
+    Microsoft.PowerShell_profile.ps1)
+      # PowerShell uses semicolon-delimited PATH on Windows but ':' on
+      # Unix where pwsh runs. `$env:PATH` mutation in the profile is
+      # the canonical way; we use the Unix separator literal because
+      # pwsh-on-Unix is the only host that reads this rc.
+      export_line="\$env:PATH = \"${prefix}/bin:\" + \$env:PATH"
+      ;;
+    *)
+      # zsh / bash / dash-family — the historical contract.
+      export_line="export PATH=\"${prefix}/bin:\$PATH\""
+      ;;
+  esac
+
   # `>>` never clobbers existing content. If the rc doesn't exist yet
   # (fresh user account), the redirect creates it with 0644 perms.
   {
@@ -650,7 +779,7 @@ recover_eacces_prefix() {
     printf '# Added by https://beeos.ai/install on %s\n' "$(date -u +%FT%TZ)"
     printf '# Reason: system npm prefix was not writable (EACCES).\n'
     printf '# To revert: delete this block AND run `npm config delete prefix`.\n'
-    printf 'export PATH="%s/bin:$PATH"\n' "$prefix"
+    printf '%s\n' "$export_line"
     printf '%s\n' "$marker_end"
   } >> "$rc"
   info "Persisted PATH to ${rc}. Set BEEOS_NO_NPM_PREFIX_FIX=1 to skip on re-runs."