@beeos-ai/cli 1.0.14 → 1.0.16

package/dist/index.js

@@ -1206,12 +1206,25 @@ function agentBinCommandAndArgs(bin) {
   return { cmd: process.execPath, args: [bin.script] };
 }
 async function ensureDeviceAgent(progress) {
-  const ts = await findExistingTs();
-  if (ts) {
-    describeFound(ts, progress);
-    return ts;
+  const found = await findExistingTs();
+  if (found) {
+    describeFound(found, progress);
+    return found;
   }
-  throw new Error(tsNotFoundHint());
+  progress.onStatus("device-agent not found \u2014 installing @beeos-ai/device-agent + @beeos-ai/device-mcp-server (one-time, ~20MB)...");
+  const outcome = await upgradeBeeosSuite({
+    packages: [NPM_PKGS.DEVICE_AGENT, NPM_PKGS.DEVICE_MCP_SERVER],
+    progress
+  });
+  if (outcome.anyFailed) {
+    throw new Error(autoInstallFailedHint(outcome));
+  }
+  const after = await findExistingTs();
+  if (!after) {
+    throw new Error(tsNotFoundHint());
+  }
+  describeFound(after, progress);
+  return after;
 }
 function describeFound(bin, progress) {
   if (bin.type === "executable") {
@@ -1286,7 +1299,11 @@ async function pathDeviceAgent() {
   return null;
 }
 function tsNotFoundHint() {
-  return "device-agent (TS) not found.\n\nPick one:\n  \u2022 dev (recommended): cd agents/device-agent && pnpm install && pnpm -r build\n  \u2022 global:            npm i -g @beeos-ai/device-agent\n  \u2022 explicit:          export BEEOS_DEVICE_AGENT_BIN=/abs/path/to/device-agent[.js]";
+  return "device-agent (TS) not found after auto-install.\n\nThis usually means npm install -g succeeded but the binary is on a\ndifferent PATH than this shell sees (common with nvm/fnm).\n\nPick one:\n  \u2022 dev (recommended): cd agents/device-agent && pnpm install && pnpm -r build\n  \u2022 global re-install: npm i -g @beeos-ai/device-agent @beeos-ai/device-mcp-server\n  \u2022 explicit override: export BEEOS_DEVICE_AGENT_BIN=/abs/path/to/device-agent[.js]";
+}
+function autoInstallFailedHint(outcome) {
+  const failed = outcome.packages.filter((p) => p.failed).map((p) => `  \u2022 ${p.pkg}: ${p.failed}`).join("\n");
+  return "Auto-install of the device-agent suite failed.\n\nFailed packages:\n" + failed + "\n\nManual fix (run, then retry `beeos device attach`):\n  npm i -g @beeos-ai/device-agent @beeos-ai/device-mcp-server\n\nPin a specific version by exporting before retry:\n  export BEEOS_DEVICE_AGENT_VERSION=<semver>\n  export BEEOS_MCP_SERVER_VERSION=<semver>";
 }
 var init_device_setup = __esm({
   "../core/dist/device-setup.js"() {
@@ -5167,6 +5184,67 @@ var init_fleet_notify = __esm({
   }
 });
 
+// src/commands/device/upgrade.ts
+async function upgrade(options = {}) {
+  const reporter = new CliReporter();
+  const outcome = await upgradeBeeosSuite({
+    packages: [NPM_PKGS.DEVICE_AGENT, NPM_PKGS.DEVICE_MCP_SERVER],
+    progress: reporter
+  });
+  reporter.stop();
+  if (outcome.anyFailed) {
+    const failed = outcome.packages.find((p) => p.failed);
+    console.error(
+      `device-agent upgrade had errors: ${failed?.failed ?? "unknown"}
+Manual fix:
+  npm i -g @beeos-ai/device-agent @beeos-ai/device-mcp-server`
+    );
+  }
+  for (const pkg of outcome.packages) {
+    if (pkg.changed) {
+      console.log(`  ${pkg.pkg}: ${pkg.before ?? "(none)"} \u2192 ${pkg.after}`);
+    } else if (!pkg.failed) {
+      console.log(`  ${pkg.pkg}: ${pkg.after ?? "(absent)"} (already current)`);
+    }
+  }
+  if (outcome.anyChanged) {
+    const reloadOutcome = await notifyFleetShutdownBestEffort();
+    switch (reloadOutcome) {
+      case "ok":
+        console.log("  Fleet asked to restart \u2014 launchd will bring it up with the new code.");
+        break;
+      case "not_running":
+        console.log("  Fleet is not running \u2014 nothing to restart.");
+        break;
+      case "unknown":
+        console.log(
+          "  Fleet restart could not be confirmed; if you see stale behaviour run\n    launchctl kickstart -k gui/$(id -u)/ai.beeos.device-fleet  # macOS\n  or stop & start the fleet manually."
+        );
+        break;
+    }
+  }
+  if (options.bridges !== false) {
+    try {
+      await scrcpyBridgeRuntime.upgrade(reporter);
+    } catch (e) {
+      console.error(`scrcpy-bridge upgrade skipped: ${e}`);
+    }
+    try {
+      await vncBridgeRuntime.upgrade(reporter);
+    } catch (e) {
+      console.error(`vnc-bridge upgrade skipped: ${e}`);
+    }
+  }
+}
+var init_upgrade2 = __esm({
+  "src/commands/device/upgrade.ts"() {
+    "use strict";
+    init_dist();
+    init_progress2();
+    init_fleet_notify();
+  }
+});
+
 // src/commands/device/state.ts
 import lockfile from "proper-lockfile";
 function deviceAgentTargetId(serial) {
@@ -5958,67 +6036,6 @@ var init_exec = __esm({
   }
 });
 
-// src/commands/device/upgrade.ts
-async function upgrade(options = {}) {
-  const reporter = new CliReporter();
-  const outcome = await upgradeBeeosSuite({
-    packages: [NPM_PKGS.DEVICE_AGENT, NPM_PKGS.DEVICE_MCP_SERVER],
-    progress: reporter
-  });
-  reporter.stop();
-  if (outcome.anyFailed) {
-    const failed = outcome.packages.find((p) => p.failed);
-    console.error(
-      `device-agent upgrade had errors: ${failed?.failed ?? "unknown"}
-Manual fix:
-  npm i -g @beeos-ai/device-agent @beeos-ai/device-mcp-server`
-    );
-  }
-  for (const pkg of outcome.packages) {
-    if (pkg.changed) {
-      console.log(`  ${pkg.pkg}: ${pkg.before ?? "(none)"} \u2192 ${pkg.after}`);
-    } else if (!pkg.failed) {
-      console.log(`  ${pkg.pkg}: ${pkg.after ?? "(absent)"} (already current)`);
-    }
-  }
-  if (outcome.anyChanged) {
-    const reloadOutcome = await notifyFleetShutdownBestEffort();
-    switch (reloadOutcome) {
-      case "ok":
-        console.log("  Fleet asked to restart \u2014 launchd will bring it up with the new code.");
-        break;
-      case "not_running":
-        console.log("  Fleet is not running \u2014 nothing to restart.");
-        break;
-      case "unknown":
-        console.log(
-          "  Fleet restart could not be confirmed; if you see stale behaviour run\n    launchctl kickstart -k gui/$(id -u)/ai.beeos.device-fleet  # macOS\n  or stop & start the fleet manually."
-        );
-        break;
-    }
-  }
-  if (options.bridges !== false) {
-    try {
-      await scrcpyBridgeRuntime.upgrade(reporter);
-    } catch (e) {
-      console.error(`scrcpy-bridge upgrade skipped: ${e}`);
-    }
-    try {
-      await vncBridgeRuntime.upgrade(reporter);
-    } catch (e) {
-      console.error(`vnc-bridge upgrade skipped: ${e}`);
-    }
-  }
-}
-var init_upgrade2 = __esm({
-  "src/commands/device/upgrade.ts"() {
-    "use strict";
-    init_dist();
-    init_progress2();
-    init_fleet_notify();
-  }
-});
-
 // src/commands/device/refresh-config.ts
 async function refreshConfig(options = {}) {
   const cfg = await loadOrCreateConfig();
@@ -6629,12 +6646,10 @@ function formatService(s) {
 
 // src/commands/update.ts
 init_dist();
-init_progress2();
+init_upgrade2();
 async function run4(agentFramework, options = {}) {
   if (agentFramework === "device") {
-    const reporter = new CliReporter();
-    await deviceRuntime.update(reporter);
-    reporter.stop();
+    await upgrade({ bridges: true });
     if (options.json) {
       emitJsonEnvelope(jsonOk({ framework: "device", action: "updated" }));
     } else {
@@ -6756,7 +6771,8 @@ async function run6(options) {
   const resolvedAgentGatewayUrl = resolveAgentGatewayUrl(cfg);
   const agentGatewayHealth = await probeAgentGateway(resolvedAgentGatewayUrl);
   const tools = await collectToolStatus();
-  const shimReport = await collectShimReport();
+  const hasBoundDevices = state.devices.entries.length > 0;
+  const shimReport = await collectShimReport(hasBoundDevices);
   const warnings = [];
   const hints = [];
   if (!state.hasIdentity) {
@@ -6822,7 +6838,7 @@ async function run6(options) {
       );
     } else if (e.outcome === "missing") {
       warnings.push(`${e.pkg}: not installed globally \u2014 run 'beeos init' to install.`);
-    } else if (e.outcome === "error") {
+    } else if (e.outcome === "error" || e.outcome === "not_installed_yet") {
     }
   }
   if (shimReport.entries.some((e) => e.outcome === "outdated" || e.outcome === "missing")) {
@@ -6923,8 +6939,12 @@ async function collectToolStatus() {
     vncBridge: { path: vncPath }
   };
 }
-async function collectShimReport() {
+async function collectShimReport(hasBoundDevices) {
   const sources = readPinSourcesFromEnv();
+  const deviceSuite = /* @__PURE__ */ new Set([
+    NPM_PKGS.DEVICE_AGENT,
+    NPM_PKGS.DEVICE_MCP_SERVER
+  ]);
   const entries = await Promise.all(
     ALL_BEEOS_PKGS.map(async (pkg) => {
       const spec = resolveInstallSpec(pkg, sources);
@@ -6934,8 +6954,9 @@ async function collectShimReport() {
       ]);
       let outcome;
       if (latest === null) outcome = "error";
-      else if (installed === null) outcome = "missing";
-      else if (installed === latest) outcome = "ok";
+      else if (installed === null) {
+        outcome = deviceSuite.has(pkg) && !hasBoundDevices ? "not_installed_yet" : "missing";
+      } else if (installed === latest) outcome = "ok";
       else outcome = "outdated";
       if (pkg === NPM_PKGS.CLI && installed === null) {
         outcome = "missing";
@@ -6953,6 +6974,8 @@ function shimMarker(outcome) {
       return "\u2191";
     case "missing":
       return "\u2717";
+    case "not_installed_yet":
+      return "\xB7";
     case "error":
       return "?";
   }
@@ -7246,19 +7269,22 @@ async function upgradeAndMaybeExit(options) {
   if (options.json) {
     return false;
   }
-  console.log("Checking for newer @beeos-ai/cli + agents on npm...");
+  const packages = await pickInstalledPackages();
+  console.log("Checking for newer @beeos-ai/cli on npm...");
   const reporter = new CliReporter();
   let outcome;
   try {
     outcome = await upgradeBeeosSuite({
-      packages: ALL_BEEOS_PKGS,
+      packages,
       progress: reporter
     });
   } catch (e) {
     reporter.stop();
     console.log(
       `  (upgrade skipped \u2014 ${e instanceof Error ? e.message : String(e)})
-  Tip: re-run \`npm install -g @beeos-ai/cli @beeos-ai/device-agent @beeos-ai/device-mcp-server\` manually.`
+  Tip: re-run \`npm install -g @beeos-ai/cli\` manually. The device
+  suite (device-agent + device-mcp-server) will be auto-installed
+  on the next \`beeos device attach\`.`
     );
     return false;
   }
@@ -7267,7 +7293,7 @@ async function upgradeAndMaybeExit(options) {
     const failed = outcome.packages.find((p) => p.failed)?.failed ?? "unknown error";
     console.log(`  \u26A0 npm install failed: ${failed}`);
     console.log(
-      "    Manual fix:\n      npm i -g @beeos-ai/cli @beeos-ai/device-agent @beeos-ai/device-mcp-server\n"
+      "    Manual fix:\n      npm i -g @beeos-ai/cli\n    (the device suite is auto-installed on `beeos device attach`)\n"
     );
     return false;
   }
@@ -7291,6 +7317,14 @@ async function upgradeAndMaybeExit(options) {
   console.log("  Agents updated. Continuing init...\n");
   return false;
 }
+async function pickInstalledPackages() {
+  const packages = [NPM_PKGS.CLI];
+  for (const pkg of [NPM_PKGS.DEVICE_AGENT, NPM_PKGS.DEVICE_MCP_SERVER]) {
+    const installed = await npmGlobalVersion(pkg).catch(() => null);
+    if (installed !== null) packages.push(pkg);
+  }
+  return packages;
+}
 
 // src/commands/service.ts
 init_dist();

package/package.json

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

package/scripts/install.sh

@@ -29,24 +29,30 @@
 #                              bootstrap requests).
 #   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.
+#                              NOT consumed by this script (CLI ≥ 1.0.16
+#                              installs the device suite lazily on the
+#                              first `beeos device attach`); export it
+#                              in the shell that runs `beeos device
+#                              attach` instead.
+#   BEEOS_MCP_SERVER_VERSION   Same as above, for @beeos-ai/device-mcp-server.
 #   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.
+#                              always `npm install -g` so the CLI is
+#                              globally available for follow-up commands.
+#                              The device-agent suite is no longer
+#                              eagerly installed (CLI ≥ 1.0.16); see
+#                              `web/packages/core/src/device-setup.ts`.
 #
-# Example: bare-metal one-shot staging install, including device-agent
-# version pin and OAuth landing on the staging dashboard:
+# Example: bare-metal one-shot staging install (no device-agent pin —
+# add `BEEOS_DEVICE_AGENT_VERSION=...` to the shell when you later run
+# `beeos device attach` if you need to pin a specific build):
 #
 #   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.2 \
-#   BEEOS_MCP_SERVER_VERSION=0.2.3 \
-#     curl -fsSL https://beeos.ai/install | bash -s -- --version 1.0.11
+#     curl -fsSL https://beeos.ai/install | bash -s -- --version 1.0.16
 
 set -euo pipefail
 
@@ -59,16 +65,11 @@ RED="\033[31m"
 CYAN="\033[36m"
 
 CLI_PACKAGE="@beeos-ai/cli@latest"
-# Sibling packages installed alongside the CLI so that `beeos device attach`
-# works on a clean machine without further `npm i -g` steps (a.k.a. the
-# "fleet ready" install strategy — see agents/device-agent/ARCHITECTURE.md
-# for the 0.2.0+ sibling-pair topology between device-agent and
-# device-mcp-server). Their versions are independent of `--version` (which
-# only pins the CLI) — both packages follow their own semver. Override via
-# BEEOS_DEVICE_AGENT_VERSION / BEEOS_MCP_SERVER_VERSION when you need to
-# pin a specific build (e.g. for a staging smoke test).
-DEVICE_AGENT_PACKAGE="@beeos-ai/device-agent@${BEEOS_DEVICE_AGENT_VERSION:-latest}"
-MCP_SERVER_PACKAGE="@beeos-ai/device-mcp-server@${BEEOS_MCP_SERVER_VERSION:-latest}"
+# `@beeos-ai/device-agent` + `@beeos-ai/device-mcp-server` are NOT
+# installed here. CLI ≥ 1.0.16 installs them lazily on the first
+# `beeos device attach` via `ensureDeviceAgent` in
+# `web/packages/core/src/device-setup.ts`. OpenClaw-only users never
+# download the device suite at all.
 MIN_NODE_VERSION=18
 NVM_VERSION="v0.40.1"
 FNM_INSTALL_URL="https://fnm.vercel.app/install"
@@ -479,35 +480,6 @@ prompt_existing_install_action() {
   esac
 }
 
-# ── Device-agent sibling suite installer ─────────────────────
-#
-# Installs `@beeos-ai/device-agent` + `@beeos-ai/device-mcp-server` globally
-# so the very first `beeos device attach` on a clean machine does not need
-# to fetch them separately. `@beeos-ai/device-common` is pulled
-# transitively as a `dependencies` entry of both — no separate install
-# needed.
-#
-# Failure here is NEVER fatal: the CLI itself was already installed
-# successfully, and `beeos device attach` will prompt to install missing
-# pieces via ensureDeviceAgent on first use. We just emit a WARN with the
-# manual recovery command.
-install_device_agent_suite() {
-  if ! command -v npm &>/dev/null; then
-    warn "npm not available — skipping device-agent suite install."
-    warn "Manual fix: install Node + run \`npm i -g ${DEVICE_AGENT_PACKAGE} ${MCP_SERVER_PACKAGE}\`."
-    return 0
-  fi
-
-  info "Installing device-agent suite (${DEVICE_AGENT_PACKAGE}, ${MCP_SERVER_PACKAGE})..."
-  if npm install -g "$DEVICE_AGENT_PACKAGE" "$MCP_SERVER_PACKAGE"; then
-    success "device-agent suite installed."
-  else
-    warn "Failed to install device-agent suite — \`beeos device attach\` will prompt for it on first use."
-    warn "Manual fix: npm i -g ${DEVICE_AGENT_PACKAGE} ${MCP_SERVER_PACKAGE}"
-  fi
-  return 0
-}
-
 # ── Main ─────────────────────────────────────────────────────
 
 run_cli() {
@@ -528,16 +500,11 @@ run_cli() {
 
   # 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.
+  # 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.
   # 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
@@ -567,10 +534,13 @@ run_cli() {
     error "      use a node version manager (nvm / fnm) or sudo"
     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.
+  # NPM succeeded — CLI is now on PATH. The device-agent suite is
+  # deliberately NOT installed here; `beeos device attach` will
+  # auto-install it on first use via `ensureDeviceAgent` (see
+  # `web/packages/core/src/device-setup.ts`). OpenClaw-only users
+  # never download those ~20MB. 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"
 }
@@ -634,7 +604,10 @@ main() {
             error "      use a node version manager (nvm / fnm) or sudo"
             exit 1
           fi
-          install_device_agent_suite
+          # Device-agent suite is intentionally 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.
         fi
         ;;
       rerun)