@beeos-ai/cli 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beeos-ai/cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "type": "module",
   "description": "BeeOS CLI — run AI agents from your desktop",
   "bin": {
@@ -11,8 +11,16 @@
   "files": [
     "bin/",
     "dist/",
+    "scripts/",
     "README.md"
   ],
+  "scripts": {
+    "build": "tsup",
+    "type-check": "tsc --noEmit",
+    "lint": "eslint src/",
+    "test": "vitest run --passWithNoTests",
+    "prepublishOnly": "pnpm build"
+  },
   "dependencies": {
     "@noble/ed25519": "^2.2.0",
     "@noble/hashes": "^1.7.0",
@@ -26,25 +34,19 @@
     "which": "^5.0.0"
   },
   "devDependencies": {
+    "@beeos/core": "workspace:*",
     "@types/node": "^22.0.0",
     "@types/proper-lockfile": "^4.1.4",
     "@types/qrcode": "^1.5.5",
     "@types/which": "^3.0.4",
     "tsup": "^8.3.0",
     "typescript": "^5.7.0",
-    "vitest": "^3.0.0",
-    "@beeos/core": "0.1.0"
+    "vitest": "^3.0.0"
   },
   "engines": {
     "node": ">=18"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "scripts": {
-    "build": "tsup",
-    "type-check": "tsc --noEmit",
-    "lint": "eslint src/",
-    "test": "vitest run --passWithNoTests"
   }
-}
+}

package/scripts/install.ps1

@@ -0,0 +1,255 @@
+#Requires -Version 5.1
+<#
+.SYNOPSIS
+    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.
+
+.EXAMPLE
+    # One-liner (PowerShell 5+):
+    irm https://beeos.ai/install.ps1 | iex
+
+.EXAMPLE
+    # With specific CLI version:
+    .\install.ps1 -Version 1.0.4
+
+.EXAMPLE
+    # Jump straight into device attach instead of init:
+    .\install.ps1 -Device
+#>
+param(
+    [string]$Version = "latest",
+    [switch]$Device,
+    [Parameter(ValueFromRemainingArguments=$true)]
+    [string[]]$Passthrough
+)
+
+$ErrorActionPreference = "Stop"
+$MinNodeVersion = 18
+
+$CliPackage = if ($Version -eq "latest") { "@beeos-ai/cli@latest" } else { "@beeos-ai/cli@$Version" }
+
+# ── Helpers ──────────────────────────────────────────────────
+
+function Write-BeeInfo  { param([string]$Msg) Write-Host "[beeos] $Msg" -ForegroundColor Cyan }
+function Write-BeeWarn  { param([string]$Msg) Write-Host "[beeos] $Msg" -ForegroundColor Yellow }
+function Write-BeeError { param([string]$Msg) Write-Host "[beeos] $Msg" -ForegroundColor Red }
+function Write-BeeOk    { param([string]$Msg) Write-Host "[beeos] $Msg" -ForegroundColor Green }
+
+# ── Platform detection ───────────────────────────────────────
+
+function Test-Platform {
+    $arch = $env:PROCESSOR_ARCHITECTURE
+    $effectiveArch = if ($env:PROCESSOR_ARCHITEW6432) { $env:PROCESSOR_ARCHITEW6432 } else { $arch }
+    Write-BeeInfo "detected: win32 $effectiveArch"
+    if ($effectiveArch -notin @("AMD64","ARM64","x86_64")) {
+        Write-BeeWarn "Unusual CPU architecture: $effectiveArch. Some sidecar binaries may be unavailable."
+    }
+}
+
+# ── Node.js detection ────────────────────────────────────────
+
+function Test-NodeVersion {
+    try {
+        $nodePath = (Get-Command node -ErrorAction SilentlyContinue).Source
+        if (-not $nodePath) { return $false }
+
+        $raw = & node -v 2>$null
+        if (-not $raw) { return $false }
+
+        $ver = $raw -replace '^v', ''
+        $major = [int]($ver.Split('.')[0])
+
+        if ($major -lt $MinNodeVersion) {
+            Write-BeeWarn "Node.js $ver found, but v${MinNodeVersion}+ is required."
+            return $false
+        }
+        return $true
+    } catch {
+        return $false
+    }
+}
+
+# ── Auto-install Node.js ─────────────────────────────────────
+
+function Install-NodeAuto {
+    Write-BeeInfo "Node.js not found. Attempting automatic installation..."
+    Write-Host ""
+
+    $winget = Get-Command winget -ErrorAction SilentlyContinue
+    if ($winget) {
+        Write-BeeInfo "Installing Node.js LTS via winget..."
+        try {
+            winget install OpenJS.NodeJS.LTS --accept-package-agreements --accept-source-agreements --silent 2>$null
+            $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" +
+                        [System.Environment]::GetEnvironmentVariable("Path", "User")
+            if (Test-NodeVersion) {
+                Write-BeeOk "Node.js installed via winget"
+                return $true
+            }
+        } catch {
+            Write-BeeWarn "winget install failed: $_"
+        }
+    }
+
+    $choco = Get-Command choco -ErrorAction SilentlyContinue
+    if ($choco) {
+        Write-BeeInfo "Installing Node.js LTS via Chocolatey..."
+        try {
+            choco install nodejs-lts -y 2>$null
+            $env:Path = [System.Environment]::GetEnvironmentVariable("Path", "Machine") + ";" +
+                        [System.Environment]::GetEnvironmentVariable("Path", "User")
+            if (Test-NodeVersion) {
+                Write-BeeOk "Node.js installed via Chocolatey"
+                return $true
+            }
+        } catch {
+            Write-BeeWarn "Chocolatey install failed: $_"
+        }
+    }
+
+    return $false
+}
+
+# ── Manual install hints ─────────────────────────────────────
+
+function Show-InstallHints {
+    Write-BeeError "Could not install Node.js automatically."
+    Write-Host ""
+    Write-BeeInfo "Please install Node.js >= $MinNodeVersion manually:"
+    Write-Host ""
+    Write-Host "  winget (recommended):" -ForegroundColor White
+    Write-Host "    winget install OpenJS.NodeJS.LTS"
+    Write-Host ""
+    Write-Host "  Official installer:" -ForegroundColor White
+    Write-Host "    https://nodejs.org/en/download/"
+    Write-Host ""
+    Write-Host "  Chocolatey:" -ForegroundColor White
+    Write-Host "    choco install nodejs-lts"
+    Write-Host ""
+    Write-BeeInfo "Then run this script again:"
+    Write-Host "  irm https://beeos.ai/install.ps1 | iex"
+    Write-Host ""
+}
+
+# ── 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 {
+    $ver = Get-BeeosVersion
+    if (-not $ver) { $ver = "unknown" }
+    Write-BeeWarn "BeeOS CLI is already installed (v$ver)."
+    Write-Host ""
+    Write-Host "  [1] Upgrade to the latest version and run beeos init"
+    Write-Host "  [2] Re-run beeos init without upgrading"
+    Write-Host "  [3] Skip (do nothing)"
+    Write-Host ""
+
+    if (-not [Environment]::UserInteractive) {
+        Write-BeeInfo "Non-interactive shell — defaulting to upgrade."
+        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 {
+    param(
+        [string]$Subcommand,
+        [string[]]$ExtraArgs
+    )
+
+    $npxPath = Get-Command npx -ErrorAction SilentlyContinue
+    $args = @($Subcommand)
+    if ($ExtraArgs) { $args += $ExtraArgs }
+
+    if ($npxPath) {
+        & npx --yes $CliPackage @args
+    } else {
+        Write-BeeWarn "npx not found, installing globally..."
+        & npm install -g $CliPackage
+        & beeos @args
+    }
+}
+
+# ── Main ─────────────────────────────────────────────────────
+
+Write-Host ""
+Write-Host "  BeeOS CLI Installer" -ForegroundColor White
+Write-Host "  https://beeos.ai" -ForegroundColor DarkGray
+Write-Host ""
+
+Test-Platform
+
+if (-not (Test-NodeVersion)) {
+    if (-not (Install-NodeAuto)) {
+        Show-InstallHints
+        exit 1
+    }
+    if (-not (Test-NodeVersion)) {
+        Show-InstallHints
+        exit 1
+    }
+}
+
+$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 "Upgrading $CliPackage..."
+            & npm install -g $CliPackage
+            if ($LASTEXITCODE -ne 0) {
+                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
+            }
+        }
+        "rerun" {
+            Write-BeeInfo "Reusing existing install."
+        }
+    }
+}
+
+Write-BeeInfo "Running BeeOS CLI..."
+Write-Host ""
+
+if ($Device) {
+    Invoke-BeeosCli -Subcommand "device" -ExtraArgs (@("attach") + $Passthrough)
+} else {
+    Invoke-BeeosCli -Subcommand "init" -ExtraArgs $Passthrough
+}

package/scripts/install.sh

@@ -0,0 +1,373 @@
+#!/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
+#
+# Entry script responsibilities:
+#   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.
+
+set -euo pipefail
+
+BOLD="\033[1m"
+DIM="\033[2m"
+RESET="\033[0m"
+GREEN="\033[32m"
+YELLOW="\033[33m"
+RED="\033[31m"
+CYAN="\033[36m"
+
+CLI_PACKAGE="@beeos-ai/cli@latest"
+MIN_NODE_VERSION=18
+NVM_VERSION="v0.40.1"
+FNM_INSTALL_URL="https://fnm.vercel.app/install"
+
+BEEOS_HOME="${BEEOS_HOME:-$HOME/.beeos}"
+
+info()    { printf "${BOLD}${CYAN}[beeos]${RESET} %s\n" "$*"; }
+warn()    { printf "${BOLD}${YELLOW}[beeos]${RESET} %s\n" "$*"; }
+error()   { printf "${BOLD}${RED}[beeos]${RESET} %s\n" "$*" >&2; }
+success() { printf "${BOLD}${GREEN}[beeos]${RESET} %s\n" "$*"; }
+
+# ── Parse arguments ──────────────────────────────────────────
+
+CLI_VERSION=""
+MODE="init"               # "init" | "device"
+PASSTHROUGH_ARGS=()
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --version)
+      CLI_VERSION="$2"
+      shift 2
+      ;;
+    --device)
+      MODE="device"
+      shift
+      ;;
+    --init)
+      MODE="init"
+      shift
+      ;;
+    *)
+      PASSTHROUGH_ARGS+=("$1")
+      shift
+      ;;
+  esac
+done
+
+if [[ -n "$CLI_VERSION" ]]; then
+  CLI_PACKAGE="@beeos-ai/cli@${CLI_VERSION}"
+fi
+
+# ── OS / architecture detection ──────────────────────────────
+
+OS_KIND=""       # darwin | linux | *
+OS_ARCH=""       # x86_64 | arm64
+LIBC_KIND=""     # gnu | musl (Linux only, empty otherwise)
+
+detect_platform() {
+  local uname_s uname_m
+  uname_s=$(uname -s 2>/dev/null || echo "unknown")
+  uname_m=$(uname -m 2>/dev/null || echo "unknown")
+
+  case "$uname_s" in
+    Darwin) OS_KIND="darwin" ;;
+    Linux)  OS_KIND="linux"  ;;
+    *)      OS_KIND="$uname_s" ;;
+  esac
+
+  case "$uname_m" in
+    x86_64|amd64) OS_ARCH="x86_64" ;;
+    aarch64|arm64) OS_ARCH="arm64" ;;
+    *) OS_ARCH="$uname_m" ;;
+  esac
+
+  if [[ "$OS_KIND" == "linux" ]]; then
+    if ldd --version 2>&1 | head -n1 | grep -qi "musl"; then
+      LIBC_KIND="musl"
+    else
+      LIBC_KIND="gnu"
+    fi
+  fi
+
+  info "detected: ${OS_KIND} ${OS_ARCH}${LIBC_KIND:+ (${LIBC_KIND})}"
+
+  case "$OS_KIND" in
+    darwin)
+      if [[ "$OS_ARCH" != "arm64" && "$OS_ARCH" != "x86_64" ]]; then
+        error "Unsupported macOS architecture: $OS_ARCH (need arm64 or x86_64)"
+        exit 2
+      fi
+      ;;
+    linux)
+      if [[ "$OS_ARCH" != "arm64" && "$OS_ARCH" != "x86_64" ]]; then
+        error "Unsupported Linux architecture: $OS_ARCH (need arm64 or x86_64)"
+        exit 2
+      fi
+      if [[ "$LIBC_KIND" == "musl" ]]; then
+        # No musl prebuilt for scrcpy-bridge / vnc-bridge yet. The CLI
+        # still works (agents run on top of Node) but some sidecars
+        # will need to be built from source.
+        warn "musl libc detected — some Rust sidecar binaries may be unavailable."
+      fi
+      ;;
+    *)
+      error "Unsupported OS: $OS_KIND (use install.ps1 for Windows)"
+      exit 2
+      ;;
+  esac
+}
+
+# ── Node.js detection ────────────────────────────────────────
+
+check_node() {
+  if ! command -v node &>/dev/null; then
+    return 1
+  fi
+
+  local version major
+  version=$(node -v 2>/dev/null | sed 's/^v//')
+  major=$(echo "$version" | cut -d. -f1)
+
+  if [ "$major" -lt "$MIN_NODE_VERSION" ] 2>/dev/null; then
+    warn "Node.js $version found, but v${MIN_NODE_VERSION}+ is required."
+    return 1
+  fi
+
+  return 0
+}
+
+# ── Auto-install Node.js (nvm -> fnm -> brew) ────────────────
+
+try_install_node() {
+  info "Node.js not found or too old. Attempting automatic installation..."
+  echo ""
+
+  # 1. Existing nvm
+  export NVM_DIR="${NVM_DIR:-$HOME/.nvm}"
+  if [[ -s "$NVM_DIR/nvm.sh" ]]; then
+    info "Loading existing nvm..."
+    # shellcheck source=/dev/null
+    . "$NVM_DIR/nvm.sh"
+    if nvm install --lts 2>/dev/null; then
+      success "Node.js $(node -v) installed via existing nvm"
+      return 0
+    fi
+  fi
+
+  # 2. Fresh nvm install
+  info "Installing nvm ${NVM_VERSION}..."
+  if curl -fsSL "https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh" | bash 2>/dev/null; then
+    # shellcheck source=/dev/null
+    . "$NVM_DIR/nvm.sh" 2>/dev/null || true
+    if nvm install --lts 2>/dev/null; then
+      success "Node.js $(node -v) installed via nvm"
+      return 0
+    fi
+  fi
+
+  # 3. fnm — works on locked-down Linux without git/curl quirks
+  if [[ "$OS_KIND" == "linux" ]] && ! command -v fnm &>/dev/null; then
+    info "Trying fnm (single-user, no sudo)..."
+    if curl -fsSL "$FNM_INSTALL_URL" | bash -s -- --skip-shell 2>/dev/null; then
+      export PATH="$HOME/.local/share/fnm:$PATH"
+      eval "$(fnm env --shell bash 2>/dev/null)" || true
+      if fnm install --lts 2>/dev/null && fnm use lts-latest 2>/dev/null; then
+        success "Node.js $(node -v) installed via fnm"
+        return 0
+      fi
+    fi
+  fi
+
+  # 4. macOS Homebrew
+  if [[ "$OS_KIND" == "darwin" ]] && command -v brew &>/dev/null; then
+    info "Trying Homebrew..."
+    if brew install node 2>/dev/null; then
+      success "Node.js installed via Homebrew"
+      return 0
+    fi
+  fi
+
+  return 1
+}
+
+# ── Manual install hints ─────────────────────────────────────
+
+print_install_hints() {
+  error "Could not install Node.js automatically."
+  echo ""
+  info "Please install Node.js >= ${MIN_NODE_VERSION} manually:"
+  echo ""
+
+  case "$OS_KIND" in
+    darwin)
+      echo "  ${BOLD}Homebrew (recommended):${RESET}"
+      echo "    brew install node"
+      echo ""
+      echo "  ${BOLD}Official installer:${RESET}"
+      echo "    https://nodejs.org/en/download/"
+      ;;
+    linux)
+      echo "  ${BOLD}nvm (recommended):${RESET}"
+      echo "    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_VERSION}/install.sh | bash"
+      echo "    source ~/.bashrc && nvm install --lts"
+      echo ""
+      echo "  ${BOLD}fnm (single-user, no sudo):${RESET}"
+      echo "    curl -fsSL ${FNM_INSTALL_URL} | bash"
+      echo "    fnm install --lts"
+      echo ""
+      echo "  ${BOLD}NodeSource:${RESET}"
+      echo "    https://github.com/nodesource/distributions"
+      echo ""
+      echo "  ${BOLD}Official binaries:${RESET}"
+      echo "    https://nodejs.org/en/download/"
+      ;;
+    *)
+      echo "  Visit https://nodejs.org/en/download/"
+      ;;
+  esac
+
+  echo ""
+  info "Then run this script again:"
+  echo "  curl -fsSL https://beeos.ai/install | bash"
+  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() {
+  # 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.
+  if [[ ! -t 0 ]] && [[ ! -t 1 ]]; then
+    info "Non-interactive shell detected — defaulting to upgrade."
+    echo "upgrade"
+    return 0
+  fi
+
+  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 "  [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() {
+  local subcmd="$1"
+  shift || true
+
+  if command -v npx &>/dev/null; then
+    exec npx --yes "$CLI_PACKAGE" "$subcmd" "$@"
+  else
+    warn "npx not found, installing globally..."
+    npm install -g "$CLI_PACKAGE"
+    exec beeos "$subcmd" "$@"
+  fi
+}
+
+main() {
+  echo ""
+  echo "  ${BOLD}BeeOS CLI Installer${RESET}"
+  echo "  ${DIM}https://beeos.ai${RESET}"
+  echo ""
+
+  detect_platform
+
+  if ! check_node; then
+    if ! try_install_node; then
+      print_install_hints
+      exit 1
+    fi
+    if ! check_node; then
+      print_install_hints
+      exit 1
+    fi
+  fi
+
+  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 "Upgrading ${CLI_PACKAGE}..."
+        if command -v npm &>/dev/null; then
+          if ! npm install -g "$CLI_PACKAGE"; then
+            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
+        fi
+        ;;
+      rerun)
+        info "Reusing existing install."
+        ;;
+    esac
+  fi
+
+  info "Running BeeOS CLI..."
+  echo ""
+
+  if [[ "$MODE" == "device" ]]; then
+    run_cli "device" "attach" "${PASSTHROUGH_ARGS[@]+"${PASSTHROUGH_ARGS[@]}"}"
+  else
+    run_cli "init" "${PASSTHROUGH_ARGS[@]+"${PASSTHROUGH_ARGS[@]}"}"
+  fi
+}
+
+main