@beeos-ai/cli 1.0.17 → 1.0.19

package/scripts/install.sh

@@ -1,58 +1,68 @@
 #!/usr/bin/env bash
 #
 # BeeOS CLI Installer (macOS / Linux)
+#
 # Usage:
 #   curl -fsSL https://beeos.ai/install | bash
 #   curl -fsSL https://beeos.ai/install | bash -s -- [beeos init args]
-#   curl -fsSL https://beeos.ai/install | bash -s -- --device    # jump into device attach
+#   curl -fsSL https://beeos.ai/install | bash -s -- --device   # → beeos device attach
 #
-# Entry script responsibilities:
+# Responsibilities (deliberately minimal — framework-agnostic):
 #   1. Detect OS + CPU architecture, refuse unsupported targets early.
-#   2. Make sure Node.js >= MIN_NODE_VERSION is available (install via nvm /
-#      fnm / brew when possible). Heavier deps (Python, uv, adb, scrcpy/vnc
-#      bridges) are handled lazily by the CLI itself.
-#   3. Detect an existing BeeOS install and let the user pick
-#      upgrade / rebind / skip before re-running the bind flow.
-#   4. Dispatch into `beeos init` (default) or `beeos device attach` when
-#      `--device` is passed.
+#   2. Make sure Node.js >= MIN_NODE_VERSION is available (install via
+#      nvm / fnm / brew when possible). All heavier dependencies (adb,
+#      scrcpy-bridge, the device-agent suite) are installed lazily by
+#      the CLI itself when the user actually needs them.
+#   3. `npm install -g @beeos-ai/cli`.
+#   4. `exec beeos init` (or `beeos device attach` with `--device`).
+#
+# Anything else — "you already have BeeOS installed, what now?",
+# framework selection, rebind variants — lives inside the CLI's own
+# `beeos init` menu, not here. The bootstrap script stays small so it's
+# easy to maintain and easy to diagnose on a customer machine.
+#
+# ── Exit codes ────────────────────────────────────────────────────
+#   0   Success (or `exec` handed off — the CLI's own exit code wins)
+#   1   Node bootstrap failure (Node missing / version too old / npm
+#       not on PATH after Node install)
+#   2   Unsupported OS / CPU architecture (and user declined override)
+#   3   `npm install -g @beeos-ai/cli` failed (CLI didn't reach PATH)
+#
+# Automation can branch on these — `1` is "fix your Node install",
+# `2` is "wrong machine", `3` is "your npm prefix / proxy / disk".
+#
+# ── Optional env vars ─────────────────────────────────────────────
+#   BEEOS_API_URL            Public API base (this script uses it for
+#                            telemetry; the CLI uses it for runtime).
+#                            Defaults to production.
+#   BEEOS_AGENT_GATEWAY_URL  Agent Gateway base (forwarded as-is to the
+#                            spawned CLI).
+#   BEEOS_DASHBOARD_URL      Dashboard base (OAuth / bind redirect).
+#   BEEOS_INSTALL_LOG        Path to a forensic log of Node-bootstrap
+#                            stderr; defaults to /tmp/beeos-install-$$.log.
+#   BEEOS_INSTALL_DRY_RUN=1  CI smoke-test escape hatch — return 0
+#                            from main() before any side effect.
+#   BEEOS_NO_TELEMETRY=1     Disable the script-level telemetry POSTs.
+#   BEEOS_USE_NPX=1          Power-user throwaway install (beeos won't
+#                            persist on PATH).
 #
-# ── Staging / dev-loop env vars (CLI ≥ 1.0.10) ──────────────────────
-# All four are inherited by the spawned `beeos init` / `beeos device
-# attach` child via the normal `exec` env passthrough — there is no
-# extra `export` needed. CLI ≥ 1.0.10 reads them via the `loadOrCreate
-# Config` env-overrides layer; older CLIs only honor BEEOS_API_URL
-# (telemetry) + BEEOS_AGENT_GATEWAY_URL (runtime).
+# IMPORTANT (env inheritance):
+#   BEEOS_API_URL / BEEOS_AGENT_GATEWAY_URL / BEEOS_DASHBOARD_URL must
+#   be set in THE SHELL THAT RUNS THIS SCRIPT before the curl pipe.
+#   They reach `beeos init` only via the normal exec env passthrough
+#   — there is NO auto-injection from the curl arguments.
 #
-#   BEEOS_API_URL              Public API base; both the script (telemetry)
-#                              and the CLI runtime use this.
-#   BEEOS_AGENT_GATEWAY_URL    Agent Gateway base (Ed25519-signed
-#                              bootstrap requests).
-#   BEEOS_DASHBOARD_URL        Dashboard base (OAuth + bind redirect).
-#   BEEOS_DEVICE_AGENT_VERSION Pin @beeos-ai/device-agent semver.
-#                              NOT consumed by this script (CLI ≥ 1.0.16
-#                              installs the device suite lazily on the
-#                              first `beeos device attach`); export it
-#                              in the shell that runs `beeos device
-#                              attach` instead.
-#   BEEOS_MCP_SERVER_VERSION   Same as above, for @beeos-ai/device-mcp-server.
-#   BEEOS_USE_NPX=1            (Power-user escape hatch) Use `npx` for a
-#                              throwaway install. `beeos` will NOT
-#                              persist on PATH after the script exits.
-#                              Default behaviour (since CLI 1.0.11) is
-#                              always `npm install -g` so the CLI is
-#                              globally available for follow-up commands.
-#                              The device-agent suite is no longer
-#                              eagerly installed (CLI ≥ 1.0.16); see
-#                              `web/packages/core/src/device-setup.ts`.
+#   Working:    `BEEOS_API_URL=... bash -c 'curl ...| bash'`
+#   Working:    Set the var in your shell profile, then run normally.
+#   Broken:     `bash -c "BEEOS_API_URL=... curl ... | bash"`
+#               (the var is local to the inner bash, not exported).
 #
-# Example: bare-metal one-shot staging install (no device-agent pin —
-# add `BEEOS_DEVICE_AGENT_VERSION=...` to the shell when you later run
-# `beeos device attach` if you need to pin a specific build):
+# Bare-metal staging one-liner:
 #
 #   BEEOS_API_URL=https://public-api-staging.beeos.ai \
 #   BEEOS_AGENT_GATEWAY_URL=https://agent-gw-staging.beeos.ai \
 #   BEEOS_DASHBOARD_URL=https://beeos-staging-web.vercel.app \
-#     curl -fsSL https://beeos.ai/install | bash -s -- --version 1.0.16
+#     curl -fsSL https://beeos.ai/install | bash -s -- --version 1.0.18
 
 set -euo pipefail
 
@@ -65,11 +75,6 @@ RED="\033[31m"
 CYAN="\033[36m"
 
 CLI_PACKAGE="@beeos-ai/cli@latest"
-# `@beeos-ai/device-agent` + `@beeos-ai/device-mcp-server` are NOT
-# installed here. CLI ≥ 1.0.16 installs them lazily on the first
-# `beeos device attach` via `ensureDeviceAgent` in
-# `web/packages/core/src/device-setup.ts`. OpenClaw-only users never
-# download the device suite at all.
 MIN_NODE_VERSION=18
 NVM_VERSION="v0.40.1"
 FNM_INSTALL_URL="https://fnm.vercel.app/install"
@@ -116,6 +121,25 @@ success() { printf "${BOLD}${GREEN}[beeos]${RESET} %s\n" "$*"; }
 # `BEEOS_NO_TELEMETRY=1` short-circuits everything. This matches the
 # Node CLI's opt-out env var verbatim so a user who disabled telemetry
 # for the CLI doesn't unexpectedly get events from the bootstrap.
+# Minimal JSON string-value escaper. Maps the four characters that
+# can break a `"..."` JSON literal to their backslash escapes:
+#
+#   \  ->  \\
+#   "  ->  \"
+#   <CR>  ->  \r
+#   <LF>  ->  \n
+#
+# We deliberately don't pull in jq (not always available) or full
+# JSON encoding — telemetry payload values are short slugs and human
+# strings, not arbitrary binary. Tab + control-char escaping is
+# nice-to-have but the four cases above are the ones that actually
+# show up (e.g. `error_code` strings carrying quoted reasons, or
+# error messages with embedded newlines).
+json_escape() {
+  printf '%s' "$1" | sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' \
+    | tr '\r' ' ' | tr '\n' ' '
+}
+
 send_telemetry() {
   local event="$1"
   local error_code="${2:-}"
@@ -137,13 +161,25 @@ send_telemetry() {
   local host_hint
   host_hint="$(hostname 2>/dev/null || echo unknown)-${os_arch}"
 
+  # 1.0.19: every value below goes through `json_escape` so a stray
+  # `"` or newline in any of these fields can't break the POST body.
+  # `success_flag` is a bare boolean literal — never user-controlled —
+  # so it stays unquoted/unescaped.
+  local ev_e os_e arch_e node_e ec_e host_e
+  ev_e=$(json_escape "$event")
+  os_e=$(json_escape "$os_kind")
+  arch_e=$(json_escape "$os_arch")
+  node_e=$(json_escape "$node_ver")
+  ec_e=$(json_escape "$error_code")
+  host_e=$(json_escape "$host_hint")
+
   # POST body kept deliberately small — matches Node CLI payload.
   # Note: `cli_version` is empty until after npx install; we fill it
   # only when the bootstrap telemetry is fired post-install, from the
   # Node side. For pre-install events it stays "" and that's fine.
   local body
   body=$(cat <<JSON
-{"event":"${event}","cli_version":"","dist_tag":"","os":"${os_kind}","arch":"${os_arch}","node_version":"${node_ver}","success":${success_flag},"error_code":"${error_code}","host_hint":"${host_hint}"}
+{"event":"${ev_e}","cli_version":"","dist_tag":"","os":"${os_e}","arch":"${arch_e}","node_version":"${node_e}","success":${success_flag},"error_code":"${ec_e}","host_hint":"${host_e}"}
 JSON
 )
 
@@ -340,8 +376,12 @@ try_install_node() {
     fi
   fi
 
-  # 3. fnm — works on locked-down Linux without git/curl quirks
-  if [[ "$OS_KIND" == "linux" ]] && ! command -v fnm &>/dev/null; then
+  # 3. fnm — works on locked-down Linux without git/curl quirks AND
+  # on macOS where users have neither Homebrew nor an existing nvm
+  # (the historical 1.0.18 path required brew on darwin, which is not
+  # always available — corporate-managed Macs, fresh users).
+  if [[ "$OS_KIND" == "linux" || "$OS_KIND" == "darwin" ]] \
+     && ! command -v fnm &>/dev/null; then
     info "Trying fnm (single-user, no sudo)..."
     if curl -fsSL "$FNM_INSTALL_URL" 2>>"$BEEOS_INSTALL_LOG" \
           | bash -s -- --skip-shell >> "$BEEOS_INSTALL_LOG" 2>&1; then
@@ -355,7 +395,8 @@ try_install_node() {
     fi
   fi
 
-  # 4. macOS Homebrew
+  # 4. macOS Homebrew (last resort — already-installed brew only,
+  # we don't try to 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
@@ -410,76 +451,6 @@ print_install_hints() {
   echo ""
 }
 
-# ── Existing install detection ───────────────────────────────
-
-beeos_already_installed() {
-  if command -v beeos &>/dev/null; then
-    return 0
-  fi
-  return 1
-}
-
-beeos_current_version() {
-  # `beeos --version` currently prints just the semver string. Tolerate
-  # other formats by extracting the first dotted number we can find.
-  local out
-  out=$(beeos --version 2>/dev/null | head -n1 | tr -d '[:space:]' || true)
-  if [[ "$out" =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then
-    echo "${BASH_REMATCH[0]}"
-  else
-    echo "$out"
-  fi
-}
-
-prompt_existing_install_action() {
-  # The labels here are anchored against the equivalents in
-  # install.ps1 (Read-ExistingInstallAction) and `init.ts`'s
-  # `decideAction` menu by
-  # `web/packages/cli/scripts/_existing_install_actions.json` and the
-  # vitest grep lint at
-  # `web/packages/cli/src/__tests__/existing-install-actions.test.ts`
-  # (P1-E of the install-link review). Keep at least one keyword from
-  # the manifest's `keywords[action]` array per option so the lint
-  # doesn't break.
-  #
-  # Only prompt on an interactive TTY. When the script is piped without a
-  # TTY attached (e.g. one-liner with no tty allocated), default to
-  # "reinstall + re-run init" which is the safest non-destructive choice.
-  if [[ ! -t 0 ]] && [[ ! -t 1 ]]; then
-    info "Non-interactive shell detected — defaulting to reinstall."
-    echo "upgrade"
-    return 0
-  fi
-
-  # Note on naming: the option below is labelled "Reinstall + upgrade
-  # CLI" deliberately. `beeos init`'s own menu has an item called
-  # "Upgrade CLI & agents" — it does (now) call `npm i -g` for the
-  # three-piece suite and re-runs `beeos start openclaw`. The script
-  # action here is broader: it also re-bootstraps Node / pnpm if
-  # missing, re-applies env vars from this shell, and *exec*s the
-  # newly-installed binary. Different verb avoids the user thinking
-  # they're picking the same code path twice. (See `init.ts`'s own
-  # upgrade branch for the in-CLI behavior.)
-  local ver
-  ver=$(beeos_current_version || true)
-  ver="${ver:-unknown}"
-  warn "BeeOS CLI is already installed (v${ver})."
-  echo ""
-  echo "  [1] Reinstall + upgrade CLI to the latest version, then run ${BOLD}beeos init${RESET}"
-  echo "  [2] Re-run ${BOLD}beeos init${RESET} without reinstalling"
-  echo "  [3] Skip (do nothing)"
-  echo ""
-
-  local choice
-  read -rp "Choose [1-3]: " choice </dev/tty || choice=""
-  case "$choice" in
-    ""|1) echo "upgrade" ;;
-    2)    echo "rerun"   ;;
-    3)    echo "skip"    ;;
-    *)    echo "upgrade" ;;
-  esac
-}
-
 # ── Main ─────────────────────────────────────────────────────
 
 run_cli() {
@@ -519,20 +490,27 @@ run_cli() {
   fi
 
   info "Installing ${CLI_PACKAGE} globally..."
-  if ! npm install -g "$CLI_PACKAGE"; then
+  # 1.0.19: tee npm output into BEEOS_INSTALL_LOG. Without this, when
+  # `npm install -g` fails the user (and support engineers) only see
+  # whatever scrolled past in the terminal — important details like
+  # the npm error code, registry URL, or proxy hint may be gone by
+  # the time they go to copy-paste. `set -o pipefail` (file header)
+  # ensures the pipe's exit status is `npm`'s, not `tee`'s.
+  if ! npm install -g "$CLI_PACKAGE" 2>&1 | tee -a "$BEEOS_INSTALL_LOG"; then
     # P0-A of the install-link review: separate "Node ready" from
     # "CLI is actually on PATH" so the dashboard never reports a
     # success that the user can't reproduce. `install.bootstrap.npm_fail`
     # is the canonical fail-after-bootstrap marker.
     send_telemetry "install.bootstrap.npm_fail" "npm_install_cli_failed" false
     error "npm install -g ${CLI_PACKAGE} failed."
+    error "  Full log: ${BEEOS_INSTALL_LOG}"
     error ""
     error "Common fixes:"
     error "  - EEXIST on /bin/beeos from another package:"
-    error "      npm uninstall -g beeos    # then re-run installer"
+    error "      npm uninstall -g @beeos-ai/cli    # then re-run installer"
     error "  - EACCES permission error:"
     error "      use a node version manager (nvm / fnm) or sudo"
-    exit 1
+    exit 3
   fi
   # NPM succeeded — CLI is now on PATH. The device-agent suite is
   # deliberately NOT installed here; `beeos device attach` will
@@ -581,41 +559,12 @@ main() {
 
   success "Node.js $(node -v) detected"
 
-  # Existing install? Let the user pick upgrade / rerun / skip.
-  if beeos_already_installed; then
-    local action
-    action=$(prompt_existing_install_action)
-    case "$action" in
-      skip)
-        info "Skipping. Run \`beeos init\` or \`beeos device attach\` manually later."
-        exit 0
-        ;;
-      upgrade)
-        info "Reinstalling ${CLI_PACKAGE}..."
-        if command -v npm &>/dev/null; then
-          if ! npm install -g "$CLI_PACKAGE"; then
-            send_telemetry "install.bootstrap.npm_fail" "npm_install_cli_failed_upgrade" false
-            error "npm install -g ${CLI_PACKAGE} failed."
-            error ""
-            error "Common fixes:"
-            error "  - EEXIST on /bin/beeos from another package:"
-            error "      npm uninstall -g beeos    # then re-run installer"
-            error "  - EACCES permission error:"
-            error "      use a node version manager (nvm / fnm) or sudo"
-            exit 1
-          fi
-          # Device-agent suite is intentionally NOT upgraded here.
-          # `beeos device upgrade` is the canonical refresh path (it
-          # also restarts the running fleet); the install-script
-          # upgrade prompt only refreshes the CLI itself.
-        fi
-        ;;
-      rerun)
-        info "Reusing existing install."
-        ;;
-    esac
-  fi
-
+  # Bootstrap is finished. Hand off to `run_cli` which performs
+  # `npm install -g @beeos-ai/cli` (idempotent — npm short-circuits
+  # when the requested version is already on disk) and then `exec`s
+  # the freshly-installed binary. "What does the CLI do when it's
+  # already installed?" is now `beeos init`'s problem; we don't
+  # second-guess it from out here.
   info "Running BeeOS CLI..."
   echo ""