@geekbeer/minion 2.54.1 → 2.56.1

package/core/lib/platform.js

@@ -31,7 +31,6 @@ function resolveDataDir() {
 
 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.
@@ -104,7 +103,6 @@ module.exports = {
   TEMP_DIR,
   DATA_DIR,
   LOG_DIR,
-  MARKER_DIR,
   buildExtendedPath,
   getExitCodePath,
   getDefaultShell,

package/core/lib/running-tasks.js

@@ -0,0 +1,125 @@
+/**
+ * Running Tasks Store
+ *
+ * In-memory store that tracks what tmux sessions are currently running
+ * on this minion. Reported to HQ via heartbeat so the dashboard can
+ * show the minion's actual state (the "body" of the minion).
+ *
+ * Mutations trigger an immediate heartbeat (debounced to 2s) so the
+ * dashboard receives near-real-time updates.
+ */
+
+const { isHqConfigured } = require('../config')
+
+/** @type {Array<import('../../src/lib/supabase/types').RunningTask>} */
+let tasks = []
+
+// Debounce timer for immediate heartbeat on mutation
+let debounceTimer = null
+const DEBOUNCE_MS = 2000
+
+// Lazy reference — resolved on first use to avoid circular require
+let _sendHeartbeat = null
+let _getStatus = null
+let _version = null
+
+function getSendHeartbeat() {
+  if (!_sendHeartbeat) {
+    _sendHeartbeat = require('../api').sendHeartbeat
+  }
+  return _sendHeartbeat
+}
+
+function getStatusFn() {
+  if (!_getStatus) {
+    _getStatus = require('../routes/health').getStatus
+  }
+  return _getStatus
+}
+
+function getVersion() {
+  if (!_version) {
+    _version = require('../../package.json').version
+  }
+  return _version
+}
+
+/**
+ * Push a status change to HQ immediately (debounced).
+ */
+function pushToHQ() {
+  if (!isHqConfigured()) return
+
+  if (debounceTimer) clearTimeout(debounceTimer)
+  debounceTimer = setTimeout(() => {
+    debounceTimer = null
+    try {
+      const { currentStatus, currentTask } = getStatusFn()
+      getSendHeartbeat()({
+        status: currentStatus,
+        current_task: currentTask,
+        running_tasks: tasks,
+        version: getVersion(),
+      }).catch(err => {
+        console.error('[RunningTasks] Heartbeat push failed:', err.message)
+      })
+    } catch (err) {
+      console.error('[RunningTasks] Failed to push heartbeat:', err.message)
+    }
+  }, DEBOUNCE_MS)
+}
+
+/**
+ * Add a running task.
+ * @param {object} entry
+ * @param {'workflow'|'routine'|'directive'} entry.type
+ * @param {string} [entry.workflow_execution_id]
+ * @param {number} [entry.step_index]
+ * @param {string} [entry.routine_id]
+ * @param {string} entry.session_name
+ * @param {string} [entry.started_at] - ISO timestamp, defaults to now
+ */
+function add(entry) {
+  const task = {
+    type: entry.type,
+    session_name: entry.session_name,
+    started_at: entry.started_at || new Date().toISOString(),
+  }
+  if (entry.workflow_execution_id) task.workflow_execution_id = entry.workflow_execution_id
+  if (entry.step_index != null) task.step_index = entry.step_index
+  if (entry.routine_id) task.routine_id = entry.routine_id
+
+  tasks.push(task)
+  console.log(`[RunningTasks] Added: ${task.type} session=${task.session_name}`)
+  pushToHQ()
+}
+
+/**
+ * Remove a running task by session name.
+ * @param {string} sessionName
+ */
+function remove(sessionName) {
+  const before = tasks.length
+  tasks = tasks.filter(t => t.session_name !== sessionName)
+  if (tasks.length < before) {
+    console.log(`[RunningTasks] Removed: session=${sessionName}`)
+    pushToHQ()
+  }
+}
+
+/**
+ * Get all currently running tasks.
+ * @returns {Array}
+ */
+function getAll() {
+  return [...tasks]
+}
+
+/**
+ * Clear all tasks (used on shutdown).
+ */
+function clear() {
+  tasks = []
+}
+
+module.exports = { add, remove, getAll, clear }

package/core/lib/step-poller.js

@@ -94,7 +94,7 @@ async function executeStep(step) {
     assigned_role,
     skill_name,
     revision_feedback,
-    extra_env,
+    template_vars,
   } = step
 
   console.log(
@@ -125,9 +125,13 @@ async function executeStep(step) {
     }
 
     // 2. Fetch the skill from HQ to ensure it's deployed locally
+    //    Pass template_vars as ?vars= so HQ expands {{VAR_NAME}} in SKILL.md
     if (skill_name) {
       try {
-        const fetchUrl = `http://localhost:${config.AGENT_PORT || 8080}/api/skills/fetch/${encodeURIComponent(skill_name)}`
+        const varsParam = template_vars
+          ? `?vars=${Buffer.from(JSON.stringify(template_vars)).toString('base64')}`
+          : ''
+        const fetchUrl = `http://localhost:${config.AGENT_PORT || 8080}/api/skills/fetch/${encodeURIComponent(skill_name)}${varsParam}`
         const fetchResp = await fetch(fetchUrl, {
           method: 'POST',
           headers: { 'Authorization': `Bearer ${config.API_TOKEN}` },
@@ -152,9 +156,6 @@ async function executeStep(step) {
     if (revision_feedback) {
       runPayload.revision_feedback = revision_feedback
     }
-    if (extra_env && typeof extra_env === 'object') {
-      runPayload.extra_env = extra_env
-    }
 
     const runUrl = `http://localhost:${config.AGENT_PORT || 8080}/api/skills/run`
     const runResp = await fetch(runUrl, {

package/core/routes/health.js

@@ -14,6 +14,7 @@ const { config, isHqConfigured } = require('../config')
 const { sendHeartbeat } = require('../api')
 const { getLlmServices, isLlmCommandConfigured } = require('../lib/llm-checker')
 const { getCapabilities, checkRequirements } = require('../lib/capability-checker')
+const runningTasks = require('../lib/running-tasks')
 
 function maskToken(token) {
   if (!token || token.length < 8) return token ? '***' : ''
@@ -99,7 +100,7 @@ async function healthRoutes(fastify) {
 
     // Push status change to HQ immediately via heartbeat
     if (changed && isHqConfigured()) {
-      sendHeartbeat({ status: currentStatus, current_task: currentTask, version }).catch(err => {
+      sendHeartbeat({ status: currentStatus, current_task: currentTask, running_tasks: runningTasks.getAll(), version }).catch(err => {
         console.error('[Heartbeat] Status-change heartbeat failed:', err.message)
       })
     }

package/core/routes/skills.js

@@ -248,11 +248,14 @@ async function skillRoutes(fastify, opts) {
       return { success: false, error: 'Invalid skill name' }
     }
 
-    console.log(`[Skills] Fetching skill from HQ: ${name}`)
+    // Forward template vars query param to HQ for {{VAR_NAME}} expansion
+    const vars = request.query.vars || ''
+    const queryString = vars ? `?vars=${encodeURIComponent(vars)}` : ''
+    console.log(`[Skills] Fetching skill from HQ: ${name}${vars ? ' (with template vars)' : ''}`)
 
     try {
-      // Fetch from HQ
-      const skill = await api.request(`/skills/${encodeURIComponent(name)}`)
+      // Fetch from HQ (with optional template variable expansion)
+      const skill = await api.request(`/skills/${encodeURIComponent(name)}${queryString}`)
 
       // Write to local filesystem using shared helper
       const result = await writeSkillToLocal(name, {
@@ -308,7 +311,7 @@ async function skillRoutes(fastify, opts) {
       return { success: false, error: 'Unauthorized' }
     }
 
-    const { skill_name, execution_id, step_index, workflow_name, role, revision_feedback, extra_env } = request.body || {}
+    const { skill_name, execution_id, step_index, workflow_name, role, revision_feedback } = request.body || {}
 
     if (!skill_name) {
       reply.code(400)
@@ -357,7 +360,6 @@ async function skillRoutes(fastify, opts) {
     const runOptions = {}
     if (role) runOptions.role = role
     if (revision_feedback) runOptions.revisionFeedback = revision_feedback
-    if (extra_env && typeof extra_env === 'object') runOptions.extraEnv = extra_env
 
     // Run asynchronously — respond immediately
     const executionPromise = (async () => {

package/core/stores/variable-store.js

@@ -98,6 +98,8 @@ function set(type, key, value) {
   const data = parseEnvFile(filePath)
   data[key] = value
   writeEnvFile(filePath, data)
+  // Sync to process.env so running child processes inherit the updated value
+  process.env[key] = value
   console.log(`[VariableStore] Set ${type} key: ${key}`)
 }
 
@@ -113,6 +115,8 @@ function remove(type, key) {
   if (!(key in data)) return false
   delete data[key]
   writeEnvFile(filePath, data)
+  // Sync to process.env so running child processes no longer inherit the removed value
+  delete process.env[key]
   console.log(`[VariableStore] Removed ${type} key: ${key}`)
   return true
 }

package/docs/api-reference.md

@@ -278,7 +278,7 @@ Response:
 }
 ```
 
-プロジェクト変数はワークフロー実行時に `extra_env` としてミニオンに渡される。
+プロジェクト変数はワークフロー実行時に `template_vars` としてミニオンに渡され、スキルの `{{VAR_NAME}}` テンプレートを展開する。
 
 ### Workflow Variables (PM only)
 

package/docs/environment-setup.md

@@ -192,8 +192,11 @@ cat ~/.mcp.json | node -e "
   console.log('Configured MCP servers:', Object.keys(servers).join(', ') || '(none)');
 "
 
-# エージェントのキャパビリティキャッシュをクリアして再検出させる
-# (キャパビリティは 5 分間キャッシュされるため、即座に反映したい場合)
-curl -s -X POST "http://localhost:8080/api/capabilities/clear-cache" \
-  -H "Authorization: Bearer $API_TOKEN"
+# ケイパビリティが更新されているか確認（キャッシュなし、常に最新を返す）
+curl -s "http://localhost:8080/api/capabilities" \
+  -H "Authorization: Bearer $API_TOKEN" | node -e "
+  const data = JSON.parse(require('fs').readFileSync('/dev/stdin','utf8'));
+  console.log('MCP servers:', Object.keys(data.mcp_servers || {}).join(', ') || '(none)');
+  console.log('Packages:', Object.keys(data.packages || {}).map(m => m + ':' + data.packages[m].items.length).join(', ') || '(none)');
+"
 ```

package/docs/task-guides.md

@@ -30,6 +30,7 @@ requires:
 ---
 
 Skill instructions here...
+Use {{PROJECT_VAR}} to reference project/workflow variables.
 ```
 
 フロントマターのフィールド:
@@ -46,6 +47,24 @@ Skill instructions here...
 `requires` を宣言すると、ワークフロー実行前にミニオンの環境と照合する事前チェック（readiness check）が行われる。
 未宣言の場合は常に実行可能と見なされる。
 
+### テンプレート変数
+
+スキル本文中で `{{VAR_NAME}}` と記述すると、ワークフロー実行時にHQ上のプロジェクト変数・ワークフロー変数の値で自動的に置換される。スキルを再利用しつつ、プロジェクトごとに異なるパラメータを渡したい場合に使う。
+
+```markdown
+---
+name: deploy-site
+description: サイトをデプロイする
+---
+
+{{DEPLOY_TARGET}} に {{SITE_URL}} をデプロイしてください。
+```
+
+- 変数名は英数字とアンダースコアのみ（`\w+`）
+- 未定義の変数は `{{VAR_NAME}}` のまま残る（エラーにはならない）
+- ワークフロー変数はプロジェクト変数を上書きする（同名キーの場合）
+- ミニオン変数・シークレットは `process.env` 経由で利用可能（テンプレートではなく環境変数として）
+
 ### 2. HQ に反映する
 
 ```bash

package/linux/routes/chat.js

@@ -301,16 +301,6 @@ function streamLlmResponse(res, prompt, sessionId) {
     const binaryPath = path.join(config.HOME_DIR, '.local', 'bin', binaryName)
     const binary = fs.existsSync(binaryPath) ? binaryPath : binaryName
 
-    const extendedPath = [
-      `${config.HOME_DIR}/bin`,
-      `${config.HOME_DIR}/.npm-global/bin`,
-      `${config.HOME_DIR}/.local/bin`,
-      `${config.HOME_DIR}/.claude/bin`,
-      '/usr/local/bin',
-      '/usr/bin',
-      '/bin',
-    ].join(':')
-
     // Build CLI args (no --max-turns: allow unlimited turns for task completion)
     const args = [
       '-p',
@@ -329,16 +319,12 @@ function streamLlmResponse(res, prompt, sessionId) {
 
     console.log(`[Chat] spawning: ${binary} ${sessionId ? `--resume ${sessionId}` : '(new session)'} (cwd: ${config.HOME_DIR})`)
 
+    // PATH, HOME, DISPLAY, and minion variables/secrets are already set in
+    // process.env at server startup, so child processes inherit them automatically.
     const child = spawn(binary, args, {
       cwd: config.HOME_DIR,
       stdio: ['pipe', 'pipe', 'pipe'],
       timeout: 600000, // 10 min
-      env: {
-        ...process.env,
-        HOME: config.HOME_DIR,
-        PATH: extendedPath,
-        DISPLAY: ':99',
-      },
     })
 
     // Track active child process for abort
@@ -540,28 +526,12 @@ function runQuickLlmCall(prompt) {
     const binaryPath = path.join(config.HOME_DIR, '.local', 'bin', binaryName)
     const binary = fs.existsSync(binaryPath) ? binaryPath : binaryName
 
-    const extendedPath = [
-      `${config.HOME_DIR}/bin`,
-      `${config.HOME_DIR}/.npm-global/bin`,
-      `${config.HOME_DIR}/.local/bin`,
-      `${config.HOME_DIR}/.claude/bin`,
-      '/usr/local/bin',
-      '/usr/bin',
-      '/bin',
-    ].join(':')
-
     const args = ['-p', '--model', 'haiku', '--max-turns', '1', '--output-format', 'json']
 
     const child = spawn(binary, args, {
       cwd: config.HOME_DIR,
       stdio: ['pipe', 'pipe', 'pipe'],
       timeout: 30000,
-      env: {
-        ...process.env,
-        HOME: config.HOME_DIR,
-        PATH: extendedPath,
-        DISPLAY: ':99',
-      },
     })
 
     child.stdin.write(prompt)

package/linux/routine-runner.js

@@ -14,7 +14,6 @@ const { Cron } = require('croner')
 const { exec } = require('child_process')
 const { promisify } = require('util')
 const crypto = require('crypto')
-const path = require('path')
 const fs = require('fs').promises
 const execAsync = promisify(exec)
 
@@ -22,7 +21,7 @@ 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')
-const variableStore = require('../core/stores/variable-store')
+const runningTasks = require('../core/lib/running-tasks')
 
 // Active cron jobs keyed by routine ID
 const activeJobs = new Map()
@@ -30,9 +29,6 @@ const activeJobs = new Map()
 // Currently running executions
 const runningExecutions = new Map()
 
-// Marker file directory (shared with workflow-runner)
-const MARKER_DIR = '/tmp/minion-executions'
-
 /**
  * Sleep for specified milliseconds
  * @param {number} ms - Milliseconds to sleep
@@ -54,36 +50,6 @@ function generateSessionName(routineId, executionId) {
   return execShort ? `rt-${routineShort}-${execShort}` : `rt-${routineShort}`
 }
 
-/**
- * Write execution marker file for skill to read
- * @param {string} sessionName - tmux session name
- * @param {object} data - Execution metadata
- */
-async function writeMarkerFile(sessionName, data) {
-  try {
-    await fs.mkdir(MARKER_DIR, { recursive: true })
-    const filePath = path.join(MARKER_DIR, `${sessionName}.json`)
-    await fs.writeFile(filePath, JSON.stringify(data, null, 2), 'utf-8')
-    console.log(`[RoutineRunner] Wrote marker file: ${filePath}`)
-  } catch (err) {
-    console.error(`[RoutineRunner] Failed to write marker file: ${err.message}`)
-  }
-}
-
-/**
- * Clean up marker file after execution
- * @param {string} sessionName - tmux session name
- */
-async function cleanupMarkerFile(sessionName) {
-  try {
-    const filePath = path.join(MARKER_DIR, `${sessionName}.json`)
-    await fs.unlink(filePath)
-    console.log(`[RoutineRunner] Cleaned up marker file: ${filePath}`)
-  } catch {
-    // Ignore if file doesn't exist
-  }
-}
-
 /**
  * Execute a routine in a single CLI session
  * All skills run sequentially with context preserved.
@@ -106,17 +72,6 @@ async function executeRoutineSession(routine, executionId, skillNames) {
 
   const prompt = `${contextPrefix}Run the following skills in order: ${skillCommands}. After completing all skills, run /execution-report to report the results.`
 
-  // Extend PATH to include common CLI installation locations
-  const additionalPaths = [
-    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 || ''
-  const extendedPath = [...additionalPaths, currentPath].join(':')
-
   // Exit code file to capture CLI result
   const exitCodeFile = `/tmp/tmux-exit-${sessionName}`
 
@@ -139,48 +94,28 @@ async function executeRoutineSession(routine, executionId, skillNames) {
     // Remove old exit code file
     await execAsync(`rm -f "${exitCodeFile}"`)
 
-    // Write marker file BEFORE starting session
-    await writeMarkerFile(sessionName, {
-      execution_id: executionId,
-      routine_id: routine.id,
-      routine_name: routine.name,
-      skill_names: skillNames,
-      started_at: new Date().toISOString(),
-    })
-
     // Build the command to run in tmux
     if (!config.LLM_COMMAND) {
       throw new Error('LLM_COMMAND is not configured. Set LLM_COMMAND in minion.env (e.g., LLM_COMMAND="claude -p \'{prompt}\'")')
     }
     const escapedPrompt = prompt.replace(/'/g, "'\\''")
     const llmCommand = config.LLM_COMMAND.replace(/\{prompt\}/g, escapedPrompt)
-    const execCommand = `${llmCommand}; echo $? > ${exitCodeFile}`
-
-    // Build injected environment: minion variables/secrets (routines don't receive HQ vars)
-    const injectedEnv = variableStore.buildEnv()
 
-    // Create tmux session with extended environment
-    // Pass execution context as environment variables for /execution-report skill
-    const tmuxEnvFlags = Object.entries(injectedEnv)
-      .map(([k, v]) => `-e "${k}=${v.replace(/"/g, '\\"')}"`)
+    // Create tmux session with the LLM command.
+    // PATH, HOME, DISPLAY, and minion variables/secrets are already set in
+    // process.env at server startup, so child processes inherit them automatically.
+    // Per-execution identifiers are passed via -e flags for the session environment.
     const tmuxCommand = [
       'tmux new-session -d',
       `-s "${sessionName}"`,
       '-x 200 -y 50',
-      `-e "DISPLAY=:99"`,
-      `-e "PATH=${extendedPath}"`,
-      `-e "HOME=${homeDir}"`,
       `-e "MINION_EXECUTION_ID=${executionId}"`,
       `-e "MINION_ROUTINE_ID=${routine.id}"`,
       `-e "MINION_ROUTINE_NAME=${routine.name.replace(/"/g, '\\"')}"`,
-      ...tmuxEnvFlags,
-      `"${execCommand}"`,
+      `"${llmCommand}; echo $? > ${exitCodeFile}"`,
     ].join(' ')
 
-    await execAsync(tmuxCommand, {
-      cwd: homeDir,
-      env: { ...process.env, HOME: homeDir },
-    })
+    await execAsync(tmuxCommand, { cwd: homeDir })
 
     // Keep session alive after command completes (for debugging via terminal mirror)
     await execAsync(`tmux set-option -t "${sessionName}" remain-on-exit on`)
@@ -238,8 +173,6 @@ async function executeRoutineSession(routine, executionId, skillNames) {
   } catch (error) {
     console.error(`[RoutineRunner] Routine ${routine.name} failed: ${error.message}`)
     return { success: false, error: error.message, sessionName }
-  } finally {
-    await cleanupMarkerFile(sessionName)
   }
 }
 
@@ -269,6 +202,14 @@ async function runRoutine(routine) {
     session_name: sessionName,
   })
 
+  // Track in running_tasks for dashboard visibility
+  runningTasks.add({
+    type: 'routine',
+    routine_id: routine.id,
+    session_name: sessionName,
+    started_at: startedAt,
+  })
+
   const logFile = logManager.getLogPath(executionId)
 
   // Save: routine running
@@ -310,6 +251,7 @@ async function runRoutine(routine) {
   await routineStore.updateLastRun(routine.id)
 
   runningExecutions.delete(executionId)
+  runningTasks.remove(sessionName)
   console.log(`[RoutineRunner] Completed routine: ${routine.name}`)
 
   return { execution_id: executionId, session_name: sessionName }
@@ -418,5 +360,4 @@ module.exports = {
   runRoutine,
   getRoutineById,
   generateSessionName,
-  MARKER_DIR,
 }

package/linux/server.js

@@ -53,6 +53,7 @@ const { startTerminalProxy, stopTerminalProxy } = require('./terminal-proxy')
 const stepPoller = require('../core/lib/step-poller')
 const revisionWatcher = require('../core/lib/revision-watcher')
 const reflectionScheduler = require('../core/lib/reflection-scheduler')
+const runningTasks = require('../core/lib/running-tasks')
 
 // Shared routes (from core/)
 const { healthRoutes, setOffline } = require('../core/routes/health')
@@ -92,11 +93,12 @@ async function shutdown(signal) {
     heartbeatTimer = null
   }
 
-  // Send offline heartbeat to HQ (best-effort, don't block shutdown)
+  // Clear running tasks and send offline heartbeat to HQ (best-effort)
+  runningTasks.clear()
   if (isHqConfigured()) {
     try {
       await Promise.race([
-        sendHeartbeat({ status: 'offline', version }),
+        sendHeartbeat({ status: 'offline', running_tasks: [], version }),
         new Promise(resolve => setTimeout(resolve, 3000)),
       ])
     } catch {
@@ -276,6 +278,21 @@ async function registerAllRoutes(app) {
 // Start server
 async function start() {
   try {
+    // Extend process.env so all child processes (tmux, spawn) inherit correct environment.
+    // This eliminates the need for per-invocation PATH building in runners/chat.
+    const { buildExtendedPath } = require('../core/lib/platform')
+    process.env.PATH = buildExtendedPath(config.HOME_DIR)
+    process.env.HOME = config.HOME_DIR
+    process.env.DISPLAY = process.env.DISPLAY || ':99'
+
+    // Load minion variables/secrets into process.env for child process inheritance
+    const variableStore = require('../core/stores/variable-store')
+    const minionEnv = variableStore.buildEnv()
+    for (const [key, value] of Object.entries(minionEnv)) {
+      if (!(key in process.env)) process.env[key] = value
+    }
+    console.log(`[Server] Loaded ${Object.keys(minionEnv).length} minion variables/secrets into process.env`)
+
     // Sync bundled assets
     syncBundledRules()
     syncBundledRoles()
@@ -331,14 +348,14 @@ async function start() {
       // Send initial online heartbeat
       const { getStatus } = require('../core/routes/health')
       const { currentTask } = getStatus()
-      sendHeartbeat({ status: 'online', current_task: currentTask, version }).catch(err => {
+      sendHeartbeat({ status: 'online', current_task: currentTask, running_tasks: runningTasks.getAll(), version }).catch(err => {
         console.error('[Heartbeat] Initial heartbeat failed:', err.message)
       })
 
       // Start periodic heartbeat
       heartbeatTimer = setInterval(() => {
         const { currentStatus, currentTask } = getStatus()
-        sendHeartbeat({ status: currentStatus, current_task: currentTask, version }).catch(err => {
+        sendHeartbeat({ status: currentStatus, current_task: currentTask, running_tasks: runningTasks.getAll(), version }).catch(err => {
           console.error('[Heartbeat] Periodic heartbeat failed:', err.message)
         })
       }, HEARTBEAT_INTERVAL_MS)

package/linux/workflow-runner.js

@@ -13,15 +13,14 @@ const { Cron } = require('croner')
 const { exec } = require('child_process')
 const { promisify } = require('util')
 const crypto = require('crypto')
-const path = require('path')
 const fs = require('fs').promises
 const execAsync = promisify(exec)
 
 const { config } = require('../core/config')
 const executionStore = require('../core/stores/execution-store')
 const workflowStore = require('../core/stores/workflow-store')
-const variableStore = require('../core/stores/variable-store')
 const logManager = require('../core/lib/log-manager')
+const runningTasks = require('../core/lib/running-tasks')
 
 // Active cron jobs keyed by workflow ID
 const activeJobs = new Map()
@@ -76,17 +75,6 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
 
   const prompt = `${rolePrefix}${revisionContext}Run the following skills in order: ${skillCommands}.`
 
-  // Extend PATH to include common CLI installation locations
-  const additionalPaths = [
-    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 || ''
-  const extendedPath = [...additionalPaths, currentPath].join(':')
-
   // Exit code file to capture CLI result
   const exitCodeFile = `/tmp/tmux-exit-${sessionName}`
 
@@ -116,29 +104,18 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
     }
     const escapedPrompt = prompt.replace(/'/g, "'\\''")
     const llmCommand = config.LLM_COMMAND.replace(/\{prompt\}/g, escapedPrompt)
-    const execCommand = `${llmCommand}; echo $? > ${exitCodeFile}`
-
-    // Build injected environment: minion variables/secrets + extra vars from HQ
-    const injectedEnv = variableStore.buildEnv(options.extraEnv || {})
 
-    // Create tmux session with extended environment
-    const tmuxEnvFlags = Object.entries(injectedEnv)
-      .map(([k, v]) => `-e "${k}=${v.replace(/"/g, '\\"')}"`)
+    // Create tmux session with the LLM command.
+    // PATH, HOME, DISPLAY, and minion variables/secrets are already set in
+    // process.env at server startup, so child processes inherit them automatically.
     const tmuxCommand = [
       'tmux new-session -d',
       `-s "${sessionName}"`,
       '-x 200 -y 50',
-      `-e "DISPLAY=:99"`,
-      `-e "PATH=${extendedPath}"`,
-      `-e "HOME=${homeDir}"`,
-      ...tmuxEnvFlags,
-      `"${execCommand}"`,
+      `"${llmCommand}; echo $? > ${exitCodeFile}"`,
     ].join(' ')
 
-    await execAsync(tmuxCommand, {
-      cwd: homeDir,
-      env: { ...process.env, HOME: homeDir },
-    })
+    await execAsync(tmuxCommand, { cwd: homeDir })
 
     // Keep session alive after command completes (for debugging via terminal mirror)
     await execAsync(`tmux set-option -t "${sessionName}" remain-on-exit on`)
@@ -237,6 +214,14 @@ async function runWorkflow(workflow, options = {}) {
     session_name: sessionName,
   })
 
+  // Track in running_tasks for dashboard visibility
+  runningTasks.add({
+    type: 'workflow',
+    workflow_execution_id: executionId,
+    session_name: sessionName,
+    started_at: startedAt,
+  })
+
   // Log file path for this execution
   const logFile = logManager.getLogPath(executionId)
 
@@ -315,6 +300,7 @@ async function runWorkflow(workflow, options = {}) {
   await workflowStore.updateLastRun(workflow.id)
 
   runningExecutions.delete(executionId)
+  runningTasks.remove(sessionName)
   console.log(`[WorkflowRunner] Completed workflow: ${workflow.name}`)
 
   return { execution_id: executionId, session_name: sessionName }

package/package.json

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

package/roles/engineer.md

@@ -25,7 +25,4 @@
 
 ## 実行コンテキスト
 
-ワークフロー実行中は以下の環境変数が利用可能:
-- `MINION_EXECUTION_ID` — 現在の実行UUID
-- `MINION_WORKFLOW_ID` — ワークフローUUID
-- `MINION_WORKFLOW_NAME` — ワークフロー名
+ミニオン変数・シークレット（HQ UIまたはAPI経由で設定）はサーバー起動時に `process.env` にロードされ、ワークフロー実行中も利用可能。

package/rules/core.md

@@ -62,10 +62,14 @@ minion-cli --version                      # バージョン確認
 | `AGENT_PORT` | Agent HTTP port (default: 8080) |
 | `MINION_USER` | System user running the agent |
 
-Workflow/Routine 実行中は以下も利用可能:
+Routine 実行中は以下もtmuxセッション環境で利用可能:
 - `MINION_EXECUTION_ID` — 実行UUID
-- `MINION_WORKFLOW_ID` / `MINION_ROUTINE_ID` — ワークフロー/ルーティンUUID
-- `MINION_WORKFLOW_NAME` / `MINION_ROUTINE_NAME` — 名前
+- `MINION_ROUTINE_ID` — ルーティンUUID
+- `MINION_ROUTINE_NAME` — ルーティン名
+
+ミニオン変数・シークレット（HQ UIまたはAPI経由で設定）はサーバー起動時に `process.env` にロードされ、全子プロセスで利用可能。
+
+プロジェクト変数・ワークフロー変数はスキル本文の `{{VAR_NAME}}` テンプレートとして展開される。スキル作成時にパラメータ化したい値は `{{変数名}}` で記述すること。
 
 ## Skills Directory
 

package/win/routes/chat.js

@@ -18,7 +18,7 @@ const path = require('path')
 const { verifyToken } = require('../../core/lib/auth')
 const { config } = require('../../core/config')
 const chatStore = require('../../core/stores/chat-store')
-const { buildExtendedPath, DATA_DIR } = require('../../core/lib/platform')
+const { DATA_DIR } = require('../../core/lib/platform')
 const { runEndOfDay } = require('../../core/lib/end-of-day')
 
 let activeChatChild = null
@@ -253,9 +253,6 @@ function streamLlmResponse(res, prompt, sessionId) {
     const binaryPath = path.join(config.HOME_DIR, '.local', 'bin', binaryName)
     const binary = fs.existsSync(binaryPath) ? binaryPath : binaryName
 
-    // Windows-compatible PATH construction
-    const extendedPath = buildExtendedPath(config.HOME_DIR)
-
     const args = ['-p', '--verbose', '--model', 'sonnet', '--output-format', 'stream-json']
     if (sessionId) args.push('--resume', sessionId)
     // Prompt is passed via stdin (not as CLI argument) to avoid
@@ -268,12 +265,6 @@ function streamLlmResponse(res, prompt, sessionId) {
       stdio: ['pipe', 'pipe', 'pipe'],
       timeout: 600000,
       shell: true, // Required on Windows to resolve .cmd shims (e.g. claude.cmd)
-      env: {
-        ...process.env,
-        HOME: config.HOME_DIR,
-        USERPROFILE: config.HOME_DIR,
-        PATH: extendedPath,
-      },
     })
 
     activeChatChild = child
@@ -442,7 +433,6 @@ function runQuickLlmCall(prompt) {
     }
     const binaryPath = path.join(config.HOME_DIR, '.local', 'bin', binaryName)
     const binary = fs.existsSync(binaryPath) ? binaryPath : binaryName
-    const extendedPath = buildExtendedPath(config.HOME_DIR)
 
     const args = ['-p', '--model', 'haiku', '--max-turns', '1', '--output-format', 'json']
 
@@ -451,12 +441,6 @@ function runQuickLlmCall(prompt) {
       stdio: ['pipe', 'pipe', 'pipe'],
       timeout: 30000,
       shell: true,
-      env: {
-        ...process.env,
-        HOME: config.HOME_DIR,
-        USERPROFILE: config.HOME_DIR,
-        PATH: extendedPath,
-      },
     })
 
     child.stdin.write(prompt)

package/win/routine-runner.js

@@ -16,8 +16,6 @@ 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')
-const { MARKER_DIR, buildExtendedPath } = require('../core/lib/platform')
-const variableStore = require('../core/stores/variable-store')
 const { activeSessions } = require('./workflow-runner')
 
 const activeJobs = new Map()
@@ -33,25 +31,6 @@ function generateSessionName(routineId, executionId) {
   return execShort ? `rt-${routineShort}-${execShort}` : `rt-${routineShort}`
 }
 
-async function writeMarkerFile(sessionName, data) {
-  try {
-    await fs.mkdir(MARKER_DIR, { recursive: true })
-    const filePath = path.join(MARKER_DIR, `${sessionName}.json`)
-    await fs.writeFile(filePath, JSON.stringify(data, null, 2), 'utf-8')
-    console.log(`[RoutineRunner] Wrote marker file: ${filePath}`)
-  } catch (err) {
-    console.error(`[RoutineRunner] Failed to write marker file: ${err.message}`)
-  }
-}
-
-async function cleanupMarkerFile(sessionName) {
-  try {
-    const filePath = path.join(MARKER_DIR, `${sessionName}.json`)
-    await fs.unlink(filePath)
-    console.log(`[RoutineRunner] Cleaned up marker file: ${filePath}`)
-  } catch { /* ignore */ }
-}
-
 function loadNodePty() {
   // Prefer prebuilt binaries (no Build Tools required)
   try { return require('node-pty-prebuilt-multiarch') } catch {}
@@ -74,7 +53,6 @@ async function executeRoutineSession(routine, executionId, skillNames) {
     : ''
   const prompt = `${contextPrefix}Run the following skills in order: ${skillCommands}. After completing all skills, run /execution-report to report the results.`
 
-  const extendedPath = buildExtendedPath(homeDir)
   const logFile = logManager.getLogPath(executionId)
 
   console.log(`[RoutineRunner] Executing routine: ${routine.name}`)
@@ -92,28 +70,16 @@ async function executeRoutineSession(routine, executionId, skillNames) {
       activeSessions.delete(sessionName)
     }
 
-    await writeMarkerFile(sessionName, {
-      execution_id: executionId,
-      routine_id: routine.id,
-      routine_name: routine.name,
-      skill_names: skillNames,
-      started_at: new Date().toISOString(),
-    })
-
     if (!config.LLM_COMMAND) {
       throw new Error('LLM_COMMAND is not configured. Set LLM_COMMAND in minion.env')
     }
     const escapedPrompt = prompt.replace(/'/g, "''")
     const llmCommand = config.LLM_COMMAND.replace(/\{prompt\}/g, escapedPrompt)
 
-    // Inject minion variables/secrets (routines don't receive HQ vars)
-    const injectedEnv = variableStore.buildEnv()
+    // PATH, HOME, USERPROFILE, and minion variables/secrets are already set in
+    // process.env at server startup. Per-execution identifiers are added here.
     const env = {
       ...process.env,
-      ...injectedEnv,
-      HOME: homeDir,
-      USERPROFILE: homeDir,
-      PATH: extendedPath,
       MINION_EXECUTION_ID: executionId,
       MINION_ROUTINE_ID: routine.id,
       MINION_ROUTINE_NAME: routine.name,
@@ -181,8 +147,6 @@ async function executeRoutineSession(routine, executionId, skillNames) {
   } catch (error) {
     console.error(`[RoutineRunner] Routine ${routine.name} failed: ${error.message}`)
     return { success: false, error: error.message, sessionName }
-  } finally {
-    await cleanupMarkerFile(sessionName)
   }
 }
 
@@ -326,5 +290,4 @@ module.exports = {
   runRoutine,
   getRoutineById,
   generateSessionName,
-  MARKER_DIR,
 }

package/win/server.js

@@ -214,6 +214,21 @@ async function registerRoutes(app) {
 // Start server
 async function start() {
   try {
+    // Extend process.env so all child processes (spawn) inherit correct environment.
+    // This eliminates the need for per-invocation PATH building in runners/chat.
+    const { buildExtendedPath } = require('../core/lib/platform')
+    process.env.PATH = buildExtendedPath(config.HOME_DIR)
+    process.env.HOME = config.HOME_DIR
+    process.env.USERPROFILE = config.HOME_DIR
+
+    // Load minion variables/secrets into process.env for child process inheritance
+    const variableStore = require('../core/stores/variable-store')
+    const minionEnv = variableStore.buildEnv()
+    for (const [key, value] of Object.entries(minionEnv)) {
+      if (!(key in process.env)) process.env[key] = value
+    }
+    console.log(`[Server] Loaded ${Object.keys(minionEnv).length} minion variables/secrets into process.env`)
+
     // Sync bundled assets
     syncBundledRules()
     syncBundledRoles()

package/win/workflow-runner.js

@@ -23,8 +23,6 @@ const { config } = require('../core/config')
 const executionStore = require('../core/stores/execution-store')
 const workflowStore = require('../core/stores/workflow-store')
 const logManager = require('../core/lib/log-manager')
-const { buildExtendedPath } = require('../core/lib/platform')
-const variableStore = require('../core/stores/variable-store')
 
 // Active cron jobs keyed by workflow ID
 const activeJobs = new Map()
@@ -86,7 +84,6 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
 
   const prompt = `${rolePrefix}${revisionContext}Run the following skills in order: ${skillCommands}.`
 
-  const extendedPath = buildExtendedPath(homeDir)
   const logFile = logManager.getLogPath(executionId)
 
   console.log(`[WorkflowRunner] Executing workflow: ${workflow.name}`)
@@ -113,15 +110,8 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
     const escapedPrompt = prompt.replace(/'/g, "''")
     const llmCommand = config.LLM_COMMAND.replace(/\{prompt\}/g, escapedPrompt)
 
-    // Build environment: base + minion variables/secrets + extra vars from HQ
-    const injectedEnv = variableStore.buildEnv(options.extraEnv || {})
-    const env = {
-      ...process.env,
-      ...injectedEnv,
-      HOME: homeDir,
-      USERPROFILE: homeDir,
-      PATH: extendedPath,
-    }
+    // PATH, HOME, USERPROFILE, and minion variables/secrets are already set in
+    // process.env at server startup, so child processes inherit them automatically.
 
     // Open log file for streaming writes
     const logDir = path.dirname(logFile)
@@ -137,7 +127,7 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
       cols: 200,
       rows: 50,
       cwd: homeDir,
-      env,
+      env: process.env,
     })
 
     // Track session