@geekbeer/minion 3.34.0 → 3.40.1

package/linux/workflow-runner.js

@@ -107,19 +107,19 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
       contractContext += '| Field | Type | Required | Description |\n|-------|------|----------|-------------|\n'
       for (const f of ic.contract.fields || []) {
         const typeDisplay = f.type === 'array' && f.items ? `array<${f.items}>` : f.type
-        contractContext += `| ${f.key} | ${typeDisplay} | ${f.required ? 'Yes' : 'No'} | ${f.description || ''} |\n`
+        contractContext += `| ${f.name} | ${typeDisplay} | ${f.required ? 'Yes' : 'No'} | ${f.description || ''} |\n`
       }
     }
     contractContext += '\n'
   }
   if (options.dagOutputContracts && options.dagOutputContracts.length > 0) {
-    contractContext += '## Output Contract\nYour output MUST conform to the following contract(s). Include all required fields in your execution report.\n'
+    contractContext += '## Output Contract (REQUIRED)\nEnd your execution report with a "## Output Data" section containing a single `json` code block whose content conforms **exactly** to the contract(s) below. HQ validates this JSON on completion; any missing required field or type mismatch fails the node.\n\nIf the skill\'s natural output does not match this shape, add a transform node upstream instead of reshaping inside the skill.\n\n'
     for (const oc of options.dagOutputContracts) {
       contractContext += `### ${oc.contract_name}\n${oc.contract.description || ''}\n`
       contractContext += '| Field | Type | Required | Description |\n|-------|------|----------|-------------|\n'
       for (const f of oc.contract.fields || []) {
         const typeDisplay = f.type === 'array' && f.items ? `array<${f.items}>` : f.type
-        contractContext += `| ${f.key} | ${typeDisplay} | ${f.required ? 'Yes' : 'No'} | ${f.description || ''} |\n`
+        contractContext += `| ${f.name} | ${typeDisplay} | ${f.required ? 'Yes' : 'No'} | ${f.description || ''} |\n`
       }
     }
     contractContext += '\n'
@@ -178,17 +178,34 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
       throw new Error('No LLM configured. Set a Primary plugin via /api/llm/config or LLM_COMMAND in minion.env')
     }
 
-    // Create tmux session with the LLM command.
+    // Create the tmux session as an empty shell first, then configure it,
+    // then inject the command via send-keys.
+    //
+    // Why two steps instead of `tmux new-session -d <cmd>`: if the LLM
+    // command exits very quickly (auth failure, missing binary, etc.) the
+    // session dies before we can call `set-option remain-on-exit on`, and
+    // the subsequent set-option/pipe-pane calls fail with "no such
+    // window". DAG transform nodes exposed this race because ephemeral
+    // skills start immediately and some failure modes (invalid prompt,
+    // missing LLM config) return instantly.
+    //
+    // Writing the invocation to a script file also insulates the command
+    // from shell-escaping edge cases when send-keys types it into the
+    // session.
+    const execScript = path.join(os.tmpdir(), `minion-workflow-exec-${sessionName}.sh`)
+    await fs.writeFile(
+      execScript,
+      `#!/bin/bash\n${llmCommand}\necho $? > ${exitCodeFile}\n`,
+      'utf-8',
+    )
+    await execAsync(`chmod +x "${execScript}"`)
+
     // PATH, HOME, DISPLAY, and minion 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',
-      `"${llmCommand}; echo $? > ${exitCodeFile}"`,
-    ].join(' ')
-
-    await execAsync(tmuxCommand, { cwd: homeDir })
+    await execAsync(
+      `tmux new-session -d -s "${sessionName}" -x 200 -y 50`,
+      { cwd: homeDir },
+    )
 
     // Keep session alive after command completes (for debugging via terminal mirror)
     await execAsync(`tmux set-option -t "${sessionName}" remain-on-exit on`)
@@ -203,6 +220,13 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
       // Continue execution even if pipe-pane fails
     }
 
+    // Now that remain-on-exit and pipe-pane are in place, inject the
+    // actual command. A fast-failing command will still be captured in the
+    // log and the exit code file will be written.
+    await execAsync(
+      `tmux send-keys -t "${sessionName}" "bash ${execScript}" Enter`,
+    )
+
     console.log(`[WorkflowRunner] Started tmux session: ${sessionName}`)
 
     // Wait for session to complete (poll for exit code file)
@@ -309,6 +333,7 @@ async function runWorkflow(workflow, options = {}) {
     skill_name: pipelineSkillNames.join(' → '),
     workflow_id: workflow.id,
     workflow_name: workflow.name,
+    workspace_id: workflow.workspace_id || '',
     status: 'running',
     outcome: null,
     started_at: startedAt,
@@ -331,6 +356,7 @@ async function runWorkflow(workflow, options = {}) {
     skill_name: pipelineSkillNames.join(' → '),
     workflow_id: workflow.id,
     workflow_name: workflow.name,
+    workspace_id: workflow.workspace_id || '',
     status: result.success ? 'completed' : 'failed',
     outcome,
     started_at: startedAt,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekbeer/minion",
-  "version": "3.34.0",
+  "version": "3.40.1",
   "description": "AI Agent runtime for Minion - manages status and skill deployment on VPS",
   "main": "linux/server.js",
   "bin": {
@@ -19,12 +19,14 @@
     "roles/",
     "docs/",
     "settings/",
+    "scripts/",
     ".env.example"
   ],
   "scripts": {
     "start": "node linux/server.js",
     "start:win": "node win/server.js",
-    "postinstall": "node postinstall.js"
+    "postinstall": "node postinstall.js",
+    "db:migration:new": "node scripts/new-migration.js"
   },
   "dependencies": {
     "croner": "^9.0.0",

package/rules/core.md

@@ -32,6 +32,9 @@ Minion
     - ノード/エッジ/contract の追加・更新は**個別API** (`/nodes` `/edges` `/contracts`) を使うこと。`PUT /dag-workflows/:id` による graph 全文PUTは型の取り違えが起きやすく、バリデーションエラーで 400 が返る
     - `edge.contract` は**単一のContract名（string）**のみ。配列は不可。複数の型構造を束ねたい場合は、それらを内包する複合Contractを1つ定義する
     - Contract内で `List<別Contract>` を表現するには `type: 'array'` + `items: "別Contract名"` を使う（詳細は `~/.minion/docs/api-reference.md` の「Contracts API」を参照）
+    - **Contract はランタイムで強制される型定義**。`node-complete` 報告時に outgoing edge の contract で `output_data` が検証され、違反はノード `failed` 扱い。スキルが contract に沿った `## Output Data` を出せない場合は **transform ノードをスキルと下流の間に挟んで整形**すること。スキル側の SKILL.md を各ワークフロー専用に改修するのは原則 NG（スキルは汎用資産）
+    - **transform ノードの I/O 型は edge の contract から自動導出**。incoming edge と outgoing edge にそれぞれ contract を必ず貼ること。`transform_instruction` は contract だけで意図が伝わらない場合の補足ヒント（任意）
+    - **fan_out の incoming edge に contract を貼る場合**、`fan_out_source` が指すフィールドが contract 内に `type='array'` として宣言されている必要がある（静的検証で弾かれる）
 - **Routine**: ミニオンスコープ。ミニオンローカルの定期タスク。
 - **Workspace**: ミニオンは複数のワークスペースに所属でき、スキルやプロジェクトはワークスペース単位でスコープされる。チャットセッションもワークスペース別に分離される。所属ワークスペースはハートビートで自動同期され、`hq list workspaces` で確認できる。
 - ミニオンは複数プロジェクトに `pm`、`engineer`、`accountant` として参加できる。
@@ -215,6 +218,7 @@ Routine 実行中は以下もtmuxセッション環境で利用可能:
 - **Todoは「1往復で完了する粒度」に分解して登録する。** 大きいタスクは複数のTodoに分ける。粒度を小さく保てば、完了マークを圧縮に奪われにくい。
 - **完了したら即座に done にマークする。** まとめて更新しない。`PUT /api/todos/:id` で `status=done`。
 - **チャットセッション内で作成するTodoには必ず `session_id` を含める。** プロンプト冒頭の `[現在のチャットセッションID]` の値を使う。紐づいた未完了Todoは次ターン以降に自動で再掲される（圧縮を跨いでも失われない）。
+- **`POST /api/todos` は `workspace_id` が必須（v3.39.0〜）。** プロンプト冒頭の `[現在のワークスペース]` のID値を使う。未所属の場合は空文字 `""` を明示的に渡す。workspace_id無しのリクエストは400エラーになる。
 - **再掲されたTodoを見たら、着手前に「既に完了していないか」を確認する。** 完了済みなら done に更新、未完なら続行。
 - 同一Todoが規定回数以上再掲されても未完了のままの場合、再掲は自動停止する。進展しないTodoはブロッカーとして起票するか手動で `cancelled` にすること。
 

package/scripts/new-migration.js

@@ -0,0 +1,53 @@
+#!/usr/bin/env node
+/**
+ * Scaffold a new DB migration file with a timestamp prefix.
+ *
+ * Usage: npm run db:migration:new <snake_case_name>
+ */
+
+const fs = require('fs')
+const path = require('path')
+
+const name = process.argv[2]
+if (!name) {
+  console.error('Usage: npm run db:migration:new <snake_case_name>')
+  process.exit(1)
+}
+
+if (!/^[a-z][a-z0-9_]*$/.test(name)) {
+  console.error(`Invalid name "${name}". Use snake_case (lowercase letters, digits, underscores).`)
+  process.exit(1)
+}
+
+const now = new Date()
+const pad = n => String(n).padStart(2, '0')
+const ts = `${now.getUTCFullYear()}${pad(now.getUTCMonth() + 1)}${pad(now.getUTCDate())}${pad(now.getUTCHours())}${pad(now.getUTCMinutes())}${pad(now.getUTCSeconds())}`
+const version = Number(ts)
+const filename = `${ts}_${name}.js`
+const filepath = path.join(__dirname, '..', 'core', 'db', 'migrations', filename)
+
+if (fs.existsSync(filepath)) {
+  console.error(`File already exists: ${filepath}`)
+  process.exit(1)
+}
+
+const template = `/**
+ * TODO: describe what this migration does and why.
+ */
+
+module.exports = {
+  version: ${version},
+  name: '${name}',
+
+  up(db, { hasColumn, tableExists }) {
+    // Add an idempotent guard so re-runs (e.g., after a partial failure) are safe:
+    //   if (hasColumn(db, 'some_table', 'some_column')) return
+    //
+    // Then apply the change:
+    //   db.exec(\`ALTER TABLE some_table ADD COLUMN some_column TEXT\`)
+  },
+}
+`
+
+fs.writeFileSync(filepath, template)
+console.log(`Created ${path.relative(process.cwd(), filepath)}`)

package/win/routes/chat.js

@@ -299,16 +299,21 @@ ${indexed}`
     return { success: true, carry_over: carryOver }
   })
 
-  // POST /api/chat/end-of-day - Generate daily log + extract memories
+  // POST /api/chat/end-of-day - Generate daily log + extract memories for one workspace
   fastify.post('/api/chat/end-of-day', async (request, reply) => {
     if (!verifyToken(request)) {
       reply.code(401)
       return { success: false, error: 'Unauthorized' }
     }
 
-    const { clear_session = false } = request.body || {}
+    const { workspace_id, clear_session = false } = request.body || {}
+    if (workspace_id !== '' && typeof workspace_id !== 'string') {
+      reply.code(400)
+      return { success: false, error: 'workspace_id is required' }
+    }
 
     const result = await runEndOfDay({
+      workspaceId: workspace_id,
       runQuickLlmCall,
       clearSession: clear_session,
     })
@@ -381,14 +386,14 @@ async function buildContextPrefix(message, context, sessionId, workspaceId) {
       '# メモリ詳細（IDを指定）',
       `curl -H "Authorization: Bearer $API_TOKEN" ${baseUrl}/api/memory/{id}`,
       '',
-      '# デイリーログ検索',
-      `curl -H "Authorization: Bearer $API_TOKEN" "${baseUrl}/api/daily-logs?search=キーワード"`,
+      '# デイリーログ検索（workspace_idは「現在のワークスペース」のIDを指定。未所属なら空文字）',
+      `curl -H "Authorization: Bearer $API_TOKEN" "${baseUrl}/api/daily-logs?workspace_id=現在のWSのID&search=キーワード"`,
       '',
-      '# デイリーログ一覧',
-      `curl -H "Authorization: Bearer $API_TOKEN" ${baseUrl}/api/daily-logs`,
+      '# デイリーログ一覧（現在のワークスペース）',
+      `curl -H "Authorization: Bearer $API_TOKEN" "${baseUrl}/api/daily-logs?workspace_id=現在のWSのID"`,
       '',
       '# 特定日のデイリーログ取得',
-      `curl -H "Authorization: Bearer $API_TOKEN" ${baseUrl}/api/daily-logs/YYYY-MM-DD`,
+      `curl -H "Authorization: Bearer $API_TOKEN" "${baseUrl}/api/daily-logs/YYYY-MM-DD?workspace_id=現在のWSのID"`,
       '```',
       '',
       '参照すべきタイミング:',
@@ -429,10 +434,10 @@ async function buildContextPrefix(message, context, sessionId, workspaceId) {
       '',
       'ToDo APIの使い方:',
       '```bash',
-      '# ToDo作成（session_idは後でセッションIDが判明してから設定）',
+      '# ToDo作成（workspace_idは必須。現在のワークスペースのIDを指定。未所属の場合は空文字 ""）',
       `curl -X POST http://localhost:${port}/api/todos \\`,
       '  -H "Authorization: Bearer $API_TOKEN" -H "Content-Type: application/json" \\',
-      '  -d \'{"title": "ステップの説明", "session_id": "SESSION_ID", "priority": "normal"}\'',
+      '  -d \'{"title": "ステップの説明", "workspace_id": "現在のWSのID", "session_id": "SESSION_ID", "priority": "normal"}\'',
       '',
       '# ToDo完了',
       `curl -X PUT http://localhost:${port}/api/todos/{id} \\`,
@@ -502,7 +507,8 @@ async function buildContextPrefix(message, context, sessionId, workspaceId) {
             `  hq dag remove-edge ${context.dagWorkflowId} <edge-id>             # エッジ削除`,
             `  hq dag validate ${context.dagWorkflowId}                          # ドラフト検証（公開せず）`,
             `  hq publish dag-workflow ${context.dagWorkflowId}                  # 公開`,
-            `Contract編集時の重要な規則: edge.contract は単一Contract名（string）のみ、配列不可。List<X> は type:"array" + items:"X" で表現。詳細は ~/.minion/docs/api-reference.md の「Contracts API」参照。`,
+            `Contract編集時の重要な規則: edge.contract は単一Contract名（string）のみ、配列不可。List<X> は type:"array" + items:"X" で表現。**contract.fields[] の各要素は { "name": "...", "type": "...", ... } の形式で、"key" ではなく "name" を使うこと**（JSON Schema等の慣習に引きずられないように）。詳細は ~/.minion/docs/api-reference.md の「Contracts API」参照。`,
+            `Contract はランタイムで強制される型: node-complete 時に outgoing edge の contract で output_data が検証され、違反はノード failed 扱い。transform は contract 同士のブリッジ（I/O 型は edge の contract から自動導出、transform_instruction は optional hint）。スキルが contract に沿った ## Output Data を出せない場合はスキルと下流の間に transform を挟んで整形すること。`,
             `graph JSON 全文PUTは非推奨: hq put dag-workflow ${context.dagWorkflowId} <body.json>`,
             `新規作成は: hq create dag-workflow <body.json>`,
             `プロジェクト内の DAG ワークフロー一覧: hq list dag-workflows ${context.projectId}`,

package/win/routes/directives.js

@@ -67,12 +67,14 @@ async function directiveRoutes(fastify) {
     const startedAt = new Date().toISOString()
     const logFile = logManager.getLogPath(effectiveExecutionId)
     const workflowName = context?.workflow_name || skill_name
+    const workspaceId = context?.workspace_id || ''
 
     await executionStore.save({
       id: effectiveExecutionId,
       skill_name,
       workflow_id: null,
       workflow_name: workflowName,
+      workspace_id: workspaceId,
       status: 'running',
       outcome: null,
       started_at: startedAt,
@@ -91,6 +93,7 @@ async function directiveRoutes(fastify) {
           id: effectiveExecutionId,
           name: workflowName,
           pipeline_skill_names: [skill_name],
+          workspace_id: workspaceId,
         }, { skipExecutionReport: true })
 
         console.log(`[Directive] Execution completed: ${skill_name} (success: ${result.execution_id ? 'yes' : 'no'})`)
@@ -101,6 +104,7 @@ async function directiveRoutes(fastify) {
           skill_name,
           workflow_id: null,
           workflow_name: workflowName,
+          workspace_id: workspaceId,
           status: 'failed',
           outcome: 'failure',
           started_at: startedAt,

package/win/routine-runner.js

@@ -208,6 +208,7 @@ async function runRoutine(routine) {
     skill_name: pipelineSkillNames.join(' -> '),
     routine_id: routine.id,
     routine_name: routine.name,
+    workspace_id: routine.workspace_id || '',
     status: 'running',
     outcome: null,
     started_at: startedAt,
@@ -225,6 +226,7 @@ async function runRoutine(routine) {
     skill_name: pipelineSkillNames.join(' -> '),
     routine_id: routine.id,
     routine_name: routine.name,
+    workspace_id: routine.workspace_id || '',
     status: result.success ? 'completed' : 'failed',
     outcome: result.success ? null : 'failure',
     started_at: startedAt,

package/win/workflow-runner.js

@@ -114,19 +114,19 @@ async function executeWorkflowSession(workflow, executionId, skillNames, options
       contractContext += '| Field | Type | Required | Description |\n|-------|------|----------|-------------|\n'
       for (const f of ic.contract.fields || []) {
         const typeDisplay = f.type === 'array' && f.items ? `array<${f.items}>` : f.type
-        contractContext += `| ${f.key} | ${typeDisplay} | ${f.required ? 'Yes' : 'No'} | ${f.description || ''} |\n`
+        contractContext += `| ${f.name} | ${typeDisplay} | ${f.required ? 'Yes' : 'No'} | ${f.description || ''} |\n`
       }
     }
     contractContext += '\n'
   }
   if (options.dagOutputContracts && options.dagOutputContracts.length > 0) {
-    contractContext += '## Output Contract\nYour output MUST conform to the following contract(s). Include all required fields in your execution report.\n'
+    contractContext += '## Output Contract (REQUIRED)\nEnd your execution report with a "## Output Data" section containing a single `json` code block whose content conforms **exactly** to the contract(s) below. HQ validates this JSON on completion; any missing required field or type mismatch fails the node.\n\nIf the skill\'s natural output does not match this shape, add a transform node upstream instead of reshaping inside the skill.\n\n'
     for (const oc of options.dagOutputContracts) {
       contractContext += `### ${oc.contract_name}\n${oc.contract.description || ''}\n`
       contractContext += '| Field | Type | Required | Description |\n|-------|------|----------|-------------|\n'
       for (const f of oc.contract.fields || []) {
         const typeDisplay = f.type === 'array' && f.items ? `array<${f.items}>` : f.type
-        contractContext += `| ${f.key} | ${typeDisplay} | ${f.required ? 'Yes' : 'No'} | ${f.description || ''} |\n`
+        contractContext += `| ${f.name} | ${typeDisplay} | ${f.required ? 'Yes' : 'No'} | ${f.description || ''} |\n`
       }
     }
     contractContext += '\n'
@@ -303,6 +303,7 @@ async function runWorkflow(workflow, options = {}) {
     skill_name: pipelineSkillNames.join(' -> '),
     workflow_id: workflow.id,
     workflow_name: workflow.name,
+    workspace_id: workflow.workspace_id || '',
     status: 'running',
     outcome: null,
     started_at: startedAt,
@@ -322,6 +323,7 @@ async function runWorkflow(workflow, options = {}) {
     skill_name: pipelineSkillNames.join(' -> '),
     workflow_id: workflow.id,
     workflow_name: workflow.name,
+    workspace_id: workflow.workspace_id || '',
     status: result.success ? 'completed' : 'failed',
     outcome,
     started_at: startedAt,