trooper-cli 0.1.5 → 0.1.7

package/README.md

@@ -2,7 +2,7 @@
 
 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
 
@@ -12,7 +12,7 @@ Install Trooper locally on this Mac:
 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
 
@@ -23,9 +23,12 @@ On macOS, `npx -y trooper-cli` prepares:
 - 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.
 
+One computer can host one local Trooper workspace at a time. Re-running the CLI for the same workspace is safe. If the computer is already paired to another workspace, Trooper leaves that installation unchanged and asks you to use another computer, choose Trooper Cloud, or uninstall the existing local host first.
+
 ## Commands
 
 ### Install local runtime
@@ -40,6 +43,12 @@ This is shorthand for:
 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:
@@ -65,6 +74,8 @@ npx -y --prefer-online trooper-cli@latest uninstall --yes
 
 This removes Trooper's local runtime, LaunchAgents, installer command file, and Trooper local Docker container. It leaves Docker, Colima, Homebrew, Node, and npm installed because those may be used by other projects.
 
+When online, uninstall also releases this computer's workspace binding so it can be paired elsewhere.
+
 Keep local workspace/config data:
 
 ```bash
@@ -85,7 +96,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

@@ -2,9 +2,13 @@
 
 import { spawn } from 'node:child_process';
 import { randomBytes } from 'node:crypto';
+import { existsSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
 
 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',
@@ -33,6 +37,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
@@ -49,7 +54,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;
     }
@@ -86,7 +91,110 @@ function localToken(prefix) {
   return `${prefix}_${randomBytes(24).toString('base64url')}`;
 }
 
-function buildLocalMacInstallCommand({ apiUrl }) {
+function decodeShellEnvValue(value = '') {
+  const normalized = String(value || '').trim();
+  if (normalized.startsWith("'") && normalized.endsWith("'")) return normalized.slice(1, -1);
+  return normalized.replace(/\\([\\ :/?&=])/g, '$1');
+}
+
+function readExistingLocalHostBinding() {
+  if (process.platform !== 'darwin') return null;
+  const installIdPath = join(homedir(), 'Library', 'Application Support', 'Trooper', 'install-id');
+  const envPath = join(homedir(), 'Library', 'Application Support', 'Trooper', 'runtime', 'trooper-local-host.env');
+  const persistedHostDeviceId = existsSync(installIdPath)
+    ? String(readFileSync(installIdPath, 'utf8') || '').trim()
+    : '';
+  if (!existsSync(envPath)) {
+    return persistedHostDeviceId ? {
+      envPath,
+      orgId: '',
+      hostDeviceId: persistedHostDeviceId,
+      apiUrl: DEFAULT_API_URL,
+      token: '',
+      paired: false,
+    } : null;
+  }
+  try {
+    const values = {};
+    for (const line of readFileSync(envPath, 'utf8').split(/\r?\n/)) {
+      const match = line.match(/^([A-Z0-9_]+)=(.*)$/);
+      if (match) values[match[1]] = decodeShellEnvValue(match[2]);
+    }
+    if (!values.ORG_ID) return null;
+    return {
+      envPath,
+      orgId: values.ORG_ID,
+      hostDeviceId: persistedHostDeviceId || values.TROOPER_INSTALLATION_ID || values.HOST_DEVICE_ID || '',
+      apiUrl: values.API_URL || DEFAULT_API_URL,
+      token: values.BRIDGE_AUTH_TOKEN || values.GATEWAY_TOKEN || '',
+      paired: values.ORG_ID !== 'local-unpaired',
+    };
+  } catch {
+    return null;
+  }
+}
+
+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',
@@ -101,10 +209,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');
 }
 
@@ -122,6 +232,26 @@ GROUP_ID="\$(/usr/bin/id -g)"
 
 echo "Uninstalling Trooper local host from this Mac..."
 
+if [[ -f "$TROOPER_HOME/trooper-local-host.env" ]]; then
+  set -a
+  source "$TROOPER_HOME/trooper-local-host.env"
+  set +a
+  if [[ -n "\${ORG_ID:-}" && "\${ORG_ID:-}" != "local-unpaired" && -n "\${BRIDGE_AUTH_TOKEN:-}" ]]; then
+    RELEASE_API="\${API_URL:-${DEFAULT_API_URL}}"
+    RELEASE_BODY="$(ORG_ID="$ORG_ID" HOST_DEVICE_ID="\${TROOPER_INSTALLATION_ID:-\${HOST_DEVICE_ID:-}}" BRIDGE_AUTH_TOKEN="$BRIDGE_AUTH_TOKEN" /usr/bin/python3 - <<'PY'
+import json, os
+print(json.dumps({
+  "token": os.environ.get("BRIDGE_AUTH_TOKEN", ""),
+  "hostDeviceId": os.environ.get("HOST_DEVICE_ID", ""),
+}, separators=(",", ":")))
+PY
+)"
+    /usr/bin/curl -fsS -X POST "$RELEASE_API/api/organizations/$ORG_ID/local-host/release" \
+      -H 'Content-Type: application/json' --data "$RELEASE_BODY" >/dev/null \
+      || echo "Warning: Trooper could not release the online workspace binding. Local removal will continue."
+  fi
+fi
+
 ROOT_OWNED_PATHS=()
 for path in "$TROOPER_HOME" "$TROOPER_PARENT_DIR/install-local-host.command" "$PLIST_DIR"/so.trooper.local-*.plist; do
   if [[ -e "$path" && ! -O "$path" ]]; then
@@ -174,14 +304,14 @@ fi
 echo "Docker, Colima, Homebrew, Node, and npm were left installed."`;
 }
 
-async function fetchSetupGuide({ apiUrl, token, platform }) {
+async function fetchSetupGuide({ apiUrl, token, platform, hostDeviceId = '' }) {
   const res = await fetch(`${apiUrl}/api/local-host/setup`, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
       'x-trooper-setup-token': token,
     },
-    body: JSON.stringify({ token, platform }),
+    body: JSON.stringify({ token, platform, hostDeviceId }),
   });
   const data = await res.json().catch(async () => ({ message: await res.text() }));
   if (!res.ok) {
@@ -261,7 +391,21 @@ 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 existingBinding = readExistingLocalHostBinding();
+    if (existingBinding?.paired) {
+      console.log(`This Mac already hosts Trooper workspace ${existingBinding.orgId}.`);
+      console.log('The existing local workspace was left unchanged. Opening Trooper...');
+      if (args['print-command'] || args['dry-run']) {
+        console.log('\n' + buildLocalMacAppInstallCommand());
+        return;
+      }
+      runShellCommand(buildLocalMacAppInstallCommand(), platform, {
+        failureLabel: 'Trooper desktop app',
+        successMessage: '\nTrooper desktop app is ready.',
+      });
+      return;
+    }
+    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);
@@ -269,13 +413,27 @@ 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;
   }
 
+  const existingBinding = readExistingLocalHostBinding();
   console.log(`Preparing Trooper local setup from ${apiUrl}...`);
-  const guide = await fetchSetupGuide({ apiUrl, token, platform });
+  const guide = await fetchSetupGuide({
+    apiUrl,
+    token,
+    platform,
+    hostDeviceId: existingBinding?.hostDeviceId || '',
+  });
+  if (existingBinding?.paired && existingBinding.orgId !== guide.orgId) {
+    console.error(`This Mac already hosts Trooper workspace ${existingBinding.orgId}.`);
+    console.error(`Trooper will not replace it with workspace ${guide.orgId}.`);
+    console.error('Open the existing workspace, use another computer, or run `npx -y trooper-cli uninstall --yes` first.');
+    process.exit(73);
+  }
   const label = guide.organizationName ? ` for ${guide.organizationName}` : '';
   console.log(`Starting Trooper ${guide.platform || platform} local host setup${label}.`);
 

package/package.json

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