@geekbeer/minion 2.68.6 → 2.73.0

package/core/api.js

@@ -88,75 +88,75 @@ async function sendHeartbeat(data) {
 
 /**
  * Create a project thread (help or discussion) on HQ.
- * @param {object} data - { project_id, title, description, thread_type?, mentions?, context? }
+ * @param {object} data - { project_id, title, content, thread_type?, mentions?, context? }
  * @returns {Promise<{ thread: object }>}
  */
-async function createHelpThread(data) {
-  return request('/help-threads', {
+async function createThread(data) {
+  return request('/threads', {
     method: 'POST',
     body: JSON.stringify(data),
   })
 }
 
 /**
- * Get open help threads in this minion's projects.
+ * Get open threads in this minion's projects.
  * @returns {Promise<{ threads: object[] }>}
  */
-async function getOpenHelpThreads() {
-  return request('/help-threads/open')
+async function getOpenThreads() {
+  return request('/threads/open')
 }
 
 /**
- * Get a help thread by ID with messages.
+ * Get a thread by ID with messages.
  * @param {string} threadId
  * @returns {Promise<{ thread: object, messages: object[] }>}
  */
-async function getHelpThread(threadId) {
-  return request(`/help-threads/${threadId}`)
+async function getThread(threadId) {
+  return request(`/threads/${threadId}`)
 }
 
 /**
- * Post a message to a help thread.
+ * Post a message to a thread.
  * @param {string} threadId
  * @param {object} data - { content, attachments?, mentions? }
  */
-async function postHelpMessage(threadId, data) {
-  return request(`/help-threads/${threadId}/messages`, {
+async function postThreadMessage(threadId, data) {
+  return request(`/threads/${threadId}/messages`, {
     method: 'POST',
     body: JSON.stringify(data),
   })
 }
 
 /**
- * Resolve a help thread.
+ * Resolve a thread.
  * @param {string} threadId
  * @param {string} resolution
  */
-async function resolveHelpThread(threadId, resolution) {
-  return request(`/help-threads/${threadId}/resolve`, {
+async function resolveThread(threadId, resolution) {
+  return request(`/threads/${threadId}/resolve`, {
     method: 'PATCH',
     body: JSON.stringify({ resolution }),
   })
 }
 
 /**
- * Cancel a help thread.
+ * Cancel a thread.
  * @param {string} threadId
  * @param {string} [reason]
  */
-async function cancelHelpThread(threadId, reason) {
-  return request(`/help-threads/${threadId}/cancel`, {
+async function cancelThread(threadId, reason) {
+  return request(`/threads/${threadId}/cancel`, {
     method: 'PATCH',
     body: JSON.stringify({ reason: reason || null }),
   })
 }
 
 /**
- * Permanently delete a help thread (PM only).
+ * Permanently delete a thread (PM only).
  * @param {string} threadId
  */
-async function deleteHelpThread(threadId) {
-  return request(`/help-threads/${threadId}`, {
+async function deleteThread(threadId) {
+  return request(`/threads/${threadId}`, {
     method: 'DELETE',
   })
 }
@@ -192,14 +192,13 @@ module.exports = {
   reportStepComplete,
   reportIssue,
   sendHeartbeat,
-  createHelpThread,
-  getOpenHelpThreads,
-  getHelpThread,
-  postHelpMessage,
-  resolveHelpThread,
-
-  cancelHelpThread,
-  deleteHelpThread,
+  createThread,
+  getOpenThreads,
+  getThread,
+  postThreadMessage,
+  resolveThread,
+  cancelThread,
+  deleteThread,
   createProjectMemory,
   searchProjectMemories,
 }

package/core/db.js

@@ -0,0 +1,297 @@
+/**
+ * SQLite Database Module
+ * Provides a singleton SQLite database connection for all minion stores.
+ * Uses better-sqlite3 (synchronous API) with WAL mode for performance.
+ *
+ * Database file: $DATA_DIR/minion.db
+ *
+ * FTS5 uses the trigram tokenizer for Japanese/CJK language support.
+ * Trigram splits text into 3-character sequences, enabling substring search
+ * in any language without a language-specific tokenizer.
+ * Note: trigram requires search queries of 3+ characters.
+ * Shorter queries fall back to LIKE-based search in the store layer.
+ */
+
+const path = require('path')
+const fs = require('fs')
+
+const { DATA_DIR } = require('./lib/platform')
+const { config } = require('./config')
+
+let _db = null
+
+/**
+ * Resolve the database file path.
+ * Uses DATA_DIR if accessible, otherwise falls back to HOME_DIR.
+ */
+function resolveDbPath() {
+  try {
+    fs.accessSync(DATA_DIR, fs.constants.W_OK)
+    return path.join(DATA_DIR, 'minion.db')
+  } catch {
+    return path.join(config.HOME_DIR, 'minion.db')
+  }
+}
+
+/**
+ * Get the singleton database connection.
+ * Initializes the database and schema on first call.
+ * @returns {import('better-sqlite3').Database}
+ */
+function getDb() {
+  if (_db) return _db
+
+  const dbPath = resolveDbPath()
+  fs.mkdirSync(path.dirname(dbPath), { recursive: true })
+
+  const Database = require('better-sqlite3')
+  _db = new Database(dbPath)
+
+  // Performance & integrity settings
+  _db.pragma('journal_mode = WAL')
+  _db.pragma('foreign_keys = ON')
+
+  initSchema(_db)
+  migrateSchema(_db)
+
+  console.log(`[DB] SQLite database initialized: ${dbPath}`)
+  return _db
+}
+
+/**
+ * Initialize all tables, indices, FTS virtual tables, and triggers.
+ * All statements use IF NOT EXISTS for idempotency.
+ */
+function initSchema(db) {
+  db.exec(`
+    -- ==================== memories ====================
+    CREATE TABLE IF NOT EXISTS memories (
+      id TEXT PRIMARY KEY,
+      title TEXT NOT NULL DEFAULT 'Untitled',
+      category TEXT NOT NULL DEFAULT 'reference'
+        CHECK (category IN ('user', 'feedback', 'project', 'reference')),
+      content TEXT NOT NULL DEFAULT '',
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_memories_category ON memories(category);
+    CREATE INDEX IF NOT EXISTS idx_memories_updated_at ON memories(updated_at DESC);
+
+    -- FTS5 with trigram tokenizer for Japanese/CJK support
+    CREATE VIRTUAL TABLE IF NOT EXISTS memories_fts USING fts5(
+      title,
+      content,
+      content=memories,
+      content_rowid=rowid,
+      tokenize='trigram'
+    );
+
+    -- Triggers to keep FTS index in sync with memories table
+    CREATE TRIGGER IF NOT EXISTS memories_ai AFTER INSERT ON memories BEGIN
+      INSERT INTO memories_fts(rowid, title, content)
+        VALUES (new.rowid, new.title, new.content);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS memories_ad AFTER DELETE ON memories BEGIN
+      INSERT INTO memories_fts(memories_fts, rowid, title, content)
+        VALUES ('delete', old.rowid, old.title, old.content);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS memories_au AFTER UPDATE ON memories BEGIN
+      INSERT INTO memories_fts(memories_fts, rowid, title, content)
+        VALUES ('delete', old.rowid, old.title, old.content);
+      INSERT INTO memories_fts(rowid, title, content)
+        VALUES (new.rowid, new.title, new.content);
+    END;
+
+    -- ==================== daily_logs ====================
+    CREATE TABLE IF NOT EXISTS daily_logs (
+      date TEXT PRIMARY KEY,
+      content TEXT NOT NULL DEFAULT '',
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      updated_at TEXT NOT NULL DEFAULT (datetime('now'))
+    );
+
+    -- FTS5 with trigram tokenizer for Japanese/CJK support
+    CREATE VIRTUAL TABLE IF NOT EXISTS daily_logs_fts USING fts5(
+      content,
+      content=daily_logs,
+      content_rowid=rowid,
+      tokenize='trigram'
+    );
+
+    CREATE TRIGGER IF NOT EXISTS daily_logs_ai AFTER INSERT ON daily_logs BEGIN
+      INSERT INTO daily_logs_fts(rowid, content)
+        VALUES (new.rowid, new.content);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS daily_logs_ad AFTER DELETE ON daily_logs BEGIN
+      INSERT INTO daily_logs_fts(daily_logs_fts, rowid, content)
+        VALUES ('delete', old.rowid, old.content);
+    END;
+
+    CREATE TRIGGER IF NOT EXISTS daily_logs_au AFTER UPDATE ON daily_logs BEGIN
+      INSERT INTO daily_logs_fts(daily_logs_fts, rowid, content)
+        VALUES ('delete', old.rowid, old.content);
+      INSERT INTO daily_logs_fts(rowid, content)
+        VALUES (new.rowid, new.content);
+    END;
+
+    -- ==================== chat_sessions ====================
+    CREATE TABLE IF NOT EXISTS chat_sessions (
+      session_id TEXT PRIMARY KEY,
+      turn_count INTEGER NOT NULL DEFAULT 0,
+      created_at INTEGER NOT NULL,
+      updated_at INTEGER NOT NULL
+    );
+
+    CREATE TABLE IF NOT EXISTS chat_messages (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL REFERENCES chat_sessions(session_id) ON DELETE CASCADE,
+      role TEXT NOT NULL,
+      content TEXT NOT NULL,
+      timestamp INTEGER NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_chat_messages_session ON chat_messages(session_id, id);
+
+    -- ==================== executions ====================
+    CREATE TABLE IF NOT EXISTS executions (
+      id TEXT PRIMARY KEY,
+      skill_name TEXT,
+      workflow_id TEXT,
+      status TEXT,
+      created_at TEXT NOT NULL DEFAULT (datetime('now')),
+      data TEXT NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_executions_workflow ON executions(workflow_id);
+    CREATE INDEX IF NOT EXISTS idx_executions_created ON executions(created_at DESC);
+
+    -- ==================== routines ====================
+    CREATE TABLE IF NOT EXISTS routines (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL,
+      data TEXT NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_routines_name ON routines(name);
+
+    -- ==================== workflows ====================
+    CREATE TABLE IF NOT EXISTS workflows (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL,
+      data TEXT NOT NULL
+    );
+
+    CREATE INDEX IF NOT EXISTS idx_workflows_name ON workflows(name);
+
+    -- ==================== schema_version ====================
+    CREATE TABLE IF NOT EXISTS schema_version (
+      version INTEGER PRIMARY KEY,
+      applied_at TEXT NOT NULL DEFAULT (datetime('now'))
+    );
+  `)
+}
+
+/**
+ * Run schema migrations for existing databases.
+ * Each migration checks schema_version to avoid re-running.
+ */
+function migrateSchema(db) {
+  const currentVersion = db.prepare(
+    'SELECT COALESCE(MAX(version), 0) as v FROM schema_version'
+  ).get().v
+
+  if (currentVersion < 1) {
+    // Migration 1: Recreate FTS tables with trigram tokenizer for Japanese support.
+    // The default unicode61 tokenizer doesn't tokenize CJK text correctly.
+    console.log('[DB] Migration 1: Switching FTS5 to trigram tokenizer...')
+
+    db.exec(`
+      -- Drop old FTS tables and triggers (may use unicode61 tokenizer)
+      DROP TRIGGER IF EXISTS memories_ai;
+      DROP TRIGGER IF EXISTS memories_ad;
+      DROP TRIGGER IF EXISTS memories_au;
+      DROP TABLE IF EXISTS memories_fts;
+
+      DROP TRIGGER IF EXISTS daily_logs_ai;
+      DROP TRIGGER IF EXISTS daily_logs_ad;
+      DROP TRIGGER IF EXISTS daily_logs_au;
+      DROP TABLE IF EXISTS daily_logs_fts;
+
+      -- Recreate with trigram tokenizer
+      CREATE VIRTUAL TABLE memories_fts USING fts5(
+        title,
+        content,
+        content=memories,
+        content_rowid=rowid,
+        tokenize='trigram'
+      );
+
+      CREATE TRIGGER memories_ai AFTER INSERT ON memories BEGIN
+        INSERT INTO memories_fts(rowid, title, content)
+          VALUES (new.rowid, new.title, new.content);
+      END;
+
+      CREATE TRIGGER memories_ad AFTER DELETE ON memories BEGIN
+        INSERT INTO memories_fts(memories_fts, rowid, title, content)
+          VALUES ('delete', old.rowid, old.title, old.content);
+      END;
+
+      CREATE TRIGGER memories_au AFTER UPDATE ON memories BEGIN
+        INSERT INTO memories_fts(memories_fts, rowid, title, content)
+          VALUES ('delete', old.rowid, old.title, old.content);
+        INSERT INTO memories_fts(rowid, title, content)
+          VALUES (new.rowid, new.title, new.content);
+      END;
+
+      CREATE VIRTUAL TABLE daily_logs_fts USING fts5(
+        content,
+        content=daily_logs,
+        content_rowid=rowid,
+        tokenize='trigram'
+      );
+
+      CREATE TRIGGER daily_logs_ai AFTER INSERT ON daily_logs BEGIN
+        INSERT INTO daily_logs_fts(rowid, content)
+          VALUES (new.rowid, new.content);
+      END;
+
+      CREATE TRIGGER daily_logs_ad AFTER DELETE ON daily_logs BEGIN
+        INSERT INTO daily_logs_fts(daily_logs_fts, rowid, content)
+          VALUES ('delete', old.rowid, old.content);
+      END;
+
+      CREATE TRIGGER daily_logs_au AFTER UPDATE ON daily_logs BEGIN
+        INSERT INTO daily_logs_fts(daily_logs_fts, rowid, content)
+          VALUES ('delete', old.rowid, old.content);
+        INSERT INTO daily_logs_fts(rowid, content)
+          VALUES (new.rowid, new.content);
+      END;
+
+      -- Rebuild FTS index from existing data
+      INSERT INTO memories_fts(memories_fts) VALUES ('rebuild');
+      INSERT INTO daily_logs_fts(daily_logs_fts) VALUES ('rebuild');
+
+      INSERT INTO schema_version (version) VALUES (1);
+    `)
+
+    console.log('[DB] Migration 1 complete: FTS5 trigram tokenizer applied')
+  }
+}
+
+/**
+ * Close the database connection.
+ * Call this during graceful shutdown to flush WAL.
+ */
+function closeDb() {
+  if (_db) {
+    _db.close()
+    _db = null
+    console.log('[DB] SQLite database closed')
+  }
+}
+
+module.exports = { getDb, closeDb }

package/core/lib/thread-watcher.js

@@ -10,7 +10,7 @@
  * 3. Rate limiting: max 1 LLM evaluation per thread per 5 minutes
  *
  * Flow per poll cycle:
- * 1. GET /api/minion/help-threads/open → list of open threads
+ * 1. GET /api/minion/threads/open → list of open threads
  * 2. For each thread with new activity:
  *    a. Check mentions → if mentioned, must evaluate
  *    b. Check read state → skip if no new messages
@@ -98,7 +98,7 @@ async function pollOnce() {
 
   polling = true
   try {
-    const data = await api.request('/help-threads/open')
+    const data = await api.request('/threads/open')
 
     if (!data.threads || data.threads.length === 0) {
       return
@@ -139,7 +139,7 @@ async function processThread(thread, myProjects, now) {
   // Fetch thread detail to get message count and check for new messages
   let detail
   try {
-    detail = await api.request(`/help-threads/${thread.id}`)
+    detail = await api.request(`/threads/${thread.id}`)
   } catch {
     return
   }
@@ -155,6 +155,13 @@ async function processThread(thread, myProjects, now) {
   // New messages detected
   const newMessages = messages.slice(state.lastMessageCount)
 
+  // Skip if all new messages are from self (avoid re-triggering on own posts)
+  const newFromOthers = newMessages.filter(m => m.sender_minion_id !== config.MINION_ID)
+  if (newFromOthers.length === 0) {
+    readState.set(thread.id, { ...state, lastMessageCount: messageCount })
+    return
+  }
+
   // Update read state (message count only — eval timestamp updated after LLM call)
   readState.set(thread.id, { ...state, lastMessageCount: messageCount })
 
@@ -187,16 +194,16 @@ async function evaluateWithLlm(threadSummary, threadDetail, allMessages, newMess
   const messageHistory = recentMessages
     .map(m => {
       const sender = m.sender_minion_id
-        ? (m.sender_minion_id === config.MINION_ID ? 'You' : `Minion(${m.sender_minion_id.slice(0, 8)})`)
-        : 'User'
+        ? (m.sender_minion_id === config.MINION_ID ? 'You' : (m.sender_name || `Minion(${m.sender_minion_id.slice(0, 8)})`))
+        : (m.sender_name || 'User')
       return `[${sender}] ${m.content}`
     })
     .join('\n')
 
   const threadType = threadDetail.thread_type || 'help'
-  const mentionNote = mentioned
-    ? '\n\nあなたはこのスレッドでメンションされています。必ず返信してください。'
-    : ''
+  const isRequester = threadDetail.requester_minion_id === config.MINION_ID
+  const mentions = threadDetail.mentions || []
+  const mentionsSummary = mentions.length > 0 ? mentions.join(', ') : 'なし（全員に向けた投稿）'
 
   // Extract optional context metadata
   const ctx = threadDetail.context || {}
@@ -205,13 +212,14 @@ async function evaluateWithLlm(threadSummary, threadDetail, allMessages, newMess
     ctx.attempted_resolution ? `試行済み: ${ctx.attempted_resolution}` : '',
   ].filter(Boolean).join('\n')
 
-  const prompt = `あなたはプロジェクト「${myProject.name}」のチームメンバー（ロール: ${myProject.role}）です。
+  const prompt = `あなたはプロジェクト「${myProject.name}」のチームメンバー（ロール: ${myProject.role}、ID: ${config.MINION_ID}）です。
 以下のスレッドに対して、あなたが返信すべきかどうかを判断し、返信する場合はその内容を生成してください。
 
 スレッドタイプ: ${threadType}
 タイトル: ${threadDetail.title}
-説明: ${threadDetail.description}
-${contextInfo}${mentionNote}
+起票者: ${isRequester ? 'あなた自身' : `他のミニオン(${threadDetail.requester_minion_id?.slice(0, 8)})`}
+メンション対象: ${mentionsSummary}
+${contextInfo}
 
 --- メッセージ履歴 ---
 ${messageHistory || '(メッセージなし)'}
@@ -225,10 +233,11 @@ ${messageHistory || '(メッセージなし)'}
 }
 
 判断基準:
+- 自分が起票したスレッドの場合、他のメンバーの回答を待つべき（追加情報がある場合を除く）
+- メンション対象が特定のロールやミニオンに限定されている場合、自分が対象でなければ静観する
 - 自分のロール（${myProject.role}）に関連する話題か
 - 自分が貢献できる知見や意見があるか
 - 既に十分な回答がある場合は重複を避ける
-- メンションされている場合は必ず返信する
 - 人間に聞くべき場合は @user メンションを含めて返信する`
 
   try {
@@ -251,7 +260,7 @@ ${messageHistory || '(メッセージなし)'}
         mentions.push('user')
       }
 
-      await api.request(`/help-threads/${threadSummary.id}/messages`, {
+      await api.request(`/threads/${threadSummary.id}/messages`, {
         method: 'POST',
         body: JSON.stringify({
           content: parsed.response,
@@ -281,7 +290,7 @@ async function fallbackMemoryMatch(thread) {
 
     if (!memData.memories || memData.memories.length === 0) return
 
-    const keywords = (thread.title + ' ' + thread.description)
+    const keywords = thread.title
       .toLowerCase()
       .split(/[\s,.\-_/]+/)
       .filter(w => w.length >= 3)
@@ -301,7 +310,7 @@ async function fallbackMemoryMatch(thread) {
       .map(m => `[${m.title}] ${m.content}`)
       .join('\n\n')
 
-    await api.request(`/help-threads/${thread.id}/messages`, {
+    await api.request(`/threads/${thread.id}/messages`, {
       method: 'POST',
       body: JSON.stringify({
         content: `関連するプロジェクトメモリーが見つかりました:\n\n${knowledgeSummary}`,

package/core/routes/daily-logs.js

@@ -1,11 +1,11 @@
 /**
  * Daily log endpoints
  *
- * Provides CRUD access to daily conversation summaries.
- * Logs are stored as markdown files in $DATA_DIR/daily-logs/YYYY-MM-DD.md.
+ * Provides CRUD + search for daily conversation summaries.
+ * Logs are stored in SQLite with FTS5 full-text search.
  *
  * Endpoints:
- *   GET    /api/daily-logs          - List all logs (date + size)
+ *   GET    /api/daily-logs          - List all logs (or search with ?search=keyword)
  *   POST   /api/daily-logs          - Create a new daily log
  *   GET    /api/daily-logs/:date    - Get a specific day's log
  *   PUT    /api/daily-logs/:date    - Update a daily log
@@ -21,14 +21,20 @@ const dailyLogStore = require('../stores/daily-log-store')
  */
 async function dailyLogRoutes(fastify) {
 
-  // GET /api/daily-logs - List all logs
+  // GET /api/daily-logs - List or search logs
   fastify.get('/api/daily-logs', async (request, reply) => {
     if (!verifyToken(request)) {
       reply.code(401)
       return { success: false, error: 'Unauthorized' }
     }
 
-    const logs = await dailyLogStore.listLogs()
+    const { search } = request.query || {}
+    if (search) {
+      const logs = dailyLogStore.searchLogs(search)
+      return { success: true, logs }
+    }
+
+    const logs = dailyLogStore.listLogs()
     return { success: true, logs }
   })
 
@@ -46,13 +52,13 @@ async function dailyLogRoutes(fastify) {
     }
 
     // Check if log already exists
-    const existing = await dailyLogStore.loadLog(date)
+    const existing = dailyLogStore.loadLog(date)
     if (existing !== null) {
       reply.code(409)
       return { success: false, error: 'Log already exists for this date. Use PUT to update.' }
     }
 
-    await dailyLogStore.saveLog(date, content)
+    dailyLogStore.saveLog(date, content)
     console.log(`[DailyLogs] Created log: ${date}`)
     return { success: true, log: { date, content } }
   })
@@ -65,7 +71,7 @@ async function dailyLogRoutes(fastify) {
     }
 
     const { date } = request.params
-    const content = await dailyLogStore.loadLog(date)
+    const content = dailyLogStore.loadLog(date)
     if (content === null) {
       reply.code(404)
       return { success: false, error: 'Log not found' }
@@ -89,13 +95,13 @@ async function dailyLogRoutes(fastify) {
     }
 
     // Check if log exists
-    const existing = await dailyLogStore.loadLog(date)
+    const existing = dailyLogStore.loadLog(date)
     if (existing === null) {
       reply.code(404)
       return { success: false, error: 'Log not found' }
     }
 
-    await dailyLogStore.saveLog(date, content)
+    dailyLogStore.saveLog(date, content)
     console.log(`[DailyLogs] Updated log: ${date}`)
     return { success: true, log: { date, content } }
   })
@@ -108,7 +114,7 @@ async function dailyLogRoutes(fastify) {
     }
 
     const { date } = request.params
-    const deleted = await dailyLogStore.deleteLog(date)
+    const deleted = dailyLogStore.deleteLog(date)
     if (!deleted) {
       reply.code(404)
       return { success: false, error: 'Log not found' }