@geekbeer/minion 3.22.0 → 3.23.1

package/core/db.js

@@ -259,12 +259,15 @@ function initSchema(db) {
       created_at TEXT NOT NULL DEFAULT (datetime('now')),
       updated_at TEXT NOT NULL DEFAULT (datetime('now')),
       completed_at TEXT,
-      data TEXT
+      data TEXT,
+      session_id TEXT,
+      injection_count INTEGER NOT NULL DEFAULT 0
     );
 
     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 (
@@ -448,9 +451,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}`)
+      }
     }
   }
 
@@ -469,10 +475,90 @@ 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}`)
+      }
+    }
+  }
+
+  if (currentVersion < 5) {
+    try {
+      console.log('[DB] Migration 5: Adding session_id / injection_count to todos...')
+
+      db.exec(`
+        ALTER TABLE todos ADD COLUMN session_id TEXT;
+        ALTER TABLE todos ADD COLUMN injection_count INTEGER NOT NULL DEFAULT 0;
+
+        CREATE INDEX IF NOT EXISTS idx_todos_session ON todos(session_id);
+
+        INSERT INTO schema_version (version) VALUES (5);
+      `)
+
+      console.log('[DB] Migration 5 complete: todos.session_id / injection_count added')
+    } catch (err) {
+      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/todos.js

@@ -40,12 +40,13 @@ async function todoRoutes(fastify) {
       return { success: false, error: 'Unauthorized' }
     }
 
-    const { status, priority, project_id, source_type, limit } = request.query || {}
+    const { status, priority, project_id, source_type, session_id, limit } = request.query || {}
     const todos = todoStore.list({
       status,
       priority,
       project_id,
       source_type,
+      session_id,
       limit: limit ? parseInt(limit, 10) : undefined,
     })
 
@@ -75,14 +76,14 @@ async function todoRoutes(fastify) {
       return { success: false, error: 'Unauthorized' }
     }
 
-    const { title, description, priority, source_type, source_id, project_id, due_at, data } = request.body || {}
+    const { title, description, priority, source_type, source_id, project_id, due_at, data, session_id } = request.body || {}
     if (!title) {
       reply.code(400)
       return { success: false, error: 'title is required' }
     }
 
     try {
-      const todo = todoStore.add({ title, description, priority, source_type, source_id, project_id, due_at, data })
+      const todo = todoStore.add({ title, description, priority, source_type, source_id, project_id, due_at, data, session_id })
       console.log(`[Todos] Created: ${todo.id} "${todo.title}"`)
       reply.code(201)
       return { success: true, todo }

package/core/stores/todo-store.js

@@ -19,6 +19,11 @@ const VALID_SOURCE_TYPES = ['thread', 'workflow', 'directive', 'user', 'self']
 // Auto-prune completed todos older than this
 const PRUNE_DAYS = 30
 
+// Max number of times an incomplete todo gets auto-injected into the chat
+// prompt before we give up and stop injecting it (to avoid infinite loops
+// when Claude cannot finish a task).
+const MAX_INJECTION_COUNT = 5
+
 /**
  * Create a new TODO.
  * @param {object} todo - { title, description?, priority?, source_type?, source_id?, project_id?, due_at?, data? }
@@ -50,12 +55,14 @@ function add(todo) {
     created_at: now,
     updated_at: now,
     completed_at: null,
+    session_id: todo.session_id || null,
+    injection_count: 0,
     ...(todo.data ? { data: todo.data } : {}),
   }
 
   db.prepare(`
-    INSERT INTO todos (id, title, description, status, priority, source_type, source_id, project_id, due_at, created_at, updated_at, completed_at, data)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    INSERT INTO todos (id, title, description, status, priority, source_type, source_id, project_id, due_at, created_at, updated_at, completed_at, data, session_id, injection_count)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `).run(
     record.id,
     record.title,
@@ -69,7 +76,9 @@ function add(todo) {
     record.created_at,
     record.updated_at,
     record.completed_at,
-    record.data ? JSON.stringify(record.data) : null
+    record.data ? JSON.stringify(record.data) : null,
+    record.session_id,
+    record.injection_count
   )
 
   console.log(`[TodoStore] Added: "${record.title}" (${record.priority}, source=${record.source_type || 'none'})`)
@@ -115,7 +124,8 @@ function update(id, updates) {
   db.prepare(`
     UPDATE todos SET title = ?, description = ?, status = ?, priority = ?,
       source_type = ?, source_id = ?, project_id = ?, due_at = ?,
-      updated_at = ?, completed_at = ?, data = ?
+      updated_at = ?, completed_at = ?, data = ?,
+      session_id = ?, injection_count = ?
     WHERE id = ?
   `).run(
     merged.title,
@@ -129,6 +139,8 @@ function update(id, updates) {
     merged.updated_at,
     merged.completed_at,
     merged.data ? JSON.stringify(merged.data) : null,
+    merged.session_id ?? null,
+    merged.injection_count ?? 0,
     id
   )
 
@@ -160,9 +172,50 @@ function getById(id) {
   return row ? parseRow(row) : null
 }
 
+/**
+ * List incomplete (pending/in_progress) todos linked to a chat session that
+ * still have remaining injection budget. Used by the chat route to remind
+ * Claude of unfinished work even after context compaction.
+ * @param {string} sessionId
+ * @returns {Array}
+ */
+function listActiveForSession(sessionId) {
+  if (!sessionId) return []
+  const db = getDb()
+  const rows = db.prepare(`
+    SELECT * FROM todos
+    WHERE session_id = ?
+      AND status IN ('pending', 'in_progress')
+      AND injection_count < ?
+    ORDER BY
+      CASE priority WHEN 'urgent' THEN 0 WHEN 'high' THEN 1 WHEN 'normal' THEN 2 WHEN 'low' THEN 3 END,
+      created_at ASC
+  `).all(sessionId, MAX_INJECTION_COUNT)
+  return rows.map(parseRow)
+}
+
+/**
+ * Increment injection_count for the given todo IDs. Should be called once
+ * the reminder has been actually written into the outgoing prompt.
+ * @param {string[]} ids
+ */
+function markInjected(ids) {
+  if (!Array.isArray(ids) || ids.length === 0) return
+  const db = getDb()
+  const now = new Date().toISOString()
+  const stmt = db.prepare(`
+    UPDATE todos
+    SET injection_count = injection_count + 1, updated_at = ?
+    WHERE id = ?
+  `)
+  for (const id of ids) {
+    stmt.run(now, id)
+  }
+}
+
 /**
  * List TODOs with optional filters.
- * @param {object} opts - { status?, priority?, project_id?, source_type?, limit? }
+ * @param {object} opts - { status?, priority?, project_id?, source_type?, session_id?, limit? }
  * @returns {Array}
  */
 function list(opts = {}) {
@@ -186,6 +239,10 @@ function list(opts = {}) {
     conditions.push('source_type = ?')
     params.push(opts.source_type)
   }
+  if (opts.session_id) {
+    conditions.push('session_id = ?')
+    params.push(opts.session_id)
+  }
 
   const where = conditions.length > 0 ? `WHERE ${conditions.join(' AND ')}` : ''
   const limit = opts.limit || 100
@@ -260,6 +317,9 @@ module.exports = {
   remove,
   getById,
   list,
+  listActiveForSession,
+  markInjected,
   getSummary,
   pruneCompleted,
+  MAX_INJECTION_COUNT,
 }

package/docs/api-reference.md

@@ -229,6 +229,38 @@ curl -X PUT /api/config/env \
 The scheduler starts automatically on server boot if `REFLECTION_TIME` is configured.
 Changes via the config API take effect immediately (no restart required).
 
+### Todos
+
+ミニオンローカルのToDoリスト。SQLiteに永続化され、HQにも同期される。
+
+| Method | Endpoint | Description |
+|--------|----------|-------------|
+| GET | `/api/todos` | List todos. Query: `status`, `priority`, `project_id`, `source_type`, `session_id`, `limit` |
+| GET | `/api/todos/summary` | Status counts |
+| GET | `/api/todos/:id` | Get single todo |
+| POST | `/api/todos` | Create. Body: `{title, description?, priority?, source_type?, source_id?, project_id?, due_at?, session_id?, data?}` |
+| PUT | `/api/todos/:id` | Update any field including `status` |
+| DELETE | `/api/todos/:id` | Delete |
+
+**フィールド**:
+- `status`: `pending` / `in_progress` / `done` / `cancelled`
+- `priority`: `low` / `normal` / `high` / `urgent`
+- `session_id`: チャットセッションID（任意）。**設定すると圧縮を跨いだ自動再掲の対象になる** — 次ターン以降のプロンプト冒頭で未完了Todoが自動表示される。
+- `injection_count`: 自動再掲された回数（読み取り専用）。一定回数を超えたTodoは再掲が停止する。
+
+**セッション紐づけ例**:
+```bash
+# 作成時にsession_idを指定すると、このセッションのチャットに自動で再掲される
+curl -X POST -H "Authorization: Bearer $API_TOKEN" -H "Content-Type: application/json" \
+  http://localhost:8080/api/todos \
+  -d '{"title": "レポートを保存", "session_id": "'$SESSION_ID'", "priority": "high"}'
+
+# 完了マーク（即座に更新すること）
+curl -X PUT -H "Authorization: Bearer $API_TOKEN" -H "Content-Type: application/json" \
+  http://localhost:8080/api/todos/$TODO_ID \
+  -d '{"status": "done"}'
+```
+
 ### Config
 
 | Method | Endpoint | Description |
@@ -1187,16 +1219,16 @@ DAG ワークフローの graph は以下の構造で保存される（`dag_work
       "label": "Per item",
       "fan_out_source": ".items",
       "template": { "nodes": [ ... ], "edges": [ ... ] },
-      "join_node": "n4",
+      "join_mode": "all",
+      "on_failure": "collect",
       "max_concurrency": 3
     },
     {
       "id": "n4",
       "type": "join",
       "label": "Collect",
-      "fan_out_node": "n3",
       "join_mode": "all",
-      "on_failure": "collect"
+      "aggregation": "array"
     },
     { "id": "n5", "type": "end", "label": "End" }
   ],
@@ -1218,8 +1250,8 @@ DAG ワークフローの graph は以下の構造で保存される（`dag_work
 | `skill` | スキル実行。`skill_version_id` と `assigned_role` が必須 | ✅ |
 | `transform` | LLM によるデータ変換。`transform_instruction` が必須 | ✅ |
 | `review` | レビューゲート。`approved` / `revision_requested` で分岐 | ❌ (内部) |
-| `fan_out` | 配列入力をテンプレートsub-graphに展開して並列実行 | ❌ (内部) |
-| `join` | fan_out の結果を集約 | ❌ (内部) |
+| `fan_out` | 配列入力をテンプレートsub-graphに展開して並列実行。子が全て settle すると自ノードが completed に遷移 | ❌ (内部) |
+| `join` | N本の上流エッジを待ち合わせる汎用バリア。fan_out とは独立 | ❌ (内部) |
 | `conditional` | 条件分岐（`llm` / `regex` / `jq`） | ❌ (内部) |
 
 #### DagNode 主要フィールド
@@ -1233,11 +1265,10 @@ DAG ワークフローの graph は以下の構造で保存される（`dag_work
 | `assigned_role` | `pm`\|`engineer`\|`accountant` | 実行ロール |
 | `fan_out_source` | string? | fan_out: 入力から配列を取り出すドット記法（例 `.items`） |
 | `template` | DagGraph? | fan_out: 各要素ごとに展開するsub-graph |
-| `join_node` | string? | fan_out: 対応する join ノードID |
 | `max_concurrency` | number? | fan_out: 並列インスタンス上限 |
-| `fan_out_node` | string? | join: 対応する fan_out ノードID |
-| `join_mode` | `all`\|`any`\|`majority` | join: 完了判定 |
-| `on_failure` | `fail_all`\|`ignore`\|`collect` | join: 失敗時の挙動 |
+| `join_mode` | `all`\|`any`\|`majority` | fan_out / join: 完了判定 |
+| `on_failure` | `fail_all`\|`ignore`\|`collect` | fan_out / join: 失敗時の挙動 |
+| `aggregation` | `array`\|`merge` | join: 上流出力の束ね方（デフォルト `array`） |
 | `condition_type` | `llm`\|`regex`\|`jq` | conditional: 条件評価方式 |
 | `condition_expression` | string | conditional: 条件式 |
 | `branches` | Record<string,string> | conditional: 条件出力→遷移先ノードID |

package/linux/routes/chat.js

@@ -22,6 +22,7 @@ const path = require('path')
 const { verifyToken } = require('../../core/lib/auth')
 const { config } = require('../../core/config')
 const chatStore = require('../../core/stores/chat-store')
+const todoStore = require('../../core/stores/todo-store')
 const { runEndOfDay } = require('../../core/lib/end-of-day')
 const { DATA_DIR } = require('../../core/lib/platform')
 const { getActivePrimary } = require('../../core/llm-plugins/lib/active')
@@ -255,6 +256,33 @@ ${indexed}`
 async function buildContextPrefix(message, context, sessionId) {
   const parts = []
 
+  // 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
+  // skipped by the store to prevent infinite loops.
+  if (sessionId) {
+    parts.push(
+      `[現在のチャットセッションID] ${sessionId}`,
+      '新規Todoを作成する際は `session_id` にこの値を含めてください（圧縮を跨いだ自動再掲の対象になります）。',
+      ''
+    )
+    const activeTodos = todoStore.listActiveForSession(sessionId)
+    if (activeTodos.length > 0) {
+      parts.push(
+        '[未完了のToDo（このセッション起点）]',
+        '以下のToDoが未完了のまま残っています。着手前に「既に完了していないか」を確認し、',
+        '完了済みなら `PUT /api/todos/:id` で status=done に更新、未完なら続行してください。',
+        ''
+      )
+      for (const t of activeTodos) {
+        const desc = t.description ? ` — ${t.description}` : ''
+        parts.push(`- [${t.id}] (${t.status}/${t.priority}) ${t.title}${desc}`)
+      }
+      parts.push('')
+      todoStore.markInjected(activeTodos.map(t => t.id))
+    }
+  }
+
   // Tell the LLM how to access memory and daily logs via API
   if (!sessionId) {
     const port = require('../../core/config').config.AGENT_PORT

package/package.json

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

package/rules/core.md

@@ -203,6 +203,18 @@ Routine 実行中は以下もtmuxセッション環境で利用可能:
 - `pm.md` — PM (Project Manager) のガイドライン
 - `engineer.md` — Engineer のガイドライン
 
+## Todo運用ルール
+
+チャット中のタスクは `/api/todos` に登録して進捗管理すること。圧縮（context compaction）を跨いでも作業を完遂するための仕組みがある。
+
+- **Todoは「1往復で完了する粒度」に分解して登録する。** 大きいタスクは複数のTodoに分ける。粒度を小さく保てば、完了マークを圧縮に奪われにくい。
+- **完了したら即座に done にマークする。** まとめて更新しない。`PUT /api/todos/:id` で `status=done`。
+- **チャットセッション内で作成するTodoには必ず `session_id` を含める。** プロンプト冒頭の `[現在のチャットセッションID]` の値を使う。紐づいた未完了Todoは次ターン以降に自動で再掲される（圧縮を跨いでも失われない）。
+- **再掲されたTodoを見たら、着手前に「既に完了していないか」を確認する。** 完了済みなら done に更新、未完なら続行。
+- 同一Todoが規定回数以上再掲されても未完了のままの場合、再掲は自動停止する。進展しないTodoはブロッカーとして起票するか手動で `cancelled` にすること。
+
+API詳細は `~/.minion/docs/api-reference.md` の「Todos」セクションを参照。
+
 ## Blocker Handling (ブロッカー対処)
 
 タスク実行中にブロッカー（自力で解決できない問題）に遭遇した場合、以下のフローに従うこと。

package/win/routes/chat.js

@@ -19,6 +19,7 @@ const http = require('http')
 const { verifyToken } = require('../../core/lib/auth')
 const { config } = require('../../core/config')
 const chatStore = require('../../core/stores/chat-store')
+const todoStore = require('../../core/stores/todo-store')
 const { DATA_DIR } = require('../../core/lib/platform')
 const { runEndOfDay } = require('../../core/lib/end-of-day')
 const { getActivePrimary } = require('../../core/llm-plugins/lib/active')
@@ -319,6 +320,32 @@ ${indexed}`
 async function buildContextPrefix(message, context, sessionId) {
   const parts = []
 
+  // 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.
+  if (sessionId) {
+    parts.push(
+      `[現在のチャットセッションID] ${sessionId}`,
+      '新規Todoを作成する際は `session_id` にこの値を含めてください（圧縮を跨いだ自動再掲の対象になります）。',
+      ''
+    )
+    const activeTodos = todoStore.listActiveForSession(sessionId)
+    if (activeTodos.length > 0) {
+      parts.push(
+        '[未完了のToDo（このセッション起点）]',
+        '以下のToDoが未完了のまま残っています。着手前に「既に完了していないか」を確認し、',
+        '完了済みなら `PUT /api/todos/:id` で status=done に更新、未完なら続行してください。',
+        ''
+      )
+      for (const t of activeTodos) {
+        const desc = t.description ? ` — ${t.description}` : ''
+        parts.push(`- [${t.id}] (${t.status}/${t.priority}) ${t.title}${desc}`)
+      }
+      parts.push('')
+      todoStore.markInjected(activeTodos.map(t => t.id))
+    }
+  }
+
   // Tell the LLM how to access memory and daily logs via API
   if (!sessionId) {
     const port = require('../../core/config').config.AGENT_PORT