@geekbeer/minion 2.33.4 → 2.42.5

package/core/routes/health.js

@@ -8,8 +8,15 @@
  */
 
 const { version } = require('../../package.json')
+const { config, isHqConfigured } = require('../config')
+const { sendHeartbeat } = require('../api')
 const { getLlmServices, isLlmCommandConfigured } = require('../lib/llm-checker')
 
+function maskToken(token) {
+  if (!token || token.length < 8) return token ? '***' : ''
+  return token.slice(0, 3) + '...' + token.slice(-3)
+}
+
 // Shared status state
 let currentStatus = 'online'
 let currentTask = null
@@ -51,6 +58,15 @@ async function healthRoutes(fastify) {
       timestamp: new Date().toISOString(),
       llm_services: getLlmServices(),
       llm_command_configured: isLlmCommandConfigured(),
+      env: {
+        HQ_URL: config.HQ_URL || '',
+        MINION_ID: config.MINION_ID || '',
+        MINION_USER: process.env.MINION_USER || '',
+        AGENT_PORT: config.AGENT_PORT,
+        API_TOKEN: maskToken(config.API_TOKEN),
+        LLM_COMMAND: config.LLM_COMMAND || '',
+        HEARTBEAT_INTERVAL: process.env.HEARTBEAT_INTERVAL || '',
+      },
     }
   })
 
@@ -58,18 +74,29 @@ async function healthRoutes(fastify) {
   fastify.post('/api/status', async (request, reply) => {
     const { status, current_task } = request.body || {}
 
+    let changed = false
+
     if (status) {
       if (!['online', 'offline', 'busy'].includes(status)) {
         reply.code(400)
         return { success: false, error: `Invalid status: ${status}` }
       }
+      if (currentStatus !== status) changed = true
       currentStatus = status
     }
 
     if (current_task !== undefined) {
+      if (currentTask !== (current_task || null)) changed = true
       currentTask = current_task || null
     }
 
+    // Push status change to HQ immediately via heartbeat
+    if (changed && isHqConfigured()) {
+      sendHeartbeat({ status: currentStatus, current_task: currentTask, version }).catch(err => {
+        console.error('[Heartbeat] Status-change heartbeat failed:', err.message)
+      })
+    }
+
     return { success: true }
   })
 }

package/core/routes/routines.js

@@ -81,7 +81,7 @@ async function routineRoutes(fastify, opts) {
 
     // Merge routine data with runtime status
     const result = routines.map(r => {
-      const runtimeInfo = status.routines.find(rr => rr.id === r.id)
+      const runtimeInfo = status.routines.find(rr => String(rr.id) === String(r.id))
       return {
         ...r,
         next_run: runtimeInfo?.next_run || null,
@@ -149,13 +149,15 @@ async function routineRoutes(fastify, opts) {
     const { id } = request.params
     const updates = request.body || {}
 
-    console.log(`[Routines] Updating routine schedule: ${id}`)
+    console.log(`[Routines] Updating routine schedule: ${id} (type: ${typeof id})`)
 
     try {
       const routines = await routineStore.load()
-      const index = routines.findIndex(r => r.id === id)
+      const index = routines.findIndex(r => String(r.id) === String(id))
 
       if (index < 0) {
+        const storedIds = routines.map(r => `${r.name}(id=${r.id}, type=${typeof r.id})`).join(', ')
+        console.error(`[Routines] Schedule update: routine not found. Requested id=${id}. Stored: [${storedIds}]`)
         reply.code(404)
         return { success: false, error: 'Routine not found' }
       }
@@ -195,7 +197,7 @@ async function routineRoutes(fastify, opts) {
 
     try {
       const routines = await routineStore.load()
-      const index = routines.findIndex(r => r.id === id)
+      const index = routines.findIndex(r => String(r.id) === String(id))
 
       if (index < 0) {
         reply.code(404)
@@ -265,20 +267,23 @@ async function routineRoutes(fastify, opts) {
       return { success: false, error: 'Unauthorized' }
     }
 
-    const { routine_id } = request.body || {}
+    const { routine_id, routine_name } = request.body || {}
 
-    if (!routine_id) {
+    if (!routine_id && !routine_name) {
       reply.code(400)
-      return { success: false, error: 'routine_id is required' }
+      return { success: false, error: 'routine_id or routine_name is required' }
     }
 
-    // Find the routine in local store
+    // Find the routine in local store (try id first, then name fallback)
     const routines = await routineStore.load()
-    const routine = routines.find(r => r.id === routine_id)
+    const routine = routines.find(r => routine_id != null && String(r.id) === String(routine_id))
+      || (routine_name && routines.find(r => r.name === routine_name))
 
     if (!routine) {
+      const storedIds = routines.map(r => `${r.name}(${r.id || 'no-id'})`).join(', ')
+      console.error(`[Routines] Trigger: routine not found. Requested id=${routine_id}, name=${routine_name}. Stored: [${storedIds}]`)
       reply.code(404)
-      return { success: false, error: 'Routine not found' }
+      return { success: false, error: `Routine not found (id=${routine_id}). Available: [${storedIds}]` }
     }
 
     console.log(`[Routines] Manual trigger for: ${routine.name}`)

package/core/routes/skills.js

@@ -51,7 +51,7 @@ function parseFrontmatter(content) {
  * @param {Array<{filename: string, content: string}>} [opts.references] - Reference files
  * @returns {Promise<{path: string, references_count: number}>}
  */
-async function writeSkillToLocal(name, { content, description, display_name, references = [] }) {
+async function writeSkillToLocal(name, { content, description, display_name, type, references = [] }) {
   const skillDir = path.join(config.HOME_DIR, '.claude', 'skills', name)
   const referencesDir = path.join(skillDir, 'references')
 
@@ -62,6 +62,7 @@ async function writeSkillToLocal(name, { content, description, display_name, ref
   const frontmatterLines = [
     `name: ${name}`,
     display_name ? `display_name: ${display_name}` : null,
+    type ? `type: ${type}` : null,
     `description: ${description || ''}`,
   ].filter(Boolean).join('\n')
 
@@ -118,6 +119,7 @@ async function pushSkillToHQ(name) {
       display_name: metadata.display_name || metadata.name || name,
       description: metadata.description || '',
       content: body,
+      type: metadata.type || 'workflow',
       references,
     }),
   })
@@ -240,6 +242,7 @@ async function skillRoutes(fastify, opts) {
         content: skill.content,
         description: skill.description,
         display_name: skill.display_name,
+        type: skill.type,
         references: skill.references || [],
       })
 

package/core/routes/workflows.js

@@ -14,10 +14,12 @@
  * - GET  /api/executions/:id         - Get single execution details
  * - GET  /api/executions/:id/log     - Get execution log file content
  * - POST /api/executions/:id/outcome - Update execution outcome (no auth, local)
+ * - POST /api/workflows/orchestrate  - Start multi-minion orchestration (from HQ)
  */
 
 const fs = require('fs').promises
 const path = require('path')
+const { orchestrate } = require('../lib/workflow-orchestrator')
 
 const { verifyToken } = require('../lib/auth')
 const workflowStore = require('../stores/workflow-store')
@@ -493,8 +495,53 @@ async function workflowRoutes(fastify, opts) {
     }
   })
 
-  // Update execution outcome (called by /execution-report skill)
-  // This endpoint does NOT require auth - skills run in the same environment
+  // Orchestrate a multi-minion workflow execution (called by HQ)
+  fastify.post('/api/workflows/orchestrate', async (request, reply) => {
+    if (!verifyToken(request)) {
+      reply.code(401)
+      return { success: false, error: 'Unauthorized' }
+    }
+
+    const { execution_id, steps, hq_url } = request.body || {}
+
+    if (!execution_id || !Array.isArray(steps)) {
+      reply.code(400)
+      return { success: false, error: 'execution_id and steps[] are required' }
+    }
+
+    console.log(`[Workflows] Starting orchestration for execution: ${execution_id} (${steps.length} steps)`)
+
+    // Load optional PM revision policy
+    let revisionPolicy = ''
+    try {
+      const policyPath = path.join(config.HOME_DIR, '.minion', 'revision-policy.md')
+      revisionPolicy = await fs.readFile(policyPath, 'utf-8')
+    } catch {
+      // No custom policy — use defaults
+    }
+
+    // Run orchestration asynchronously
+    orchestrate({ executionId: execution_id, steps, hqUrl: hq_url, revisionPolicy })
+      .then((result) => {
+        if (result.success) {
+          console.log(`[Workflows] Orchestration completed: ${execution_id}`)
+        } else {
+          console.error(`[Workflows] Orchestration failed: ${execution_id} — ${result.error}`)
+        }
+      })
+      .catch((err) => {
+        console.error(`[Workflows] Orchestration error: ${execution_id} — ${err.message}`)
+      })
+
+    return {
+      success: true,
+      message: 'Orchestration started',
+      execution_id,
+    }
+  })
+
+  // Update execution outcome (called by workflow runner after completion)
+  // This endpoint does NOT require auth - runs in the same environment
   fastify.post('/api/executions/:id/outcome', async (request, reply) => {
     const { id } = request.params
     const { outcome, summary, details } = request.body || {}

package/core/stores/chat-store.js

@@ -61,8 +61,9 @@ async function save(session) {
  * Creates a new session if none exists
  * @param {string} sessionId - Claude CLI session ID
  * @param {{ role: string, content: string }} msg - Message to add
+ * @param {number} [turnCount] - Optional turn count to update session with
  */
-async function addMessage(sessionId, msg) {
+async function addMessage(sessionId, msg, turnCount) {
   let session = await load()
 
   // If session_id changed, start a new session
@@ -70,6 +71,7 @@ async function addMessage(sessionId, msg) {
     session = {
       session_id: sessionId,
       messages: [],
+      turn_count: 0,
       created_at: Date.now(),
       updated_at: Date.now(),
     }
@@ -82,6 +84,11 @@ async function addMessage(sessionId, msg) {
   })
   session.updated_at = Date.now()
 
+  // Update turn count if provided
+  if (typeof turnCount === 'number' && turnCount > 0) {
+    session.turn_count = (session.turn_count || 0) + turnCount
+  }
+
   // Prune old messages
   if (session.messages.length > MAX_MESSAGES) {
     session.messages = session.messages.slice(-MAX_MESSAGES)

package/core/stores/routine-store.js

@@ -60,7 +60,7 @@ async function save(routines) {
  */
 async function updateLastRun(routineId) {
   const routines = await load()
-  const routine = routines.find(r => r.id === routineId)
+  const routine = routines.find(r => String(r.id) === String(routineId))
   if (routine) {
     routine.last_run = new Date().toISOString()
     await save(routines)
@@ -85,7 +85,7 @@ async function findByName(name) {
  */
 async function upsertFromHQ(routineData) {
   const routines = await load()
-  const index = routines.findIndex(r => r.id === routineData.id)
+  const index = routines.findIndex(r => String(r.id) === String(routineData.id))
 
   if (index >= 0) {
     // Update from HQ (preserve local-only fields if any)

package/linux/lib/process-manager.js

@@ -54,6 +54,11 @@ function buildAllowedCommands(procMgr) {
       command: `${SUDO}npm install -g @geekbeer/minion@latest && ${SUDO}systemctl restart minion-agent`,
       deferred: true,
     }
+    commands['update-agent-dev'] = {
+      description: 'Update @geekbeer/minion from Verdaccio (dev) and restart',
+      command: `${SUDO}npm install -g @geekbeer/minion@latest --registry http://verdaccio:4873 && ${SUDO}systemctl restart minion-agent`,
+      deferred: true,
+    }
     commands['restart-display'] = {
       description: 'Restart Xvfb, Fluxbox, x11vnc and noVNC services',
       command: `${SUDO}systemctl restart xvfb fluxbox x11vnc novnc`,
@@ -73,6 +78,11 @@ function buildAllowedCommands(procMgr) {
       command: `${SUDO}npm install -g @geekbeer/minion@latest && ${SUDO}supervisorctl restart minion-agent`,
       deferred: true,
     }
+    commands['update-agent-dev'] = {
+      description: 'Update @geekbeer/minion from Verdaccio (dev) and restart',
+      command: `${SUDO}npm install -g @geekbeer/minion@latest --registry http://verdaccio:4873 && ${SUDO}supervisorctl restart minion-agent`,
+      deferred: true,
+    }
     commands['restart-display'] = {
       description: 'Restart Xvfb, x11vnc and noVNC services',
       command: `${SUDO}supervisorctl restart xvfb fluxbox x11vnc novnc`,
@@ -87,6 +97,10 @@ function buildAllowedCommands(procMgr) {
       description: 'Update @geekbeer/minion to latest version',
       command: `${SUDO}npm install -g @geekbeer/minion@latest`,
     }
+    commands['update-agent-dev'] = {
+      description: 'Update @geekbeer/minion from Verdaccio (dev)',
+      command: `${SUDO}npm install -g @geekbeer/minion@latest --registry http://verdaccio:4873`,
+    }
     commands['status-services'] = {
       description: 'Show agent process info',
       command: 'echo "Process Manager: standalone (no systemd/supervisord)" && echo "Agent PID: $$" && echo "Node version: $(node -v)" && echo "Uptime: $(ps -o etime= -p $$)"',

package/linux/minion-cli.sh

@@ -11,6 +11,7 @@
 #   sudo minion-cli restart                  # Restart agent service (root)
 #   minion-cli status                        # Get current status
 #   minion-cli health                        # Health check
+#   minion-cli diagnose                      # Run full service diagnostics
 #   minion-cli set-status busy "Running X"   # Set status and task
 #   minion-cli set-status online             # Set status only
 #
@@ -186,8 +187,8 @@ do_setup() {
     fi
   elif [ "$(id -u)" -eq 0 ]; then
     # Running as root without --user
-    if [ "$PROC_MGR" = "supervisord" ]; then
-      # Container environment (supervisord) - allow root for backward compatibility
+    if [ "$PROC_MGR" = "supervisord" ] && [ -f /.dockerenv ]; then
+      # Container environment (supervisord + Docker) - allow root for backward compatibility
       echo "  NOTE: Running as root in container environment (supervisord detected)"
       TARGET_USER="root"
       TARGET_HOME="$HOME"
@@ -303,7 +304,6 @@ do_setup() {
   fi
 
   ENV_CONTENT+="AGENT_PORT=8080\n"
-  ENV_CONTENT+="HEARTBEAT_INTERVAL=30\n"
   ENV_CONTENT+="MINION_USER=${TARGET_USER}\n"
 
   echo -e "$ENV_CONTENT" | $SUDO tee /opt/minion-agent/.env > /dev/null
@@ -316,21 +316,23 @@ do_setup() {
     local NPM_BIN
     NPM_BIN="$(which npm)"
     local SUDOERS_FILE="/etc/sudoers.d/minion-agent"
-    local SUDOERS_CONTENT="${TARGET_USER} ALL=(root) NOPASSWD: ${NPM_BIN} install -g @geekbeer/minion@latest"
 
-    case "$PROC_MGR" in
-      systemd)
-        SUDOERS_CONTENT+="\n${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/systemctl restart minion-agent"
-        SUDOERS_CONTENT+="\n${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/systemctl restart xvfb fluxbox autocutsel vnc novnc"
-        ;;
-      supervisord)
-        SUDOERS_CONTENT+="\n${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/supervisorctl restart minion-agent"
-        SUDOERS_CONTENT+="\n${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/supervisorctl restart xvfb fluxbox autocutsel vnc novnc"
-        SUDOERS_CONTENT+="\n${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/supervisorctl status"
-        ;;
-    esac
+    {
+      echo "${TARGET_USER} ALL=(root) NOPASSWD: ${NPM_BIN} install -g @geekbeer/minion@latest"
+      echo "${TARGET_USER} ALL=(root) NOPASSWD: ${NPM_BIN} install -g @geekbeer/minion@latest --registry *"
 
-    echo -e "$SUDOERS_CONTENT" | $SUDO tee "$SUDOERS_FILE" > /dev/null
+      case "$PROC_MGR" in
+        systemd)
+          echo "${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/systemctl restart minion-agent"
+          echo "${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/systemctl restart xvfb fluxbox autocutsel vnc novnc"
+          ;;
+        supervisord)
+          echo "${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/supervisorctl restart minion-agent"
+          echo "${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/supervisorctl restart xvfb fluxbox autocutsel vnc novnc"
+          echo "${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/supervisorctl status"
+          ;;
+      esac
+    } | $SUDO tee "$SUDOERS_FILE" > /dev/null
     $SUDO chmod 440 "$SUDOERS_FILE"
     echo "  -> $SUDOERS_FILE created"
   else
@@ -1034,6 +1036,44 @@ case "${1:-}" in
     curl -s "$AGENT_URL/api/health" | jq .
     ;;
 
+  diagnose)
+    echo "Running diagnostics..."
+    echo ""
+    RESULT=$(curl -s --max-time 15 "$AGENT_URL/api/diagnose" 2>/dev/null) || {
+      echo "FAIL: Cannot reach minion agent at $AGENT_URL"
+      echo "      Is the agent running? Try: sudo minion-cli start"
+      exit 1
+    }
+
+    # Parse and display results with color coding
+    SUMMARY=$(echo "$RESULT" | jq -r '.summary // "UNKNOWN"')
+    VERSION=$(echo "$RESULT" | jq -r '.version // "?"')
+    PLATFORM=$(echo "$RESULT" | jq -r '.platform // "?"')
+
+    echo "=== Minion Diagnostics (v${VERSION}, ${PLATFORM}) ==="
+    echo ""
+
+    # Display each check with pass/fail indicator
+    for CHECK in agent hq tunnel vnc terminal llm env; do
+      OK=$(echo "$RESULT" | jq -r ".checks.${CHECK}.ok")
+      DETAILS=$(echo "$RESULT" | jq -r ".checks.${CHECK}.details // \"\"")
+      CHECK_UPPER=$(echo "$CHECK" | tr '[:lower:]' '[:upper:]')
+
+      if [ "$OK" = "true" ]; then
+        printf "  \033[32m[PASS]\033[0m %-10s %s\n" "$CHECK_UPPER" "$DETAILS"
+      else
+        printf "  \033[31m[FAIL]\033[0m %-10s %s\n" "$CHECK_UPPER" "$DETAILS"
+      fi
+    done
+
+    echo ""
+    if [ "$SUMMARY" = "ALL OK" ]; then
+      echo -e "\033[32m$SUMMARY\033[0m"
+    else
+      echo -e "\033[33m$SUMMARY\033[0m"
+    fi
+    ;;
+
   start)
     require_root start
     svc_control start
@@ -1107,6 +1147,7 @@ case "${1:-}" in
     echo "  sudo minion-cli restart                   # Restart agent service (root)"
     echo "  minion-cli status                         # Get current status"
     echo "  minion-cli health                         # Health check"
+    echo "  minion-cli diagnose                       # Run full service diagnostics"
     echo "  minion-cli set-status <status> [task]     # Set status and optional task"
     echo "  minion-cli skill <push|fetch|list>        # Manage skills with HQ"
     echo "  minion-cli --version                      # Show version"