@bsbofmusic/memos-memu-local-memory-tools-for-agent 1.2.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsbofmusic/memos-memu-local-memory-tools-for-agent",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "MCP server — one-shot install + query for memos (PostgreSQL) and memuK (SQLite) local memory. Designed for OpenClaw agents.",
   "main": "src/index.js",
   "type": "module",

package/src/index.js

@@ -9,6 +9,7 @@ import {
 import { install_memory_system } from './tools/install.js';
 import { memos_query } from './tools/memos.js';
 import { memuk_search } from './tools/memuk.js';
+import { memos_memuk_query } from './tools/memos_memuk.js';
 import { verify_memory_system } from './tools/verify.js';
 
 const SERVER_NAME = 'memos-memu-local-memory-tools-for-agent';
@@ -83,6 +84,28 @@ export const tools = [
       required: ['query'],
     },
   },
+  {
+    name: 'memos_memuk_query',
+    description:
+      'Query BOTH memos PostgreSQL AND memuK SQLite at the SAME TIME, combine and deduplicate results. ' +
+      'Use for: fast parallel recall of both raw quotes AND topic summaries. ' +
+      'Returns combined results sorted by time (newest first), with source tagged [memos]/[memuK].',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        query: {
+          type: 'string',
+          description: 'Keywords to search in both memo content AND memuK summaries',
+        },
+        limit: {
+          type: 'number',
+          description: 'Max results to return PER SOURCE (default 10, max 20 each)',
+          default: 10,
+        },
+      },
+      required: ['query'],
+    },
+  },
 ];
 
 const server = new Server(
@@ -107,6 +130,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         return await memos_query(args);
       case 'memuk_search':
         return await memuk_search(args);
+      case 'memos_memuk_query':
+        return await memos_memuk_query(args);
       default:
         return {
           content: [{ type: 'text', text: `Unknown tool: ${name}` }],

package/src/tools/memos_memuk.js

@@ -0,0 +1,116 @@
+import { detectEnv, psql, parsePsqlJson, sqlite, parseSqlite } from '../shared/db.js';
+
+export async function memos_memuk_query({ query, limit = 10 }) {
+  if (!query || typeof query !== 'string') {
+    return {
+      content: [{ type: 'text', text: '❌ memos_memuk_query requires a non-empty "query" string.' }],
+      isError: true,
+    };
+  }
+
+  const safe = s => s.replace(/'/g, "''");
+  const lim = Math.min(parseInt(limit) || 10, 20);
+
+  // 同时调两个查询，并行执行
+  const [memosResult, memuKResult] = await Promise.all([
+    (async () => {
+      const sql = `
+SELECT jsonb_agg(q ORDER BY created_ts DESC)
+FROM (
+  SELECT
+    id,
+    substr(content, 1, 500) AS content,
+    created_ts,
+    visibility
+  FROM memo
+  WHERE content ILIKE '%${safe(query)}%'
+  ORDER BY created_ts DESC
+  LIMIT ${lim}
+) q;`.trim();
+      try {
+        const raw = psql(sql);
+        const rows = parsePsqlJson(raw);
+        return { rows: Array.isArray(rows) ? rows.slice(0, lim) : [] };
+      } catch (err) {
+        return { rows: [], error: err.message };
+      }
+    })(),
+    (async () => {
+      const sql = `
+SELECT json_group_array(json_object(
+  'id', id,
+  'summary', substr(summary, 1, 500),
+  'memory_type', memory_type,
+  'happened_at', happened_at
+))
+FROM (
+  SELECT id, summary, memory_type, happened_at
+  FROM memu_memory_items
+  WHERE summary LIKE '%${safe(query)}%'
+  ORDER BY happened_at DESC
+  LIMIT ${lim}
+) q;`.trim();
+      try {
+        const raw = sqlite(sql);
+        const rows = parseSqlite(raw);
+        return { rows: Array.isArray(rows) ? rows.slice(0, lim) : [] };
+      } catch (err) {
+        return { rows: [], error: err.message };
+      }
+    })()
+  ]);
+
+  // 合并结果，去重
+  const seenIds = new Set();
+  const combined = [];
+  for (const r of memosResult.rows) {
+    const id = `memos:${r.id}`;
+    if (!seenIds.has(id)) {
+      seenIds.add(id);
+      combined.push({ ...r, source: 'memos' });
+    }
+  }
+  for (const r of memuKResult.rows) {
+    const id = `memuk:${r.id}`;
+    if (!seenIds.has(id)) {
+      seenIds.add(id);
+      combined.push({ ...r, source: 'memuK' });
+    }
+  }
+
+  // 按时间倒序排列
+  combined.sort((a, b) => {
+    const ta = a.created_ts || a.happened_at || 0;
+    const tb = b.created_ts || b.happened_at || 0;
+    return tb - ta;
+  });
+
+  if (!combined.length) {
+    return {
+      content: [{ type: 'text', text: `✅ memos_memuk_query "${query}" returned 0 results from both sources.` }],
+    };
+  }
+
+  const lines = combined.map((r, i) => {
+    let ts = 'unknown';
+    try {
+      const ms = typeof (r.created_ts || r.happened_at) === 'number'
+        ? (r.created_ts || r.happened_at)
+        : parseInt(String(r.created_ts || r.happened_at));
+      if (ms > 1e12) {
+        ts = new Date(ms).toLocaleString('zh-CN', { timeZone: 'Asia/Shanghai' });
+      } else if (ms > 1e9) {
+        ts = new Date(ms * 1000).toLocaleString('zh-CN', { timeZone: 'Asia/Shanghai' });
+      }
+    } catch {}
+    const sourceTag = r.source === 'memos' ? '[memos]' : '[memuK]';
+    return `─── ${i + 1}. ${sourceTag} [id:${r.id}] ${ts} ───\n${r.content || r.summary || ''}`;
+  });
+
+  return {
+    content: [{
+      type: 'text',
+      text: `📋 Combined memos + memuK results for "${query}" (${combined.length}):\n\n${lines.join('\n\n')}`,
+    }],
+  };
+}