@j0hanz/memory-mcp 1.0.0 → 1.0.1

package/dist/tools/progress.js

@@ -0,0 +1,129 @@
+const DEFAULT_PROGRESS_INTERVAL_MS = 250;
+function toProgressToken(value) {
+    if (typeof value === 'string' || typeof value === 'number') {
+        return value;
+    }
+    return undefined;
+}
+function toNotificationParams(progressToken, progress) {
+    const params = {
+        progressToken,
+        progress: progress.current,
+    };
+    if (progress.total !== undefined) {
+        params.total = progress.total;
+    }
+    if (progress.message !== undefined) {
+        params.message = progress.message;
+    }
+    return params;
+}
+function isFailedResult(result) {
+    if (result.isError) {
+        return true;
+    }
+    if (typeof result.structuredContent === 'object' &&
+        'ok' in result.structuredContent) {
+        return result.structuredContent.ok === false;
+    }
+    return false;
+}
+function defaultCompletionMessage(startMessage, result) {
+    return `${startMessage} • ${isFailedResult(result) ? 'failed' : 'completed'}`;
+}
+export async function notifyProgress(extra, progress) {
+    const progressToken = toProgressToken(extra._meta?.progressToken);
+    if (progressToken === undefined) {
+        return;
+    }
+    if (typeof extra.sendNotification !== 'function') {
+        return;
+    }
+    try {
+        await extra.sendNotification({
+            method: 'notifications/progress',
+            params: toNotificationParams(progressToken, progress),
+        });
+    }
+    catch {
+        // best-effort progress
+    }
+}
+export function createProgressReporter(extra, options = {}) {
+    const minIntervalMs = options.minIntervalMs ?? DEFAULT_PROGRESS_INTERVAL_MS;
+    let lastCurrent = 0;
+    let lastReportedAt = 0;
+    let isCompleted = false;
+    let notificationChain = Promise.resolve();
+    const reporter = ((progress) => {
+        if (isCompleted) {
+            return;
+        }
+        const monotonicCurrent = progress.current >= lastCurrent ? progress.current : lastCurrent;
+        const now = Date.now();
+        const shouldFlush = now - lastReportedAt >= minIntervalMs ||
+            (progress.total !== undefined && monotonicCurrent >= progress.total);
+        lastCurrent = monotonicCurrent;
+        if (!shouldFlush) {
+            return;
+        }
+        lastReportedAt = now;
+        isCompleted =
+            progress.total !== undefined && monotonicCurrent >= progress.total;
+        const payload = { current: monotonicCurrent };
+        if (progress.total !== undefined) {
+            payload.total = progress.total;
+        }
+        if (progress.message !== undefined) {
+            payload.message = progress.message;
+        }
+        notificationChain = notificationChain.then(() => notifyProgress(extra, payload));
+    });
+    reporter.flush = async () => {
+        await notificationChain;
+    };
+    return reporter;
+}
+export function progressWithMessage(reporter, getMessage) {
+    const wrapped = (({ current, total }) => {
+        const message = getMessage(total === undefined ? { current } : { current, total });
+        reporter({
+            current,
+            ...(total === undefined ? {} : { total }),
+            message,
+        });
+    });
+    wrapped.flush = () => reporter.flush();
+    return wrapped;
+}
+export function wrapToolHandler(handler, options) {
+    return async (args, extra) => {
+        const startMessage = options.progressMessage(args);
+        await notifyProgress(extra, {
+            current: 0,
+            total: 1,
+            message: startMessage,
+        });
+        let result;
+        try {
+            result = await handler(args, extra);
+        }
+        catch (error) {
+            await notifyProgress(extra, {
+                current: 1,
+                total: 1,
+                message: `${startMessage} • failed`,
+            });
+            throw error;
+        }
+        const completionMessage = options.completionMessage?.(args, result) ??
+            defaultCompletionMessage(startMessage, result);
+        await notifyProgress(extra, {
+            current: 1,
+            total: 1,
+            message: completionMessage,
+        });
+        return result;
+    };
+}
+//# sourceMappingURL=progress.js.map

package/dist/tools/progress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"progress.js","sourceRoot":"","sources":["../../src/tools/progress.ts"],"names":[],"mappings":"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"}

package/dist/tools/recall.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recall.d.ts","sourceRoot":"","sources":["../../src/tools/recall.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAMzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAqO9C,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,GAAG,IAAI,CA8DnE"}
+{"version":3,"file":"recall.d.ts","sourceRoot":"","sources":["../../src/tools/recall.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAUzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAmO9C,wBAAgB,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,GAAG,IAAI,CAgInE"}

package/dist/tools/recall.js

@@ -1,11 +1,20 @@
+import { McpError, } from '@modelcontextprotocol/sdk/types.js';
 import process from 'node:process';
-import { E_UNKNOWN, getErrorMessage } from '../lib/errors.js';
-import { decodeCursor, encodeCursor, splitPage } from '../lib/pagination.js';
-import { buildAndWhereClause, buildFilterClauses, sanitizeFtsQuery, } from '../lib/search.js';
+import { E_UNKNOWN, getErrorMessage, rethrowMcpError } from '../lib/errors.js';
+import { logToolEvent } from '../lib/mcp-utils.js';
+import { splitPage } from '../lib/pagination.js';
+import { buildSearchCursorScope, decodeSearchCursor, encodeSearchCursor, } from '../lib/search-cursor.js';
+import { loadRankedSearchRows, toMemoryFilters } from '../lib/search.js';
 import { createErrorResponse, createToolResponse, } from '../lib/tool-response.js';
 import { parseMemoryRow } from '../lib/types.js';
 import { RecallInputSchema } from '../schemas/inputs.js';
 import { RecallResultSchema } from '../schemas/outputs.js';
+import { createProgressReporter, notifyProgress, progressWithMessage, } from './progress.js';
+import { getToolResultPayload, isOkStructuredToolResult } from './result.js';
+function countPayloadArrayItems(payload, key) {
+    const value = payload[key];
+    return Array.isArray(value) ? value.length : 0;
+}
 function parseEnvInt(name, fallback, min, max) {
     const raw = process.env[name];
     if (raw == null)
@@ -18,42 +27,23 @@ function parseEnvInt(name, fallback, min, max) {
 const MAX_FRONTIER_SIZE = parseEnvInt('RECALL_MAX_FRONTIER_SIZE', 1000, 100, 50000);
 const MAX_EDGE_ROWS = parseEnvInt('RECALL_MAX_EDGE_ROWS', 5000, 100, 50000);
 const MAX_VISITED_NODES = parseEnvInt('RECALL_MAX_VISITED_NODES', 5000, 100, 50000);
-function toMemoryFilters(params) {
-    const filters = {};
-    if (params.min_importance != null) {
-        filters.min_importance = params.min_importance;
-    }
-    if (params.max_importance != null) {
-        filters.max_importance = params.max_importance;
-    }
-    if (params.memory_type != null) {
-        filters.memory_type = params.memory_type;
-    }
-    return filters;
-}
-function createPlaceholders(count) {
-    return new Array(count).fill('?').join(',');
-}
-function loadSeedRows(db, query, limit, offset, filters) {
-    const ftsQuery = sanitizeFtsQuery(query);
-    const filter = buildFilterClauses(filters);
-    const whereExtra = buildAndWhereClause(filter.clauses);
-    return db
-        .prepare(`SELECT m.*, memories_fts.rank AS rank FROM memories m
-       JOIN memories_fts ON memories_fts.rowid = m.rowid
-       WHERE memories_fts MATCH ?${whereExtra}
-       ORDER BY memories_fts.rank
-       LIMIT ? OFFSET ?`)
-        .all(ftsQuery, ...filter.params, limit + 1, offset);
-}
+const EDGE_QUERY_SQL = `SELECT from_hash, to_hash, relation_type FROM relationships
+         WHERE from_hash IN (SELECT value FROM json_each(?))
+            OR to_hash   IN (SELECT value FROM json_each(?))
+         LIMIT ?`;
+const MEMORIES_BY_HASH_SQL = 'SELECT * FROM memories WHERE hash IN (SELECT value FROM json_each(?))';
 function traverseGraph(db, seeds, depth, signal, onHop) {
-    const visited = new Set(seeds.map((r) => r.hash));
+    const visited = new Set();
+    const frontier = [];
+    for (const seed of seeds) {
+        visited.add(seed.hash);
+        frontier.push(seed.hash);
+    }
     const edges = [];
     const seenEdges = new Set();
-    let frontier = seeds.map((r) => r.hash);
     let depthReached = 0;
     let aborted = false;
-    for (let hop = 0; hop < depth && frontier.length > 0; hop++) {
+    for (let hop = 0; hop < depth && frontier.length > 0; hop += 1) {
         if (signal?.aborted) {
             aborted = true;
             break;
@@ -61,7 +51,7 @@ function traverseGraph(db, seeds, depth, signal, onHop) {
         depthReached = hop + 1;
         onHop?.(hop, depth);
         if (frontier.length > MAX_FRONTIER_SIZE) {
-            frontier = frontier.slice(0, MAX_FRONTIER_SIZE);
+            frontier.length = MAX_FRONTIER_SIZE;
             aborted = true;
         }
         const remainingEdgeBudget = MAX_EDGE_ROWS - edges.length;
@@ -70,20 +60,22 @@ function traverseGraph(db, seeds, depth, signal, onHop) {
             aborted = true;
             break;
         }
-        const placeholders = createPlaceholders(frontier.length);
+        const frontierJson = JSON.stringify(frontier);
         const edgeRows = db
-            .prepare(`SELECT from_hash, to_hash, relation_type FROM relationships
-         WHERE from_hash IN (${placeholders}) OR to_hash IN (${placeholders})
-         LIMIT ?`)
-            .all(...frontier, ...frontier, remainingEdgeBudget + 1);
-        const rows = edgeRows.length > remainingEdgeBudget
-            ? edgeRows.slice(0, remainingEdgeBudget)
-            : edgeRows;
+            .prepareOnce(EDGE_QUERY_SQL)
+            .all(frontierJson, frontierJson, remainingEdgeBudget + 1);
+        const rowsToProcess = edgeRows.length > remainingEdgeBudget
+            ? remainingEdgeBudget
+            : edgeRows.length;
         if (edgeRows.length > remainingEdgeBudget) {
             aborted = true;
         }
         const nextHashes = [];
-        for (const edge of rows) {
+        for (let i = 0; i < rowsToProcess; i += 1) {
+            const edge = edgeRows[i];
+            if (edge === undefined) {
+                break;
+            }
             const edgeKey = `${edge.from_hash}|${edge.to_hash}|${edge.relation_type}`;
             if (!seenEdges.has(edgeKey)) {
                 seenEdges.add(edgeKey);
@@ -93,19 +85,30 @@ function traverseGraph(db, seeds, depth, signal, onHop) {
                     relation_type: edge.relation_type,
                 });
             }
-            for (const h of [edge.from_hash, edge.to_hash]) {
-                if (!visited.has(h)) {
-                    if (visited.size >= MAX_VISITED_NODES) {
-                        aborted = true;
-                        break;
-                    }
-                    visited.add(h);
-                    if (nextHashes.length < MAX_FRONTIER_SIZE) {
-                        nextHashes.push(h);
-                    }
-                    else {
-                        aborted = true;
-                    }
+            if (!visited.has(edge.from_hash)) {
+                if (visited.size >= MAX_VISITED_NODES) {
+                    aborted = true;
+                    break;
+                }
+                visited.add(edge.from_hash);
+                if (nextHashes.length < MAX_FRONTIER_SIZE) {
+                    nextHashes.push(edge.from_hash);
+                }
+                else {
+                    aborted = true;
+                }
+            }
+            if (!visited.has(edge.to_hash)) {
+                if (visited.size >= MAX_VISITED_NODES) {
+                    aborted = true;
+                    break;
+                }
+                visited.add(edge.to_hash);
+                if (nextHashes.length < MAX_FRONTIER_SIZE) {
+                    nextHashes.push(edge.to_hash);
+                }
+                else {
+                    aborted = true;
                 }
             }
             if (aborted &&
@@ -113,7 +116,8 @@ function traverseGraph(db, seeds, depth, signal, onHop) {
                 break;
             }
         }
-        frontier = nextHashes;
+        frontier.length = 0;
+        frontier.push(...nextHashes);
     }
     return { edges, visited, depthReached, aborted };
 }
@@ -121,46 +125,60 @@ function loadMemoriesByHashes(db, hashes) {
     if (hashes.length === 0) {
         return [];
     }
-    const placeholders = createPlaceholders(hashes.length);
-    const memRows = db
-        .prepare(`SELECT * FROM memories WHERE hash IN (${placeholders})`)
-        .all(...hashes);
-    return memRows.map(parseMemoryRow);
+    return db
+        .prepareOnce(MEMORIES_BY_HASH_SQL)
+        .all(JSON.stringify(hashes));
 }
-function createHopNotifier(progressToken, sendNotification) {
-    if (progressToken == null) {
-        return undefined;
+function formatRecallCompletionMessage(query, result) {
+    const failedMessage = `⊙ recall: ${query} • failed`;
+    if (result.isError) {
+        return failedMessage;
     }
-    return (hop, total) => {
-        void sendNotification({
-            method: 'notifications/progress',
-            params: { progressToken, progress: hop + 1, total },
-        }).catch(() => { });
-    };
-}
-function toProgressToken(value) {
-    if (typeof value === 'string' || typeof value === 'number') {
-        return value;
+    if (!isOkStructuredToolResult(result)) {
+        return failedMessage;
+    }
+    const payload = getToolResultPayload(result);
+    if (!payload) {
+        return `⊙ recall: ${query} • completed`;
     }
-    return undefined;
+    const memoriesCount = countPayloadArrayItems(payload, 'memories');
+    const edgesCount = countPayloadArrayItems(payload, 'graph');
+    const aborted = 'aborted' in payload && payload.aborted === true;
+    return `⊙ recall: ${query} • ${memoriesCount} memories, ${edgesCount} edges${aborted ? ' [aborted]' : ''}`;
 }
 export function registerRecall(server, db) {
     server.registerTool('recall', {
         title: 'Recall (BFS Graph Traversal)',
-        description: 'Search memories by full-text query, then traverse the relationship graph up to `depth` hops via BFS. Returns all discovered memories and the edges connecting them.',
+        description: 'Search memories by full-text query, then traverse the relationship graph up to `depth` hops via BFS. Returns all discovered memories and the edges connecting them. Query terms are matched individually; FTS5 phrase operators and negation are not supported.',
         inputSchema: RecallInputSchema,
         outputSchema: RecallResultSchema,
         annotations: { readOnlyHint: true, openWorldHint: false },
-    }, (params, { signal, _meta, sendNotification }) => {
+    }, async (params, extra) => {
+        const { depth, limit, cursor } = params;
+        const filters = toMemoryFilters(params);
+        const scope = buildSearchCursorScope(params.query, filters);
+        const contextLabel = `⊙ recall: ${params.query} [depth ${depth}]`;
+        const completionCurrent = depth + 1;
+        await notifyProgress(extra, {
+            current: 0,
+            total: completionCurrent,
+            message: contextLabel,
+        });
+        const hopReporter = progressWithMessage(createProgressReporter(extra), ({ current, total }) => `⊙ recall: ${params.query} [hop ${current}/${Math.max((total ?? current) - 1, current)}]`);
+        const onHop = (hop) => {
+            hopReporter({ current: hop + 1, total: completionCurrent });
+        };
+        let result;
+        let thrownError;
         try {
-            const { depth, limit, cursor } = params;
-            const offset = cursor ? decodeCursor(cursor) : 0;
-            const onHop = createHopNotifier(toProgressToken(_meta?.progressToken), sendNotification);
+            const decodedCursor = cursor
+                ? decodeSearchCursor(cursor, scope)
+                : undefined;
             // Step 1: FTS seed search
-            const seedRows = loadSeedRows(db, params.query, limit, offset, toMemoryFilters(params));
+            const seedRows = loadRankedSearchRows(db, params.query, limit, decodedCursor, filters);
             const { page: pageSeeds, hasMore } = splitPage(seedRows, limit);
             // Step 2: BFS traversal up to `depth` hops
-            const traversal = traverseGraph(db, pageSeeds, depth, signal, onHop);
+            const traversal = traverseGraph(db, pageSeeds, depth, extra.signal, onHop);
             // Step 3: Load all discovered memory rows
             const allHashes = Array.from(traversal.visited);
             const seedRelevance = new Map();
@@ -168,25 +186,59 @@ export function registerRecall(server, db) {
                 if (seed.rank != null)
                     seedRelevance.set(seed.hash, -seed.rank);
             }
-            const memories = loadMemoriesByHashes(db, allHashes).map((m) => {
-                const rel = seedRelevance.get(m.hash);
-                return rel != null ? { ...m, relevance: rel } : m;
+            const memoryRows = loadMemoriesByHashes(db, allHashes);
+            const memories = memoryRows.map((row) => {
+                const memory = parseMemoryRow(row);
+                const rel = seedRelevance.get(memory.hash);
+                if (rel != null) {
+                    memory.relevance = rel;
+                }
+                return memory;
             });
-            const nextCursor = hasMore ? encodeCursor(offset + limit) : undefined;
-            return createToolResponse({
-                ok: true,
-                result: {
-                    memories,
-                    graph: traversal.edges,
-                    depth_reached: traversal.depthReached,
-                    ...(traversal.aborted ? { aborted: true } : {}),
-                    ...(nextCursor ? { nextCursor } : {}),
-                },
+            let nextCursor;
+            if (hasMore && pageSeeds.length > 0) {
+                const lastSeed = pageSeeds[pageSeeds.length - 1];
+                if (lastSeed !== undefined) {
+                    const rank = lastSeed.rank ?? 0;
+                    nextCursor = encodeSearchCursor(scope, rank, lastSeed.hash);
+                }
+            }
+            await logToolEvent(server, 'recall', {
+                depth,
+                depth_reached: traversal.depthReached,
+                seed_count: pageSeeds.length,
+                visited_nodes: traversal.visited.size,
+                edge_count: traversal.edges.length,
+                aborted: traversal.aborted,
+            });
+            result = createToolResponse({
+                memories,
+                graph: traversal.edges,
+                depth_reached: traversal.depthReached,
+                ...(traversal.aborted ? { aborted: true } : {}),
+                ...(nextCursor ? { nextCursor } : {}),
             });
         }
         catch (err) {
-            return createErrorResponse(E_UNKNOWN, getErrorMessage(err));
+            if (err instanceof McpError) {
+                thrownError = err;
+            }
+            else {
+                rethrowMcpError(err);
+                result = createErrorResponse(E_UNKNOWN, getErrorMessage(err));
+            }
+        }
+        await hopReporter.flush();
+        const completionResult = result ?? createErrorResponse(E_UNKNOWN, getErrorMessage(thrownError));
+        await notifyProgress(extra, {
+            current: completionCurrent,
+            total: completionCurrent,
+            message: formatRecallCompletionMessage(params.query, completionResult),
+        });
+        if (thrownError) {
+            throw thrownError;
         }
+        return completionResult;
     });
 }
 //# sourceMappingURL=recall.js.map

package/dist/tools/recall.js.map

@@ -1 +1 @@
-{"version":3,"file":"recall.js","sourceRoot":"","sources":["../../src/tools/recall.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"recall.js","sourceRoot":"","sources":["../../src/tools/recall.ts"],"names":[],"mappings":"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"}

package/dist/tools/result.d.ts

@@ -0,0 +1,5 @@
+import type { CallToolResult } from '@modelcontextprotocol/sdk/types.js';
+export type ToolResultPayload = Record<string, unknown>;
+export declare function isOkStructuredToolResult(result: CallToolResult): boolean;
+export declare function getToolResultPayload(result: CallToolResult): ToolResultPayload | undefined;
+//# sourceMappingURL=result.d.ts.map

package/dist/tools/result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../src/tools/result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEzE,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAMxD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAExE;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,cAAc,GACrB,iBAAiB,GAAG,SAAS,CAO/B"}

package/dist/tools/result.js

@@ -0,0 +1,14 @@
+function isRecord(value) {
+    return typeof value === 'object' && value !== null;
+}
+export function isOkStructuredToolResult(result) {
+    return result.isError !== true && isRecord(result.structuredContent);
+}
+export function getToolResultPayload(result) {
+    const { structuredContent } = result;
+    if (result.isError === true || !isRecord(structuredContent)) {
+        return undefined;
+    }
+    return structuredContent;
+}
+//# sourceMappingURL=result.js.map

package/dist/tools/result.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"result.js","sourceRoot":"","sources":["../../src/tools/result.ts"],"names":[],"mappings":"AAIA,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAAsB;IAC7D,OAAO,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,MAAsB;IAEtB,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAAC;IACrC,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;QAC5D,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}

package/dist/tools/retrieve-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"retrieve-context.d.ts","sourceRoot":"","sources":["../../src/tools/retrieve-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAIzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAiD9C,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,GAAG,IAAI,CAkD5E"}
+{"version":3,"file":"retrieve-context.d.ts","sourceRoot":"","sources":["../../src/tools/retrieve-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAMzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAkH9C,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,GAAG,IAAI,CAsG5E"}