@geekbeer/minion 2.25.0 → 2.33.4

package/{config.js → 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/{lib → 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/{lib → 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

@@ -0,0 +1,117 @@
+/**
+ * Cross-platform utility module
+ *
+ * Provides platform-aware paths, separators, and helpers.
+ * Used by core/ modules (stores, log-manager, llm-checker) and win/ modules
+ * to provide consistent cross-platform behavior.
+ */
+
+const os = require('os')
+const path = require('path')
+const fs = require('fs')
+
+const IS_WINDOWS = process.platform === 'win32'
+const PATH_SEPARATOR = path.delimiter // ';' on Windows, ':' on Unix
+const TEMP_DIR = os.tmpdir()
+
+/**
+ * Resolve the data directory for minion agent persistent files.
+ * Windows: %PROGRAMDATA%\minion-agent (or fallback to %USERPROFILE%\.minion-agent)
+ * Linux:   /opt/minion-agent (existing behavior)
+ */
+function resolveDataDir() {
+  if (IS_WINDOWS) {
+    const programData = process.env.PROGRAMDATA || process.env.ALLUSERSPROFILE
+    if (programData) {
+      const dir = path.join(programData, 'minion-agent')
+      try {
+        fs.mkdirSync(dir, { recursive: true })
+        return dir
+      } catch {
+        // Fall through to home-based path
+      }
+    }
+    return path.join(os.homedir(), '.minion-agent')
+  }
+  return '/opt/minion-agent'
+}
+
+const DATA_DIR = resolveDataDir()
+const LOG_DIR = path.join(DATA_DIR, 'logs')
+const MARKER_DIR = path.join(TEMP_DIR, 'minion-executions')
+
+/**
+ * Build extended PATH including common CLI installation locations.
+ * Uses the correct platform separator.
+ * @param {string} homeDir - User home directory
+ * @returns {string} Extended PATH string
+ */
+function buildExtendedPath(homeDir) {
+  const additionalPaths = IS_WINDOWS
+    ? [
+        path.join(homeDir, '.local', 'bin'),
+        path.join(homeDir, '.npm-global'),
+        path.join(homeDir, '.claude', 'bin'),
+        path.join(homeDir, 'AppData', 'Roaming', 'npm'),
+        path.join(process.env.PROGRAMFILES || 'C:\\Program Files', 'nodejs'),
+      ]
+    : [
+        path.join(homeDir, 'bin'),
+        path.join(homeDir, '.npm-global', 'bin'),
+        path.join(homeDir, '.local', 'bin'),
+        path.join(homeDir, '.claude', 'bin'),
+        '/usr/local/bin',
+      ]
+
+  const currentPath = process.env.PATH || ''
+  return [...additionalPaths, currentPath].join(PATH_SEPARATOR)
+}
+
+/**
+ * Get exit code file path for a session.
+ * @param {string} sessionName - Session identifier
+ * @returns {string} Path to exit code file
+ */
+function getExitCodePath(sessionName) {
+  return path.join(TEMP_DIR, `minion-exit-${sessionName}`)
+}
+
+/**
+ * Get the default shell for spawning processes.
+ * @returns {string} Shell executable path
+ */
+function getDefaultShell() {
+  if (IS_WINDOWS) {
+    return process.env.COMSPEC || 'cmd.exe'
+  }
+  return process.env.SHELL || '/bin/sh'
+}
+
+/**
+ * Resolve .env file path.
+ * Prefers DATA_DIR/.env, falls back to ~/minion.env.
+ * @param {string} homeDir - User home directory
+ * @returns {string} Path to .env file
+ */
+function resolveEnvFilePath(homeDir) {
+  const dataEnv = path.join(DATA_DIR, '.env')
+  try {
+    fs.accessSync(path.dirname(dataEnv), fs.constants.W_OK)
+    return dataEnv
+  } catch {
+    return path.join(homeDir, 'minion.env')
+  }
+}
+
+module.exports = {
+  IS_WINDOWS,
+  PATH_SEPARATOR,
+  TEMP_DIR,
+  DATA_DIR,
+  LOG_DIR,
+  MARKER_DIR,
+  buildExtendedPath,
+  getExitCodePath,
+  getDefaultShell,
+  resolveEnvFilePath,
+}

package/{routes → core/routes}/health.js

@@ -7,7 +7,7 @@
  * - POST /api/status  - Update status
  */
 
-const { version } = require('../package.json')
+const { version } = require('../../package.json')
 const { getLlmServices, isLlmCommandConfigured } = require('../lib/llm-checker')
 
 // Shared status state

package/{routes → core/routes}/routines.js

@@ -12,8 +12,7 @@
  */
 
 const { verifyToken } = require('../lib/auth')
-const routineRunner = require('../routine-runner')
-const routineStore = require('../routine-store')
+const routineStore = require('../stores/routine-store')
 const api = require('../api')
 const { isHqConfigured } = require('../config')
 
@@ -21,7 +20,8 @@ const { isHqConfigured } = require('../config')
  * Register routine routes as Fastify plugin
  * @param {import('fastify').FastifyInstance} fastify
  */
-async function routineRoutes(fastify) {
+async function routineRoutes(fastify, opts) {
+  const { routineRunner } = opts
   // Receive routines from HQ (upsert: add new, update existing)
   fastify.post('/api/routines', async (request, reply) => {
     if (!verifyToken(request)) {

package/{routes → core/routes}/skills.js

@@ -17,8 +17,7 @@ const crypto = require('crypto')
 const { verifyToken } = require('../lib/auth')
 const api = require('../api')
 const { config, isHqConfigured } = require('../config')
-const workflowRunner = require('../workflow-runner')
-const executionStore = require('../execution-store')
+const executionStore = require('../stores/execution-store')
 const logManager = require('../lib/log-manager')
 
 /**
@@ -128,7 +127,8 @@ async function pushSkillToHQ(name) {
  * Register skill routes as Fastify plugin
  * @param {import('fastify').FastifyInstance} fastify
  */
-async function skillRoutes(fastify) {
+async function skillRoutes(fastify, opts) {
+  const { workflowRunner } = opts
   // List deployed skills from local .claude/skills directory
   fastify.get('/api/list-skills', async (request, reply) => {
     if (!verifyToken(request)) {

package/{routes → core/routes}/workflows.js

@@ -20,9 +20,8 @@ const fs = require('fs').promises
 const path = require('path')
 
 const { verifyToken } = require('../lib/auth')
-const workflowRunner = require('../workflow-runner')
-const workflowStore = require('../workflow-store')
-const executionStore = require('../execution-store')
+const workflowStore = require('../stores/workflow-store')
+const executionStore = require('../stores/execution-store')
 const logManager = require('../lib/log-manager')
 const api = require('../api')
 const { config, isHqConfigured } = require('../config')
@@ -32,7 +31,8 @@ const { writeSkillToLocal, pushSkillToHQ } = require('./skills')
  * Register workflow routes as Fastify plugin
  * @param {import('fastify').FastifyInstance} fastify
  */
-async function workflowRoutes(fastify) {
+async function workflowRoutes(fastify, opts) {
+  const { workflowRunner } = opts
   // Receive workflows from HQ (upsert: add new, update existing)
   fastify.post('/api/workflows', async (request, reply) => {
     if (!verifyToken(request)) {

package/{chat-store.js → core/stores/chat-store.js}

@@ -7,19 +7,19 @@
 const fs = require('fs').promises
 const path = require('path')
 
-const { config } = require('./config')
+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/{execution-store.js → core/stores/execution-store.js}

@@ -7,20 +7,20 @@
 const fs = require('fs').promises
 const path = require('path')
 
-const { config } = require('./config')
+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/{routine-store.js → core/stores/routine-store.js}

@@ -7,15 +7,15 @@
 const fs = require('fs').promises
 const path = require('path')
 
-const { config } = require('./config')
+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/{workflow-store.js → core/stores/workflow-store.js}

@@ -7,16 +7,15 @@
 const fs = require('fs').promises
 const path = require('path')
 
-const { config } = require('./config')
+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/{minion-cli.sh → linux/minion-cli.sh}

@@ -41,7 +41,7 @@ fi
 
 # Resolve version from package.json (installed location)
 CLI_DIR="$(cd "$(dirname "$(readlink -f "$0")")" && pwd)"
-CLI_VERSION="$(node -p "require('${CLI_DIR}/package.json').version")"
+CLI_VERSION="$(node -p "require('${CLI_DIR}/../package.json').version")"
 
 # Use sudo only when not running as root
 SUDO=""
@@ -89,6 +89,28 @@ svc_control() {
 
 AGENT_URL="${MINION_AGENT_URL:-http://localhost:8080}"
 
+# Detect LAN IPv4 address (best-effort)
+detect_lan_ip() {
+  local ip=""
+  # Method 1: Use ip route to find the source IP for default gateway
+  if command -v ip &>/dev/null; then
+    ip=$(ip route get 1.1.1.1 2>/dev/null | grep -oP 'src \K[\d.]+' | head -1)
+  fi
+  # Method 2: Parse ip addr for non-loopback, non-docker, non-APIPA addresses
+  if [ -z "$ip" ] && command -v ip &>/dev/null; then
+    ip=$(ip -4 addr show scope global 2>/dev/null \
+      | grep -oP 'inet \K[\d.]+' \
+      | grep -v '^172\.17\.' \
+      | grep -v '^169\.254\.' \
+      | head -1)
+  fi
+  # Method 3: hostname -I (available on most Linux distros)
+  if [ -z "$ip" ] && command -v hostname &>/dev/null; then
+    ip=$(hostname -I 2>/dev/null | awk '{print $1}')
+  fi
+  echo "$ip"
+}
+
 # Auto-load .env so that API_TOKEN etc. are available in interactive shells
 ENV_FILE="/opt/minion-agent/.env"
 if [ -f "$ENV_FILE" ] && [ -r "$ENV_FILE" ]; then
@@ -319,7 +341,7 @@ do_setup() {
   echo "[6/${TOTAL_STEPS}] Creating service configuration ($PROC_MGR)..."
   local NPM_ROOT
   NPM_ROOT="$(npm root -g)"
-  local SERVER_PATH="${NPM_ROOT}/@geekbeer/minion/server.js"
+  local SERVER_PATH="${NPM_ROOT}/@geekbeer/minion/linux/server.js"
 
   if [ ! -f "$SERVER_PATH" ]; then
     echo "  ERROR: server.js not found at $SERVER_PATH"
@@ -732,14 +754,33 @@ CFEOF
     echo "Notifying HQ of setup completion..."
     local NOTIFY_RESPONSE
     local HOSTNAME_VAL
+    local LAN_IP
     HOSTNAME_VAL=$(hostname 2>/dev/null || echo "")
+    LAN_IP=$(detect_lan_ip)
+
+    # Build request body with LAN IP detection
+    # Docker: use hostname (container name) for internal_ip_address (resolved via Docker DNS)
+    # Self-hosted: use LAN IP for both fields (hostname is not resolvable on LAN)
+    local BODY
+    if [ -f /.dockerenv ]; then
+      BODY="{\"internal_ip_address\":\"${HOSTNAME_VAL}\"}"
+    elif [ -n "$LAN_IP" ]; then
+      BODY="{\"internal_ip_address\":\"${LAN_IP}\",\"ip_address\":\"${LAN_IP}\"}"
+    else
+      BODY="{\"internal_ip_address\":\"${HOSTNAME_VAL}\"}"
+    fi
+
     NOTIFY_RESPONSE=$(curl -sfL -X POST "${HQ_URL}/api/minion/setup-complete" \
       -H "Content-Type: application/json" \
       -H "Authorization: Bearer ${API_TOKEN}" \
-      -d "{\"internal_ip_address\":\"${HOSTNAME_VAL}\"}" 2>&1) || true
+      -d "$BODY" 2>&1) || true
 
     if echo "$NOTIFY_RESPONSE" | grep -q '"success":true' 2>/dev/null; then
-      echo "  -> HQ notified successfully"
+      if [ -n "$LAN_IP" ] && [ ! -f /.dockerenv ]; then
+        echo "  -> HQ notified successfully (LAN IP: ${LAN_IP})"
+      else
+        echo "  -> HQ notified successfully"
+      fi
     else
       echo "  -> HQ notification skipped (HQ may not be reachable)"
     fi
@@ -915,14 +956,30 @@ SUPEOF
   echo "[4/4] Notifying HQ..."
   local NOTIFY_RESPONSE
   local HOSTNAME_VAL
+  local LAN_IP
   HOSTNAME_VAL=$(hostname 2>/dev/null || echo "")
+  LAN_IP=$(detect_lan_ip)
+
+  local BODY
+  if [ -f /.dockerenv ]; then
+    BODY="{\"internal_ip_address\":\"${HOSTNAME_VAL}\"}"
+  elif [ -n "$LAN_IP" ]; then
+    BODY="{\"internal_ip_address\":\"${LAN_IP}\",\"ip_address\":\"${LAN_IP}\"}"
+  else
+    BODY="{\"internal_ip_address\":\"${HOSTNAME_VAL}\"}"
+  fi
+
   NOTIFY_RESPONSE=$(curl -sfL -X POST "${HQ_URL}/api/minion/setup-complete" \
     -H "Content-Type: application/json" \
     -H "Authorization: Bearer ${API_TOKEN}" \
-    -d "{\"internal_ip_address\":\"${HOSTNAME_VAL}\"}" 2>&1) || true
+    -d "$BODY" 2>&1) || true
 
   if echo "$NOTIFY_RESPONSE" | grep -q '"success":true' 2>/dev/null; then
-    echo "  -> HQ notified successfully"
+    if [ -n "$LAN_IP" ] && [ ! -f /.dockerenv ]; then
+      echo "  -> HQ notified successfully (LAN IP: ${LAN_IP})"
+    else
+      echo "  -> HQ notified successfully"
+    fi
   else
     echo "  -> Skipped (heartbeat will notify HQ within 30s)"
   fi

package/{routes → linux/routes}/chat.js

@@ -17,9 +17,9 @@
 const { spawn } = require('child_process')
 const fs = require('fs')
 const path = require('path')
-const { verifyToken } = require('../lib/auth')
-const { config } = require('../config')
-const chatStore = require('../chat-store')
+const { verifyToken } = require('../../core/lib/auth')
+const { config } = require('../../core/config')
+const chatStore = require('../../core/stores/chat-store')
 
 /** @type {import('child_process').ChildProcess | null} */
 let activeChatChild = null

package/{routes → linux/routes}/commands.js

@@ -10,7 +10,7 @@ const { exec } = require('child_process')
 const { promisify } = require('util')
 const execAsync = promisify(exec)
 
-const { verifyToken } = require('../lib/auth')
+const { verifyToken } = require('../../core/lib/auth')
 const { detectProcessManager, buildAllowedCommands } = require('../lib/process-manager')
 
 const PROC_MGR = detectProcessManager()

package/{routes → linux/routes}/config.js

@@ -10,9 +10,9 @@
 const { execSync } = require('child_process')
 const fs = require('fs')
 const path = require('path')
-const { verifyToken } = require('../lib/auth')
-const { clearLlmCache } = require('../lib/llm-checker')
-const { config } = require('../config')
+const { verifyToken } = require('../../core/lib/auth')
+const { clearLlmCache } = require('../../core/lib/llm-checker')
+const { config } = require('../../core/config')
 
 /** Keys that can be read/written via the config API */
 const ALLOWED_ENV_KEYS = ['LLM_COMMAND']

package/{routes → linux/routes}/directives.js

@@ -12,12 +12,12 @@ const fs = require('fs').promises
 const path = require('path')
 const crypto = require('crypto')
 
-const { verifyToken } = require('../lib/auth')
-const { config } = require('../config')
-const { writeSkillToLocal } = require('./skills')
+const { verifyToken } = require('../../core/lib/auth')
+const { config } = require('../../core/config')
+const { writeSkillToLocal } = require('../../core/routes/skills')
 const workflowRunner = require('../workflow-runner')
-const executionStore = require('../execution-store')
-const logManager = require('../lib/log-manager')
+const executionStore = require('../../core/stores/execution-store')
+const logManager = require('../../core/lib/log-manager')
 
 /**
  * Parse frontmatter from skill content to extract body

package/{routes → linux/routes}/files.js

@@ -16,8 +16,8 @@ const fsSync = require('fs')
 const path = require('path')
 const { spawn } = require('child_process')
 
-const { verifyToken } = require('../lib/auth')
-const { config } = require('../config')
+const { verifyToken } = require('../../core/lib/auth')
+const { config } = require('../../core/config')
 
 /** Base directory for file storage */
 const FILES_DIR = path.join(config.HOME_DIR, 'files')

package/{routes → linux/routes}/terminal.js

@@ -20,8 +20,8 @@ const path = require('path')
 const net = require('net')
 const execAsync = promisify(exec)
 
-const { verifyToken } = require('../lib/auth')
-const { config } = require('../config')
+const { verifyToken } = require('../../core/lib/auth')
+const { config } = require('../../core/config')
 
 // Ensure consistent HOME for tmux socket path
 const homeDir = config.HOME_DIR

package/{routine-runner.js → linux/routine-runner.js}

@@ -18,10 +18,10 @@ const path = require('path')
 const fs = require('fs').promises
 const execAsync = promisify(exec)
 
-const { config } = require('./config')
-const executionStore = require('./execution-store')
-const routineStore = require('./routine-store')
-const logManager = require('./lib/log-manager')
+const { config } = require('../core/config')
+const executionStore = require('../core/stores/execution-store')
+const routineStore = require('../core/stores/routine-store')
+const logManager = require('../core/lib/log-manager')
 
 // Active cron jobs keyed by routine ID
 const activeJobs = new Map()