@geekbeer/minion 3.16.1 → 3.22.0

package/win/bin/hq.ps1

@@ -4,9 +4,9 @@
     HQ API helper for minion chat context (Windows version)
 
 .DESCRIPTION
-    Fetches resource details from the HQ server API.
-    Used by Claude CLI during chat to retrieve information about
-    skills, workflows, and projects that the user is viewing on the dashboard.
+    Fetches and manipulates resources on the HQ server API.
+    Used by Claude CLI during chat to retrieve / edit information about
+    skills, workflows, projects, and DAG workflows.
 
     Environment variables (inherited from minion server):
       HQ_URL    - HQ server URL (e.g., https://minion-agent.com)
@@ -17,6 +17,11 @@
     .\hq.ps1 fetch workflow <name>
     .\hq.ps1 fetch project <id>
     .\hq.ps1 fetch project-context <id>
+    .\hq.ps1 fetch dag-workflow <id>
+    .\hq.ps1 fetch dag-execution <id>
+    .\hq.ps1 create dag-workflow <body.json>
+    .\hq.ps1 put dag-workflow <id> <body.json>
+    .\hq.ps1 publish dag-workflow <id>
 #>
 
 param(
@@ -24,15 +29,17 @@ param(
     [string]$Command,
 
     [Parameter(Position = 1)]
-    [string]$Resource,
+    [string]$Arg1,
 
     [Parameter(Position = 2)]
-    [string]$Identifier
+    [string]$Arg2,
+
+    [Parameter(Position = 3)]
+    [string]$Arg3
 )
 
 $ErrorActionPreference = 'Stop'
 
-# Validate required environment variables
 if (-not $env:HQ_URL) {
     Write-Error "Error: HQ_URL is not set"
     exit 1
@@ -47,10 +54,46 @@ $Headers = @{ 'Authorization' = "Bearer $($env:API_TOKEN)" }
 
 function Invoke-HqApi {
     param([string]$Url)
-
     try {
         $response = Invoke-RestMethod -Uri $Url -Headers $Headers -Method Get -ErrorAction Stop
-        $response | ConvertTo-Json -Depth 10
+        $response | ConvertTo-Json -Depth 20
+    }
+    catch {
+        $statusCode = $_.Exception.Response.StatusCode.value__
+        Write-Error "Error: HQ API returned HTTP $statusCode"
+        Write-Error $_.ErrorDetails.Message
+        exit 1
+    }
+}
+
+function Assert-ValidJsonFile {
+    param([string]$Path)
+    if (-not (Test-Path -Path $Path -PathType Leaf)) {
+        Write-Error "Error: file not found: $Path"
+        exit 1
+    }
+    try {
+        $raw = Get-Content -Raw -Path $Path
+        $null = $raw | ConvertFrom-Json -ErrorAction Stop
+    }
+    catch {
+        Write-Error "Error: invalid JSON syntax in $Path"
+        Write-Error $_.Exception.Message
+        exit 1
+    }
+}
+
+function Send-JsonRequest {
+    param(
+        [string]$Method,
+        [string]$Url,
+        [string]$Path
+    )
+    $raw = Get-Content -Raw -Path $Path
+    try {
+        $response = Invoke-RestMethod -Uri $Url -Headers $Headers -Method $Method `
+            -ContentType 'application/json' -Body $raw -ErrorAction Stop
+        $response | ConvertTo-Json -Depth 20
     }
     catch {
         $statusCode = $_.Exception.Response.StatusCode.value__
@@ -60,49 +103,134 @@ function Invoke-HqApi {
     }
 }
 
+function Send-EmptyPost {
+    param([string]$Url)
+    try {
+        $response = Invoke-RestMethod -Uri $Url -Headers $Headers -Method Post `
+            -ContentType 'application/json' -Body '' -ErrorAction Stop
+        $response | ConvertTo-Json -Depth 20
+    }
+    catch {
+        $statusCode = $_.Exception.Response.StatusCode.value__
+        Write-Error "Error: HQ API returned HTTP $statusCode"
+        Write-Error $_.ErrorDetails.Message
+        exit 1
+    }
+}
+
+function Show-Usage {
+    Write-Host "HQ API helper for minion chat" -ForegroundColor Cyan
+    Write-Host ""
+    Write-Host "Usage:"
+    Write-Host "  hq fetch skill <name>                 - Get skill details"
+    Write-Host "  hq fetch workflow <name>              - Get workflow details"
+    Write-Host "  hq fetch project <id>                 - Get project info"
+    Write-Host "  hq fetch project-context <id>         - Get project context"
+    Write-Host "  hq fetch dag-workflow <id>            - Get DAG workflow details"
+    Write-Host "  hq fetch dag-execution <id>           - Get DAG execution details"
+    Write-Host "  hq create dag-workflow <body.json>    - Create a DAG workflow (PM only)"
+    Write-Host "  hq put dag-workflow <id> <body.json>  - Update DAG workflow draft (PM only)"
+    Write-Host "  hq publish dag-workflow <id>          - Publish the draft as a new version (PM only)"
+}
+
 switch ($Command) {
     'fetch' {
+        $Resource = $Arg1
+        $Identifier = $Arg2
         if (-not $Resource -or -not $Identifier) {
-            Write-Error "Usage: hq fetch {skill|workflow|project|project-context} <identifier>"
+            Write-Error "Usage: hq fetch {skill|workflow|project|project-context|dag-workflow|dag-execution} <identifier>"
             exit 1
         }
 
         switch ($Resource) {
-            'skill' {
-                Invoke-HqApi "$BaseUrl/skills/$Identifier"
-            }
-            'workflow' {
-                Invoke-HqApi "$BaseUrl/workflows/$Identifier"
-            }
+            'skill'           { Invoke-HqApi "$BaseUrl/skills/$Identifier" }
+            'workflow'        { Invoke-HqApi "$BaseUrl/workflows/$Identifier" }
             'project' {
                 $response = Invoke-RestMethod -Uri "$BaseUrl/me/projects" -Headers $Headers -Method Get
                 $project = $response.projects | Where-Object { $_.id -eq $Identifier }
                 if ($project) {
-                    $project | ConvertTo-Json -Depth 10
+                    $project | ConvertTo-Json -Depth 20
                 }
                 else {
                     Write-Error "Project not found: $Identifier"
                     exit 1
                 }
             }
-            'project-context' {
-                Invoke-HqApi "$BaseUrl/me/project/$Identifier/context"
-            }
+            'project-context' { Invoke-HqApi "$BaseUrl/me/project/$Identifier/context" }
+            'dag-workflow'    { Invoke-HqApi "$BaseUrl/dag-workflows/$Identifier" }
+            'dag-execution'   { Invoke-HqApi "$BaseUrl/dag-executions/$Identifier" }
             default {
                 Write-Error "Unknown resource: $Resource"
-                Write-Error "Usage: hq fetch {skill|workflow|project|project-context} <identifier>"
+                Write-Error "Usage: hq fetch {skill|workflow|project|project-context|dag-workflow|dag-execution} <identifier>"
+                exit 1
+            }
+        }
+    }
+
+    'create' {
+        $Resource = $Arg1
+        switch ($Resource) {
+            'dag-workflow' {
+                $BodyFile = $Arg2
+                if (-not $BodyFile) {
+                    Write-Error "Usage: hq create dag-workflow <body.json>"
+                    Write-Error "  body.json must contain at least { project_id, name } and optionally { graph, content, change_summary }"
+                    exit 1
+                }
+                Assert-ValidJsonFile -Path $BodyFile
+                Send-JsonRequest -Method 'Post' -Url "$BaseUrl/dag-workflows" -Path $BodyFile
+            }
+            default {
+                Write-Error "Unknown create resource: $Resource"
+                Write-Error "Usage: hq create dag-workflow <body.json>"
+                exit 1
+            }
+        }
+    }
+
+    'put' {
+        $Resource = $Arg1
+        switch ($Resource) {
+            'dag-workflow' {
+                $Id = $Arg2
+                $BodyFile = $Arg3
+                if (-not $Id -or -not $BodyFile) {
+                    Write-Error "Usage: hq put dag-workflow <id> <body.json>"
+                    Write-Error "  body.json may contain { graph, content, change_summary, name, is_active, maturity }"
+                    exit 1
+                }
+                Assert-ValidJsonFile -Path $BodyFile
+                Send-JsonRequest -Method 'Put' -Url "$BaseUrl/dag-workflows/$Id" -Path $BodyFile
+            }
+            default {
+                Write-Error "Unknown put resource: $Resource"
+                Write-Error "Usage: hq put dag-workflow <id> <body.json>"
                 exit 1
             }
         }
     }
+
+    'publish' {
+        $Resource = $Arg1
+        switch ($Resource) {
+            'dag-workflow' {
+                $Id = $Arg2
+                if (-not $Id) {
+                    Write-Error "Usage: hq publish dag-workflow <id>"
+                    exit 1
+                }
+                Send-EmptyPost -Url "$BaseUrl/dag-workflows/$Id/publish"
+            }
+            default {
+                Write-Error "Unknown publish resource: $Resource"
+                Write-Error "Usage: hq publish dag-workflow <id>"
+                exit 1
+            }
+        }
+    }
+
     default {
-        Write-Host "HQ API helper for minion chat" -ForegroundColor Cyan
-        Write-Host ""
-        Write-Host "Usage:"
-        Write-Host "  hq fetch skill <name>            - Get skill details"
-        Write-Host "  hq fetch workflow <name>          - Get workflow details"
-        Write-Host "  hq fetch project <id>             - Get project info"
-        Write-Host "  hq fetch project-context <id>     - Get project context"
+        Show-Usage
         exit 1
     }
 }

package/win/routes/chat.js

@@ -21,6 +21,7 @@ const { config } = require('../../core/config')
 const chatStore = require('../../core/stores/chat-store')
 const { DATA_DIR } = require('../../core/lib/platform')
 const { runEndOfDay } = require('../../core/lib/end-of-day')
+const { getActivePrimary } = require('../../core/llm-plugins/lib/active')
 
 let activeChatChild = null
 let wslModeActive = false
@@ -398,6 +399,45 @@ async function buildContextPrefix(message, context, sessionId) {
           )
         }
         break
+      case 'dag-workflow':
+        if (context.projectId && context.dagWorkflowId) {
+          parts.push(
+            `ユーザーはHQダッシュボードで DAG ワークフロー (ID: ${context.dagWorkflowId}) のエディタ/詳細を閲覧しています。`,
+            `DAG ワークフローはノード/エッジ形式でスキル間の依存関係を表現し、fan-out / join / conditional / transform / review をサポートします。`,
+            `DAG ワークフロー情報を取得するには以下を実行してください:`,
+            `  hq fetch dag-workflow ${context.dagWorkflowId}`,
+            `プロジェクトコンテキスト:`,
+            `  hq fetch project-context ${context.projectId}`,
+            `PMロールの場合、graph JSON を直接編集できます:`,
+            `  hq put dag-workflow ${context.dagWorkflowId} <body.json>   # ドラフト更新 (構造チェックのみ)`,
+            `  hq publish dag-workflow ${context.dagWorkflowId}           # ドラフトを新バージョンとして公開 (フル検証)`,
+            `新規作成は: hq create dag-workflow <body.json>`,
+            `DAG の構造（nodes/edges/node types/scope_path 等）や実行フローの詳細は ~/.minion/docs/api-reference.md の「DAG Workflows」セクション、および ~/.minion/docs/task-guides.md の「DAG ワークフロー」セクションを参照してください。`,
+            `取得した内容をもとに回答してください。`
+          )
+        }
+        break
+      case 'dag-execution':
+        if (context.projectId && context.dagExecutionId) {
+          parts.push(
+            `ユーザーはHQダッシュボードで DAG 実行 (ID: ${context.dagExecutionId}) の詳細を閲覧しています。`,
+            `DAG 実行の詳細（graph_snapshot + 各 node_executions の状態）を取得するには以下を実行してください:`,
+            `  hq fetch dag-execution ${context.dagExecutionId}`
+          )
+          if (context.dagWorkflowId) {
+            parts.push(
+              `対応するDAGワークフロー定義:`,
+              `  hq fetch dag-workflow ${context.dagWorkflowId}`
+            )
+          }
+          parts.push(
+            `プロジェクトコンテキスト:`,
+            `  hq fetch project-context ${context.projectId}`,
+            `ノード状態の意味（pending/waiting/running/completed/failed/skipped, review_status, scope_path 等）は ~/.minion/docs/api-reference.md の「DAG Workflows」セクションを参照してください。`,
+            `取得した内容をもとに回答してください。`
+          )
+        }
+        break
     }
   }
   if (parts.length > 0) return `${parts.join('\n')}\n\n${message}`
@@ -416,7 +456,70 @@ function getLlmBinary() {
  * Tracks block types to correctly forward tool_use vs text events
  * and counts turns for session management.
  */
-function streamLlmResponse(res, prompt, sessionId, workspaceId, originalMessage) {
+async function streamLlmResponse(res, prompt, sessionId, workspaceId, originalMessage) {
+  const primary = getActivePrimary()
+  if (primary) {
+    return streamViaPlugin(primary, res, prompt, sessionId, workspaceId, originalMessage)
+  }
+  return streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, originalMessage)
+}
+
+async function streamViaPlugin(plugin, res, prompt, sessionId, workspaceId, originalMessage) {
+  const input = { prompt }
+  const activeRef = { current: null }
+
+  let fullResponse = ''
+  let resolvedSessionId = sessionId || null
+  let turnCount = 0
+
+  const emit = event => {
+    if (event.type === 'session') {
+      resolvedSessionId = event.sessionId
+    } else if (event.type === 'delta') {
+      fullResponse += event.content
+      res.write(`data: ${JSON.stringify({ type: 'delta', content: event.content })}\n\n`)
+    } else if (event.type === 'text') {
+      fullResponse += event.content
+      res.write(`data: ${JSON.stringify({ type: 'text', content: event.content })}\n\n`)
+      turnCount++
+    } else {
+      res.write(`data: ${JSON.stringify(event)}\n\n`)
+    }
+  }
+
+  res.on('close', () => { activeRef.current?.kill?.('SIGTERM') })
+
+  let output
+  if (plugin.capabilities.streaming && typeof plugin.stream === 'function') {
+    output = await plugin.stream(input, emit, { resumeSessionId: sessionId, activeChildRef: activeRef })
+  } else {
+    output = await plugin.invoke(input)
+    if (output.text) {
+      fullResponse = output.text
+      res.write(`data: ${JSON.stringify({ type: 'text', content: output.text })}\n\n`)
+      turnCount = 1
+    }
+    if (output.error) {
+      res.write(`data: ${JSON.stringify({ type: 'error', error: output.error.message })}\n\n`)
+    }
+  }
+  resolvedSessionId = output?.metadata?.sessionId || resolvedSessionId
+
+  if (resolvedSessionId) {
+    if (!sessionId) {
+      await chatStore.addMessage(resolvedSessionId, { role: 'user', content: originalMessage || prompt }, undefined, workspaceId)
+    }
+    if (fullResponse) {
+      await chatStore.addMessage(resolvedSessionId, { role: 'assistant', content: fullResponse }, turnCount, workspaceId)
+    }
+  }
+
+  const session = await chatStore.load(workspaceId)
+  const totalTurnCount = session?.turn_count || turnCount
+  res.write(`data: ${JSON.stringify({ type: 'done', session_id: resolvedSessionId, turn_count: totalTurnCount })}\n\n`)
+}
+
+function streamViaLegacyLlmCommand(res, prompt, sessionId, workspaceId, originalMessage) {
   return new Promise((resolve, reject) => {
     const binaryName = getLlmBinary()
     if (!binaryName) {
@@ -597,7 +700,17 @@ function streamLlmResponse(res, prompt, sessionId, workspaceId, originalMessage)
 /**
  * Run a quick non-streaming LLM call (for summarization etc.)
  */
-function runQuickLlmCall(prompt) {
+async function runQuickLlmCall(prompt) {
+  const primary = getActivePrimary()
+  if (primary) {
+    const output = await primary.invoke({ prompt, model: primary.name === 'claude' ? 'haiku' : undefined, timeoutMs: 30000 })
+    if (output.error) throw new Error(output.error.message)
+    return output.text || ''
+  }
+  return runQuickLlmCallLegacy(prompt)
+}
+
+function runQuickLlmCallLegacy(prompt) {
   return new Promise((resolve, reject) => {
     const binaryName = getLlmBinary()
     if (!binaryName) {

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.