@beeos-ai/cli 1.0.18 → 1.0.20

package/package.json

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

package/scripts/install.ps1

@@ -27,6 +27,16 @@
       $env:BEEOS_USE_NPX = "1"      Power-user throwaway install (beeos
                                      won't persist on PATH).
 
+    IMPORTANT (env inheritance):
+      $env:BEEOS_API_URL / BEEOS_AGENT_GATEWAY_URL / BEEOS_DASHBOARD_URL
+      must be set in THE SAME PowerShell session that runs this script
+      before the irm | iex pipe. They reach `beeos init` via the normal
+      process env passthrough — there is NO auto-injection from
+      command-line args.
+
+        Working:  $env:BEEOS_API_URL = '...'; irm beeos.ai/install.ps1 | iex
+        Broken:   irm beeos.ai/install.ps1 | iex   (vars never set)
+
 .EXAMPLE
     # One-liner (PowerShell 5+):
     irm https://beeos.ai/install.ps1 | iex
@@ -331,9 +341,15 @@ function Install-NodeAuto {
     # choco's portable installs work without admin in some cases.
     if (-not (Test-IsAdministrator)) {
         if (Request-Elevation) {
-            # Elevated process took over; exit cleanly so the user
-            # doesn't see two installs racing.
-            exit 0
+            # Elevated process took over; exit so the user doesn't see
+            # two installs racing. We use exit 10 (not 0) so any CI /
+            # automation wrapping the call can distinguish "the install
+            # COMPLETED in this session" (exit 0) from "the install
+            # was MOVED to an elevated window — wait for that one to
+            # finish" (exit 10). The new window's exit code is the
+            # authoritative success / failure signal.
+            Write-BeeOk "Installation moved to the elevated window. This session exits with code 10."
+            exit 10
         }
         Write-BeeWarn "Continuing without admin — winget/choco may fail with EACCES."
     }
@@ -441,19 +457,25 @@ function Invoke-BeeosCli {
     }
 
     Write-BeeInfo "Installing $CliPackage globally..."
-    & npm install -g $CliPackage
-    if ($LASTEXITCODE -ne 0) {
+    # 1.0.19: tee npm output into $BeeosInstallLog so support
+    # engineers can see the full npm stderr after-the-fact, not just
+    # whatever scrolled past in the terminal. `2>&1` merges stderr
+    # into the pipe so Tee-Object captures both streams.
+    & npm install -g $CliPackage 2>&1 | Tee-Object -FilePath $BeeosInstallLog -Append
+    $npmExit = $LASTEXITCODE
+    if ($npmExit -ne 0) {
         # P0-A of the install-link review: fail-after-bootstrap signal.
         # The `install.bootstrap.cli_installed` event is only emitted
         # AFTER npm reports success.
         Send-Telemetry -Event "install.bootstrap.npm_fail" -ErrorCode "npm_install_cli_failed" -Success $false
         Write-BeeError "npm install -g $CliPackage failed."
+        Write-BeeError "  Full log: $BeeosInstallLog"
         Write-BeeError ""
         Write-BeeError "Common fixes:"
         Write-BeeError "  - EEXIST on beeos from another package:"
-        Write-BeeError "      npm uninstall -g beeos    # then re-run installer"
+        Write-BeeError "      npm uninstall -g @beeos-ai/cli    # then re-run installer"
         Write-BeeError "  - EACCES / permission error: run PowerShell as Administrator"
-        exit 1
+        exit 3
     }
     # Device-agent suite is intentionally NOT installed here; `beeos
     # device attach` will auto-install it on first use via

package/scripts/install.sh

@@ -21,6 +21,16 @@
 # `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).
@@ -36,6 +46,17 @@
 #   BEEOS_USE_NPX=1          Power-user throwaway install (beeos won't
 #                            persist on PATH).
 #
+# 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.
+#
+#   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).
+#
 # Bare-metal staging one-liner:
 #
 #   BEEOS_API_URL=https://public-api-staging.beeos.ai \
@@ -100,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:-}"
@@ -121,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
 )
 
@@ -324,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
@@ -339,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
@@ -433,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