@geekbeer/minion 3.42.3 → 3.43.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekbeer/minion",
-  "version": "3.42.3",
+  "version": "3.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

@@ -7,7 +7,7 @@
 #   minion-cli-win setup                    # Install software & register services (admin required)
 #   minion-cli-win configure --hq-url https://... --minion-id <UUID> --api-token <TOKEN>
 #   minion-cli-win uninstall [--keep-data]  # Remove agent (admin required)
-#   minion-cli-win start | stop | restart | status | health | daemons | diagnose | version | help
+#   minion-cli-win start | stop [--force] | restart | status | health | daemons | diagnose | version | help
 
 # Parse arguments manually to avoid issues with npm wrapper passing $args as array
 $Command = 'help'
@@ -16,6 +16,7 @@ $MinionId = ''
 $ApiToken = ''
 $SetupTunnel = $false
 $KeepData = $false
+$Force = $false
 
 $i = 0
 while ($i -lt $args.Count) {
@@ -28,6 +29,7 @@ while ($i -lt $args.Count) {
         '^--api-token$' { $i++; if ($i -lt $args.Count) { $ApiToken = [string]$args[$i] } }
         '^--setup-tunnel$' { $SetupTunnel = $true }
         '^--keep-data$' { $KeepData = $true }
+        '^--force$' { $Force = $true }
         '^(-h|--help)$' { $Command = 'help' }
     }
     $i++
@@ -40,10 +42,15 @@ $ErrorActionPreference = 'Stop'
 # Require Administrator for service management commands
 # ============================================================
 $adminRequired = @('setup', 'uninstall')
-if ($Command -in $adminRequired) {
+$needsAdmin = $Command -in $adminRequired
+# `stop --force` rewrites NSSM AppExit config and may need to kill processes
+# owned by the service account → requires Administrator.
+if ($Command -eq 'stop' -and $Force) { $needsAdmin = $true }
+if ($needsAdmin) {
     $currentPrincipal = New-Object Security.Principal.WindowsPrincipal([Security.Principal.WindowsIdentity]::GetCurrent())
     if (-not $currentPrincipal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
-        Write-Host "ERROR: '$Command' requires Administrator privileges." -ForegroundColor Red
+        $label = if ($Command -eq 'stop' -and $Force) { 'stop --force' } else { $Command }
+        Write-Host "ERROR: '$label' requires Administrator privileges." -ForegroundColor Red
         Write-Host "  Right-click PowerShell and select 'Run as administrator'." -ForegroundColor Yellow
         exit 1
     }
@@ -440,6 +447,108 @@ function Stop-MinionService {
     Write-Host "minion-agent service stopped"
 }
 
+function Stop-MinionServiceForce {
+    # Force-stop path used when `stop` (graceful) is broken — typically after a
+    # corrupted update where .env is unreadable, the agent API is unresponsive,
+    # or NSSM keeps respawning node.exe and locking package files.
+    #
+    # Steps:
+    #   1. Disable NSSM auto-restart on every minion service (so sc.exe stop sticks)
+    #   2. sc.exe stop each service
+    #   3. Kill remaining helper processes (tvnserver/websockify/cloudflared)
+    #   4. Kill any node.exe whose CommandLine references a minion script
+    #   5. Restore NSSM AppExit Restart so subsequent `start` behaves normally
+    Write-Host ""
+    Write-Host "=========================================" -ForegroundColor Yellow
+    Write-Host " Stop --force: bypassing graceful shutdown" -ForegroundColor Yellow
+    Write-Host "=========================================" -ForegroundColor Yellow
+    Write-Host ""
+
+    $services = @('minion-agent', 'minion-websockify', 'minion-cloudflared', 'minion-vnc')
+    $nssmAvailable = $NssmPath -and (Test-Path $NssmPath)
+
+    # Step 1: Disable NSSM auto-restart so sc.exe stop is not undone.
+    if ($nssmAvailable) {
+        foreach ($svc in $services) {
+            $state = Get-ServiceState $svc
+            if (-not $state) { continue }
+            Invoke-Nssm set $svc AppExit Default Exit | Out-Null
+            Invoke-Nssm set $svc AppThrottle 0 | Out-Null
+            Write-Detail "Disabled auto-restart for $svc"
+        }
+    } else {
+        Write-Warn "NSSM not found — skipping AppExit override (services may auto-restart)"
+    }
+
+    # Step 2: Stop each service via sc.exe (works without admin if SDDL granted).
+    foreach ($svc in $services) {
+        $state = Get-ServiceState $svc
+        if (-not $state) { continue }
+        if ($state -eq 'STOPPED') {
+            Write-Detail "$svc already stopped"
+            continue
+        }
+        sc.exe stop $svc 2>&1 | Out-Null
+        for ($i = 0; $i -lt 10; $i++) {
+            $s = Get-ServiceState $svc
+            if ($s -eq 'STOPPED') { break }
+            Start-Sleep -Seconds 1
+        }
+        $final = Get-ServiceState $svc
+        if ($final -eq 'STOPPED') {
+            Write-Detail "$svc stopped"
+        } else {
+            Write-Warn "$svc state=$final (sc.exe stop did not complete in 10s)"
+        }
+    }
+
+    # Step 3: Kill helper processes that may have been spawned outside NSSM.
+    foreach ($name in @('tvnserver', 'websockify', 'cloudflared')) {
+        $procs = Get-Process -Name $name -ErrorAction SilentlyContinue
+        if ($procs) {
+            $procs | Stop-Process -Force -ErrorAction SilentlyContinue
+            Write-Detail "Killed $name ($($procs.Count) process(es))"
+        }
+    }
+
+    # Step 4: Kill node.exe processes that hold the package files. We match on
+    # CommandLine so we don't touch unrelated node processes the user is running.
+    $nodePattern = 'minion|@geekbeer\\minion|terminal-server|workflow-runner|routine-runner|wsl-session-server'
+    try {
+        $nodeProcs = Get-CimInstance Win32_Process -Filter "Name='node.exe'" -ErrorAction Stop |
+            Where-Object { $_.CommandLine -match $nodePattern }
+        foreach ($p in $nodeProcs) {
+            try {
+                Stop-Process -Id $p.ProcessId -Force -ErrorAction Stop
+                Write-Detail "Killed node.exe pid=$($p.ProcessId)"
+            } catch {
+                Write-Warn "Failed to kill node.exe pid=$($p.ProcessId): $($_.Exception.Message)"
+            }
+        }
+        if (-not $nodeProcs) {
+            Write-Detail "No matching node.exe processes"
+        }
+    } catch {
+        Write-Warn "Could not enumerate node processes: $($_.Exception.Message)"
+    }
+
+    # Step 5: Restore AppExit Restart so a subsequent `start` behaves normally.
+    if ($nssmAvailable) {
+        foreach ($svc in $services) {
+            $state = Get-ServiceState $svc
+            if (-not $state) { continue }
+            Invoke-Nssm set $svc AppExit Default Restart | Out-Null
+            Invoke-Nssm set $svc AppThrottle 1500 | Out-Null
+        }
+        Write-Detail "Restored NSSM auto-restart settings"
+    }
+
+    Write-Host ""
+    Write-Host "Force-stop complete. If files are still locked, run:" -ForegroundColor Cyan
+    Write-Host "  Get-Process | Where-Object { `$_.Modules.FileName -like '*\@geekbeer\minion\*' } | Select Id,ProcessName" -ForegroundColor Gray
+    Write-Host ""
+}
+
 function Restart-MinionService {
     Stop-MinionService
     Start-Sleep -Seconds 2
@@ -1673,7 +1782,9 @@ switch ($Command) {
     'reconfigure' { Invoke-Configure }  # alias for backwards compatibility
     'uninstall' { Invoke-Uninstall }
     'start' { Start-MinionService }
-    'stop' { Stop-MinionService }
+    'stop' {
+        if ($Force) { Stop-MinionServiceForce } else { Stop-MinionService }
+    }
     'restart' { Restart-MinionService }
     'status' { Show-Status }
     'health' { Show-Health }
@@ -1692,7 +1803,8 @@ switch ($Command) {
         Write-Host "Commands (no admin required):"
         Write-Host "  configure     Connect to HQ, deploy skills, start services"
         Write-Host "  start         Start the minion-agent service"
-        Write-Host "  stop          Stop the minion-agent service"
+        Write-Host "  stop          Stop the minion-agent service (graceful)"
+        Write-Host "  stop --force  Force-stop all minion services & processes (admin required)"
         Write-Host "  restart       Restart the minion-agent service"
         Write-Host "  status        Show agent service status"
         Write-Host "  health        Check agent health endpoint"
@@ -1709,5 +1821,11 @@ switch ($Command) {
         Write-Host ""
         Write-Host "Uninstall options:"
         Write-Host "  --keep-data          Preserve .env file"
+        Write-Host ""
+        Write-Host "Stop options:"
+        Write-Host "  --force              Disable NSSM auto-restart, sc.exe stop all services,"
+        Write-Host "                       kill remaining helpers (tvnserver/websockify/cloudflared)"
+        Write-Host "                       and node.exe processes that lock package files."
+        Write-Host "                       Use when graceful stop fails (e.g. corrupted update)."
     }
 }