@geekbeer/minion 2.42.3 → 2.42.5

package/package.json

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

package/win/minion-cli.ps1

@@ -68,6 +68,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 +351,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 +438,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 +580,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 +594,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 +607,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: $_"