@geekbeer/minion 3.23.1 → 3.25.0

package/core/config.js

@@ -77,6 +77,11 @@ const config = {
   MINION_ID: process.env.MINION_ID || '',
   MINION_EMAIL: process.env.MINION_ID ? `m-${process.env.MINION_ID}@minion-agent.com` : '',
 
+  // Workspace targeting (optional)
+  // When set, skill push/fetch operations will target this workspace.
+  // If not set, HQ resolves the workspace from workspace_minions.
+  WORKSPACE_ID: process.env.WORKSPACE_ID || '',
+
   // Server settings
   AGENT_PORT: parseInt(process.env.AGENT_PORT, 10) || 8080,
 

package/core/db.js

@@ -192,6 +192,14 @@ function initSchema(db) {
         VALUES (new.rowid, new.content);
     END;
 
+    -- ==================== workspaces (cache from HQ) ====================
+    CREATE TABLE IF NOT EXISTS workspaces (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL,
+      slug TEXT NOT NULL,
+      updated_at INTEGER NOT NULL
+    );
+
     -- ==================== chat_sessions ====================
     CREATE TABLE IF NOT EXISTS chat_sessions (
       session_id TEXT PRIMARY KEY,
@@ -267,7 +275,6 @@ function initSchema(db) {
     CREATE INDEX IF NOT EXISTS idx_todos_status ON todos(status);
     CREATE INDEX IF NOT EXISTS idx_todos_project ON todos(project_id);
     CREATE INDEX IF NOT EXISTS idx_todos_priority ON todos(priority);
-    CREATE INDEX IF NOT EXISTS idx_todos_session ON todos(session_id);
 
     -- ==================== emails ====================
     CREATE TABLE IF NOT EXISTS emails (

package/core/routes/skills.js

@@ -104,10 +104,12 @@ async function writeSkillToLocal(name, { content, description, display_name, typ
  * Reusable by workflow push to auto-sync pipeline skills.
  *
  * @param {string} name - Skill slug (e.g. "execution-report")
+ * @param {object} [opts]
+ * @param {string} [opts.workspaceId] - Target workspace ID (overrides WORKSPACE_ID env var)
  * @returns {Promise<object>} HQ response
  * @throws {Error} If skill not found locally or HQ rejects
  */
-async function pushSkillToHQ(name) {
+async function pushSkillToHQ(name, opts = {}) {
   // Use the Primary plugin's skill directory as the canonical read source.
   // Skills are written identically to every enabled plugin dir, so reading
   // from any one of them yields the same content.
@@ -140,16 +142,24 @@ async function pushSkillToHQ(name) {
     }
   }
 
+  const payload = {
+    name: metadata.name || name,
+    display_name: metadata.display_name || metadata.name || name,
+    description: metadata.description || '',
+    content: rawContent,
+    type: metadata.type || 'workflow',
+    files,
+  }
+
+  // Include workspace_id if specified or configured (for multi-workspace targeting)
+  const targetWorkspaceId = opts.workspaceId || config.WORKSPACE_ID
+  if (targetWorkspaceId) {
+    payload.workspace_id = targetWorkspaceId
+  }
+
   return api.request('/skills', {
     method: 'POST',
-    body: JSON.stringify({
-      name: metadata.name || name,
-      display_name: metadata.display_name || metadata.name || name,
-      description: metadata.description || '',
-      content: rawContent,
-      type: metadata.type || 'workflow',
-      files,
-    }),
+    body: JSON.stringify(payload),
   })
 }
 
@@ -204,6 +214,7 @@ async function skillRoutes(fastify, opts) {
   })
 
   // Push local skill to HQ
+  // Optional body: { workspace_id?: string } — overrides WORKSPACE_ID env var
   fastify.post('/api/skills/push/:name', async (request, reply) => {
     if (!verifyToken(request)) {
       reply.code(401)
@@ -216,16 +227,17 @@ async function skillRoutes(fastify, opts) {
     }
 
     const { name } = request.params
+    const { workspace_id } = request.body || {}
 
     if (!name || !/^[a-z0-9-]+$/.test(name)) {
       reply.code(400)
       return { success: false, error: 'Invalid skill name' }
     }
 
-    console.log(`[Skills] Pushing skill to HQ: ${name}`)
+    console.log(`[Skills] Pushing skill to HQ: ${name}${workspace_id ? ` (workspace: ${workspace_id})` : ''}`)
 
     try {
-      const result = await pushSkillToHQ(name)
+      const result = await pushSkillToHQ(name, { workspaceId: workspace_id })
       console.log(`[Skills] Skill pushed to HQ: ${name}`)
       return { success: true, ...result }
     } catch (error) {
@@ -254,13 +266,17 @@ async function skillRoutes(fastify, opts) {
       return { success: false, error: 'Invalid skill name' }
     }
 
-    // Forward template vars query param to HQ for {{VAR_NAME}} expansion
+    // Forward template vars and workspace_id query params to HQ
     const vars = request.query.vars || ''
-    const queryString = vars ? `?vars=${encodeURIComponent(vars)}` : ''
-    console.log(`[Skills] Fetching skill from HQ: ${name}${vars ? ' (with template vars)' : ''}`)
+    const fetchWorkspaceId = request.query.workspace_id || config.WORKSPACE_ID || ''
+    const queryParams = new URLSearchParams()
+    if (vars) queryParams.set('vars', vars)
+    if (fetchWorkspaceId) queryParams.set('workspace_id', fetchWorkspaceId)
+    const queryString = queryParams.toString() ? `?${queryParams.toString()}` : ''
+    console.log(`[Skills] Fetching skill from HQ: ${name}${vars ? ' (with template vars)' : ''}${fetchWorkspaceId ? ` (workspace: ${fetchWorkspaceId})` : ''}`)
 
     try {
-      // Fetch from HQ (with optional template variable expansion)
+      // Fetch from HQ (with optional template variable expansion and workspace scoping)
       const skill = await api.request(`/skills/${encodeURIComponent(name)}${queryString}`)
 
       // Write to local filesystem using shared helper
@@ -297,10 +313,12 @@ async function skillRoutes(fastify, opts) {
       return { success: false, error: 'HQ not configured' }
     }
 
-    console.log('[Skills] Listing remote skills from HQ')
+    const remoteWorkspaceId = request.query.workspace_id || config.WORKSPACE_ID || ''
+    const remoteQuery = remoteWorkspaceId ? `?workspace_id=${encodeURIComponent(remoteWorkspaceId)}` : ''
+    console.log(`[Skills] Listing remote skills from HQ${remoteWorkspaceId ? ` (workspace: ${remoteWorkspaceId})` : ''}`)
 
     try {
-      const result = await api.request('/skills')
+      const result = await api.request(`/skills${remoteQuery}`)
       return result
     } catch (error) {
       console.error(`[Skills] Failed to list remote skills: ${error.message}`)

package/core/stores/workspace-store.js

@@ -0,0 +1,48 @@
+/**
+ * Workspace Store (SQLite)
+ * Caches workspace memberships synced from HQ via heartbeat.
+ */
+
+const { getDb } = require('../db')
+
+/**
+ * Upsert all workspaces (replace entire cache with latest from HQ).
+ * @param {Array<{ id: string, name: string, slug: string }>} workspaces
+ */
+function upsertAll(workspaces) {
+  const db = getDb()
+  const upsert = db.prepare(
+    'INSERT INTO workspaces (id, name, slug, updated_at) VALUES (?, ?, ?, ?) ON CONFLICT(id) DO UPDATE SET name=excluded.name, slug=excluded.slug, updated_at=excluded.updated_at'
+  )
+  const deleteAll = db.prepare('DELETE FROM workspaces')
+  const tx = db.transaction((items) => {
+    deleteAll.run()
+    const now = Date.now()
+    for (const ws of items) {
+      upsert.run(ws.id, ws.name, ws.slug, now)
+    }
+  })
+  tx(workspaces || [])
+}
+
+/**
+ * List all cached workspaces.
+ * @returns {Array<{ id: string, name: string, slug: string, updated_at: number }>}
+ */
+function list() {
+  const db = getDb()
+  return db.prepare('SELECT * FROM workspaces ORDER BY name').all()
+}
+
+/**
+ * Get a workspace by ID.
+ * @param {string} id
+ * @returns {{ id: string, name: string, slug: string, updated_at: number } | undefined}
+ */
+function getById(id) {
+  if (!id) return undefined
+  const db = getDb()
+  return db.prepare('SELECT * FROM workspaces WHERE id = ?').get(id)
+}
+
+module.exports = { upsertAll, list, getById }

package/docs/api-reference.md

@@ -17,6 +17,21 @@ Authentication: `Authorization: Bearer $API_TOKEN` header (except where noted).
 | GET | `/api/status` | Agent status, uptime, version, HQ connection |
 | POST | `/api/status` | Update status. Body: `{status, current_task}` |
 
+### Workspaces
+
+ミニオンは複数のワークスペースに所属できる。所属ワークスペースはハートビートレスポンスで自動同期される。
+
+| Method | HQ Endpoint | Description |
+|--------|-------------|-------------|
+| GET | `/api/minion/workspaces` | 所属ワークスペース一覧を取得 |
+
+ハートビートレスポンスにも `workspaces` 配列が含まれ、30秒ごとに自動同期される。
+
+```bash
+# hq CLIで所属ワークスペースを確認
+hq list workspaces
+```
+
 ### Skills
 
 | Method | Endpoint | Description |
@@ -27,6 +42,16 @@ Authentication: `Authorization: Bearer $API_TOKEN` header (except where noted).
 | POST | `/api/skills/fetch/:name` | Fetch skill from HQ and deploy locally |
 | GET | `/api/skills/remote` | List skills on HQ |
 
+#### ワークスペーススコープ
+
+スキルはワークスペース単位でスコープされる。`WORKSPACE_ID` 環境変数を設定するか、リクエストごとに `workspace_id` を指定することで、プッシュ先・取得元のワークスペースを制御できる。未指定の場合、HQがミニオンの所属ワークスペースから自動解決する。
+
+| エンドポイント | パラメータ | 指定方法 |
+|--------------|-----------|---------|
+| `POST /api/skills/push/:name` | `workspace_id` | リクエストボディ |
+| `POST /api/skills/fetch/:name` | `workspace_id` | クエリパラメータ |
+| `GET /api/skills/remote` | `workspace_id` | クエリパラメータ |
+
 ### Workflows
 
 | Method | Endpoint | Description |

package/linux/bin/hq

@@ -16,6 +16,7 @@
 #   hq fetch project-context <id>         - Get project context (shared Markdown document)
 #   hq fetch dag-workflow <id>            - Get DAG workflow details (graph, version)
 #   hq fetch dag-execution <id>           - Get DAG execution details (nodes, status)
+#   hq list workspaces                    - List workspaces this minion belongs to
 #   hq create dag-workflow <body.json>    - Create a DAG workflow (PM only). Body: {project_id, name, graph?, ...}
 #   hq put dag-workflow <id> <body.json>  - Update DAG workflow draft (PM only). Body: {graph?, content?, ...}
 #   hq publish dag-workflow <id>          - Publish the draft as a new version (PM only, validated)
@@ -144,6 +145,7 @@ print_usage() {
   echo "  hq fetch project-context <id>         - Get project context" >&2
   echo "  hq fetch dag-workflow <id>            - Get DAG workflow details" >&2
   echo "  hq fetch dag-execution <id>           - Get DAG execution details" >&2
+  echo "  hq list workspaces                    - List workspaces this minion belongs to" >&2
   echo "  hq create dag-workflow <body.json>    - Create a DAG workflow (PM only)" >&2
   echo "  hq put dag-workflow <id> <body.json>  - Update DAG workflow draft (PM only)" >&2
   echo "  hq publish dag-workflow <id>          - Publish the draft as a new version (PM only)" >&2
@@ -192,6 +194,20 @@ case "${1:-}" in
     esac
     ;;
 
+  list)
+    resource="${2:-}"
+    case "$resource" in
+      workspaces)
+        fetch_resource "$BASE_URL/workspaces"
+        ;;
+      *)
+        echo "Unknown list resource: $resource" >&2
+        echo "Usage: hq list workspaces" >&2
+        exit 1
+        ;;
+    esac
+    ;;
+
   create)
     resource="${2:-}"
     case "$resource" in

package/linux/routes/chat.js

@@ -52,8 +52,8 @@ async function chatRoutes(fastify) {
 
     const workspaceId = workspace_id || null
 
-    // Build prompt — add memory context on new sessions + page context
-    const prompt = await buildContextPrefix(message, context, session_id)
+    // Build prompt — add memory context on new sessions + page context + workspace
+    const prompt = await buildContextPrefix(message, context, session_id, workspaceId)
 
     // Store user message
     const currentSessionId = session_id || null
@@ -253,9 +253,22 @@ ${indexed}`
  * On new sessions (no session_id), injects minion memory + recent daily logs.
  * No conversation history injection — Claude CLI handles that via --resume.
  */
-async function buildContextPrefix(message, context, sessionId) {
+async function buildContextPrefix(message, context, sessionId, workspaceId) {
   const parts = []
 
+  // Inject workspace context so Claude Code knows which workspace it's operating in
+  if (workspaceId) {
+    const workspaceStore = require('../../core/stores/workspace-store')
+    const ws = workspaceStore.getById(workspaceId)
+    if (ws) {
+      parts.push(
+        `[現在のワークスペース] ${ws.name} (ID: ${ws.id})`,
+        'スキル操作やプロジェクト参照はこのワークスペースのスコープで行われます。',
+        ''
+      )
+    }
+  }
+
   // Re-inject unfinished todos tied to this session. This is how we survive
   // context compaction: even if Claude forgot the plan, the outstanding
   // todos are re-shown on the next turn. Todos past MAX_INJECTION_COUNT are

package/linux/server.js

@@ -378,15 +378,23 @@ async function start() {
       const { currentTask } = getStatus()
       const todoStore = require('../core/stores/todo-store')
       const getTodoSummary = () => { try { return todoStore.getSummary() } catch { return null } }
-      sendHeartbeat({ status: 'online', current_task: currentTask, running_tasks: runningTasks.getAll(), config_warnings: getConfigWarnings(), todo_summary: getTodoSummary(), version }).catch(err => {
+      const workspaceStore = require('../core/stores/workspace-store')
+      const syncWorkspaces = (response) => {
+        if (response && Array.isArray(response.workspaces)) {
+          workspaceStore.upsertAll(response.workspaces)
+        }
+      }
+
+      sendHeartbeat({ status: 'online', current_task: currentTask, running_tasks: runningTasks.getAll(), config_warnings: getConfigWarnings(), todo_summary: getTodoSummary(), version }).then(syncWorkspaces).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, running_tasks: runningTasks.getAll(), config_warnings: getConfigWarnings(), todo_summary: getTodoSummary(), version }).then(() => {
+        sendHeartbeat({ status: currentStatus, current_task: currentTask, running_tasks: runningTasks.getAll(), config_warnings: getConfigWarnings(), todo_summary: getTodoSummary(), version }).then(response => {
           lastBeatAt = new Date().toISOString()
+          syncWorkspaces(response)
         }).catch(err => {
           console.error('[Heartbeat] Periodic heartbeat failed:', err.message)
         })

package/package.json

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

package/rules/core.md

@@ -29,6 +29,7 @@ Minion
 - **Workflow**: プロジェクトスコープ。線形パイプライン形式のバージョン管理ワークフロー。ミニオンAPIで push/fetch 可能。
 - **DAG Workflow**: プロジェクトスコープ。ノード/エッジで依存関係を表現する新方式。fan-out / join / conditional / transform / review をサポート。作成・編集はHQダッシュボードのみ、ミニオンは `dag-step-poller` で自動実行。詳細は `~/.minion/docs/api-reference.md` の「DAG Workflows」と `~/.minion/docs/task-guides.md` の「DAG ワークフロー」を参照。
 - **Routine**: ミニオンスコープ。ミニオンローカルの定期タスク。
+- **Workspace**: ミニオンは複数のワークスペースに所属でき、スキルやプロジェクトはワークスペース単位でスコープされる。チャットセッションもワークスペース別に分離される。所属ワークスペースはハートビートで自動同期され、`hq list workspaces` で確認できる。
 - ミニオンは複数プロジェクトに `pm`、`engineer`、`accountant` として参加できる。
 
 ## Email

package/win/bin/hq.ps1

@@ -128,6 +128,7 @@ function Show-Usage {
     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 list workspaces                    - List workspaces this minion belongs to"
     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)"
@@ -167,6 +168,18 @@ switch ($Command) {
         }
     }
 
+    'list' {
+        $Resource = $Arg1
+        switch ($Resource) {
+            'workspaces' { Invoke-HqApi "$BaseUrl/workspaces" }
+            default {
+                Write-Error "Unknown list resource: $Resource"
+                Write-Error "Usage: hq list workspaces"
+                exit 1
+            }
+        }
+    }
+
     'create' {
         $Resource = $Arg1
         switch ($Resource) {

package/win/routes/chat.js

@@ -125,7 +125,7 @@ async function chatRoutes(fastify) {
     }
 
     const workspaceId = workspace_id || null
-    const prompt = await buildContextPrefix(message, context, session_id)
+    const prompt = await buildContextPrefix(message, context, session_id, workspaceId)
     const currentSessionId = session_id || null
 
     if (currentSessionId) {
@@ -317,9 +317,22 @@ ${indexed}`
   })
 }
 
-async function buildContextPrefix(message, context, sessionId) {
+async function buildContextPrefix(message, context, sessionId, workspaceId) {
   const parts = []
 
+  // Inject workspace context so Claude Code knows which workspace it's operating in
+  if (workspaceId) {
+    const workspaceStore = require('../../core/stores/workspace-store')
+    const ws = workspaceStore.getById(workspaceId)
+    if (ws) {
+      parts.push(
+        `[現在のワークスペース] ${ws.name} (ID: ${ws.id})`,
+        'スキル操作やプロジェクト参照はこのワークスペースのスコープで行われます。',
+        ''
+      )
+    }
+  }
+
   // Re-inject unfinished todos tied to this session. Survives context
   // compaction — Claude sees outstanding todos again on the next turn.
   // Skipped past MAX_INJECTION_COUNT to prevent infinite loops.

package/win/server.js

@@ -345,15 +345,23 @@ async function start() {
       const { currentTask } = getStatus()
       const todoStore = require('../core/stores/todo-store')
       const getTodoSummary = () => { try { return todoStore.getSummary() } catch { return null } }
-      sendHeartbeat({ status: 'online', current_task: currentTask, config_warnings: getConfigWarnings(), todo_summary: getTodoSummary(), version }).catch(err => {
+      const workspaceStore = require('../core/stores/workspace-store')
+      const syncWorkspaces = (response) => {
+        if (response && Array.isArray(response.workspaces)) {
+          workspaceStore.upsertAll(response.workspaces)
+        }
+      }
+
+      sendHeartbeat({ status: 'online', current_task: currentTask, config_warnings: getConfigWarnings(), todo_summary: getTodoSummary(), version }).then(syncWorkspaces).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, config_warnings: getConfigWarnings(), todo_summary: getTodoSummary(), version }).then(() => {
+        sendHeartbeat({ status: currentStatus, current_task: currentTask, config_warnings: getConfigWarnings(), todo_summary: getTodoSummary(), version }).then(response => {
           lastBeatAt = new Date().toISOString()
+          syncWorkspaces(response)
         }).catch(err => {
           console.error('[Heartbeat] Periodic heartbeat failed:', err.message)
         })