@geekbeer/minion 3.17.0 → 3.23.0

package/win/routine-runner.js

@@ -18,6 +18,8 @@ const routineStore = require('../core/stores/routine-store')
 const logManager = require('../core/lib/log-manager')
 const { activeSessions } = require('./workflow-runner')
 const { expandSkillTemplates, restoreSkillTemplates } = require('../core/lib/template-expander')
+const { getActivePrimary } = require('../core/llm-plugins/lib/active')
+const os = require('os')
 
 const activeJobs = new Map()
 const runningExecutions = new Map()
@@ -48,11 +50,16 @@ async function executeRoutineSession(routine, executionId, skillNames) {
   const homeDir = config.HOME_DIR
   const sessionName = generateSessionName(routine.id, executionId)
 
-  const skillCommands = skillNames.map(name => `/${name}`).join(', then ')
+  const primary = getActivePrimary()
+  const formatSkill = primary && typeof primary.formatSkillInvocation === 'function'
+    ? primary.formatSkillInvocation.bind(primary)
+    : (name) => `/${name}`
+  const skillCommands = skillNames.map(name => formatSkill(name)).join(', then ')
   const contextPrefix = routine.context
     ? `## Context\n\n${routine.context}\n\n---\n\n`
     : ''
-  const prompt = `${contextPrefix}Run the following skills in order: ${skillCommands}. After completing all skills, run /execution-report to report the results.`
+  const reportSkill = formatSkill('execution-report')
+  const prompt = `${contextPrefix}Run the following skills in order: ${skillCommands}. After completing all skills, run ${reportSkill} to report the results.`
 
   const logFile = logManager.getLogPath(executionId)
 
@@ -82,11 +89,18 @@ async function executeRoutineSession(routine, executionId, skillNames) {
       activeSessions.delete(sessionName)
     }
 
-    if (!config.LLM_COMMAND) {
-      throw new Error('LLM_COMMAND is not configured. Set LLM_COMMAND in minion.env')
+    let llmCommand
+    const primary = getActivePrimary()
+    if (primary && typeof primary.buildShellInvocation === 'function') {
+      const promptFile = path.join(os.tmpdir(), `minion-routine-prompt-${sessionName}.txt`)
+      await fs.writeFile(promptFile, prompt, 'utf-8')
+      llmCommand = primary.buildShellInvocation({ promptFile })
+    } else if (config.LLM_COMMAND) {
+      const escapedPrompt = prompt.replace(/'/g, "''")
+      llmCommand = config.LLM_COMMAND.replace(/\{prompt\}/g, escapedPrompt)
+    } else {
+      throw new Error('No LLM configured. Set a Primary plugin via /api/llm/config or LLM_COMMAND in minion.env')
     }
-    const escapedPrompt = prompt.replace(/'/g, "''")
-    const llmCommand = config.LLM_COMMAND.replace(/\{prompt\}/g, escapedPrompt)
 
     // PATH, HOME, USERPROFILE, and minion secrets are already set in
     // process.env at server startup. Per-execution identifiers are added here.

package/win/server.js

@@ -62,6 +62,7 @@ const { threadRoutes } = require('../core/routes/threads')
 const { todoRoutes } = require('../core/routes/todos')
 const { emailRoutes } = require('../core/routes/emails')
 const { daemonRoutes } = require('../core/routes/daemons')
+const { llmRoutes } = require('../core/routes/llm')
 
 // Validate configuration
 validate()
@@ -224,6 +225,7 @@ async function registerRoutes(app) {
   await app.register(todoRoutes)
   await app.register(emailRoutes)
   await app.register(daemonRoutes, { heartbeatStatus: () => ({ running: !!heartbeatTimer, last_beat_at: lastBeatAt }) })
+  await app.register(llmRoutes)
 
   // Shutdown endpoint — allows detached restart/update scripts to trigger
   // graceful shutdown (offline heartbeat) before force-killing the process.

package/win/workflow-runner.js

@@ -24,6 +24,8 @@ const executionStore = require('../core/stores/execution-store')
 const workflowStore = require('../core/stores/workflow-store')
 const logManager = require('../core/lib/log-manager')
 const { expandSkillTemplates, restoreSkillTemplates } = require('../core/lib/template-expander')
+const { getActivePrimary } = require('../core/llm-plugins/lib/active')
+const os = require('os')
 
 // Active cron jobs keyed by workflow ID
 const activeJobs = new Map()
@@ -73,10 +75,14 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
   const sessionName = generateSessionName(workflow.id, executionId)
 
   // Build prompt
-  const skillCommands = skillNames.map(name => `/${name}`).join(', then ')
+  const primary = getActivePrimary()
+  const formatSkill = primary && typeof primary.formatSkillInvocation === 'function'
+    ? primary.formatSkillInvocation.bind(primary)
+    : (name) => `/${name}`
+  const skillCommands = skillNames.map(name => formatSkill(name)).join(', then ')
 
   const rolePrefix = options.role
-    ? `You are acting as the "${options.role}" role in this session. Read ~/.minion/roles/${options.role}.md for your role guidelines before proceeding.\n\n`
+    ? `You are acting as the ${options.role} role in this session. Read ~/.minion/roles/${options.role}.md for your role guidelines before proceeding.\n\n`
     : ''
 
   const revisionContext = options.revisionFeedback
@@ -115,12 +121,19 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
       activeSessions.delete(sessionName)
     }
 
-    // Build the LLM command
-    if (!config.LLM_COMMAND) {
-      throw new Error('LLM_COMMAND is not configured. Set LLM_COMMAND in minion.env')
+    // Build the LLM command (prefer plugin system, fall back to LLM_COMMAND)
+    let llmCommand
+    const primary = getActivePrimary()
+    if (primary && typeof primary.buildShellInvocation === 'function') {
+      const promptFile = path.join(os.tmpdir(), `minion-workflow-prompt-${sessionName}.txt`)
+      await fs.writeFile(promptFile, prompt, 'utf-8')
+      llmCommand = primary.buildShellInvocation({ promptFile })
+    } else if (config.LLM_COMMAND) {
+      const escapedPrompt = prompt.replace(/'/g, "''")
+      llmCommand = config.LLM_COMMAND.replace(/\{prompt\}/g, escapedPrompt)
+    } else {
+      throw new Error('No LLM configured. Set a Primary plugin via /api/llm/config or LLM_COMMAND in minion.env')
     }
-    const escapedPrompt = prompt.replace(/'/g, "''")
-    const llmCommand = config.LLM_COMMAND.replace(/\{prompt\}/g, escapedPrompt)
 
     // PATH, HOME, USERPROFILE, and minion secrets are already set in
     // process.env at server startup, so child processes inherit them automatically.