@geekbeer/minion 2.43.1 → 2.44.0

package/package.json

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

package/win/minion-cli.ps1

@@ -218,8 +218,8 @@ function Restart-MinionProcess {
 # ============================================================
 
 function Invoke-Setup {
-    $totalSteps = 9
-    if ($SetupTunnel) { $totalSteps = 10 }
+    $totalSteps = 10
+    if ($SetupTunnel) { $totalSteps = 11 }
 
     # Minionization warning
     Write-Host ""
@@ -308,8 +308,64 @@ function Invoke-Setup {
         }
     }
 
-    # Step 2: Install Claude Code CLI
-    Write-Step 2 $totalSteps "Installing Claude Code..."
+    # Step 2: Install Git (required by Claude Code for git-bash)
+    Write-Step 2 $totalSteps "Checking Git (git-bash)..."
+    $gitBashPath = $null
+    if (Test-CommandExists 'git') {
+        $gitVersion = & git --version 2>$null
+        Write-Detail "Git already installed ($gitVersion)"
+        # Detect bash.exe path from git installation
+        $gitExe = (Get-Command git).Source
+        $gitDir = Split-Path (Split-Path $gitExe)
+        $candidateBash = Join-Path $gitDir 'bin\bash.exe'
+        if (Test-Path $candidateBash) { $gitBashPath = $candidateBash }
+    }
+    else {
+        Write-Host "  Installing Git via winget..."
+        try {
+            & winget install --id Git.Git --accept-package-agreements --accept-source-agreements
+            # Refresh PATH
+            $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [System.Environment]::GetEnvironmentVariable('PATH', 'User')
+            if (Test-CommandExists 'git') {
+                Write-Detail "Git installed successfully"
+                $gitExe = (Get-Command git).Source
+                $gitDir = Split-Path (Split-Path $gitExe)
+                $candidateBash = Join-Path $gitDir 'bin\bash.exe'
+                if (Test-Path $candidateBash) { $gitBashPath = $candidateBash }
+            }
+            else {
+                Write-Warn "Git installed but not in PATH. Please restart this terminal."
+            }
+        }
+        catch {
+            Write-Warn "Failed to install Git. Please install manually from https://git-scm.com/downloads/win"
+        }
+    }
+    # Fallback: search common install paths
+    if (-not $gitBashPath) {
+        $commonPaths = @(
+            'C:\Program Files\Git\bin\bash.exe',
+            'C:\Program Files (x86)\Git\bin\bash.exe',
+            (Join-Path $env:LOCALAPPDATA 'Programs\Git\bin\bash.exe')
+        )
+        foreach ($p in $commonPaths) {
+            if (Test-Path $p) { $gitBashPath = $p; break }
+        }
+    }
+    if ($gitBashPath) {
+        Write-Detail "git-bash found: $gitBashPath"
+        # Set CLAUDE_CODE_GIT_BASH_PATH for the current user (persists across sessions)
+        [Environment]::SetEnvironmentVariable('CLAUDE_CODE_GIT_BASH_PATH', $gitBashPath, 'User')
+        $env:CLAUDE_CODE_GIT_BASH_PATH = $gitBashPath
+        Write-Detail "CLAUDE_CODE_GIT_BASH_PATH set for current user"
+    }
+    else {
+        Write-Warn "git-bash not found. Claude Code may not work."
+        Write-Host "  Install Git from https://git-scm.com/downloads/win and re-run setup." -ForegroundColor Gray
+    }
+
+    # Step 3: Install Claude Code CLI
+    Write-Step 3 $totalSteps "Installing Claude Code..."
     if (Test-CommandExists 'claude') {
         $claudeVersion = & claude --version 2>$null
         Write-Detail "Claude Code already installed ($claudeVersion)"
@@ -330,8 +386,8 @@ function Invoke-Setup {
     Write-Host "  Please run 'claude' in a terminal to complete the authentication process." -ForegroundColor Yellow
     Write-Host ""
 
-    # Step 3: Create config directory and .env
-    Write-Step 3 $totalSteps "Creating config directory and .env..."
+    # Step 4: Create config directory and .env
+    Write-Step 4 $totalSteps "Creating config directory and .env..."
     New-Item -Path $DataDir -ItemType Directory -Force | Out-Null
     New-Item -Path $LogDir -ItemType Directory -Force | Out-Null
     $envValues = @{
@@ -344,8 +400,8 @@ function Invoke-Setup {
     Write-EnvFile $EnvFile $envValues
     Write-Detail "$EnvFile generated"
 
-    # Step 4: Install node-pty (required for Windows terminal management)
-    Write-Step 4 $totalSteps "Installing terminal support (node-pty)..."
+    # Step 5: Install node-pty (required for Windows terminal management)
+    Write-Step 5 $totalSteps "Installing terminal support (node-pty)..."
     $npmRoot = & npm root -g 2>$null
     $minionPkgDir = Join-Path $npmRoot '@geekbeer\minion'
     if (Test-Path $minionPkgDir) {
@@ -383,8 +439,8 @@ function Invoke-Setup {
         Write-Host "  Please run: npm install -g @geekbeer/minion"
     }
 
-    # Step 5: Generate start-agent.ps1 and register auto-start
-    Write-Step 5 $totalSteps "Registering auto-start..."
+    # Step 6: Generate start-agent.ps1 and register auto-start
+    Write-Step 6 $totalSteps "Registering auto-start..."
     $serverJs = Join-Path $minionPkgDir 'win\server.js'
     if (-not (Test-Path $serverJs)) {
         $serverJs = Join-Path $minionPkgDir 'win' 'server.js'
@@ -421,23 +477,45 @@ if (Test-Path `$EnvFile) {
 
 New-Item -Path `$LogDir -ItemType Directory -Force | Out-Null
 
+# Startup log for debugging VNC/websockify/cloudflared launch
+`$StartupLog = Join-Path `$LogDir 'startup.log'
+function Write-StartupLog {
+    param([string]`$Message)
+    `$ts = Get-Date -Format 'yyyy-MM-dd HH:mm:ss'
+    Add-Content -Path `$StartupLog -Value "[`$ts] `$Message"
+}
+Write-StartupLog "=== start-agent.ps1 starting (PID: `$PID) ==="
+Write-StartupLog "DataDir: `$DataDir"
+Write-StartupLog "ServerJs: `$ServerJs"
+
 # Write PID of this watchdog process
 Set-Content -Path `$PidFile -Value `$PID
 
 # Helper: find websockify executable
 function Get-WebsockifyCommand {
     if (Get-Command websockify -ErrorAction SilentlyContinue) {
-        return @((Get-Command websockify).Source)
+        `$found = (Get-Command websockify).Source
+        Write-StartupLog "websockify found on PATH: `$found"
+        return @(`$found)
     }
+    Write-StartupLog "websockify not on PATH, checking Python..."
     if (Get-Command python -ErrorAction SilentlyContinue) {
+        `$pyPath = (Get-Command python).Source
+        Write-StartupLog "Python found: `$pyPath"
         `$scriptsDir = & python -c "import sysconfig; print(sysconfig.get_path('scripts'))" 2>`$null
+        Write-StartupLog "Python Scripts dir: `$scriptsDir"
         if (`$scriptsDir) {
             `$wsExe = Join-Path `$scriptsDir 'websockify.exe'
+            Write-StartupLog "Checking `$wsExe : exists=$(Test-Path `$wsExe)"
             if (Test-Path `$wsExe) { return @(`$wsExe) }
         }
         `$check = & python -c "import websockify" 2>&1
+        Write-StartupLog "python -c 'import websockify' exit code: `$LASTEXITCODE"
         if (`$LASTEXITCODE -eq 0) { return @('python', '-m', 'websockify') }
+    } else {
+        Write-StartupLog "Python not found"
     }
+    Write-StartupLog "websockify not found by any method"
     return `$null
 }
 
@@ -448,29 +526,43 @@ if (Test-Path 'C:\Program Files\TightVNC\tvnserver.exe') {
 } elseif (Test-Path (Join-Path `$DataDir 'tightvnc\PFiles\TightVNC\tvnserver.exe')) {
     `$vncExe = Join-Path `$DataDir 'tightvnc\PFiles\TightVNC\tvnserver.exe'
 }
+Write-StartupLog "VNC exe: `$vncExe"
 if (`$vncExe) {
     # Start VNC server in application mode (no admin, no service registration)
     `$vncProc = Get-Process -Name tvnserver -ErrorAction SilentlyContinue
     if (-not `$vncProc) {
+        Write-StartupLog "Starting TightVNC server..."
         Start-Process -FilePath `$vncExe -ArgumentList '-run' -WindowStyle Hidden
         # Wait for VNC server to bind port 5900 before starting websockify
         Start-Sleep -Seconds 3
+    } else {
+        Write-StartupLog "TightVNC already running (PID: `$(`$vncProc.Id))"
     }
     # Reload registry config (ensures no-auth settings are applied)
     & `$vncExe -controlapp -reload 2>`$null
-    `$wsCmd = Get-WebsockifyCommand
+    [array]`$wsCmd = Get-WebsockifyCommand
+    Write-StartupLog "websockify command result (count=`$(`$wsCmd.Count)): `$(`$wsCmd -join ' ')"
     if (`$wsCmd) {
         `$wsProc = Get-Process -Name websockify -ErrorAction SilentlyContinue
         if (-not `$wsProc) {
+            Write-StartupLog "Starting websockify (count=`$(`$wsCmd.Count))..."
             if (`$wsCmd.Count -eq 1) {
                 Start-Process -FilePath `$wsCmd[0] -ArgumentList '6080', 'localhost:5900' -WindowStyle Hidden
+                Write-StartupLog "websockify started: `$(`$wsCmd[0]) 6080 localhost:5900"
             } 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
+                Write-StartupLog "websockify started: `$(`$wsCmd[0]) `$wsArgs"
             }
+        } else {
+            Write-StartupLog "websockify already running (PID: `$(`$wsProc.Id))"
         }
+    } else {
+        Write-StartupLog "ERROR: websockify command not found, skipping"
     }
+} else {
+    Write-StartupLog "VNC server not found, skipping VNC+websockify setup"
 }
 
 # Start cloudflared tunnel if configured
@@ -484,9 +576,12 @@ if (Test-Path `$cfConfig) {
     }
     if (`$cfExe) {
         Start-Process -FilePath `$cfExe -ArgumentList 'tunnel', 'run' -WindowStyle Hidden
+        Write-StartupLog "cloudflared started: `$cfExe"
     }
 }
 
+Write-StartupLog "=== Startup sequence complete, entering watchdog loop ==="
+
 # Watchdog loop: restart node if it crashes
 `$nodePath = (Get-Command node).Source
 while (`$true) {
@@ -521,8 +616,8 @@ Remove-Item `$PidFile -Force -ErrorAction SilentlyContinue
     $shortcut.Save()
     Write-Detail "Startup shortcut created: $shortcutPath"
 
-    # Step 6: Disable screensaver, lock screen, and sleep
-    Write-Step 6 $totalSteps "Disabling screensaver, lock screen, and sleep..."
+    # Step 7: Disable screensaver, lock screen, and sleep
+    Write-Step 7 $totalSteps "Disabling screensaver, lock screen, and sleep..."
     # Screensaver off
     Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name ScreenSaveActive -Value '0'
     Set-ItemProperty -Path 'HKCU:\Control Panel\Desktop' -Name ScreenSaveTimeOut -Value '0'
@@ -538,8 +633,8 @@ Remove-Item `$PidFile -Force -ErrorAction SilentlyContinue
     & powercfg -change -monitor-timeout-dc 0 2>$null
     Write-Detail "Sleep and monitor timeout disabled"
 
-    # Step 7: Install TightVNC Server
-    Write-Step 7 $totalSteps "Setting up TightVNC Server..."
+    # Step 8: Install TightVNC Server
+    Write-Step 8 $totalSteps "Setting up TightVNC Server..."
     $vncSystemPath = 'C:\Program Files\TightVNC\tvnserver.exe'
     $vncPortableDir = Join-Path $DataDir 'tightvnc'
     $vncPortablePath = Join-Path $vncPortableDir 'PFiles\TightVNC\tvnserver.exe'
@@ -598,8 +693,8 @@ Remove-Item `$PidFile -Force -ErrorAction SilentlyContinue
         Write-Detail "TightVNC configured: localhost-only, no VNC password (auth via HQ proxy)"
     }
 
-    # Step 8: Setup websockify (WebSocket proxy for VNC)
-    Write-Step 8 $totalSteps "Setting up websockify..."
+    # Step 9: Setup websockify (WebSocket proxy for VNC)
+    Write-Step 9 $totalSteps "Setting up websockify..."
     if (Get-WebsockifyCommand) {
         Write-Detail "websockify already installed"
     }
@@ -655,7 +750,7 @@ Remove-Item `$PidFile -Force -ErrorAction SilentlyContinue
         }
     }
 
-    # Step 9 (optional): Cloudflare Tunnel
+    # Step 10 (optional): Cloudflare Tunnel
     if ($SetupTunnel) {
         $currentStep = $totalSteps - 1
         Write-Step $currentStep $totalSteps "Setting up Cloudflare Tunnel..."