@geekbeer/minion 2.32.0 → 2.33.4

package/core/config.js

@@ -19,13 +19,13 @@ const { execSync } = require('child_process')
 
 /**
  * Resolve the correct home directory for the minion user.
- * In supervisord environments, os.homedir() may return /root because
- * the HOME env var is not inherited. This function uses MINION_USER
- * (set in .env during setup) to look up the correct home via getent passwd.
+ * On Linux, supervisord environments may set HOME=/root incorrectly.
+ * This function uses MINION_USER + getent passwd to find the correct home.
+ * On Windows, os.homedir() is always correct (returns %USERPROFILE%).
  */
 function resolveHomeDir() {
   const minionUser = process.env.MINION_USER
-  if (minionUser) {
+  if (minionUser && process.platform !== 'win32') {
     try {
       const entry = execSync(`getent passwd ${minionUser}`, { encoding: 'utf-8' }).trim()
       const home = entry.split(':')[5]

package/core/lib/llm-checker.js

@@ -10,26 +10,13 @@ const fs = require('fs')
 const path = require('path')
 const { execSync } = require('child_process')
 const { config } = require('../config')
+const { IS_WINDOWS, buildExtendedPath } = require('./platform')
 
 const CACHE_TTL_MS = 60000
 
 let cachedResult = null
 let cachedAt = 0
 
-/**
- * Build extended PATH that includes common Claude CLI installation locations
- */
-function getExtendedPath() {
-  const additionalPaths = [
-    path.join(config.HOME_DIR, '.local', 'bin'),
-    path.join(config.HOME_DIR, 'bin'),
-    path.join(config.HOME_DIR, '.npm-global', 'bin'),
-    path.join(config.HOME_DIR, '.claude', 'bin'),
-    '/usr/local/bin',
-  ]
-  return [...additionalPaths, process.env.PATH || '/usr/bin:/bin'].join(':')
-}
-
 /**
  * Check Claude Code authentication.
  * First checks known credential file locations (fast path),
@@ -57,14 +44,16 @@ function isClaudeAuthenticated() {
   // Fallback: check via claude CLI command (handles newer credential storage)
   try {
     const claudePath = path.join(config.HOME_DIR, '.local', 'bin', 'claude')
-    const claudeBin = fs.existsSync(claudePath) ? claudePath : 'claude'
+    const claudeBin = (!IS_WINDOWS && fs.existsSync(claudePath)) ? claudePath : 'claude'
     execSync(`${claudeBin} auth whoami`, {
       encoding: 'utf-8',
       timeout: 5000,
       stdio: 'pipe',
       env: {
+        ...process.env,
         HOME: config.HOME_DIR,
-        PATH: getExtendedPath(),
+        ...(IS_WINDOWS && { USERPROFILE: config.HOME_DIR }),
+        PATH: buildExtendedPath(config.HOME_DIR),
       },
     })
     return true
@@ -83,6 +72,10 @@ function isGeminiAuthenticated() {
   const possiblePaths = [
     path.join(config.HOME_DIR, '.config', 'gemini'),
     path.join(config.HOME_DIR, '.config', 'gcloud', 'application_default_credentials.json'),
+    // Windows-specific locations
+    ...(IS_WINDOWS ? [
+      path.join(config.HOME_DIR, 'AppData', 'Roaming', 'gcloud', 'application_default_credentials.json'),
+    ] : []),
   ]
   for (const p of possiblePaths) {
     try {

package/core/lib/log-manager.js

@@ -6,9 +6,10 @@
 
 const fs = require('fs').promises
 const path = require('path')
+const platform = require('./platform')
 
-// Log storage configuration
-const LOG_DIR = '/opt/minion-agent/logs'
+// Log storage configuration (platform-aware via platform.js)
+const LOG_DIR = platform.LOG_DIR
 const MAX_LOG_FILES = 100
 
 /**

package/core/lib/platform.js

@@ -2,8 +2,8 @@
  * Cross-platform utility module
  *
  * Provides platform-aware paths, separators, and helpers.
- * Used by win/ modules to avoid hardcoded Unix paths.
- * This file does NOT modify any existing Linux module behavior.
+ * Used by core/ modules (stores, log-manager, llm-checker) and win/ modules
+ * to provide consistent cross-platform behavior.
  */
 
 const os = require('os')

package/core/stores/chat-store.js

@@ -8,18 +8,18 @@ const fs = require('fs').promises
 const path = require('path')
 
 const { config } = require('../config')
+const { DATA_DIR } = require('../lib/platform')
 
 const MAX_MESSAGES = 100
 
 /**
  * Get chat session file path
- * Uses /opt/minion-agent/ if available, otherwise home dir
+ * Uses DATA_DIR if available (platform-aware), otherwise home dir
  */
 function getFilePath() {
-  const optPath = '/opt/minion-agent/chat-session.json'
   try {
-    require('fs').accessSync(path.dirname(optPath))
-    return optPath
+    require('fs').accessSync(DATA_DIR)
+    return path.join(DATA_DIR, 'chat-session.json')
   } catch {
     return path.join(config.HOME_DIR, 'chat-session.json')
   }

package/core/stores/execution-store.js

@@ -8,19 +8,19 @@ const fs = require('fs').promises
 const path = require('path')
 
 const { config } = require('../config')
+const { DATA_DIR } = require('../lib/platform')
 
 // Max executions to keep (older ones are pruned)
 const MAX_EXECUTIONS = 200
 
 /**
  * Get execution file path
- * Uses /opt/minion-agent/ if available, otherwise home dir
+ * Uses DATA_DIR if available (platform-aware), otherwise home dir
  */
 function getExecutionFilePath() {
-  const optPath = '/opt/minion-agent/executions.json'
   try {
-    require('fs').accessSync(path.dirname(optPath))
-    return optPath
+    require('fs').accessSync(DATA_DIR)
+    return path.join(DATA_DIR, 'executions.json')
   } catch {
     return path.join(config.HOME_DIR, 'executions.json')
   }

package/core/stores/routine-store.js

@@ -8,14 +8,14 @@ const fs = require('fs').promises
 const path = require('path')
 
 const { config } = require('../config')
+const { DATA_DIR } = require('../lib/platform')
 
-// Routine file location: /opt/minion-agent/routines.json (systemd/supervisord)
-// or ~/routines.json (standalone)
+// Routine file location: DATA_DIR/routines.json (platform-aware)
+// or ~/routines.json (fallback)
 function getRoutineFilePath() {
-  const optPath = '/opt/minion-agent/routines.json'
   try {
-    require('fs').accessSync(path.dirname(optPath))
-    return optPath
+    require('fs').accessSync(DATA_DIR)
+    return path.join(DATA_DIR, 'routines.json')
   } catch {
     return path.join(config.HOME_DIR, 'routines.json')
   }

package/core/stores/workflow-store.js

@@ -8,15 +8,14 @@ const fs = require('fs').promises
 const path = require('path')
 
 const { config } = require('../config')
+const { DATA_DIR } = require('../lib/platform')
 
-// Workflow file location: /opt/minion-agent/workflows.json (systemd/supervisord)
-// or ~/workflows.json (standalone)
+// Workflow file location: DATA_DIR/workflows.json (platform-aware)
+// or ~/workflows.json (fallback)
 function getWorkflowFilePath() {
-  const optPath = '/opt/minion-agent/workflows.json'
-  // Use /opt path if it exists (production), otherwise home dir
   try {
-    require('fs').accessSync(path.dirname(optPath))
-    return optPath
+    require('fs').accessSync(DATA_DIR)
+    return path.join(DATA_DIR, 'workflows.json')
   } catch {
     return path.join(config.HOME_DIR, 'workflows.json')
   }

package/package.json

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

package/win/minion-cli.ps1

@@ -423,8 +423,16 @@ if (`$vncExe) {
 
 # Start cloudflared tunnel if configured
 `$cfConfig = Join-Path `$env:USERPROFILE '.cloudflared\config.yml'
-if ((Test-Path `$cfConfig) -and (Get-Command cloudflared -ErrorAction SilentlyContinue)) {
-    Start-Process -FilePath (Get-Command cloudflared).Source -ArgumentList 'tunnel', 'run' -WindowStyle Hidden
+if (Test-Path `$cfConfig) {
+    `$cfExe = `$null
+    if (Get-Command cloudflared -ErrorAction SilentlyContinue) {
+        `$cfExe = (Get-Command cloudflared).Source
+    } elseif (Test-Path (Join-Path `$DataDir 'cloudflared.exe')) {
+        `$cfExe = Join-Path `$DataDir 'cloudflared.exe'
+    }
+    if (`$cfExe) {
+        Start-Process -FilePath `$cfExe -ArgumentList 'tunnel', 'run' -WindowStyle Hidden
+    }
 }
 
 # Watchdog loop: restart node if it crashes
@@ -606,18 +614,18 @@ Remove-Item `$PidFile -Force -ErrorAction SilentlyContinue
         Write-Host "  Fetching tunnel configuration from HQ..."
         try {
             $headers = @{ 'Authorization' = "Bearer $ApiToken" }
-            $tunnelData = Invoke-RestMethod -Uri "$HqUrl/api/minion/tunnel-credentials" -Headers $headers
+            $tunnelData = Invoke-RestMethod -Uri "$HqUrl/api/minion/tunnel-credentials?platform=windows" -Headers $headers
 
             if ($tunnelData.tunnel_id) {
                 $cfConfigDir = Join-Path $env:USERPROFILE '.cloudflared'
                 New-Item -Path $cfConfigDir -ItemType Directory -Force | Out-Null
 
-                # Save credentials
-                $tunnelData.credentials_json | Set-Content (Join-Path $cfConfigDir "$($tunnelData.tunnel_id).json") -Encoding UTF8
+                # Save credentials (BOM-free UTF-8, required by cloudflared)
+                [System.IO.File]::WriteAllText((Join-Path $cfConfigDir "$($tunnelData.tunnel_id).json"), $tunnelData.credentials_json, [System.Text.UTF8Encoding]::new($false))
                 Write-Detail "Tunnel credentials saved"
 
-                # Save config
-                $tunnelData.config_yml | Set-Content (Join-Path $cfConfigDir 'config.yml') -Encoding UTF8
+                # Save config (BOM-free UTF-8)
+                [System.IO.File]::WriteAllText((Join-Path $cfConfigDir 'config.yml'), $tunnelData.config_yml, [System.Text.UTF8Encoding]::new($false))
                 Write-Detail "Tunnel config saved (will run as user process on start)"
             }
             else {

package/win/routes/config.js

@@ -9,7 +9,7 @@ const fs = require('fs')
 const path = require('path')
 const zlib = require('zlib')
 const { verifyToken } = require('../../core/lib/auth')
-const { clearLlmCache } = require('../lib/llm-checker')
+const { clearLlmCache } = require('../../core/lib/llm-checker')
 const { config } = require('../../core/config')
 const { resolveEnvFilePath } = require('../../core/lib/platform')
 

package/win/routes/directives.js

@@ -13,7 +13,7 @@ const { config } = require('../../core/config')
 const { writeSkillToLocal } = require('../../core/routes/skills')
 const workflowRunner = require('../workflow-runner')
 const executionStore = require('../../core/stores/execution-store')
-const logManager = require('../lib/log-manager')
+const logManager = require('../../core/lib/log-manager')
 
 function parseFrontmatter(content) {
   const match = content.match(/^---\n([\s\S]*?)\n---\n([\s\S]*)$/)

package/win/routes/terminal.js

@@ -58,18 +58,37 @@ function createPtySession(sessionName, command) {
     completed: false,
     exitCode: null,
     startedAt: new Date().toISOString(),
+    wsClients: new Set(),
   }
 
+  // ttyd message type for output (must match terminal-server.js)
+  const MSG_OUTPUT = 0x30 // '0'
+
   ptyProcess.onData((data) => {
     session.buffer += data
     if (session.buffer.length > 1024 * 1024) {
       session.buffer = session.buffer.slice(-512 * 1024)
     }
+    // Broadcast to all WebSocket clients using ttyd OUTPUT format
+    if (session.wsClients && session.wsClients.size > 0) {
+      const outBuf = Buffer.alloc(1 + Buffer.byteLength(data))
+      outBuf[0] = MSG_OUTPUT
+      outBuf.write(data, 1)
+      for (const ws of session.wsClients) {
+        try {
+          if (ws.readyState === 1) ws.send(outBuf)
+        } catch { /* ignore */ }
+      }
+    }
   })
 
   ptyProcess.onExit(({ exitCode }) => {
     session.completed = true
     session.exitCode = exitCode
+    // Close all WebSocket clients
+    for (const ws of (session.wsClients || [])) {
+      try { ws.close() } catch { /* ignore */ }
+    }
   })
 
   activeSessions.set(sessionName, session)

package/win/routine-runner.js

@@ -14,7 +14,7 @@ const fsSync = require('fs')
 const { config } = require('../core/config')
 const executionStore = require('../core/stores/execution-store')
 const routineStore = require('../core/stores/routine-store')
-const logManager = require('./lib/log-manager')
+const logManager = require('../core/lib/log-manager')
 const { MARKER_DIR, buildExtendedPath } = require('../core/lib/platform')
 const { activeSessions } = require('./workflow-runner')
 

package/win/terminal-server.js

@@ -168,6 +168,14 @@ function startTerminalServer() {
       const titleMsg = Buffer.from([MSG_SET_TITLE, ...Buffer.from(JSON.stringify({ title: sessionName }))])
       ws.send(titleMsg)
 
+      // Replay buffered output so reconnecting clients see prior content
+      if (session.buffer && session.buffer.length > 0) {
+        const outBuf = Buffer.alloc(1 + Buffer.byteLength(session.buffer))
+        outBuf[0] = MSG_OUTPUT
+        outBuf.write(session.buffer, 1)
+        try { ws.send(outBuf) } catch { /* ignore */ }
+      }
+
       // Handle incoming messages (ttyd protocol)
       ws.on('message', (data) => {
         if (!session.pty || session.completed) return

package/win/workflow-runner.js

@@ -20,7 +20,7 @@ const fsSync = require('fs')
 const { config } = require('../core/config')
 const executionStore = require('../core/stores/execution-store')
 const workflowStore = require('../core/stores/workflow-store')
-const logManager = require('./lib/log-manager')
+const logManager = require('../core/lib/log-manager')
 const { MARKER_DIR, buildExtendedPath } = require('../core/lib/platform')
 
 // Active cron jobs keyed by workflow ID

package/win/lib/llm-checker.js

@@ -1,115 +0,0 @@
-/**
- * Windows LLM Service authentication checker
- *
- * Same logic as lib/llm-checker.js but with Windows-compatible paths
- * and PATH separator handling.
- */
-
-const fs = require('fs')
-const path = require('path')
-const { execSync } = require('child_process')
-const { config } = require('../../core/config')
-const { buildExtendedPath } = require('../../core/lib/platform')
-
-const CACHE_TTL_MS = 60000
-let cachedResult = null
-let cachedAt = 0
-
-function isClaudeAuthenticated() {
-  const candidates = [
-    path.join(config.HOME_DIR, '.claude', '.credentials.json'),
-    path.join(config.HOME_DIR, '.claude', 'credentials.json'),
-  ]
-  for (const p of candidates) {
-    try {
-      if (fs.existsSync(p)) {
-        const content = fs.readFileSync(p, 'utf-8')
-        const parsed = JSON.parse(content)
-        if (parsed && Object.keys(parsed).length > 0) return true
-      }
-    } catch { /* not authenticated */ }
-  }
-
-  try {
-    const claudePath = path.join(config.HOME_DIR, '.local', 'bin', 'claude')
-    const claudeBin = fs.existsSync(claudePath) ? claudePath : 'claude'
-    execSync(`${claudeBin} auth whoami`, {
-      encoding: 'utf-8',
-      timeout: 5000,
-      stdio: 'pipe',
-      env: {
-        ...process.env,
-        HOME: config.HOME_DIR,
-        USERPROFILE: config.HOME_DIR,
-        PATH: buildExtendedPath(config.HOME_DIR),
-      },
-    })
-    return true
-  } catch {
-    return false
-  }
-}
-
-function isGeminiAuthenticated() {
-  if (process.env.GEMINI_API_KEY || process.env.GOOGLE_API_KEY) return true
-
-  const possiblePaths = [
-    path.join(config.HOME_DIR, '.config', 'gemini'),
-    path.join(config.HOME_DIR, '.config', 'gcloud', 'application_default_credentials.json'),
-    // Windows-specific locations
-    path.join(config.HOME_DIR, 'AppData', 'Roaming', 'gcloud', 'application_default_credentials.json'),
-  ]
-  for (const p of possiblePaths) {
-    try {
-      if (!fs.existsSync(p)) continue
-      const stat = fs.statSync(p)
-      if (stat.isDirectory()) {
-        if (fs.readdirSync(p).length > 0) return true
-      } else {
-        if (fs.readFileSync(p, 'utf-8').trim().length > 0) return true
-      }
-    } catch { /* ignore */ }
-  }
-  return false
-}
-
-function isCodexAuthenticated() {
-  if (process.env.OPENAI_API_KEY) return true
-  const codexConfig = path.join(config.HOME_DIR, '.codex')
-  try {
-    if (fs.existsSync(codexConfig) && fs.statSync(codexConfig).isDirectory()) {
-      if (fs.readdirSync(codexConfig).length > 0) return true
-    }
-  } catch { /* ignore */ }
-  return false
-}
-
-const SERVICE_DEFINITIONS = [
-  { name: 'claude', display_name: 'Claude Code', check: isClaudeAuthenticated },
-  { name: 'gemini', display_name: 'Gemini CLI', check: isGeminiAuthenticated },
-  { name: 'codex', display_name: 'Codex', check: isCodexAuthenticated },
-]
-
-function isLlmCommandConfigured() {
-  return !!config.LLM_COMMAND
-}
-
-function getLlmServices() {
-  const now = Date.now()
-  if (cachedResult && (now - cachedAt) < CACHE_TTL_MS) {
-    return cachedResult
-  }
-  const services = SERVICE_DEFINITIONS.map(({ name, display_name, check }) => ({
-    name, display_name, authenticated: check(),
-  }))
-  cachedResult = services
-  cachedAt = now
-  return services
-}
-
-function clearLlmCache() {
-  cachedResult = null
-  cachedAt = 0
-}
-
-module.exports = { getLlmServices, clearLlmCache, isLlmCommandConfigured }

package/win/lib/log-manager.js

@@ -1,119 +0,0 @@
-/**
- * Windows Log Manager
- *
- * Manages workflow execution log files using platform-aware paths.
- * Drop-in replacement for lib/log-manager.js on Windows.
- */
-
-const fs = require('fs').promises
-const path = require('path')
-const { LOG_DIR } = require('../../core/lib/platform')
-
-const MAX_LOG_FILES = 100
-
-async function ensureLogDir() {
-  try {
-    await fs.mkdir(LOG_DIR, { recursive: true })
-  } catch (err) {
-    console.error(`[LogManager] Failed to create log directory: ${err.message}`)
-    throw err
-  }
-}
-
-function getLogPath(executionId) {
-  return path.join(LOG_DIR, `${executionId}.log`)
-}
-
-async function logExists(executionId) {
-  try {
-    await fs.access(getLogPath(executionId))
-    return true
-  } catch {
-    return false
-  }
-}
-
-async function readLog(executionId, options = {}) {
-  const logPath = getLogPath(executionId)
-  try {
-    const stats = await fs.stat(logPath)
-    const content = await fs.readFile(logPath, 'utf-8')
-    const allLines = content.split('\n')
-
-    let resultContent = content
-    if (options.tail && options.tail > 0) {
-      resultContent = allLines.slice(-options.tail).join('\n')
-    }
-
-    return { content: resultContent, lines: allLines.length, size: stats.size }
-  } catch (err) {
-    if (err.code === 'ENOENT') return null
-    throw err
-  }
-}
-
-async function pruneOldLogs() {
-  try {
-    try { await fs.access(LOG_DIR) } catch { return }
-
-    const files = await fs.readdir(LOG_DIR)
-    const logFiles = files.filter(f => f.endsWith('.log'))
-    if (logFiles.length <= MAX_LOG_FILES) return
-
-    console.log(`[LogManager] Pruning logs: ${logFiles.length} files (max: ${MAX_LOG_FILES})`)
-
-    const fileStats = await Promise.all(
-      logFiles.map(async f => {
-        try {
-          const stats = await fs.stat(path.join(LOG_DIR, f))
-          return { name: f, mtime: stats.mtime }
-        } catch { return null }
-      })
-    )
-
-    const validFiles = fileStats.filter(f => f !== null)
-    validFiles.sort((a, b) => a.mtime - b.mtime)
-
-    const toDelete = validFiles.slice(0, validFiles.length - MAX_LOG_FILES)
-    for (const file of toDelete) {
-      try {
-        await fs.unlink(path.join(LOG_DIR, file.name))
-        console.log(`[LogManager] Deleted old log: ${file.name}`)
-      } catch (err) {
-        console.error(`[LogManager] Failed to delete ${file.name}: ${err.message}`)
-      }
-    }
-    console.log(`[LogManager] Pruned ${toDelete.length} old log files`)
-  } catch (err) {
-    console.error(`[LogManager] Failed to prune logs: ${err.message}`)
-  }
-}
-
-async function getLogStats() {
-  try {
-    try { await fs.access(LOG_DIR) } catch { return { count: 0, totalSize: 0 } }
-    const files = await fs.readdir(LOG_DIR)
-    const logFiles = files.filter(f => f.endsWith('.log'))
-    let totalSize = 0
-    for (const f of logFiles) {
-      try {
-        const stats = await fs.stat(path.join(LOG_DIR, f))
-        totalSize += stats.size
-      } catch { /* skip */ }
-    }
-    return { count: logFiles.length, totalSize }
-  } catch {
-    return { count: 0, totalSize: 0 }
-  }
-}
-
-module.exports = {
-  LOG_DIR,
-  MAX_LOG_FILES,
-  ensureLogDir,
-  getLogPath,
-  logExists,
-  readLog,
-  pruneOldLogs,
-  getLogStats,
-}