@geekbeer/minion 3.5.33 → 3.5.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekbeer/minion",
-  "version": "3.5.33",
+  "version": "3.5.35",
   "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,56 @@ function Test-CommandExists {
     $null -ne (Get-Command $Name -ErrorAction SilentlyContinue)
 }
 
+function Install-GitDirect {
+    # Download and install Git for Windows from GitHub Releases.
+    # Uses the GitHub API to resolve the latest 64-bit installer URL.
+    Write-Host "  Downloading Git for Windows..."
+    try {
+        $releaseApi = 'https://api.github.com/repos/git-for-windows/git/releases/latest'
+        $release = Invoke-RestMethod -Uri $releaseApi -UseBasicParsing
+        $asset = $release.assets | Where-Object { $_.name -match '64-bit\.exe$' -and $_.name -notmatch 'portable' } | Select-Object -First 1
+        if (-not $asset) { Write-Warn "Could not find Git installer from GitHub releases"; return $false }
+
+        $installerPath = Join-Path $env:TEMP $asset.name
+        Invoke-WebRequest -Uri $asset.browser_download_url -OutFile $installerPath -UseBasicParsing
+        Write-Host "  Running Git installer (silent)..."
+        $proc = Start-Process -FilePath $installerPath -ArgumentList '/VERYSILENT', '/NORESTART', '/SP-' -Wait -PassThru
+        Remove-Item $installerPath -Force -ErrorAction SilentlyContinue
+        return ($proc.ExitCode -eq 0)
+    }
+    catch {
+        Write-Warn "Git download failed: $_"
+        return $false
+    }
+}
+
+function Install-PythonDirect {
+    # Download and install Python from python.org.
+    # Installs for all users with PATH prepended.
+    Write-Host "  Downloading Python 3.12..."
+    try {
+        $pyUrl = 'https://www.python.org/ftp/python/3.12.8/python-3.12.8-amd64.exe'
+        $installerPath = Join-Path $env:TEMP 'python-installer.exe'
+        Invoke-WebRequest -Uri $pyUrl -OutFile $installerPath -UseBasicParsing
+        Write-Host "  Running Python installer (silent)..."
+        $proc = Start-Process -FilePath $installerPath -ArgumentList '/quiet', 'InstallAllUsers=1', 'PrependPath=1', 'Include_pip=1' -Wait -PassThru
+        Remove-Item $installerPath -Force -ErrorAction SilentlyContinue
+        return ($proc.ExitCode -eq 0)
+    }
+    catch {
+        Write-Warn "Python download failed: $_"
+        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
@@ -490,23 +540,8 @@ function Invoke-Setup {
         Write-Detail "Node.js $nodeVersion already installed"
     }
     else {
-        Write-Host "  Installing Node.js via winget..."
-        try {
-            & winget install --id OpenJS.NodeJS.LTS --source winget --accept-package-agreements --accept-source-agreements
-            # Refresh PATH
-            $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('PATH', 'User')
-            if (Test-CommandExists 'node') {
-                Write-Detail "Node.js installed successfully"
-            }
-            else {
-                Write-Warn "Node.js installed but not in PATH. Please restart this terminal."
-                exit 1
-            }
-        }
-        catch {
-            Write-Error "Failed to install Node.js. Please install manually from https://nodejs.org/"
-            exit 1
-        }
+        Write-Error "Node.js is required but not installed. Please install from https://nodejs.org/ and re-run setup."
+        exit 1
     }
 
     # Step 2: Install Git (required by Claude Code for git-bash)
@@ -522,9 +557,8 @@ function Invoke-Setup {
         if (Test-Path $candidateBash) { $gitBashPath = $candidateBash }
     }
     else {
-        Write-Host "  Installing Git via winget..."
-        try {
-            & winget install --id Git.Git --source winget --accept-package-agreements --accept-source-agreements
+        $installed = Install-GitDirect
+        if ($installed) {
             # Refresh PATH
             $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('PATH', 'User')
             if (Test-CommandExists 'git') {
@@ -538,7 +572,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 +795,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)"
     }
@@ -779,16 +813,13 @@ function Invoke-Setup {
             if ($pyVer -match '\d+\.\d+') { $pythonUsable = $true }
         }
         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 = Install-PythonDirect
+            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 from https://www.python.org/downloads/"
             }
         }
 
@@ -1012,7 +1043,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"
@@ -1243,21 +1274,16 @@ function Invoke-Configure {
 
         # Install cloudflared if needed
         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')
-            }
-            elseif (Test-CommandExists 'choco') {
-                & choco install cloudflared -y
-            }
-            else {
-                Write-Host "  Downloading cloudflared..."
+            Write-Host "  Downloading cloudflared..."
+            try {
                 $cfUrl = 'https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-windows-amd64.exe'
                 $cfPath = Join-Path $DataDir 'cloudflared.exe'
-                Invoke-WebRequest -Uri $cfUrl -OutFile $cfPath
+                Invoke-WebRequest -Uri $cfUrl -OutFile $cfPath -UseBasicParsing
                 Write-Detail "cloudflared downloaded to $cfPath"
             }
+            catch {
+                Write-Warn "Failed to download cloudflared: $_"
+            }
         }
         else {
             Write-Detail "cloudflared already installed"