trooper-cli 0.1.0 → 0.1.1

package/bin/trooper.js

@@ -5,6 +5,12 @@ 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 LOCAL_MAC_LABELS = [
+  'so.trooper.local-gateway',
+  'so.trooper.local-bridge',
+  'so.trooper.local-tunnel',
+  'so.trooper.local-heartbeat',
+];
 
 function printHelp() {
   console.log(`Trooper CLI
@@ -12,15 +18,19 @@ function printHelp() {
 Usage:
   npx -y trooper-cli onboard --yes
   npx -y trooper-cli onboard --yes --token <setup-token>
+  npx -y trooper-cli uninstall --yes
 
 Aliases:
   setup                 Same as onboard
+  remove                Same as uninstall
 
 Options:
   --token <token>       Optional short-lived setup token from Trooper for workspace pairing
   --api <url>           Trooper API URL (defaults to production)
   --platform <name>     macos, windows, or linux (defaults to this computer)
   --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
   --print-command       Print the installer command without running it
   --dry-run             Same as --print-command
   -h, --help            Show this help
@@ -37,7 +47,7 @@ function parseArgs(argv) {
     }
     const [key, inlineValue] = arg.split('=', 2);
     const name = key.replace(/^-+/, '');
-    if (['help', 'h', 'dry-run', 'print-command', 'yes', 'y'].includes(name)) {
+    if (['help', 'h', 'dry-run', 'print-command', 'yes', 'y', 'keep-data', 'remove-app'].includes(name)) {
       args[name] = true;
       continue;
     }
@@ -96,6 +106,62 @@ function buildLocalMacInstallCommand({ apiUrl }) {
   ].join('\n');
 }
 
+function buildLocalMacUninstallCommand({ keepData = false, removeApp = false } = {}) {
+  const labels = LOCAL_MAC_LABELS.map(shellSingleQuote).join(' ');
+  return `set -euo pipefail
+TROOPER_HOME="\${TROOPER_HOME:-$HOME/Library/Application Support/Trooper/runtime}"
+TROOPER_PARENT_DIR="\$(dirname "$TROOPER_HOME")"
+PLIST_DIR="$HOME/Library/LaunchAgents"
+OPENCLAW_GATEWAY_CONTAINER="\${OPENCLAW_GATEWAY_CONTAINER:-openclaw-openclaw-gateway-1}"
+LABELS=(${labels})
+
+echo "Uninstalling Trooper local host from this Mac..."
+
+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
+    ROOT_OWNED_PATHS+=("$path")
+  fi
+done
+if (( \${#ROOT_OWNED_PATHS[@]} > 0 )); then
+  echo "Repairing ownership from an earlier Trooper local-host installation..."
+  sudo chown -R "\$(id -u):\$(id -g)" "\${ROOT_OWNED_PATHS[@]}"
+fi
+
+for label in "\${LABELS[@]}"; do
+  launchctl bootout "gui/\$(id -u)/$label" >/dev/null 2>&1 || true
+  launchctl bootout "gui/\$(id -u)" "$PLIST_DIR/$label.plist" >/dev/null 2>&1 || true
+  rm -f "$PLIST_DIR/$label.plist"
+done
+
+if command -v docker >/dev/null 2>&1; then
+  docker rm -f "$OPENCLAW_GATEWAY_CONTAINER" trooper-local-gateway >/dev/null 2>&1 || true
+fi
+
+rm -f "$TROOPER_PARENT_DIR/install-local-host.command" /tmp/trooper-local-mac-host.sh
+
+if [[ ${keepData ? '1' : '0'} == "1" ]]; then
+  rm -rf "$TROOPER_HOME/bridge" "$TROOPER_HOME/bin" "$TROOPER_HOME/logs"
+  rm -f "$TROOPER_HOME/trooper-local-host.env"
+  echo "Preserved local Trooper data at: $TROOPER_HOME/openclaw-data"
+else
+  rm -rf "$TROOPER_HOME"
+fi
+
+if [[ ${removeApp ? '1' : '0'} == "1" ]]; then
+  rm -rf "$HOME/Applications/Trooper.app" 2>/dev/null || true
+  if [[ -d "/Applications/Trooper.app" ]]; then
+    rm -rf "/Applications/Trooper.app" 2>/dev/null || echo "Trooper.app in /Applications still exists; remove it from Finder or rerun with permission."
+  fi
+fi
+
+echo "Trooper local host has been uninstalled."
+if [[ ${keepData ? '1' : '0'} != "1" ]]; then
+  echo "Local runtime data was removed from: $TROOPER_HOME"
+fi
+echo "Docker, Colima, Homebrew, Node, and npm were left installed."`;
+}
+
 async function fetchSetupGuide({ apiUrl, token, platform }) {
   const res = await fetch(`${apiUrl}/api/local-host/setup`, {
     method: 'POST',
@@ -118,19 +184,19 @@ async function fetchSetupGuide({ apiUrl, token, platform }) {
   return data;
 }
 
-function runInstallCommand(command, platform, { successMessage = '' } = {}) {
+function runShellCommand(command, platform, { failureLabel = 'Command', successMessage = '' } = {}) {
   const isWindows = platform === 'windows' || process.platform === 'win32';
   const child = isWindows
     ? spawn('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', command], { stdio: 'inherit' })
     : spawn(process.platform === 'darwin' ? '/bin/zsh' : '/bin/bash', ['-lc', command], { stdio: 'inherit' });
 
   child.on('error', (error) => {
-    console.error(`Could not start installer: ${error.message}`);
+    console.error(`Could not start ${failureLabel.toLowerCase()}: ${error.message}`);
     process.exit(1);
   });
   child.on('exit', (code, signal) => {
     if (signal) {
-      console.error(`Installer stopped by signal ${signal}`);
+      console.error(`${failureLabel} stopped by signal ${signal}`);
       process.exit(1);
     }
     if ((code ?? 0) === 0 && successMessage) {
@@ -147,7 +213,7 @@ async function main() {
     printHelp();
     return;
   }
-  if (!['setup', 'onboard'].includes(command)) {
+  if (!['setup', 'onboard', 'uninstall', 'remove'].includes(command)) {
     console.error(`Unknown command: ${command}`);
     printHelp();
     process.exit(1);
@@ -157,6 +223,27 @@ async function main() {
   const platform = String(args.platform || process.env.TROOPER_SETUP_PLATFORM || detectPlatform()).trim().toLowerCase();
   const token = String(args.token || args['setup-token'] || process.env.TROOPER_SETUP_TOKEN || '').trim();
 
+  if (command === 'uninstall' || command === 'remove') {
+    if (platform !== 'macos') {
+      console.error('Trooper local-host uninstall is currently available for macOS.');
+      process.exit(1);
+    }
+    if (!args.yes && !args.y && !args['print-command'] && !args['dry-run']) {
+      console.error('Refusing to uninstall without --yes. Run: npx -y trooper-cli uninstall --yes');
+      process.exit(1);
+    }
+    const uninstallCommand = buildLocalMacUninstallCommand({
+      keepData: Boolean(args['keep-data']),
+      removeApp: Boolean(args['remove-app']),
+    });
+    if (args['print-command'] || args['dry-run']) {
+      console.log(uninstallCommand);
+      return;
+    }
+    runShellCommand(uninstallCommand, platform, { failureLabel: 'Uninstall' });
+    return;
+  }
+
   if (!token) {
     if (platform !== 'macos') {
       console.error('Tokenless local install is currently available for macOS. Open Trooper to prepare a paired installer for this platform.');
@@ -168,7 +255,8 @@ async function main() {
       console.log('\n' + installCommand);
       return;
     }
-    runInstallCommand(installCommand, platform, {
+    runShellCommand(installCommand, platform, {
+      failureLabel: 'Installer',
       successMessage: '\nTrooper local host is installed. Open Trooper to connect this Mac to your workspace.',
     });
     return;
@@ -184,7 +272,7 @@ async function main() {
     return;
   }
 
-  runInstallCommand(guide.installCommand, platform);
+  runShellCommand(guide.installCommand, platform, { failureLabel: 'Installer' });
 }
 
 main().catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trooper-cli",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Trooper local host setup CLI",
   "type": "module",
   "bin": {