@geekbeer/minion 3.5.30 → 3.5.32

package/core/db.js

@@ -2,6 +2,8 @@
  * SQLite Database Module
  * Provides a singleton SQLite database connection for all minion stores.
  * Uses better-sqlite3 (synchronous API) with WAL mode for performance.
+ * Falls back to Node.js built-in node:sqlite when better-sqlite3 is unavailable
+ * (e.g., no prebuilt binaries for the current Node.js version on Windows).
  *
  * Database file: $DATA_DIR/minion.db
  *
@@ -33,6 +35,63 @@ function resolveDbPath() {
   }
 }
 
+/**
+ * Open a database connection using better-sqlite3 or node:sqlite fallback.
+ * @param {string} dbPath
+ * @returns {import('better-sqlite3').Database}
+ */
+function openDatabase(dbPath) {
+  // Try better-sqlite3 first (fastest, has prebuilt binaries for most platforms)
+  try {
+    const Database = require('better-sqlite3')
+    const db = new Database(dbPath)
+    db.pragma('journal_mode = WAL')
+    db.pragma('foreign_keys = ON')
+    console.log('[DB] Using better-sqlite3')
+    return db
+  } catch (e) {
+    console.log(`[DB] better-sqlite3 unavailable (${e.message}), trying node:sqlite...`)
+  }
+
+  // Fallback to Node.js built-in sqlite (available in Node 22.5.0+)
+  try {
+    const { DatabaseSync } = require('node:sqlite')
+    const db = new DatabaseSync(dbPath)
+    db.exec('PRAGMA journal_mode = WAL')
+    db.exec('PRAGMA foreign_keys = ON')
+
+    // Polyfill db.pragma() for compatibility with better-sqlite3 API
+    db.pragma = function (str) {
+      const stmt = db.prepare(`PRAGMA ${str}`)
+      return stmt.get()
+    }
+
+    // Polyfill db.transaction() for compatibility with better-sqlite3 API
+    db.transaction = function (fn) {
+      return function (...args) {
+        db.exec('BEGIN')
+        try {
+          const result = fn(...args)
+          db.exec('COMMIT')
+          return result
+        } catch (e) {
+          db.exec('ROLLBACK')
+          throw e
+        }
+      }
+    }
+
+    console.log('[DB] Using node:sqlite (built-in)')
+    return db
+  } catch (e) {
+    throw new Error(
+      `[DB] No SQLite driver available. Install better-sqlite3 or use Node.js 22.5.0+ for built-in sqlite support. ` +
+      `better-sqlite3 error: check that Python and build tools are installed, or use Node.js 22 LTS which has prebuilt binaries. ` +
+      `node:sqlite error: ${e.message}`
+    )
+  }
+}
+
 /**
  * Get the singleton database connection.
  * Initializes the database and schema on first call.
@@ -44,12 +103,7 @@ function getDb() {
   const dbPath = resolveDbPath()
   fs.mkdirSync(path.dirname(dbPath), { recursive: true })
 
-  const Database = require('better-sqlite3')
-  _db = new Database(dbPath)
-
-  // Performance & integrity settings
-  _db.pragma('journal_mode = WAL')
-  _db.pragma('foreign_keys = ON')
+  _db = openDatabase(dbPath)
 
   initSchema(_db)
   migrateSchema(_db)

package/linux/minion-cli.sh

@@ -1120,7 +1120,6 @@ SUPEOF
   else
     echo "  tail -f /var/log/supervisor/minion-agent.log  # View logs"
   fi
-}
   echo ""
   echo "The minion should appear online in HQ shortly."
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekbeer/minion",
-  "version": "3.5.30",
+  "version": "3.5.32",
   "description": "AI Agent runtime for Minion - manages status and skill deployment on VPS",
   "main": "linux/server.js",
   "bin": {
@@ -27,12 +27,12 @@
     "postinstall": "node postinstall.js"
   },
   "dependencies": {
-    "better-sqlite3": "^11.0.0",
     "croner": "^9.0.0",
     "fastify": "^5.2.2",
     "ws": "^8.0.0"
   },
   "optionalDependencies": {
+    "better-sqlite3": "^11.0.0",
     "node-pty": "^1.0.0"
   },
   "engines": {

package/win/minion-cli.ps1

@@ -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..."
@@ -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

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 |