@geekbeer/minion 3.23.0 → 3.24.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

@@ -267,7 +267,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 (
@@ -451,9 +450,12 @@ function migrateSchema(db) {
 
       console.log('[DB] Migration 3 complete: memories.project_id added')
     } catch (err) {
-      // Column may already exist (duplicate column error)
-      console.warn(`[DB] Migration 3 skipped: ${err.message}`)
-      try { db.exec("INSERT OR IGNORE INTO schema_version (version) VALUES (3)") } catch {}
+      if (hasColumn(db, 'memories', 'project_id')) {
+        console.warn(`[DB] Migration 3 skipped (column already exists): ${err.message}`)
+        try { db.exec("INSERT OR IGNORE INTO schema_version (version) VALUES (3)") } catch {}
+      } else {
+        console.error(`[DB] Migration 3 FAILED — memories.project_id not added: ${err.message}`)
+      }
     }
   }
 
@@ -472,8 +474,12 @@ function migrateSchema(db) {
 
       console.log('[DB] Migration 4 complete: chat_sessions.workspace_id added')
     } catch (err) {
-      console.warn(`[DB] Migration 4 skipped: ${err.message}`)
-      try { db.exec("INSERT OR IGNORE INTO schema_version (version) VALUES (4)") } catch {}
+      if (hasColumn(db, 'chat_sessions', 'workspace_id')) {
+        console.warn(`[DB] Migration 4 skipped (column already exists): ${err.message}`)
+        try { db.exec("INSERT OR IGNORE INTO schema_version (version) VALUES (4)") } catch {}
+      } else {
+        console.error(`[DB] Migration 4 FAILED — chat_sessions.workspace_id not added: ${err.message}`)
+      }
     }
   }
 
@@ -492,10 +498,66 @@ function migrateSchema(db) {
 
       console.log('[DB] Migration 5 complete: todos.session_id / injection_count added')
     } catch (err) {
-      console.warn(`[DB] Migration 5 skipped: ${err.message}`)
-      try { db.exec("INSERT OR IGNORE INTO schema_version (version) VALUES (5)") } catch {}
+      if (hasColumn(db, 'todos', 'session_id') && hasColumn(db, 'todos', 'injection_count')) {
+        console.warn(`[DB] Migration 5 skipped (columns already exist): ${err.message}`)
+        try { db.exec("INSERT OR IGNORE INTO schema_version (version) VALUES (5)") } catch {}
+      } else {
+        console.error(`[DB] Migration 5 FAILED — todos columns not added: ${err.message}`)
+      }
+    }
+  }
+
+  // Repair step: fix DBs where migrations were incorrectly marked as done
+  // but columns were never actually added (caused by the old catch-all error handling)
+  repairMissingColumns(db)
+}
+
+/**
+ * Check if a table has a specific column.
+ * @param {import('better-sqlite3').Database} db
+ * @param {string} table
+ * @param {string} column
+ * @returns {boolean}
+ */
+function hasColumn(db, table, column) {
+  const cols = db.prepare(`PRAGMA table_info(${table})`).all()
+  return cols.some(c => c.name === column)
+}
+
+/**
+ * Repair missing columns that should have been added by migrations.
+ * Handles DBs where migrations were marked as done but ALTER TABLE actually failed.
+ */
+function repairMissingColumns(db) {
+  const repairs = [
+    { table: 'memories', column: 'project_id', sql: 'ALTER TABLE memories ADD COLUMN project_id TEXT DEFAULT NULL' },
+    { table: 'chat_sessions', column: 'workspace_id', sql: 'ALTER TABLE chat_sessions ADD COLUMN workspace_id TEXT DEFAULT NULL' },
+    { table: 'todos', column: 'session_id', sql: 'ALTER TABLE todos ADD COLUMN session_id TEXT' },
+    { table: 'todos', column: 'injection_count', sql: 'ALTER TABLE todos ADD COLUMN injection_count INTEGER NOT NULL DEFAULT 0' },
+  ]
+
+  for (const { table, column, sql } of repairs) {
+    if (!hasColumn(db, table, column)) {
+      try {
+        console.warn(`[DB] Repair: adding missing column ${table}.${column}`)
+        db.exec(sql)
+        console.log(`[DB] Repair: ${table}.${column} added successfully`)
+      } catch (err) {
+        console.error(`[DB] Repair FAILED for ${table}.${column}: ${err.message}`)
+      }
     }
   }
+
+  // Ensure indexes exist after repair
+  try {
+    db.exec(`
+      CREATE INDEX IF NOT EXISTS idx_memories_project_id ON memories(project_id);
+      CREATE INDEX IF NOT EXISTS idx_chat_sessions_workspace ON chat_sessions(workspace_id, updated_at DESC);
+      CREATE INDEX IF NOT EXISTS idx_todos_session ON todos(session_id);
+    `)
+  } catch (err) {
+    console.warn(`[DB] Repair index creation skipped: ${err.message}`)
+  }
 }
 
 /**

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/docs/api-reference.md

@@ -27,6 +27,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/package.json

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