@beeos-ai/cli 1.0.17 → 1.0.19

package/package.json

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

package/scripts/_existing_install_actions.json

@@ -1,56 +1,52 @@
 {
   "$comment": [
-    "P1-E of the install-link review (shared anchor file).",
+    "Existing-install copy lint anchor (was P1-E of the install-link review).",
     "",
-    "Three call sites render the 'BeeOS is already installed — what now?'",
-    "menu with subtly different copy:",
+    "## Historical context",
     "",
-    "  1. web/packages/cli/scripts/install.sh   (bash, pre-Node)",
-    "  2. web/packages/cli/scripts/install.ps1  (PowerShell, pre-Node)",
-    "  3. web/packages/core/src/detect.ts        (TS, post-Node, used by init.ts)",
+    "Before CLI 1.0.18 the same 'BeeOS is already installed — what now?'",
+    "menu was rendered from THREE places — install.sh, install.ps1, and",
+    "init.ts — and this manifest enforced shared keyword wording across",
+    "all three. The bash + PowerShell sites can't import TypeScript",
+    "constants, so a vitest grep lint",
+    "(`web/packages/cli/src/__tests__/existing-install-actions.test.ts`)",
+    "kept the three menus from drifting apart.",
     "",
-    "Pre-Node sites can't import TypeScript constants, so we anchor the",
-    "wording with this manifest plus a vitest grep lint",
-    "(`web/packages/cli/src/__tests__/existing-install-actions.test.ts`).",
-    "If you change a label in any of the three files, update the",
-    "matching `keywords` here so the lint stays representative; if you",
-    "add a new action altogether, add a new entry below + render it",
-    "in all three sites.",
+    "## CLI 1.0.18 simplification",
     "",
-    "## Note on the 1.0.17 rebind split (P2 of the install-link review)",
+    "The bootstrap scripts (install.sh / install.ps1) are now framework-",
+    "agnostic: their only job is `detect Node + npm i -g @beeos-ai/cli +",
+    "exec beeos init`. They no longer render any menu — 'what to do",
+    "when BeeOS is already installed' is `beeos init`'s job, where the",
+    "user sees the upgrade / rebind / reset-all / skip choices.",
     "",
-    "detect.ts now exposes TWO rebind variants in addition to the three",
-    "actions enforced here:",
+    "Consequence: the cross-site copy alignment lint shrinks to a",
+    "**single-file** lint on detect.ts. install.sh and install.ps1 are",
+    "removed from `files`. The `actions` block stays as a sanity check",
+    "that detect.ts's `initDecisionLabel` keeps recognisable terminology",
+    "(Upgrade / Re-bind / Skip).",
     "",
-    "  - 'rebind'    — soft rebind, keeps Ed25519 key, refreshes binding;",
-    "                  same instance_id (platform Bind handler returns",
-    "                  the existing instance for a known pubkey).",
-    "  - 'reset-all' — rotates the key AND wipes binding; NEW instance.",
-    "",
-    "These are NOT enforced across all 3 call sites because the",
-    "pre-Node bash/PowerShell installers have only [Reinstall][Re-run][Skip]",
-    "buttons — the rebind variants live exclusively inside `beeos init`'s",
-    "interactive menu. The 'rerun' keyword 'Re-bind' below incidentally",
-    "covers detect.ts's soft-rebind label, which keeps this lint passing."
+    "The `advisory` block (added in 1.0.17 for the soft-rebind / reset-all",
+    "split) is preserved and still pins the must-appear-in copy on",
+    "detect.ts so users can tell the two rebind variants apart from the",
+    "label alone."
   ],
   "actions": {
     "upgrade": {
-      "$comment": "Reinstall the CLI to the latest version, then proceed. install.sh/install.ps1 wording differs slightly from init.ts which says 'Upgrade CLI & agents'; both must hit at least one keyword from `keywords`.",
-      "keywords": ["Reinstall", "Upgrade"]
+      "$comment": "detect.ts 'Upgrade CLI & agents' label.",
+      "keywords": ["Upgrade"]
     },
     "rerun": {
-      "$comment": "Reuse the existing install (no npm i -g). install.sh/install.ps1 say 'Re-run beeos init'. detect.ts's soft-rebind label includes 'Re-bind' which is intentionally captured here too — see the 1.0.17 split note in $comment above.",
-      "keywords": ["Re-run", "Re-bind", "Reusing"]
+      "$comment": "detect.ts soft-rebind label includes 'Re-bind'; advisory block below pins the full phrasing.",
+      "keywords": ["Re-bind", "Reusing"]
     },
     "skip": {
-      "$comment": "Do nothing. Stable wording across all three sites.",
+      "$comment": "Stable across releases.",
       "keywords": ["Skip"]
     }
   },
-  "$files_root_comment": "Paths below are relative to the `web/` workspace root (the test resolves them against that anchor).",
+  "$files_root_comment": "Path is relative to the `web/` workspace root (the test resolves it against that anchor).",
   "files": [
-    "packages/cli/scripts/install.sh",
-    "packages/cli/scripts/install.ps1",
     "packages/core/src/detect.ts"
   ],
   "$advisory_comment": "Strings below are advisory — not enforced by the lint, but checked by `existing-install-actions.test.ts` to make sure detect.ts's two rebind variants stay distinguishable from each other.",

package/scripts/install.Tests.ps1

@@ -64,6 +64,9 @@ Describe "install.ps1 parse-time integrity" {
         # CLI >= 1.0.16: Install-DeviceAgentSuite has been removed —
         # the device suite installs lazily on the first
         # `beeos device attach` (see core/device-setup.ts).
+        # CLI >= 1.0.18: Read-ExistingInstallAction + Get-BeeosVersion
+        # are gone — `beeos init` is the single owner of the
+        # already-installed menu, the bootstrap script just hands off.
         $expected = @(
             "Write-BeeInfo",
             "Write-BeeOk",
@@ -74,7 +77,6 @@ Describe "install.ps1 parse-time integrity" {
             "Install-NodeAuto",
             "Show-InstallHints",
             "Send-Telemetry",
-            "Read-ExistingInstallAction",
             "Invoke-BeeosCli",
             # P2-8: PSCore + RunAs auto-elevation helpers.
             "Test-IsAdministrator",

package/scripts/install.ps1

@@ -4,43 +4,38 @@
     BeeOS CLI Installer for Windows.
 
 .DESCRIPTION
-    Detects or installs Node.js (via winget / Chocolatey fallback), then
-    dispatches into `beeos init` (default) or `beeos device attach` when
-    `-Device` is passed. Heavier deps (Python, uv, adb, scrcpy/vnc bridges)
-    are installed lazily by the CLI itself.
-
-    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
-    process env passthrough — no extra Set-Item / -PassThru is needed. CLI
-    >= 1.0.10 reads them via the loadOrCreateConfig env-overrides layer;
-    older CLIs only honor BEEOS_API_URL (telemetry) +
-    BEEOS_AGENT_GATEWAY_URL (runtime).
-
-      $env:BEEOS_API_URL              Public API base; both this script
-                                       (telemetry) and the CLI runtime use
-                                       this.
-      $env:BEEOS_AGENT_GATEWAY_URL    Agent Gateway base (Ed25519-signed
-                                       bootstrap requests).
-      $env:BEEOS_DASHBOARD_URL        Dashboard base (OAuth + bind redirect).
-      $env:BEEOS_DEVICE_AGENT_VERSION Pin @beeos-ai/device-agent semver.
-                                       NOT consumed by this script
-                                       (CLI >= 1.0.16 lazy-installs the
-                                       device suite on the first
-                                       `beeos device attach`); export it
-                                       in the shell that runs `beeos
-                                       device attach` instead.
-      $env:BEEOS_MCP_SERVER_VERSION   Same, for @beeos-ai/device-mcp-server.
-      $env: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
-                                       suite is NOT eagerly installed
-                                       (CLI >= 1.0.16); see
-                                       web/packages/core/src/device-setup.ts.
+    Responsibilities (deliberately minimal — framework-agnostic):
+      1. Detect or install Node.js (via winget / Chocolatey fallback).
+      2. `npm install -g @beeos-ai/cli`.
+      3. `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.
+
+    Optional env vars:
+
+      $env:BEEOS_API_URL            Public API base (this script uses
+                                     it for telemetry; the CLI uses it
+                                     for runtime). Defaults to production.
+      $env:BEEOS_AGENT_GATEWAY_URL  Agent Gateway base (forwarded as-is
+                                     to the spawned CLI).
+      $env:BEEOS_DASHBOARD_URL      Dashboard base (OAuth / bind redirect).
+      $env:BEEOS_INSTALL_DRY_RUN=1  CI smoke-test escape hatch.
+      $env:BEEOS_NO_TELEMETRY=1     Disable script-level telemetry POSTs.
+      $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+):
@@ -48,14 +43,14 @@
 
 .EXAMPLE
     # With specific CLI version:
-    .\install.ps1 -Version 1.0.4
+    .\install.ps1 -Version 1.0.18
 
 .EXAMPLE
     # Jump straight into device attach instead of init:
     .\install.ps1 -Device
 
 .EXAMPLE
-    # Bare-metal one-shot staging install (CLI >= 1.0.16):
+    # Bare-metal staging one-liner:
     $env:BEEOS_API_URL              = "https://public-api-staging.beeos.ai"
     $env:BEEOS_AGENT_GATEWAY_URL    = "https://agent-gw-staging.beeos.ai"
     $env:BEEOS_DASHBOARD_URL        = "https://beeos-staging-web.vercel.app"
@@ -346,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."
     }
@@ -425,59 +426,6 @@ function Show-InstallHints {
     }
 }
 
-# ── Existing install detection ───────────────────────────────
-
-function Get-BeeosVersion {
-    try {
-        $out = & beeos --version 2>$null
-        if ($out) {
-            if ($out -match "\d+\.\d+\.\d+") { return $Matches[0] }
-            return ($out -replace '\s+','')
-        }
-    } catch {}
-    return $null
-}
-
-function Read-ExistingInstallAction {
-    # Note on naming: "Reinstall + upgrade CLI" deliberately differs
-    # from the `beeos init` menu's "Upgrade CLI & agents" item. The
-    # script-side action also re-bootstraps Node / pnpm and re-applies
-    # this shell's env vars before exec'ing the new binary, which the
-    # in-CLI upgrade does NOT do — choosing a different verb keeps the
-    # two flows distinguishable. See `install.sh` for the matching
-    # docstring.
-    #
-    # P1-E of the install-link review: the labels rendered below are
-    # anchored against `install.sh::prompt_existing_install_action` +
-    # `init.ts::decideAction` via
-    # `web/packages/cli/scripts/_existing_install_actions.json` and
-    # the vitest grep lint at
-    # `web/packages/cli/src/__tests__/existing-install-actions.test.ts`.
-    # Keep at least one keyword from `keywords[action]` per option.
-    $ver = Get-BeeosVersion
-    if (-not $ver) { $ver = "unknown" }
-    Write-BeeWarn "BeeOS CLI is already installed (v$ver)."
-    Write-Host ""
-    Write-Host "  [1] Reinstall + upgrade CLI to the latest version, then run beeos init"
-    Write-Host "  [2] Re-run beeos init without reinstalling"
-    Write-Host "  [3] Skip (do nothing)"
-    Write-Host ""
-
-    if (-not [Environment]::UserInteractive) {
-        Write-BeeInfo "Non-interactive shell — defaulting to reinstall."
-        return "upgrade"
-    }
-
-    $choice = Read-Host "Choose [1-3]"
-    switch ($choice) {
-        "" { return "upgrade" }
-        "1" { return "upgrade" }
-        "2" { return "rerun" }
-        "3" { return "skip" }
-        default { return "upgrade" }
-    }
-}
-
 # ── Run CLI ──────────────────────────────────────────────────
 
 function Invoke-BeeosCli {
@@ -509,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
@@ -608,37 +562,11 @@ if (-not (Test-NodeVersion)) {
 $nodeVer = & node -v
 Write-BeeOk "Node.js $nodeVer detected"
 
-$beeosCmd = Get-Command beeos -ErrorAction SilentlyContinue
-if ($beeosCmd) {
-    $action = Read-ExistingInstallAction
-    switch ($action) {
-        "skip" {
-            Write-BeeInfo "Skipping. Run `beeos init` or `beeos device attach` manually later."
-            exit 0
-        }
-        "upgrade" {
-            Write-BeeInfo "Reinstalling $CliPackage..."
-            & npm install -g $CliPackage
-            if ($LASTEXITCODE -ne 0) {
-                Send-Telemetry -Event "install.bootstrap.npm_fail" -ErrorCode "npm_install_cli_failed_upgrade" -Success $false
-                Write-BeeError "npm install -g $CliPackage failed."
-                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 "  - EACCES / permission error: run PowerShell as Administrator"
-                exit 1
-            }
-            # Device suite is 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.
-        }
-        "rerun" {
-            Write-BeeInfo "Reusing existing install."
-        }
-    }
-}
+# Bootstrap is finished. Hand off to `Invoke-BeeosCli` which performs
+# `npm install -g @beeos-ai/cli` (idempotent — npm short-circuits when
+# the requested version is already on disk) and then runs 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.
 
 Write-BeeInfo "Running BeeOS CLI..."
 Write-Host ""