@beeos-ai/cli 1.0.10 → 1.0.12

package/dist/index.js

@@ -1148,26 +1148,56 @@ function archiveName(cfg, target) {
   const suffix = target.includes("windows") ? "zip" : "tar.gz";
   return `${cfg.name}-${target}.${suffix}`;
 }
+async function fetchArchiveBuffer(cfg, url, progress, maxAttempts = 3) {
+  const p = getPlatformAdapter();
+  let lastError = null;
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    let resp;
+    try {
+      resp = await p.fetch(url);
+    } catch (e) {
+      lastError = String(e);
+      progress.onStatus(`${cfg.name} download attempt ${attempt}/${maxAttempts} failed: ${lastError}`);
+      if (attempt < maxAttempts) {
+        await new Promise((r) => setTimeout(r, 1e3 * 2 ** (attempt - 1)));
+      }
+      continue;
+    }
+    if (!resp.ok) {
+      progress.onStatus(`${cfg.name} download: ${resp.status} ${resp.statusText} (${url})`);
+      if (resp.status === 404) {
+        progress.onStatus(`Hint: the current release may not include the requested target. Try setting $${cfg.binaryEnv} to a locally built binary, ` + (cfg.releaseUrlEnv ? `or $${cfg.releaseUrlEnv} to a different release URL.` : `or check for a newer release.`));
+      }
+      if (resp.status === 404 || resp.status === 403 || resp.status === 401) {
+        return null;
+      }
+      lastError = `${resp.status} ${resp.statusText}`;
+      if (attempt < maxAttempts) {
+        await new Promise((r) => setTimeout(r, 1e3 * 2 ** (attempt - 1)));
+      }
+      continue;
+    }
+    try {
+      return new Uint8Array(await resp.arrayBuffer());
+    } catch (e) {
+      lastError = String(e);
+      progress.onStatus(`${cfg.name} stream interrupted on attempt ${attempt}/${maxAttempts}: ${lastError}`);
+      if (attempt < maxAttempts) {
+        await new Promise((r) => setTimeout(r, 1e3 * 2 ** (attempt - 1)));
+      }
+    }
+  }
+  progress.onStatus(`${cfg.name} download gave up after ${maxAttempts} attempts (last: ${lastError ?? "unknown"}).`);
+  return null;
+}
 async function downloadManagedBinary(cfg, target, progress) {
   const p = getPlatformAdapter();
   const base = releaseBaseUrl(cfg);
   const url = `${base}/${archiveName(cfg, target)}`;
   progress.onStatus(`Downloading ${cfg.name} (${target})...`);
-  let resp;
-  try {
-    resp = await p.fetch(url);
-  } catch (e) {
-    progress.onStatus(`${cfg.name} download failed: ${String(e)}`);
+  const data = await fetchArchiveBuffer(cfg, url, progress);
+  if (!data)
     return null;
-  }
-  if (!resp.ok) {
-    progress.onStatus(`${cfg.name} download: ${resp.status} ${resp.statusText} (${url})`);
-    if (resp.status === 404) {
-      progress.onStatus(`Hint: the current release may not include ${target}. Try setting $${cfg.binaryEnv} to a locally built binary, ` + (cfg.releaseUrlEnv ? `or $${cfg.releaseUrlEnv} to a different release URL.` : `or check for a newer release.`));
-    }
-    return null;
-  }
-  const data = new Uint8Array(await resp.arrayBuffer());
   const digestUrl = `${url}.sha256`;
   let expected = null;
   try {
@@ -4335,6 +4365,8 @@ var init_state = __esm({
 });
 
 // src/commands/device/attach.ts
+import { spawn as spawn2 } from "child_process";
+import readline from "readline";
 async function attach(options) {
   const cfg = await loadOrCreateConfig();
   const reporter = new CliReporter();
@@ -4418,7 +4450,7 @@ async function attach(options) {
       throw e;
     }
   });
-  await maybeNotifyFleetWithHint();
+  await maybeNotifyFleetWithHint(cfg);
 }
 async function attachAll(cfg, reporter, withVideo, options) {
   const devices = await deviceRuntime.listAdbDevices();
@@ -4493,7 +4525,7 @@ async function attachAll(cfg, reporter, withVideo, options) {
     await saveDeviceState(state);
     console.log(`Attached ${committed.length} device(s); supervision via device-agent fleet.`);
   });
-  await maybeNotifyFleetWithHint();
+  await maybeNotifyFleetWithHint(cfg);
 }
 function commitAttachResults(state, commits) {
   const committed = [];
@@ -4587,15 +4619,80 @@ async function installService(mgr, spec) {
   maybePrintFallbackBanner(mgr.kind);
   await mgr.install(spec);
 }
-async function maybeNotifyFleetWithHint() {
+async function maybeNotifyFleetWithHint(cfg) {
   const outcome = await notifyFleetReloadBestEffort();
-  if (outcome === "not_running") printFleetNotRunningHint();
+  if (outcome !== "not_running") return;
+  if (!shouldOfferFleetEnable()) {
+    printFleetNotRunningHint();
+    return;
+  }
+  console.log("");
+  console.log("device-agent fleet is not running yet. Until you start");
+  console.log("it, the device is recorded in ~/.beeos/devices.json but");
+  console.log("no process is supervising the per-device agent.");
+  console.log("");
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  const answer = await new Promise((resolve) => {
+    rl.question("Enable fleet now (registers a launchd service)? [Y/n]: ", (a) => {
+      rl.close();
+      resolve(a);
+    });
+  });
+  const yes = answer.trim() === "" || /^y(es)?$/i.test(answer.trim());
+  if (!yes) {
+    printFleetNotRunningHint();
+    return;
+  }
+  const ok = await runDeviceAgentFleetEnable(cfg);
+  if (!ok) {
+    console.error("");
+    console.error("fleet enable did not complete cleanly. Re-run manually:");
+    console.error("  device-agent fleet enable --agent-gateway-url <URL>");
+    console.error("");
+    printFleetNotRunningHint();
+    return;
+  }
+  console.log("");
+  console.log("fleet enabled \u2014 supervised processes should come up within a few seconds.");
+  console.log("Check status with:  device-agent fleet devices");
+}
+function shouldOfferFleetEnable(inputs = {
+  platform: process.platform,
+  stdinIsTTY: process.stdin.isTTY,
+  stdoutIsTTY: process.stdout.isTTY,
+  env: process.env
+}) {
+  if (inputs.platform !== "darwin") return false;
+  if (inputs.env.BEEOS_NO_FLEET_AUTOSTART === "1") return false;
+  if (!inputs.stdinIsTTY) return false;
+  if (!inputs.stdoutIsTTY) return false;
+  return true;
+}
+async function runDeviceAgentFleetEnable(cfg) {
+  const agentGatewayUrl = resolveAgentGatewayUrl(cfg);
+  return new Promise((resolve) => {
+    try {
+      const child = spawn2(
+        "device-agent",
+        ["fleet", "enable", "--agent-gateway-url", agentGatewayUrl],
+        { stdio: "inherit" }
+      );
+      child.once("close", (code) => resolve(code === 0));
+      child.once("error", () => resolve(false));
+    } catch {
+      resolve(false);
+    }
+  });
 }
 async function registerVideoBridge(_mgr, reporter, params) {
   if (!params.withVideo) return { mode: "none" };
   const agentGatewayUrl = resolveAgentGatewayUrl(params.cfg);
   if (params.vncHost) {
-    const binary2 = await vncBridgeRuntime.ensureInstalled(reporter);
+    const binary2 = await ensureBridgeBinaryDegraded(
+      vncBridgeRuntime.ensureInstalled.bind(vncBridgeRuntime),
+      reporter,
+      "vnc-bridge"
+    );
     if (!binary2) {
       console.error(
         `  vnc-bridge binary unavailable \u2014 ${params.serial} will run without VNC streaming.`
@@ -4615,16 +4712,33 @@ async function registerVideoBridge(_mgr, reporter, params) {
     await installService(_mgr, spec);
     return { mode: "vnc" };
   }
-  const binary = await scrcpyBridgeRuntime.ensureInstalled(reporter);
+  const binary = await ensureBridgeBinaryDegraded(
+    scrcpyBridgeRuntime.ensureInstalled.bind(scrcpyBridgeRuntime),
+    reporter,
+    "scrcpy-bridge"
+  );
   if (!binary) {
     console.error(
       `  scrcpy-bridge binary unavailable \u2014 ${params.serial} will run without WebRTC video.
-  Install from https://github.com/beeos-ai/scrcpy-bridge or set BEEOS_SCRCPY_BRIDGE_BIN.`
+  ACP control + screenshots still work. To recover live video later:
+    \u2022 re-run: beeos device attach --serial ${params.serial}  (will retry the download)
+    \u2022 or download from https://github.com/beeos-ai/scrcpy-bridge/releases
+      and set BEEOS_SCRCPY_BRIDGE_BIN to its absolute path.`
     );
     return { mode: "none" };
   }
   return { mode: "scrcpy" };
 }
+async function ensureBridgeBinaryDegraded(fn, reporter, label) {
+  try {
+    return await fn(reporter);
+  } catch (e) {
+    console.error(
+      `  ${label} install threw unexpectedly (${String(e)}) \u2014 degrading to no-video mode.`
+    );
+    return null;
+  }
+}
 async function ensureAdbAvailable(reporter) {
   const existing = await findAdb();
   if (existing) return;
@@ -5388,7 +5502,7 @@ init_device2();
 
 // src/commands/init.ts
 init_dist();
-import readline from "readline";
+import readline2 from "readline";
 
 // src/commands/doctor.ts
 init_dist();
@@ -5833,7 +5947,7 @@ function printNextSteps() {
   console.log("");
 }
 function prompt(question) {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  const rl = readline2.createInterface({ input: process.stdin, output: process.stdout });
   return new Promise((resolve) => {
     rl.question(question, (answer) => {
       rl.close();

package/package.json

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

package/scripts/install.ps1

@@ -24,6 +24,15 @@
       $env:BEEOS_DASHBOARD_URL        Dashboard base (OAuth + bind redirect).
       $env:BEEOS_DEVICE_AGENT_VERSION Pin @beeos-ai/device-agent semver.
       $env:BEEOS_MCP_SERVER_VERSION   Pin @beeos-ai/device-mcp-server semver.
+      $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 plus the device-agent suite
+                                       are both globally available for
+                                       follow-up commands.
 
 .EXAMPLE
     # One-liner (PowerShell 5+):
@@ -38,11 +47,11 @@
     .\install.ps1 -Device
 
 .EXAMPLE
-    # Bare-metal one-shot staging install (CLI >= 1.0.10):
+    # Bare-metal one-shot staging install (CLI >= 1.0.11):
     $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"
-    $env:BEEOS_DEVICE_AGENT_VERSION = "0.4.1"
+    $env:BEEOS_DEVICE_AGENT_VERSION = "0.4.2"
     $env:BEEOS_MCP_SERVER_VERSION   = "0.2.3"
     irm https://beeos.ai/install.ps1 | iex
 #>
@@ -333,32 +342,41 @@ function Invoke-BeeosCli {
         [string[]]$ExtraArgs
     )
 
-    $npxPath = Get-Command npx -ErrorAction SilentlyContinue
     $args = @($Subcommand)
     if ($ExtraArgs) { $args += $ExtraArgs }
 
-    if ($npxPath) {
-        # Temporary / npx path: deliberately do NOT install the device-agent
-        # suite globally. The user opted into the throwaway-install flow, so
-        # we honor that — if they later run `beeos device attach`,
-        # ensureDeviceAgent will guide them through a global install at that
-        # point.
+    # ALWAYS install globally. Pre-1.0.11 we branched into `npx --yes`
+    # when available, which gave irm|iex users a throwaway install but
+    # silently broke their next step (`beeos device attach`) because
+    # `beeos` was not on PATH after the script exited. Power users who
+    # explicitly want the old throwaway behaviour can set
+    # `$env:BEEOS_USE_NPX = "1"`.
+    $npxPath = Get-Command npx -ErrorAction SilentlyContinue
+    if ($env:BEEOS_USE_NPX -eq "1" -and $npxPath) {
+        Write-BeeWarn "BEEOS_USE_NPX=1 — using throwaway npx install (beeos won't persist on PATH)."
         & npx --yes $CliPackage @args
-    } else {
-        Write-BeeWarn "npx not found, installing globally..."
-        & 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
-        }
-        Install-DeviceAgentSuite
-        & beeos @args
+        return
+    }
+
+    $npmPath = Get-Command npm -ErrorAction SilentlyContinue
+    if (-not $npmPath) {
+        Write-BeeError "npm not found — install Node.js first (this script tries that for you)."
+        exit 1
+    }
+
+    Write-BeeInfo "Installing $CliPackage globally..."
+    & 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
     }
+    Install-DeviceAgentSuite
+    & beeos @args
 }
 
 # ── Main ─────────────────────────────────────────────────────

package/scripts/install.sh

@@ -30,6 +30,13 @@
 #   BEEOS_DASHBOARD_URL        Dashboard base (OAuth + bind redirect).
 #   BEEOS_DEVICE_AGENT_VERSION Pin @beeos-ai/device-agent semver.
 #   BEEOS_MCP_SERVER_VERSION   Pin @beeos-ai/device-mcp-server semver.
+#   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 plus
+#                              the device-agent suite are both globally
+#                              available for follow-up commands.
 #
 # Example: bare-metal one-shot staging install, including device-agent
 # version pin and OAuth landing on the staging dashboard:
@@ -37,9 +44,9 @@
 #   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 \
-#   BEEOS_DEVICE_AGENT_VERSION=0.4.1 \
+#   BEEOS_DEVICE_AGENT_VERSION=0.4.2 \
 #   BEEOS_MCP_SERVER_VERSION=0.2.3 \
-#     curl -fsSL https://beeos.ai/install | bash -s -- --version 1.0.10
+#     curl -fsSL https://beeos.ai/install | bash -s -- --version 1.0.11
 
 set -euo pipefail
 
@@ -495,28 +502,44 @@ run_cli() {
     stdin_src="/dev/tty"
   fi
 
-  if command -v npx &>/dev/null; then
-    # Temporary / npx path: deliberately do NOT install the device-agent
-    # suite globally. The user opted into the throwaway-install flow, so
-    # we honor that — if they later run `beeos device attach`,
-    # ensureDeviceAgent will guide them through a global install at that
-    # point.
+  # ALWAYS install globally. We previously branched to `npx --yes` when
+  # available so curl|bash users got a throwaway install, but that
+  # silently broke the post-install UX:
+  #   - `beeos` was not on PATH after the script exited, so the user's
+  #     next step (`beeos device attach`) failed with `command not found`
+  #     and the obvious recovery (re-run the one-liner) hit the
+  #     "existing install" prompt because some state in ~/.beeos
+  #     persisted, leaving the user stuck.
+  #   - The device-agent suite was deliberately skipped on the npx
+  #     branch, so even if the user re-ran via `npm i -g`, the very
+  #     next `beeos device attach` had to bootstrap device-agent
+  #     itself.
+  # Power users who explicitly want the old throwaway behaviour can set
+  # `BEEOS_USE_NPX=1`. Default is global install.
+  if [[ "${BEEOS_USE_NPX:-}" == "1" ]] && command -v npx &>/dev/null; then
+    warn "BEEOS_USE_NPX=1 — using throwaway npx install (beeos won't persist on PATH)."
     exec npx --yes "$CLI_PACKAGE" "$subcmd" "$@" <"$stdin_src"
-  else
-    warn "npx not found, installing globally..."
-    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
-    install_device_agent_suite
-    exec beeos "$subcmd" "$@" <"$stdin_src"
   fi
+
+  if ! command -v npm &>/dev/null; then
+    error "npm not found — install Node.js first (this script tries that for you;"
+    error "see ${BEEOS_INSTALL_LOG} for why auto-install bailed out)."
+    exit 1
+  fi
+
+  info "Installing ${CLI_PACKAGE} globally..."
+  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
+  install_device_agent_suite
+  exec beeos "$subcmd" "$@" <"$stdin_src"
 }
 
 main() {