@geekbeer/minion 2.42.3 → 2.43.0

package/linux/minion-cli.sh

@@ -6,6 +6,7 @@
 # Usage:
 #   sudo minion-cli setup [options]          # Set up minion agent service (root)
 #   sudo minion-cli reconfigure [options]    # Re-register with new HQ credentials (root)
+#   sudo minion-cli uninstall [--keep-data]  # Remove agent and services (root)
 #   sudo minion-cli start                    # Start agent service (root)
 #   sudo minion-cli stop                     # Stop agent service (root)
 #   sudo minion-cli restart                  # Restart agent service (root)
@@ -807,6 +808,167 @@ CFEOF
   fi
 }
 
+# ============================================================
+# uninstall subcommand
+# ============================================================
+do_uninstall() {
+  local KEEP_DATA=false
+
+  # Parse arguments
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --keep-data)
+        KEEP_DATA=true
+        shift
+        ;;
+      *)
+        echo "Unknown option: $1"
+        echo "Usage: sudo minion-cli uninstall [--keep-data]"
+        exit 1
+        ;;
+    esac
+  done
+
+  echo "========================================="
+  echo " @geekbeer/minion Uninstall"
+  echo "========================================="
+  echo ""
+  echo "This will remove the minion agent and all related services."
+  if [ "$KEEP_DATA" = true ]; then
+    echo "  --keep-data: /opt/minion-agent/.env will be preserved."
+  else
+    echo "  Config directory /opt/minion-agent/ will be deleted."
+  fi
+  echo ""
+  echo -n "Type 'yes' to continue: "
+  read -r CONFIRM
+  if [ "$CONFIRM" != "yes" ]; then
+    echo "Uninstall cancelled."
+    exit 0
+  fi
+  echo ""
+
+  local TOTAL_STEPS=5
+
+  # Step 1: Stop and disable services
+  echo "[1/${TOTAL_STEPS}] Stopping and disabling services..."
+  case "$PROC_MGR" in
+    systemd)
+      for svc in minion-agent tmux-init novnc vnc autocutsel fluxbox xvfb; do
+        if [ -f "/etc/systemd/system/${svc}.service" ]; then
+          $SUDO systemctl stop "$svc" 2>/dev/null || true
+          $SUDO systemctl disable "$svc" 2>/dev/null || true
+          $SUDO rm -f "/etc/systemd/system/${svc}.service"
+          echo "  -> Removed ${svc}.service"
+        fi
+      done
+      $SUDO systemctl daemon-reload
+      ;;
+    supervisord)
+      for conf in minion-agent cloudflared; do
+        local CONF_FILE="/etc/supervisor/conf.d/${conf}.conf"
+        if [ -f "$CONF_FILE" ]; then
+          $SUDO supervisorctl stop "$conf" 2>/dev/null || true
+          $SUDO rm -f "$CONF_FILE"
+          echo "  -> Removed ${conf}.conf"
+        fi
+      done
+      if $SUDO supervisorctl status &>/dev/null; then
+        $SUDO supervisorctl reread 2>/dev/null || true
+        $SUDO supervisorctl update 2>/dev/null || true
+      fi
+      ;;
+    *)
+      echo "  -> No supported process manager found, skipping"
+      ;;
+  esac
+
+  # Step 2: Remove sudoers file
+  echo "[2/${TOTAL_STEPS}] Removing sudoers configuration..."
+  local SUDOERS_FILE="/etc/sudoers.d/minion-agent"
+  if [ -f "$SUDOERS_FILE" ]; then
+    $SUDO rm -f "$SUDOERS_FILE"
+    echo "  -> Removed $SUDOERS_FILE"
+  else
+    echo "  -> Not found, skipping"
+  fi
+
+  # Step 3: Remove config directory
+  echo "[3/${TOTAL_STEPS}] Removing config directory..."
+  if [ "$KEEP_DATA" = true ]; then
+    echo "  -> Skipped (--keep-data)"
+  else
+    if [ -d /opt/minion-agent ]; then
+      $SUDO rm -rf /opt/minion-agent
+      echo "  -> Removed /opt/minion-agent/"
+    else
+      echo "  -> Not found, skipping"
+    fi
+  fi
+
+  # Step 4: Remove deployed skills and rules
+  echo "[4/${TOTAL_STEPS}] Removing deployed skills and rules..."
+
+  # Detect target user home (best-effort from existing service config)
+  local UNINSTALL_HOME="$TARGET_HOME"
+
+  local CLAUDE_SKILLS_DIR="${UNINSTALL_HOME}/.claude/skills"
+  local CLAUDE_RULES_DIR="${UNINSTALL_HOME}/.claude/rules"
+
+  # Remove bundled skills (only skills that ship with the package)
+  local NPM_ROOT
+  NPM_ROOT="$(npm root -g 2>/dev/null)" || true
+  local BUNDLED_SKILLS_DIR="${NPM_ROOT}/@geekbeer/minion/skills"
+
+  if [ -d "$BUNDLED_SKILLS_DIR" ] && [ -d "$CLAUDE_SKILLS_DIR" ]; then
+    for skill_dir in "$BUNDLED_SKILLS_DIR"/*/; do
+      if [ -d "$skill_dir" ]; then
+        local skill_name
+        skill_name=$(basename "$skill_dir")
+        if [ -d "${CLAUDE_SKILLS_DIR}/${skill_name}" ]; then
+          rm -rf "${CLAUDE_SKILLS_DIR}/${skill_name}"
+          echo "  -> Removed skill: $skill_name"
+        fi
+      fi
+    done
+  else
+    echo "  -> No bundled skills to remove"
+  fi
+
+  # Remove deployed rules
+  if [ -f "${CLAUDE_RULES_DIR}/core.md" ]; then
+    rm -f "${CLAUDE_RULES_DIR}/core.md"
+    echo "  -> Removed rules: core.md"
+  fi
+
+  # Step 5: Remove Cloudflare Tunnel config
+  echo "[5/${TOTAL_STEPS}] Removing Cloudflare Tunnel configuration..."
+  if [ -d /etc/cloudflared ]; then
+    # Stop cloudflared service if running via systemd
+    if [ "$PROC_MGR" = "systemd" ]; then
+      $SUDO systemctl stop cloudflared 2>/dev/null || true
+      $SUDO systemctl disable cloudflared 2>/dev/null || true
+    fi
+    $SUDO rm -rf /etc/cloudflared
+    echo "  -> Removed /etc/cloudflared/"
+  else
+    echo "  -> Not found, skipping"
+  fi
+
+  echo ""
+  echo "========================================="
+  echo " Uninstall Complete!"
+  echo "========================================="
+  echo ""
+  echo "The minion agent services have been removed."
+  echo ""
+  echo "To also remove the npm package:"
+  echo "  npm uninstall -g @geekbeer/minion"
+  echo ""
+  echo "Software installed by setup (Claude Code, Gemini CLI, VNC, etc.)"
+  echo "was NOT removed. Uninstall them manually if needed."
+}
+
 # ============================================================
 # reconfigure subcommand
 # ============================================================
@@ -1007,6 +1169,12 @@ case "${1:-}" in
     do_setup "$@"
     ;;
 
+  uninstall)
+    require_root uninstall
+    shift
+    do_uninstall "$@"
+    ;;
+
   reconfigure)
     require_root reconfigure
     shift
@@ -1142,6 +1310,7 @@ case "${1:-}" in
     echo "Usage:"
     echo "  sudo minion-cli setup [options]           # Set up agent service (root)"
     echo "  sudo minion-cli reconfigure [options]     # Re-register with new HQ credentials (root)"
+    echo "  sudo minion-cli uninstall [options]       # Remove agent and services (root)"
     echo "  sudo minion-cli start                     # Start agent service (root)"
     echo "  sudo minion-cli stop                      # Stop agent service (root)"
     echo "  sudo minion-cli restart                   # Restart agent service (root)"
@@ -1164,6 +1333,9 @@ case "${1:-}" in
     echo "  --minion-id <UUID>    Minion ID (required)"
     echo "  --api-token <TOKEN>   API token (required)"
     echo ""
+    echo "Uninstall options:"
+    echo "  --keep-data           Keep /opt/minion-agent/.env (preserve credentials)"
+    echo ""
     echo "Status values: online, offline, busy"
     echo ""
     echo "Environment:"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekbeer/minion",
-  "version": "2.42.3",
+  "version": "2.43.0",
   "description": "AI Agent runtime for Minion - manages status and skill deployment on VPS",
   "main": "linux/server.js",
   "bin": {

package/win/minion-cli.ps1

@@ -3,6 +3,7 @@
 # Usage:
 #   minion-cli-win setup --hq-url https://... --minion-id <UUID> --api-token <TOKEN>
 #   minion-cli-win setup --setup-tunnel
+#   minion-cli-win uninstall [--keep-data]
 #   minion-cli-win start | stop | restart | status | health | diagnose | version | help
 
 # Parse arguments manually to avoid issues with npm wrapper passing $args as array
@@ -11,17 +12,19 @@ $HqUrl = ''
 $MinionId = ''
 $ApiToken = ''
 $SetupTunnel = $false
+$KeepData = $false
 
 $i = 0
 while ($i -lt $args.Count) {
     $arg = [string]$args[$i]
     switch -Regex ($arg) {
-        '^(setup|reconfigure|start|stop|restart|status|health|diagnose|version|help)$' { $Command = $arg }
+        '^(setup|reconfigure|uninstall|start|stop|restart|status|health|diagnose|version|help)$' { $Command = $arg }
         '^(-v|--version)$' { $Command = 'version' }
         '^--hq-url$' { $i++; if ($i -lt $args.Count) { $HqUrl = [string]$args[$i] } }
         '^--minion-id$' { $i++; if ($i -lt $args.Count) { $MinionId = [string]$args[$i] } }
         '^--api-token$' { $i++; if ($i -lt $args.Count) { $ApiToken = [string]$args[$i] } }
         '^--setup-tunnel$' { $SetupTunnel = $true }
+        '^--keep-data$' { $KeepData = $true }
         '^(-h|--help)$' { $Command = 'help' }
     }
     $i++
@@ -68,6 +71,28 @@ function Test-CommandExists {
     $null -ne (Get-Command $Name -ErrorAction SilentlyContinue)
 }
 
+function Get-WebsockifyCommand {
+    # Returns @(executable, args-prefix) for launching websockify.
+    # 1) websockify.exe on PATH
+    if (Get-Command websockify -ErrorAction SilentlyContinue) {
+        return @((Get-Command websockify).Source)
+    }
+    # 2) Look in Python Scripts directories
+    if (Test-CommandExists 'python') {
+        $scriptsDir = & python -c "import sysconfig; print(sysconfig.get_path('scripts'))" 2>$null
+        if ($scriptsDir) {
+            $wsExe = Join-Path $scriptsDir 'websockify.exe'
+            if (Test-Path $wsExe) { return @($wsExe) }
+        }
+    }
+    # 3) Fallback: python -m websockify
+    if (Test-CommandExists 'python') {
+        $check = & python -c "import websockify" 2>&1
+        if ($LASTEXITCODE -eq 0) { return @('python', '-m', 'websockify') }
+    }
+    return $null
+}
+
 function Get-LanIPAddress {
     try {
         $ip = (Get-NetIPAddress -AddressFamily IPv4 -ErrorAction SilentlyContinue |
@@ -329,17 +354,21 @@ function Invoke-Setup {
 
         # Try prebuilt version first (no Build Tools required)
         try {
-            & npm install node-pty-prebuilt-multiarch 2>$null
-            Write-Detail "node-pty-prebuilt-multiarch installed (no Build Tools needed)"
-            $ptyInstalled = $true
+            $npmResult = cmd /c "npm install node-pty-prebuilt-multiarch 2>&1"
+            if ($LASTEXITCODE -eq 0) {
+                Write-Detail "node-pty-prebuilt-multiarch installed (no Build Tools needed)"
+                $ptyInstalled = $true
+            }
         } catch {}
 
         # Fallback: source-compiled version (requires Visual Studio Build Tools)
         if (-not $ptyInstalled) {
             try {
-                & npm install node-pty 2>$null
-                Write-Detail "node-pty installed (compiled from source)"
-                $ptyInstalled = $true
+                $npmResult = cmd /c "npm install node-pty 2>&1"
+                if ($LASTEXITCODE -eq 0) {
+                    Write-Detail "node-pty installed (compiled from source)"
+                    $ptyInstalled = $true
+                }
             } catch {}
         }
 
@@ -412,10 +441,17 @@ if (`$vncExe) {
     }
     # Reload registry config (ensures no-auth settings are applied)
     & `$vncExe -controlapp -reload 2>`$null
-    if (Get-Command websockify -ErrorAction SilentlyContinue) {
+    `$wsCmd = Get-WebsockifyCommand
+    if (`$wsCmd) {
         `$wsProc = Get-Process -Name websockify -ErrorAction SilentlyContinue
         if (-not `$wsProc) {
-            Start-Process -FilePath (Get-Command websockify).Source -ArgumentList '6080', 'localhost:5900' -WindowStyle Hidden
+            if (`$wsCmd.Count -eq 1) {
+                Start-Process -FilePath `$wsCmd[0] -ArgumentList '6080', 'localhost:5900' -WindowStyle Hidden
+            } else {
+                # python -m websockify 6080 localhost:5900
+                `$wsArgs = (`$wsCmd[1..(`$wsCmd.Count-1)] + @('6080', 'localhost:5900')) -join ' '
+                Start-Process -FilePath `$wsCmd[0] -ArgumentList `$wsArgs -WindowStyle Hidden
+            }
         }
     }
 }
@@ -547,7 +583,7 @@ Remove-Item `$PidFile -Force -ErrorAction SilentlyContinue
 
     # Step 8: Setup websockify (WebSocket proxy for VNC)
     Write-Step 8 $totalSteps "Setting up websockify..."
-    if (Test-CommandExists 'websockify') {
+    if (Get-WebsockifyCommand) {
         Write-Detail "websockify already installed"
     }
     else {
@@ -561,9 +597,10 @@ Remove-Item `$PidFile -Force -ErrorAction SilentlyContinue
         if (-not $pythonUsable) {
             Write-Host "  Python not found. Installing via winget..."
             try {
-                & winget install --id Python.Python.3.12 --accept-package-agreements --accept-source-agreements
+                $wingetResult = cmd /c "winget install --id Python.Python.3.12 --accept-package-agreements --accept-source-agreements 2>&1"
                 $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('PATH', 'User')
-                Write-Detail "Python installed"
+                if ($LASTEXITCODE -eq 0) { Write-Detail "Python installed" }
+                else { Write-Warn "winget install may have failed (exit code $LASTEXITCODE): $wingetResult" }
             }
             catch {
                 Write-Warn "Failed to install Python: $_"
@@ -573,21 +610,28 @@ Remove-Item `$PidFile -Force -ErrorAction SilentlyContinue
 
         Write-Host "  Installing websockify via pip..."
         try {
+            # Use cmd /c to prevent pip's stderr (progress bars, warnings) from
+            # becoming RemoteException errors in PowerShell remoting sessions.
             if (Test-CommandExists 'pip') {
-                & pip install websockify 2>$null
-                Write-Detail "websockify installed"
+                $pipResult = cmd /c "pip install websockify 2>&1"
+                if ($LASTEXITCODE -eq 0) { Write-Detail "websockify installed" }
+                else { Write-Warn "pip install failed (exit code $LASTEXITCODE): $pipResult" }
             }
             elseif (Test-CommandExists 'pip3') {
-                & pip3 install websockify 2>$null
-                Write-Detail "websockify installed"
+                $pipResult = cmd /c "pip3 install websockify 2>&1"
+                if ($LASTEXITCODE -eq 0) { Write-Detail "websockify installed" }
+                else { Write-Warn "pip3 install failed (exit code $LASTEXITCODE): $pipResult" }
             }
             elseif (Test-CommandExists 'python') {
-                & python -m pip install websockify 2>$null
-                Write-Detail "websockify installed (via python -m pip)"
+                $pipResult = cmd /c "python -m pip install websockify 2>&1"
+                if ($LASTEXITCODE -eq 0) { Write-Detail "websockify installed (via python -m pip)" }
+                else { Write-Warn "python -m pip install failed (exit code $LASTEXITCODE): $pipResult" }
             }
             else {
                 Write-Warn "pip not found. Install Python first, then: pip install websockify"
             }
+            # Refresh PATH so websockify.exe in Python Scripts dir is discoverable
+            $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('PATH', 'User')
         }
         catch {
             Write-Warn "Failed to install websockify: $_"
@@ -743,6 +787,152 @@ Remove-Item `$PidFile -Force -ErrorAction SilentlyContinue
     Write-Host "  Get-Content $(Join-Path $LogDir 'service-stdout.log') -Tail 50  # View logs"
 }
 
+# ============================================================
+# Uninstall
+# ============================================================
+
+function Invoke-Uninstall {
+    Write-Host ""
+    Write-Host "=========================================" -ForegroundColor Red
+    Write-Host " @geekbeer/minion Uninstall" -ForegroundColor Red
+    Write-Host "=========================================" -ForegroundColor Red
+    Write-Host ""
+    Write-Host "This will remove the minion agent and all related configuration."
+    if ($KeepData) {
+        Write-Host "  --keep-data: $EnvFile will be preserved."
+    }
+    else {
+        Write-Host "  Data directory $DataDir will be deleted."
+    }
+    Write-Host ""
+    $confirm = Read-Host "  Type 'yes' to continue"
+    if ($confirm -ne 'yes') {
+        Write-Host "Uninstall cancelled."
+        exit 0
+    }
+    Write-Host ""
+
+    $totalSteps = 5
+
+    # Step 1: Stop agent and child processes
+    Write-Step 1 $totalSteps "Stopping agent and related processes..."
+    Stop-MinionProcess
+
+    # Stop VNC server
+    $vncProc = Get-Process -Name tvnserver -ErrorAction SilentlyContinue
+    if ($vncProc) {
+        Stop-Process -Name tvnserver -Force -ErrorAction SilentlyContinue
+        Write-Detail "TightVNC server stopped"
+    }
+
+    # Stop websockify
+    $wsProc = Get-Process -Name websockify -ErrorAction SilentlyContinue
+    if ($wsProc) {
+        Stop-Process -Name websockify -Force -ErrorAction SilentlyContinue
+        Write-Detail "websockify stopped"
+    }
+
+    # Stop cloudflared
+    $cfProc = Get-Process -Name cloudflared -ErrorAction SilentlyContinue
+    if ($cfProc) {
+        Stop-Process -Name cloudflared -Force -ErrorAction SilentlyContinue
+        Write-Detail "cloudflared stopped"
+    }
+
+    Write-Detail "All processes stopped"
+
+    # Step 2: Remove startup shortcut
+    Write-Step 2 $totalSteps "Removing auto-start registration..."
+    $startupDir = [Environment]::GetFolderPath('Startup')
+    $shortcutPath = Join-Path $startupDir 'MinionAgent.lnk'
+    if (Test-Path $shortcutPath) {
+        Remove-Item $shortcutPath -Force
+        Write-Detail "Removed $shortcutPath"
+    }
+    else {
+        Write-Detail "Startup shortcut not found, skipping"
+    }
+
+    # Step 3: Remove data directory (or keep .env)
+    Write-Step 3 $totalSteps "Removing data directory..."
+    if ($KeepData) {
+        # Remove everything except .env
+        if (Test-Path $DataDir) {
+            Get-ChildItem -Path $DataDir -Recurse -File | Where-Object { $_.FullName -ne $EnvFile } | Remove-Item -Force -ErrorAction SilentlyContinue
+            Get-ChildItem -Path $DataDir -Recurse -Directory | Sort-Object { $_.FullName.Length } -Descending | ForEach-Object {
+                if ((Get-ChildItem $_.FullName -Force | Measure-Object).Count -eq 0) {
+                    Remove-Item $_.FullName -Force -ErrorAction SilentlyContinue
+                }
+            }
+            Write-Detail "Data directory cleaned (kept .env)"
+        }
+        else {
+            Write-Detail "Data directory not found, skipping"
+        }
+    }
+    else {
+        if (Test-Path $DataDir) {
+            Remove-Item $DataDir -Recurse -Force
+            Write-Detail "Removed $DataDir"
+        }
+        else {
+            Write-Detail "Data directory not found, skipping"
+        }
+    }
+
+    # Step 4: Remove deployed skills and rules
+    Write-Step 4 $totalSteps "Removing deployed skills and rules..."
+    $claudeSkillsDir = Join-Path $env:USERPROFILE '.claude\skills'
+    $claudeRulesDir = Join-Path $env:USERPROFILE '.claude\rules'
+
+    # Remove bundled skills (only skills that ship with the package)
+    $npmRoot = & npm root -g 2>$null
+    $bundledSkillsDir = Join-Path $npmRoot '@geekbeer\minion\skills'
+    if ((Test-Path $bundledSkillsDir) -and (Test-Path $claudeSkillsDir)) {
+        Get-ChildItem -Path $bundledSkillsDir -Directory | ForEach-Object {
+            $targetSkill = Join-Path $claudeSkillsDir $_.Name
+            if (Test-Path $targetSkill) {
+                Remove-Item $targetSkill -Recurse -Force
+                Write-Detail "Removed skill: $($_.Name)"
+            }
+        }
+    }
+    else {
+        Write-Detail "No bundled skills to remove"
+    }
+
+    # Remove deployed rules
+    $coreRule = Join-Path $claudeRulesDir 'core.md'
+    if (Test-Path $coreRule) {
+        Remove-Item $coreRule -Force
+        Write-Detail "Removed rules: core.md"
+    }
+
+    # Step 5: Remove Cloudflare Tunnel configuration
+    Write-Step 5 $totalSteps "Removing Cloudflare Tunnel configuration..."
+    $cfConfigDir = Join-Path $env:USERPROFILE '.cloudflared'
+    if (Test-Path $cfConfigDir) {
+        Remove-Item $cfConfigDir -Recurse -Force
+        Write-Detail "Removed $cfConfigDir"
+    }
+    else {
+        Write-Detail "Not found, skipping"
+    }
+
+    Write-Host ""
+    Write-Host "=========================================" -ForegroundColor Green
+    Write-Host " Uninstall Complete!" -ForegroundColor Green
+    Write-Host "=========================================" -ForegroundColor Green
+    Write-Host ""
+    Write-Host "The minion agent has been removed."
+    Write-Host ""
+    Write-Host "To also remove the npm package:"
+    Write-Host "  npm uninstall -g @geekbeer/minion"
+    Write-Host ""
+    Write-Host "Software installed by setup (Node.js, Claude Code, TightVNC, etc.)"
+    Write-Host "was NOT removed. Uninstall them manually if needed."
+}
+
 # ============================================================
 # Reconfigure
 # ============================================================
@@ -828,6 +1018,9 @@ switch ($Command) {
     'setup' {
         Invoke-Setup
     }
+    'uninstall' {
+        Invoke-Uninstall
+    }
     'reconfigure' {
         Invoke-Reconfigure
     }
@@ -904,6 +1097,7 @@ switch ($Command) {
         Write-Host "Usage (no admin required):"
         Write-Host "  minion-cli-win setup [options]          # Set up agent (auto-start on login)"
         Write-Host "  minion-cli-win reconfigure [options]    # Re-register with new HQ credentials"
+        Write-Host "  minion-cli-win uninstall [options]      # Remove agent and configuration"
         Write-Host "  minion-cli-win start                    # Start agent process"
         Write-Host "  minion-cli-win stop                     # Stop agent process"
         Write-Host "  minion-cli-win restart                  # Restart agent process"
@@ -923,6 +1117,9 @@ switch ($Command) {
         Write-Host "  --minion-id <UUID>    Minion ID (required)"
         Write-Host "  --api-token <TOKEN>   API token (required)"
         Write-Host ""
+        Write-Host "Uninstall options:"
+        Write-Host "  --keep-data           Keep .env file (preserve credentials)"
+        Write-Host ""
         Write-Host "Data directory: $DataDir"
         Write-Host ""
         Write-Host "Environment:"