@geekbeer/minion 3.5.33 → 3.5.34

package/package.json

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

package/win/minion-cli.ps1

@@ -114,6 +114,35 @@ function Test-CommandExists {
     $null -ne (Get-Command $Name -ErrorAction SilentlyContinue)
 }
 
+function Invoke-Winget {
+    # Wrapper for winget install that handles broken sources.
+    # winget's msstore source can fail with 0x8a15000f on fresh/misconfigured systems.
+    # This function tries: (1) --source winget, (2) winget source reset + retry, (3) fail.
+    param([string]$Id)
+
+    if (-not (Test-CommandExists 'winget')) { return $false }
+
+    # Attempt 1: install with --source winget (skip msstore)
+    $result = cmd /c "winget install --id $Id --source winget --accept-package-agreements --accept-source-agreements 2>&1"
+    if ($LASTEXITCODE -eq 0) { return $true }
+
+    # Attempt 2: reset sources and retry
+    Write-Host "  Retrying after winget source reset..."
+    cmd /c "winget source reset --force 2>&1" | Out-Null
+    $result = cmd /c "winget install --id $Id --source winget --accept-package-agreements --accept-source-agreements 2>&1"
+    if ($LASTEXITCODE -eq 0) { return $true }
+
+    return $false
+}
+
+function Remove-ScheduledTaskSilent {
+    # Delete a scheduled task without emitting errors if it doesn't exist.
+    # PowerShell's NativeCommandError makes schtasks stderr impossible to suppress
+    # with 2>&1 | Out-Null alone, so we run via cmd /c.
+    param([string]$TaskName)
+    cmd /c "schtasks /Delete /TN `"$TaskName`" /F >nul 2>&1"
+}
+
 function Get-WebsockifyCommand {
     # Returns @(executable, args-prefix) for launching websockify.
     # Python writes informational output to stderr, which causes terminating errors
@@ -491,8 +520,8 @@ function Invoke-Setup {
     }
     else {
         Write-Host "  Installing Node.js via winget..."
-        try {
-            & winget install --id OpenJS.NodeJS.LTS --source winget --accept-package-agreements --accept-source-agreements
+        $installed = Invoke-Winget 'OpenJS.NodeJS.LTS'
+        if ($installed) {
             # Refresh PATH
             $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('PATH', 'User')
             if (Test-CommandExists 'node') {
@@ -503,7 +532,7 @@ function Invoke-Setup {
                 exit 1
             }
         }
-        catch {
+        else {
             Write-Error "Failed to install Node.js. Please install manually from https://nodejs.org/"
             exit 1
         }
@@ -523,8 +552,8 @@ function Invoke-Setup {
     }
     else {
         Write-Host "  Installing Git via winget..."
-        try {
-            & winget install --id Git.Git --source winget --accept-package-agreements --accept-source-agreements
+        $installed = Invoke-Winget 'Git.Git'
+        if ($installed) {
             # Refresh PATH
             $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('PATH', 'User')
             if (Test-CommandExists 'git') {
@@ -538,7 +567,7 @@ function Invoke-Setup {
                 Write-Warn "Git installed but not in PATH. Please restart this terminal."
             }
         }
-        catch {
+        else {
             Write-Warn "Failed to install Git. Please install manually from https://git-scm.com/downloads/win"
         }
     }
@@ -761,7 +790,7 @@ function Invoke-Setup {
         Invoke-Nssm remove minion-vnc confirm
 
         # Register VNC as logon task (must run in user session for desktop capture)
-        schtasks /Delete /TN "MinionVNC" /F 2>&1 | Out-Null
+        Remove-ScheduledTaskSilent "MinionVNC"
         schtasks /Create /TN "MinionVNC" /TR "'$vncExePath' -run" /SC ONLOGON /RL HIGHEST /F | Out-Null
         Write-Detail "TightVNC registered as logon task (user session, not service)"
     }
@@ -780,15 +809,13 @@ function Invoke-Setup {
         }
         if (-not $pythonUsable) {
             Write-Host "  Python not found. Installing via winget..."
-            try {
-                $wingetResult = cmd /c "winget install --id Python.Python.3.12 --source winget --accept-package-agreements --accept-source-agreements 2>&1"
+            $installed = Invoke-Winget 'Python.Python.3.12'
+            if ($installed) {
                 $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('PATH', 'User')
-                if ($LASTEXITCODE -eq 0) { Write-Detail "Python installed" }
-                else { Write-Warn "winget install may have failed (exit code $LASTEXITCODE): $wingetResult" }
+                Write-Detail "Python installed"
             }
-            catch {
-                Write-Warn "Failed to install Python: $_"
-                Write-Host "  Install manually: winget install --id Python.Python.3.12 --source winget"
+            else {
+                Write-Warn "Failed to install Python. Install manually: winget install --id Python.Python.3.12"
             }
         }
 
@@ -1012,7 +1039,7 @@ function Invoke-Uninstall {
     }
 
     # Remove VNC logon task and legacy NSSM service
-    schtasks /Delete /TN "MinionVNC" /F 2>&1 | Out-Null
+    Remove-ScheduledTaskSilent "MinionVNC"
     Invoke-Nssm stop minion-vnc
     Invoke-Nssm remove minion-vnc confirm
     Write-Detail "VNC logon task and legacy service removed"
@@ -1245,8 +1272,10 @@ function Invoke-Configure {
         if (-not (Test-CommandExists 'cloudflared')) {
             Write-Host "  Installing cloudflared..."
             if (Test-CommandExists 'winget') {
-                & winget install --id Cloudflare.cloudflared --source winget --accept-package-agreements --accept-source-agreements
-                $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('PATH', 'User')
+                $installed = Invoke-Winget 'Cloudflare.cloudflared'
+                if ($installed) {
+                    $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('PATH', 'User')
+                }
             }
             elseif (Test-CommandExists 'choco') {
                 & choco install cloudflared -y