@hanhnd/agent-kit 1.0.38 → 1.0.40

package/dist/mcp/memory.js

@@ -1,29 +1,33 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { z } from 'zod';
-import { Embedder } from '../services/memory/embedder.js';
-import { MemoryIndexer } from '../services/memory/indexer.js';
-import { MemoryStore } from '../services/memory/store.js';
+import { createMemorySubsystem, } from '../services/memory/subsystem.js';
 import { SOURCE_TYPES } from '../services/memory/types.js';
 import { initializeConversationDigestModel } from '../services/digest/processor.js';
 import { DEFAULT_DIGEST_MODEL_ID } from '../services/digest/constants.js';
 import { formatError, mcpJson, mcpText } from '../utils/utils.js';
-import { loadGlobalSettings, resolveConversationDigestConfig, resolveMemoryConfig, } from '../core/config/index.js';
+import { loadGlobalSettings, resolveConversationDigestConfig } from '../core/config/index.js';
 /**
- * Registers tool handlers onto an already-constructed indexer/store pair.
+ * Registers tool handlers against the current memory subsystem state.
  */
-function registerMemoryToolHandlers(server, indexer, store, config, workspaceRoot = process.cwd()) {
+function registerMemoryToolHandlers(server, subsystem, workspaceRoot = process.cwd()) {
+    const { config } = subsystem;
     server.tool('kit_memory_search', 'Search persistent memory for factual or semantic matches (decisions, concepts, entities). Extract concise keywords only, removing stopwords and filler words from the user request before querying. Use kit_memory_recent for temporal or recency questions.', {
         query: z.string().min(1).describe('Keyword-only search query with stopwords removed'),
         top_k: z.number().int().positive().optional().describe('Number of results to return'),
     }, async ({ query, top_k }) => {
         try {
+            if (!subsystem.indexer || !subsystem.store) {
+                return mcpText(formatInitializationFailure(subsystem));
+            }
+            const { indexer, store } = subsystem;
             const results = await indexer.search(query, top_k ?? config.topK);
+            const lifecycleNote = formatLifecycleNote(subsystem);
             const degradedNote = !store.vecAvailable
                 ? '⚠️ Vector search unavailable — showing keyword-only results.\n\n'
                 : '';
             if (results.length === 0) {
-                return mcpText(`${degradedNote}No memories found for query: "${query}"`);
+                return mcpText(`${lifecycleNote}${degradedNote}No memories found for query: "${query}"`);
             }
             const formatted = results
                 .map((r) => {
@@ -34,7 +38,7 @@ function registerMemoryToolHandlers(server, indexer, store, config, workspaceRoo
                 return `### ${displaySource} (score: ${r.score.toFixed(3)})\n${content}`;
             })
                 .join('\n\n---\n\n');
-            return mcpText(`${degradedNote}${formatted}`);
+            return mcpText(`${lifecycleNote}${degradedNote}${formatted}`);
         }
         catch (err) {
             return mcpText(`kit_memory_search failed: ${formatError(err)}`);
@@ -45,13 +49,17 @@ function registerMemoryToolHandlers(server, indexer, store, config, workspaceRoo
         source_type: z.enum(SOURCE_TYPES).optional().describe('Optional source type filter'),
     }, async ({ n, source_type }) => {
         try {
+            if (!subsystem.store) {
+                return mcpText(formatInitializationFailure(subsystem));
+            }
+            const store = subsystem.store;
             const rows = store.getRecentSources({ limit: n ?? 5, sourceType: source_type });
             if (rows.length === 0)
                 return mcpText('No recent sources found.');
             const blocks = [];
             for (const row of rows) {
                 try {
-                    const content = fs.readFileSync(path.join(config.wikiDir, row.source), 'utf8');
+                    const content = await fs.promises.readFile(path.join(config.wikiDir, row.source), 'utf8');
                     const displaySource = row.source.replace(/^compiled\//, '');
                     blocks.push(`### ${displaySource}\n${content}`);
                 }
@@ -71,6 +79,13 @@ function registerMemoryToolHandlers(server, indexer, store, config, workspaceRoo
         content: z.string().min(1).describe('Content to save to memory'),
     }, async ({ content }) => {
         try {
+            if (!subsystem.indexer) {
+                return mcpJson({
+                    saved: false,
+                    error: formatInitializationFailure(subsystem),
+                });
+            }
+            const indexer = subsystem.indexer;
             await indexer.save(content);
             return mcpJson({
                 saved: true,
@@ -109,22 +124,31 @@ function registerMemoryToolHandlers(server, indexer, store, config, workspaceRoo
         }
     });
 }
+function formatLifecycleNote(subsystem) {
+    if (subsystem.status.state === 'warming' || subsystem.status.state === 'initializing') {
+        return '⚠️ Memory index is warming — results may be stale until startup indexing completes.\n\n';
+    }
+    if (subsystem.status.state === 'degraded') {
+        return `⚠️ Memory index is degraded${subsystem.status.error ? `: ${subsystem.status.error}` : ''}.\n\n`;
+    }
+    return '';
+}
+function formatInitializationFailure(subsystem) {
+    const detail = subsystem.status.error ? `: ${subsystem.status.error}` : '';
+    return `Memory initialization failed${detail}`;
+}
 /**
  * Initializes the memory subsystem and registers all memory tools.
- * Returns the MemoryIndexer so the caller can fire startupIndex() after server.connect().
+ * Returns the MemorySubsystem so the caller can fire startWarmup() after server.connect().
  * Returns null when memory is disabled (settings.memory.enabled !== true).
  */
 export function registerMemoryTools(server, workspaceRoot, overrides) {
     const settings = overrides?.settings ?? loadGlobalSettings();
     if (settings.memory?.enabled !== true)
         return null;
-    const config = overrides?.config ?? resolveMemoryConfig(settings, workspaceRoot);
-    const store = overrides?.store ?? new MemoryStore(path.join(config.wikiDir, 'index.db'), config);
-    const indexer = overrides?.indexer ??
-        (() => {
-            const embedder = new Embedder(config.embeddingModel);
-            return new MemoryIndexer(store, embedder, config);
-        })();
-    registerMemoryToolHandlers(server, indexer, store, config, workspaceRoot);
-    return indexer;
+    const subsystem = createMemorySubsystem(workspaceRoot, { ...overrides, settings });
+    if (!subsystem)
+        return null;
+    registerMemoryToolHandlers(server, subsystem, workspaceRoot);
+    return subsystem;
 }