trooper-cli 0.1.4 → 0.1.6

package/README.md

@@ -2,27 +2,28 @@
 
 Official command-line installer for Trooper's local desktop runtime.
 
-Trooper can run on your own Mac without a hosted cloud computer. This CLI installs the local bridge, starts the local AI gateway, and lets the Trooper desktop app pair the machine to your workspace.
+Trooper can run on your own Mac without a hosted cloud computer. This CLI installs the local bridge, starts the local AI gateway, installs the Trooper desktop app when it is missing, and opens Trooper so the machine can pair to your workspace.
 
 ## Quick Start
 
 Install Trooper locally on this Mac:
 
 ```bash
-npx -y trooper-cli onboard --yes
+npx -y trooper-cli
 ```
 
-Then open the Trooper desktop app to connect this computer to your workspace.
+The command opens the Trooper desktop app when setup finishes.
 
 ## What It Sets Up
 
-On macOS, `trooper-cli onboard --yes` prepares:
+On macOS, `npx -y trooper-cli` prepares:
 
 - A local Trooper bridge on `http://127.0.0.1:3002`
 - A local AI gateway on `http://127.0.0.1:18789`
 - LaunchAgents so the local host can keep running
 - A Docker-compatible runtime using existing Docker or Colima when needed
 - Local runtime files under `~/Library/Application Support/Trooper/runtime`
+- Trooper.app in `~/Applications` when the desktop app is not already installed
 
 The local desktop plan does not require a Trooper cloud computer or Stripe checkout.
 
@@ -30,10 +31,22 @@ The local desktop plan does not require a Trooper cloud computer or Stripe check
 
 ### Install local runtime
 
+```bash
+npx -y trooper-cli
+```
+
+This is shorthand for:
+
 ```bash
 npx -y trooper-cli onboard --yes
 ```
 
+Install only the runtime and skip desktop app install/open:
+
+```bash
+npx -y trooper-cli --skip-app
+```
+
 ### Install with a Trooper setup token
 
 The Trooper app may generate a short-lived setup token for workspace pairing:
@@ -48,7 +61,7 @@ npx -y trooper-cli onboard --yes \
 ### Preview the installer command
 
 ```bash
-npx -y trooper-cli onboard --yes --dry-run
+npx -y trooper-cli --dry-run
 ```
 
 ### Uninstall local runtime
@@ -79,7 +92,7 @@ npx -y --prefer-online trooper-cli@latest uninstall --yes --remove-app
 
 ## Desktop App
 
-Local desktop install is meant to be started from the Trooper Mac or Windows app. The web onboarding page shows the plan, but only the desktop app can safely launch the local helper installer.
+The CLI installs and opens the Trooper Mac app automatically when it is missing. If the app is already installed in `~/Applications`, `/Applications`, or registered with Launch Services, the CLI opens the existing app instead of downloading it again.
 
 ## Links
 

package/bin/trooper.js

@@ -5,6 +5,7 @@ import { randomBytes } from 'node:crypto';
 
 const DEFAULT_API_URL = 'https://trooper-production.up.railway.app';
 const LOCAL_MAC_SETUP_SCRIPT_URL = 'https://raw.githubusercontent.com/absurdfounder/trooper-bridge/main/setup-local-mac-host.sh';
+const TROOPER_MAC_APP_DMG_URL = 'https://github.com/absurdfounder/trooper_landing/releases/download/macos-latest/Trooper.dmg';
 const LOCAL_MAC_LABELS = [
   'so.trooper.local-gateway',
   'so.trooper.local-bridge',
@@ -16,11 +17,13 @@ function printHelp() {
   console.log(`Trooper CLI
 
 Usage:
+  npx -y trooper-cli
   npx -y trooper-cli onboard --yes
   npx -y trooper-cli onboard --yes --token <setup-token>
   npx -y trooper-cli uninstall --yes
 
 Aliases:
+  no command            Same as onboard --yes
   setup                 Same as onboard
   remove                Same as uninstall
 
@@ -31,6 +34,7 @@ Options:
   --yes                 Run non-interactively with sensible defaults
   --keep-data           Preserve local workspace/config data during uninstall
   --remove-app          Also remove Trooper.app when uninstalling, if it is writable
+  --skip-app            Install the local runtime only; do not install/open Trooper.app
   --print-command       Print the installer command without running it
   --dry-run             Same as --print-command
   -h, --help            Show this help
@@ -47,7 +51,7 @@ function parseArgs(argv) {
     }
     const [key, inlineValue] = arg.split('=', 2);
     const name = key.replace(/^-+/, '');
-    if (['help', 'h', 'dry-run', 'print-command', 'yes', 'y', 'keep-data', 'remove-app'].includes(name)) {
+    if (['help', 'h', 'dry-run', 'print-command', 'yes', 'y', 'keep-data', 'remove-app', 'skip-app'].includes(name)) {
       args[name] = true;
       continue;
     }
@@ -84,7 +88,67 @@ function localToken(prefix) {
   return `${prefix}_${randomBytes(24).toString('base64url')}`;
 }
 
-function buildLocalMacInstallCommand({ apiUrl }) {
+function buildLocalMacAppInstallCommand() {
+  return `install_or_open_trooper_app() {
+  export PATH="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+  local app_path=""
+  for candidate in "$HOME/Applications/Trooper.app" "/Applications/Trooper.app"; do
+    if [[ -d "$candidate" ]]; then
+      app_path="$candidate"
+      break
+    fi
+  done
+
+  if [[ -z "$app_path" ]] && /usr/bin/open -Ra "Trooper" >/dev/null 2>&1; then
+    echo "Opening Trooper desktop app..."
+    /usr/bin/open -a "Trooper"
+    return 0
+  fi
+
+  if [[ -n "$app_path" ]]; then
+    echo "Opening Trooper desktop app..."
+    /usr/bin/open "$app_path"
+    return 0
+  fi
+
+  echo "Installing Trooper desktop app..."
+  local dmg_url="\${TROOPER_MAC_APP_DMG_URL:-${TROOPER_MAC_APP_DMG_URL}}"
+  local tmp_dmg mount_dir app_src install_root
+  tmp_dmg="$(/usr/bin/mktemp -t trooper-macos.XXXXXX).dmg"
+  mount_dir="$(/usr/bin/mktemp -d -t trooper-dmg.XXXXXX)"
+  install_root="$HOME/Applications"
+
+  cleanup_trooper_dmg() {
+    /usr/bin/hdiutil detach "$mount_dir" -quiet >/dev/null 2>&1 || true
+    /bin/rm -f "$tmp_dmg"
+    /bin/rm -rf "$mount_dir"
+  }
+  trap cleanup_trooper_dmg EXIT
+
+  /usr/bin/curl -fL --retry 3 --retry-delay 2 "$dmg_url" -o "$tmp_dmg"
+  /usr/bin/hdiutil attach "$tmp_dmg" -mountpoint "$mount_dir" -nobrowse -quiet
+  app_src="$(/usr/bin/find "$mount_dir" -maxdepth 1 -name "Trooper.app" -type d | /usr/bin/head -1)"
+  if [[ -z "$app_src" ]]; then
+    echo "Trooper.app was not found inside the downloaded DMG."
+    return 1
+  fi
+
+  /bin/mkdir -p "$install_root"
+  /bin/rm -rf "$install_root/Trooper.app"
+  /usr/bin/ditto "$app_src" "$install_root/Trooper.app"
+  /usr/bin/hdiutil detach "$mount_dir" -quiet >/dev/null 2>&1 || true
+  trap - EXIT
+  /bin/rm -f "$tmp_dmg"
+  /bin/rm -rf "$mount_dir"
+
+  echo "Trooper desktop app installed at: $install_root/Trooper.app"
+  /usr/bin/open "$install_root/Trooper.app"
+}
+
+install_or_open_trooper_app`;
+}
+
+function buildLocalMacInstallCommand({ apiUrl, installApp = true } = {}) {
   const hostSuffix = randomBytes(6).toString('hex');
   const env = {
     TROOPER_LOCAL_HOST: '1',
@@ -99,10 +163,12 @@ function buildLocalMacInstallCommand({ apiUrl }) {
     TUNNEL_PROVIDER: 'local',
   };
   return [
+    'set -euo pipefail',
     buildExportCommand(env),
     `curl -fsSL ${shellSingleQuote(LOCAL_MAC_SETUP_SCRIPT_URL)} -o /tmp/trooper-local-mac-host.sh`,
     'chmod +x /tmp/trooper-local-mac-host.sh',
     'bash /tmp/trooper-local-mac-host.sh',
+    installApp ? buildLocalMacAppInstallCommand() : '',
   ].join('\n');
 }
 
@@ -218,7 +284,7 @@ function runShellCommand(command, platform, { failureLabel = 'Command', successM
 
 async function main() {
   const args = parseArgs(process.argv.slice(2));
-  const command = args._[0] || 'help';
+  const command = args._[0] || 'onboard';
   if (args.help || args.h || command === 'help') {
     printHelp();
     return;
@@ -259,7 +325,7 @@ async function main() {
       console.error('Tokenless local install is currently available for macOS. Open Trooper to prepare a paired installer for this platform.');
       process.exit(1);
     }
-    const installCommand = buildLocalMacInstallCommand({ apiUrl });
+    const installCommand = buildLocalMacInstallCommand({ apiUrl, installApp: !args['skip-app'] });
     console.log('Starting Trooper local host setup on this Mac...');
     if (args['print-command'] || args['dry-run']) {
       console.log('\n' + installCommand);
@@ -267,7 +333,9 @@ async function main() {
     }
     runShellCommand(installCommand, platform, {
       failureLabel: 'Installer',
-      successMessage: '\nTrooper local host is installed. Open Trooper to connect this Mac to your workspace.',
+      successMessage: args['skip-app']
+        ? '\nTrooper local host is installed. Open Trooper to connect this Mac to your workspace.'
+        : '\nTrooper local host is installed. Trooper desktop app is ready.',
     });
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trooper-cli",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Official Trooper CLI for installing and managing the local desktop AI runtime.",
   "type": "module",
   "bin": {