trooper-cli 0.1.6 → 0.1.7

package/README.md

@@ -27,6 +27,8 @@ On macOS, `npx -y trooper-cli` prepares:
 
 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
@@ -72,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

package/bin/trooper.js

@@ -2,6 +2,9 @@
 
 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';
@@ -88,6 +91,49 @@ function localToken(prefix) {
   return `${prefix}_${randomBytes(24).toString('base64url')}`;
 }
 
+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"
@@ -186,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
@@ -238,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) {
@@ -325,6 +391,20 @@ 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 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']) {
@@ -340,8 +420,20 @@ async function main() {
     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.6",
+  "version": "0.1.7",
   "description": "Official Trooper CLI for installing and managing the local desktop AI runtime.",
   "type": "module",
   "bin": {