@geekbeer/minion 3.59.2 → 3.59.3

package/package.json

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

package/win/minion-cli.ps1

@@ -17,6 +17,7 @@ $ApiToken = ''
 $SetupTunnel = $false
 $KeepData = $false
 $Force = $false
+$All = $false
 
 $i = 0
 while ($i -lt $args.Count) {
@@ -30,6 +31,7 @@ while ($i -lt $args.Count) {
         '^--setup-tunnel$' { $SetupTunnel = $true }
         '^--keep-data$' { $KeepData = $true }
         '^--force$' { $Force = $true }
+        '^--all$' { $All = $true }
         '^(-h|--help)$' { $Command = 'help' }
     }
     $i++
@@ -555,6 +557,70 @@ function Restart-MinionService {
     Start-MinionService
 }
 
+function Restart-AllMinionServices {
+    # Restart every NSSM-managed minion service plus the user-session logon tasks.
+    # Use case: Windows Update or similar reboot left some services (typically
+    # cloudflared, which is DEMAND_START) not running. The plain `restart`
+    # command only touches minion-agent, so this is the catch-all recovery path.
+    $services = @('minion-cloudflared', 'minion-websockify', 'minion-agent')
+
+    # Step 1: Ask minion-agent to shut down gracefully (sends offline heartbeat).
+    # Same pattern as Stop-MinionService — don't wait for exit, sc.exe will finish it.
+    $token = ''
+    if (Test-Path $EnvFile) {
+        $envVars = Read-EnvFile $EnvFile
+        if ($envVars['API_TOKEN']) { $token = $envVars['API_TOKEN'] }
+    }
+    try {
+        $headers = @{}
+        if ($token) { $headers['Authorization'] = "Bearer $token" }
+        Invoke-RestMethod -Uri "$AgentUrl/api/shutdown" -Method POST `
+            -ContentType 'application/json' -Headers $headers -TimeoutSec 3 | Out-Null
+    } catch {
+        # Agent may already be down — sc.exe stop will handle it
+    }
+
+    # Step 2: Stop services (cloudflared first so tunnel teardown doesn't race
+    # with agent shutdown, websockify next, agent last).
+    foreach ($svc in $services) {
+        $state = Get-ServiceState $svc
+        if (-not $state) {
+            Write-Warn "$svc: not installed, skipping"
+            continue
+        }
+        if ($state -ne 'STOPPED') {
+            Write-Host "Stopping $svc..."
+            sc.exe stop $svc 2>&1 | Out-Null
+        }
+    }
+
+    # Step 3: Wait for all services to reach STOPPED (up to 15 seconds total).
+    for ($i = 0; $i -lt 15; $i++) {
+        $stillRunning = $false
+        foreach ($svc in $services) {
+            $s = Get-ServiceState $svc
+            if ($s -and $s -ne 'STOPPED') { $stillRunning = $true; break }
+        }
+        if (-not $stillRunning) { break }
+        Start-Sleep -Seconds 1
+    }
+
+    # Step 4: Start services in reverse order (agent → websockify → cloudflared).
+    foreach ($svc in @('minion-agent', 'minion-websockify', 'minion-cloudflared')) {
+        $state = Get-ServiceState $svc
+        if (-not $state) { continue }
+        Write-Host "Starting $svc..."
+        sc.exe start $svc 2>&1 | Out-Null
+    }
+
+    # Step 5: Re-trigger user-session logon tasks. schtasks /Run is a no-op if
+    # the task is already running, so this is safe regardless of current state.
+    schtasks /Run /TN MinionVNC 2>$null | Out-Null
+    schtasks /Run /TN MinionWSL 2>$null | Out-Null
+
+    Write-Host "All minion services restarted"
+}
+
 # ============================================================
 # Setup
 # ============================================================
@@ -1785,7 +1851,9 @@ switch ($Command) {
     'stop' {
         if ($Force) { Stop-MinionServiceForce } else { Stop-MinionService }
     }
-    'restart' { Restart-MinionService }
+    'restart' {
+        if ($All) { Restart-AllMinionServices } else { Restart-MinionService }
+    }
     'status' { Show-Status }
     'health' { Show-Health }
     'daemons' { Show-Daemons }
@@ -1806,6 +1874,7 @@ switch ($Command) {
         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 "  restart --all Restart all minion services (agent + websockify + cloudflared)"
         Write-Host "  status        Show agent service status"
         Write-Host "  health        Check agent health endpoint"
         Write-Host "  daemons       Show all daemon service status"
@@ -1827,5 +1896,11 @@ switch ($Command) {
         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)."
+        Write-Host ""
+        Write-Host "Restart options:"
+        Write-Host "  --all                Restart minion-agent, minion-websockify, and"
+        Write-Host "                       minion-cloudflared, then re-trigger MinionVNC/MinionWSL"
+        Write-Host "                       logon tasks. Use after Windows Update or when only"
+        Write-Host "                       some services came back online."
     }
 }