@beeos-ai/cli 1.0.12 → 1.0.14

package/scripts/install.sh

@@ -99,9 +99,11 @@ success() { printf "${BOLD}${GREEN}[beeos]${RESET} %s\n" "$*"; }
 
 # ── Telemetry (script-level, pre-CLI) ────────────────────────
 #
-# Mirrors `web/packages/cli/src/telemetry.ts` so we can capture
+# Mirrors `web/packages/cli/src/telemetry.ts` (the Node-side single
+# source of truth for event names + payload shape) so we can capture
 # failures that happen BEFORE the Node CLI even starts (e.g. Node
-# install failure, unsupported arch). Fire-and-forget with a 2 s cap —
+# install failure, unsupported arch). Add a new event in BOTH places
+# or the dashboard query and the script will silently disagree. Fire-and-forget with a 2 s cap —
 # we must never block a real install on a flaky telemetry endpoint.
 #
 # Event names used here:
@@ -230,7 +232,10 @@ detect_platform() {
   #     let them override when they know what they're doing.
   local interactive=0
   if [[ -t 0 ]] || [[ -t 1 ]]; then interactive=1; fi
-  local arch_bail arch_confirm
+  # Inner helper functions — `local` doesn't apply to function
+  # declarations in bash, so these are scoped via the closure-style
+  # convention of "only callers inside this function see them" plus a
+  # naming prefix so they don't collide with outer scope.
   arch_bail() {
     local reason="$1"
     error "$reason"
@@ -426,22 +431,41 @@ beeos_current_version() {
 }
 
 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
-  # "upgrade + re-run init" which is the safest non-destructive choice.
+  # "reinstall + re-run init" which is the safest non-destructive choice.
   if [[ ! -t 0 ]] && [[ ! -t 1 ]]; then
-    info "Non-interactive shell detected — defaulting to upgrade."
+    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] Upgrade to the latest version and run ${BOLD}beeos init${RESET}"
-  echo "  [2] Re-run ${BOLD}beeos init${RESET} without upgrading"
+  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 ""
 
@@ -529,6 +553,11 @@ run_cli() {
 
   info "Installing ${CLI_PACKAGE} globally..."
   if ! npm install -g "$CLI_PACKAGE"; 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 ""
     error "Common fixes:"
@@ -539,10 +568,26 @@ run_cli() {
     exit 1
   fi
   install_device_agent_suite
+  # NPM succeeded AND device-agent suite either installed or skipped
+  # with a warning. Fire the "CLI is reachable on PATH" event before
+  # exec — exec replaces our process so this is the last chance.
+  send_telemetry "install.bootstrap.cli_installed"
   exec beeos "$subcmd" "$@" <"$stdin_src"
 }
 
 main() {
+  # P1-F of the install-link review: dry-run hook for bats / CI smoke
+  # tests. Mirrors `install.ps1`'s `BEEOS_INSTALL_DRY_RUN=1` early
+  # exit. When set, every helper has been parsed and `main` was
+  # entered — the script is "loadable" — but no telemetry, no Node
+  # install, no `npm install -g`, no exec. This lets shellcheck +
+  # bats catch parse-time and helper-availability regressions
+  # without spawning a real Node bootstrap.
+  if [[ "${BEEOS_INSTALL_DRY_RUN:-}" == "1" ]]; then
+    echo "[beeos] BEEOS_INSTALL_DRY_RUN=1 — exiting early (smoke test mode)"
+    return 0
+  fi
+
   echo ""
   echo "  ${BOLD}BeeOS CLI Installer${RESET}"
   echo "  ${DIM}https://beeos.ai${RESET}"
@@ -576,9 +621,10 @@ main() {
         exit 0
         ;;
       upgrade)
-        info "Upgrading ${CLI_PACKAGE}..."
+        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:"
@@ -600,7 +646,13 @@ main() {
   info "Running BeeOS CLI..."
   echo ""
 
-  send_telemetry "install.bootstrap.success"
+  # P0-A of the install-link review: this event marks "Node bootstrap
+  # finished, about to dispatch into npm install -g + the CLI". The
+  # follow-up `install.bootstrap.cli_installed` (fired inside run_cli
+  # after npm succeeds) is the real "user has working `beeos` on PATH"
+  # signal. The two are split so dashboards can distinguish bootstrap
+  # failures from npm/CLI failures.
+  send_telemetry "install.bootstrap.bootstrap_done"
 
   if [[ "$MODE" == "device" ]]; then
     run_cli "device" "attach" "${PASSTHROUGH_ARGS[@]+"${PASSTHROUGH_ARGS[@]}"}"