@geekbeer/minion 3.5.31 → 3.5.33

package/package.json

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

package/win/minion-cli.ps1

@@ -492,7 +492,7 @@ function Invoke-Setup {
     else {
         Write-Host "  Installing Node.js via winget..."
         try {
-            & winget install --id OpenJS.NodeJS.LTS --accept-package-agreements --accept-source-agreements
+            & 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') {
@@ -524,7 +524,7 @@ function Invoke-Setup {
     else {
         Write-Host "  Installing Git via winget..."
         try {
-            & winget install --id Git.Git --accept-package-agreements --accept-source-agreements
+            & winget install --id Git.Git --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 'git') {
@@ -761,7 +761,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>$null
+        schtasks /Delete /TN "MinionVNC" /F 2>&1 | Out-Null
         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)"
     }
@@ -781,14 +781,14 @@ 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 --accept-package-agreements --accept-source-agreements 2>&1"
+                $wingetResult = cmd /c "winget install --id Python.Python.3.12 --source winget --accept-package-agreements --accept-source-agreements 2>&1"
                 $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" }
             }
             catch {
                 Write-Warn "Failed to install Python: $_"
-                Write-Host "  Install manually: winget install Python.Python.3.12"
+                Write-Host "  Install manually: winget install --id Python.Python.3.12 --source winget"
             }
         }
 
@@ -996,7 +996,7 @@ function Invoke-Uninstall {
     }
     Write-Host ""
 
-    $totalSteps = 6
+    $totalSteps = 7
 
     # Step 1: Stop and remove all NSSM services
     Write-Step 1 $totalSteps "Stopping and removing services..."
@@ -1012,7 +1012,7 @@ function Invoke-Uninstall {
     }
 
     # Remove VNC logon task and legacy NSSM service
-    schtasks /Delete /TN "MinionVNC" /F 2>$null
+    schtasks /Delete /TN "MinionVNC" /F 2>&1 | Out-Null
     Invoke-Nssm stop minion-vnc
     Invoke-Nssm remove minion-vnc confirm
     Write-Detail "VNC logon task and legacy service removed"
@@ -1103,8 +1103,43 @@ function Invoke-Uninstall {
         Write-Detail "Removed legacy service credentials file"
     }
 
-    # Step 6: Remove Cloudflare Tunnel configuration
-    Write-Step 6 $totalSteps "Removing Cloudflare Tunnel configuration..."
+    # Step 6: Remove npm global bin from user PATH (added by postinstall)
+    Write-Step 6 $totalSteps "Cleaning up PATH entries..."
+    $npmBin = $null
+    try { $npmBin = (& npm prefix -g 2>$null) } catch {}
+    if ($npmBin) {
+        $targetUserName = Split-Path $TargetUserProfile -Leaf
+        $targetUserSid = $null
+        try {
+            $targetUserSid = (New-Object System.Security.Principal.NTAccount($targetUserName)).Translate(
+                [System.Security.Principal.SecurityIdentifier]).Value
+        } catch {}
+        if ($targetUserSid) {
+            $regPath = "Registry::HKEY_USERS\$targetUserSid\Environment"
+            if (Test-Path $regPath) {
+                $currentPath = (Get-ItemProperty -Path $regPath -Name PATH -ErrorAction SilentlyContinue).PATH
+                if ($currentPath -and $currentPath -like "*$npmBin*") {
+                    $newPath = ($currentPath -split ';' | Where-Object { $_ -ne $npmBin }) -join ';'
+                    if ($newPath) {
+                        Set-ItemProperty -Path $regPath -Name PATH -Value $newPath
+                    } else {
+                        Remove-ItemProperty -Path $regPath -Name PATH -ErrorAction SilentlyContinue
+                    }
+                    Write-Detail "Removed $npmBin from target user's PATH"
+                }
+            }
+        }
+        # Also clean up the current user's PATH
+        $userPath = [Environment]::GetEnvironmentVariable('PATH', 'User')
+        if ($userPath -and $userPath -like "*$npmBin*") {
+            $newPath = ($userPath -split ';' | Where-Object { $_ -ne $npmBin }) -join ';'
+            [Environment]::SetEnvironmentVariable('PATH', $newPath, 'User')
+            Write-Detail "Removed $npmBin from current user's PATH"
+        }
+    }
+
+    # Step 7: Remove Cloudflare Tunnel configuration
+    Write-Step 7 $totalSteps "Removing Cloudflare Tunnel configuration..."
     $cfConfigDir = Join-Path $TargetUserProfile '.cloudflared'
     if (Test-Path $cfConfigDir) {
         Remove-Item $cfConfigDir -Recurse -Force
@@ -1210,7 +1245,7 @@ function Invoke-Configure {
         if (-not (Test-CommandExists 'cloudflared')) {
             Write-Host "  Installing cloudflared..."
             if (Test-CommandExists 'winget') {
-                & winget install --id Cloudflare.cloudflared --accept-package-agreements --accept-source-agreements
+                & 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') {

package/win/postinstall.ps1

@@ -1,13 +1,52 @@
-# postinstall.ps1 — Re-apply file ACLs after npm install -g replaces the package directory.
+# postinstall.ps1 — Post-install tasks for @geekbeer/minion on Windows.
 # Called automatically from postinstall.js on Windows.
-# Requires Administrator privileges (npm install -g typically runs as admin).
-# Exit silently if not admin or if setup has never been run (no .target-user-profile).
+#
+# Tasks:
+# 1. Ensure npm global bin directory is in the user's PATH (any user)
+# 2. Re-apply file ACLs after npm install -g replaces the package directory (admin only)
 
 $ErrorActionPreference = 'SilentlyContinue'
 
+# --- Ensure npm global bin is in PATH ----------------------------------------
+# npm's global bin directory (where minion-cli-win.cmd is created) may not be in
+# PATH, especially when Node.js was installed via winget or exe installer.
+# Add it to the current user's persistent PATH if missing.
+
+function Ensure-NpmBinInPath {
+    $npmBin = $null
+    try { $npmBin = (& npm prefix -g 2>$null) } catch {}
+    if (-not $npmBin -or -not (Test-Path $npmBin)) { return }
+
+    # Check if already in Machine or User PATH
+    $machinePath = [Environment]::GetEnvironmentVariable('PATH', 'Machine')
+    $userPath = [Environment]::GetEnvironmentVariable('PATH', 'User')
+    $allPath = "$machinePath;$userPath"
+
+    if ($allPath -split ';' | Where-Object { $_ -eq $npmBin }) { return }
+
+    # Append to User PATH
+    if ($userPath) {
+        # Remove trailing semicolons before appending
+        $userPath = $userPath.TrimEnd(';')
+        [Environment]::SetEnvironmentVariable('PATH', "$userPath;$npmBin", 'User')
+    } else {
+        [Environment]::SetEnvironmentVariable('PATH', $npmBin, 'User')
+    }
+
+    # Also update current session so subsequent commands in this process work
+    $env:PATH = "$env:PATH;$npmBin"
+
+    Write-Host "[@geekbeer/minion] Added npm global bin to PATH: $npmBin"
+    Write-Host "[@geekbeer/minion] Please restart your terminal for the PATH change to take effect."
+}
+
+Ensure-NpmBinInPath
+
 # --- Locate setup metadata ---------------------------------------------------
 # During setup, .minion/.target-user-profile is written to the target user's
 # home directory.  We need to find it by scanning user profiles.
+# ACL restoration requires Administrator privileges.
+# Exit silently if not admin or if setup has never been run (no .target-user-profile).
 
 function Find-TargetUserProfile {
     $profiles = Get-CimInstance Win32_UserProfile -ErrorAction SilentlyContinue |