xiaozuoassistant 0.2.37 → 0.2.39

package/dist/server/core/memories/manager.js

@@ -16,6 +16,25 @@ export class MemoryManager {
         return MemoryManager.instance;
     }
     // --- Layer 1: Short-term (Session) ---
+    getFeishuAppId(sessionId) {
+        if (sessionId.startsWith('feishu:')) {
+            const parts = sessionId.split(':');
+            if (parts.length >= 2) {
+                const botName = parts[1];
+                const feishuConfig = config.channels?.feishu;
+                if (Array.isArray(feishuConfig)) {
+                    const bot = feishuConfig.find(b => b.name === botName);
+                    if (bot)
+                        return bot.appId;
+                }
+                else if (feishuConfig) {
+                    if (botName === 'default')
+                        return feishuConfig.appId;
+                }
+            }
+        }
+        return undefined;
+    }
     async createSession(input) {
         return this.shortTerm.createSession(input);
     }
@@ -42,7 +61,8 @@ export class MemoryManager {
         // to avoid cluttering.
         if (message.content.length > 10) { // Simple filter
             const userId = config.userId || 'default';
-            this.vector.addMemory(message.content, 'recent', { sessionId, role: message.role, userId })
+            const appId = this.getFeishuAppId(sessionId);
+            this.vector.addMemory(message.content, 'recent', { sessionId, role: message.role, userId, appId })
                 .catch(err => console.error('Background vector add failed:', err));
         }
         // 3. Extract Facts (Structured) - This usually requires an LLM call to extract
@@ -74,9 +94,19 @@ export class MemoryManager {
         const history = await this.getHistory(sessionId);
         const recentMessages = history.slice(-10).map(m => `${m.role}: ${m.content}`).join('\n');
         // 2. Search Vector Memory (Recent & Long-term)
-        const vectorResults = await this.vector.search(query, undefined, 10);
-        const vectorFiltered = vectorResults.filter(r => (r.metadata?.userId || 'default') === uid).slice(0, 3);
-        const vectorContext = vectorFiltered.map(r => `[Memory]: ${r.text}`).join('\n');
+        // We search more broadly to ensure we find both User-specific and Bot-specific memories
+        const vectorResults = await this.vector.search(query, undefined, 20);
+        const botAppId = this.getFeishuAppId(sessionId);
+        // Filter results: Include memories belonging to the user OR the current bot
+        const vectorFiltered = vectorResults.filter(r => {
+            const isUserMemory = (r.metadata?.userId || 'default') === uid;
+            const isBotMemory = botAppId && r.metadata?.appId === botAppId;
+            return isUserMemory || isBotMemory;
+        }).slice(0, 5); // Take top 5 relevant chunks
+        const vectorContext = vectorFiltered.map(r => {
+            const source = (botAppId && r.metadata?.appId === botAppId) ? `[Bot Knowledge]` : `[User Memory]`;
+            return `${source}: ${r.text}`;
+        }).join('\n');
         // 3. Get User Profile (Structured)
         const profile = await this.structured.getUserProfile(uid);
         const profileContext = Object.entries(profile).map(([k, v]) => `[User Info] ${k}: ${v}`).join('\n');
@@ -135,6 +165,7 @@ ${recentMessages}
                     const content = chunk.map(m => `${m.role}: ${m.content}`).join('\n');
                     // 1. Memory Archiving (Project or General)
                     const projectIds = session.projectIds || (session.projectId ? [session.projectId] : []);
+                    const appId = this.getFeishuAppId(session.id);
                     if (projectIds.length > 0) {
                         // Project Context
                         const projectInfo = await brain.extractKeyInformation(content, 'project');
@@ -143,7 +174,8 @@ ${recentMessages}
                                 await this.vector.addMemory(projectInfo, 'project_archive', {
                                     sessionId: session.id,
                                     projectId: pid,
-                                    archivedAt: now
+                                    archivedAt: now,
+                                    appId
                                 });
                                 console.log(`[MemoryManager] Archived project info for Project ${pid} (Chunk ${i / CHUNK_SIZE + 1})`);
                             }
@@ -156,7 +188,8 @@ ${recentMessages}
                             await this.vector.addMemory(generalInfo, 'long_term', {
                                 sessionId: session.id,
                                 archivedAt: now,
-                                source: 'auto_archive'
+                                source: 'auto_archive',
+                                appId
                             });
                             console.log(`[MemoryManager] Archived general info for Session ${session.id} (Chunk ${i / CHUNK_SIZE + 1})`);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaozuoassistant",
-  "version": "0.2.37",
+  "version": "0.2.39",
   "description": "A local-first personal AI assistant with multi-channel support and enhanced memory.",
   "author": "mantle.lau",
   "license": "MIT",