xiaozuoassistant 0.1.69 → 0.1.71

package/dist/server/core/memories/short-term.js

@@ -14,8 +14,13 @@ function normalizeWorkspace(input) {
 }
 export class ShortTermMemory {
     constructor() {
-        this.metaCache = new Map();
+        this.instanceId = Math.random().toString(36).substring(7);
+        // 主存：所有 Session Meta 数据
+        this.sessions = new Map();
         this.initPromise = null;
+        // 持久化队列，确保串行写入 index.json
+        this.saveQueue = Promise.resolve();
+        console.log(`[ShortTermMemory] Instance created: ${this.instanceId}`);
         fs.ensureDirSync(SESSIONS_DIR);
     }
     static getInstance() {
@@ -31,18 +36,61 @@ export class ShortTermMemory {
         await this.initPromise;
     }
     async init() {
-        fs.ensureDirSync(SESSIONS_DIR);
-        const indexExists = await fs.pathExists(INDEX_FILE);
-        if (indexExists) {
-            await this.warmMetaCache();
-            return;
+        try {
+            await fs.ensureDir(SESSIONS_DIR);
+            const indexExists = await fs.pathExists(INDEX_FILE);
+            if (indexExists) {
+                await this.loadSessionsFromDisk();
+            }
+            else {
+                await this.migrateLegacyIfNeeded();
+                // 迁移后再次尝试加载，如果还没有则初始化为空
+                if (await fs.pathExists(INDEX_FILE)) {
+                    await this.loadSessionsFromDisk();
+                }
+                else {
+                    this.sessions.clear();
+                    await this.persistIndex();
+                }
+            }
+            console.log(`[ShortTermMemory] Initialized with ${this.sessions.size} sessions.`);
+        }
+        catch (e) {
+            console.error('[ShortTermMemory] Initialization failed:', e);
+            // 即使失败，sessions 也是空的 Map，不会崩溃，但数据可能丢失
+        }
+    }
+    async loadSessionsFromDisk() {
+        try {
+            const data = await fs.readJson(INDEX_FILE);
+            this.sessions.clear();
+            if (Array.isArray(data)) {
+                for (const meta of data) {
+                    if (meta && typeof meta.id === 'string') {
+                        this.sessions.set(meta.id, meta);
+                    }
+                }
+            }
         }
-        await this.migrateLegacyIfNeeded();
-        const existsAfter = await fs.pathExists(INDEX_FILE);
-        if (!existsAfter) {
-            await fs.writeJson(INDEX_FILE, [], { spaces: 2 });
+        catch (e) {
+            console.error('[ShortTermMemory] Failed to load index.json:', e);
+            // 此时保持 sessions 为空或之前的状态
         }
-        await this.warmMetaCache();
+    }
+    async persistIndex() {
+        // 将当前所有 sessions 转为数组并排序
+        const metas = Array.from(this.sessions.values());
+        metas.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
+        // 加入写入队列
+        this.saveQueue = this.saveQueue.then(async () => {
+            try {
+                await fs.writeJson(INDEX_FILE, metas, { spaces: 2 });
+            }
+            catch (e) {
+                console.error('[ShortTermMemory] Failed to persist index.json:', e);
+            }
+        });
+        return this.saveQueue;
     }
     getSessionDir(sessionId) {
         return path.join(SESSIONS_DIR, sessionId);
@@ -56,34 +104,12 @@ export class ShortTermMemory {
     getRunsFile(sessionId) {
         return path.join(this.getSessionDir(sessionId), 'runs.json');
     }
-    async loadIndex() {
-        try {
-            const data = await fs.readJson(INDEX_FILE);
-            if (Array.isArray(data))
-                return data;
-            return [];
-        }
-        catch {
-            return [];
-        }
-    }
-    async saveIndex(metas) {
-        await fs.writeJson(INDEX_FILE, metas, { spaces: 2 });
-    }
-    async warmMetaCache() {
-        const metas = await this.loadIndex();
-        this.metaCache.clear();
-        for (const meta of metas) {
-            if (meta && typeof meta.id === 'string') {
-                this.metaCache.set(meta.id, meta);
-            }
-        }
-    }
     async migrateLegacyIfNeeded() {
         const files = await fs.readdir(SESSIONS_DIR);
         const legacyFiles = files.filter(f => f.endsWith('.json') && f !== 'index.json');
         if (legacyFiles.length === 0)
             return;
+        console.log('[ShortTermMemory] Migrating legacy sessions...');
         const metas = [];
         for (const file of legacyFiles) {
             const filePath = path.join(SESSIONS_DIR, file);
@@ -113,12 +139,16 @@ export class ShortTermMemory {
         }
         if (metas.length > 0) {
             metas.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
-            await fs.writeJson(INDEX_FILE, metas, { spaces: 2 });
+            for (const m of metas) {
+                this.sessions.set(m.id, m);
+            }
+            await this.persistIndex();
         }
     }
     async createSession(input) {
         await this.ensureReady();
         const id = uuidv4();
+        console.log(`[ShortTermMemory:${this.instanceId}] Creating session: ${id}`);
         const now = Date.now();
         const meta = {
             id,
@@ -136,35 +166,40 @@ export class ShortTermMemory {
         const sessionDir = this.getSessionDir(id);
         await fs.ensureDir(sessionDir);
         await fs.writeJson(this.getMessagesFile(id), [], { spaces: 2 });
-        const metas = await this.loadIndex();
-        metas.unshift(meta);
-        await this.saveIndex(metas);
-        this.metaCache.set(id, meta);
+        // 更新内存
+        this.sessions.set(id, meta);
+        // 异步持久化
+        await this.persistIndex();
+        console.log(`[ShortTermMemory] Session created: ${id}`);
         return { meta, messages: [] };
     }
     async listSessions() {
         await this.ensureReady();
-        const metas = await this.loadIndex();
+        const metas = Array.from(this.sessions.values());
         metas.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
         return metas;
     }
     async getSessionMeta(id) {
         await this.ensureReady();
-        if (this.metaCache.has(id))
-            return this.metaCache.get(id);
-        const metas = await this.loadIndex();
-        const found = metas.find(m => m.id === id) || null;
-        if (found)
-            this.metaCache.set(id, found);
-        return found;
+        let meta = this.sessions.get(id) || null;
+        // 如果内存中没有，尝试重新加载磁盘（可能是其他进程创建的）
+        if (!meta) {
+            console.log(`[ShortTermMemory:${this.instanceId}] Cache miss for ${id}, reloading from disk...`);
+            await this.loadSessionsFromDisk();
+            meta = this.sessions.get(id) || null;
+        }
+        if (!meta) {
+            console.log(`[ShortTermMemory:${this.instanceId}] Session not found in memory after reload: ${id}. Total sessions: ${this.sessions.size}`);
+            // Log all available IDs for debugging
+            // console.log(`[ShortTermMemory:${this.instanceId}] Available IDs: ${Array.from(this.sessions.keys()).join(', ')}`);
+        }
+        return meta;
     }
     async updateSessionMeta(id, patch) {
         await this.ensureReady();
-        const metas = await this.loadIndex();
-        const idx = metas.findIndex(m => m.id === id);
-        if (idx < 0)
+        const current = this.sessions.get(id);
+        if (!current)
             throw new Error('Session not found');
-        const current = metas[idx];
         const next = {
             ...current,
             alias: patch.alias === null ? undefined : (patch.alias !== undefined ? (String(patch.alias).trim() || undefined) : current.alias),
@@ -192,24 +227,17 @@ export class ShortTermMemory {
                 next.context = val;
             }
         }
-        const metaForIndex = { ...next };
-        delete metaForIndex.context;
-        metas[idx] = metaForIndex;
-        metas.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
-        await this.saveIndex(metas);
-        this.metaCache.set(id, next);
+        // 更新内存并持久化
+        this.sessions.set(id, next);
+        await this.persistIndex();
         return next;
     }
     async persistSession(id) {
         await this.ensureReady();
-        const current = await this.getSessionMeta(id);
+        const current = this.sessions.get(id);
         if (!current)
             throw new Error('Session not found');
         const now = Date.now();
-        const metas = await this.loadIndex();
-        const idx = metas.findIndex(m => m.id === id);
-        if (idx < 0)
-            throw new Error('Session not found');
         let context = '';
         try {
             const ctxFile = this.getContextFile(id);
@@ -221,10 +249,8 @@ export class ShortTermMemory {
             // ignore
         }
         const next = { ...current, context: context || undefined, updatedAt: now, lastActiveAt: now };
-        metas[idx] = { ...metas[idx], updatedAt: now, lastActiveAt: now };
-        metas.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
-        await this.saveIndex(metas);
-        this.metaCache.set(id, next);
+        this.sessions.set(id, next);
+        await this.persistIndex();
         await fs.ensureDir(this.getSessionDir(id));
         await fs.ensureFile(this.getMessagesFile(id));
         await fs.ensureFile(this.getRunsFile(id));
@@ -241,6 +267,7 @@ export class ShortTermMemory {
             messages = Array.isArray(data) ? data : [];
         }
         catch {
+            // 如果消息文件不存在或读取失败，尝试重新创建
             await fs.ensureDir(this.getSessionDir(id));
             await fs.writeJson(msgFile, [], { spaces: 2 });
             messages = [];
@@ -259,8 +286,7 @@ export class ShortTermMemory {
     }
     async createRun(sessionId, userContent, runId) {
         await this.ensureReady();
-        const meta = await this.getSessionMeta(sessionId);
-        if (!meta)
+        if (!this.sessions.has(sessionId))
             throw new Error('Session not found');
         const now = Date.now();
         const id = runId || uuidv4();
@@ -323,88 +349,91 @@ export class ShortTermMemory {
         }
     }
     async getMessages(sessionId) {
+        // 复用 getSession 逻辑，它包含了文件读取和错误处理
         const session = await this.getSession(sessionId);
         return session ? session.messages : [];
     }
     async addMessage(sessionId, message) {
         await this.ensureReady();
-        const session = await this.getSession(sessionId);
-        if (!session)
+        const sessionMeta = this.sessions.get(sessionId);
+        if (!sessionMeta)
             throw new Error(`Session ${sessionId} not found`);
         const msg = { ...message };
         if (!msg.timestamp)
             msg.timestamp = Date.now();
-        session.messages.push(msg);
-        await fs.writeJson(this.getMessagesFile(sessionId), session.messages, { spaces: 2 });
-        const metas = await this.loadIndex();
-        const idx = metas.findIndex(m => m.id === sessionId);
-        if (idx >= 0) {
-            metas[idx] = {
-                ...metas[idx],
-                updatedAt: Date.now(),
-                lastActiveAt: Date.now()
-            };
-            metas.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
-            await this.saveIndex(metas);
-            this.metaCache.set(sessionId, metas.find(m => m.id === sessionId));
+        // 更新 messages.json
+        // 注意：这里仍然存在 messages.json 的并发写入风险，但比 index.json 低，因为通常一个 session 是串行的
+        // 如果需要严格安全，也应该为每个 session 维护一个 write queue
+        const msgFile = this.getMessagesFile(sessionId);
+        let messages = [];
+        try {
+            const data = await fs.readJson(msgFile);
+            messages = Array.isArray(data) ? data : [];
+        }
+        catch {
+            messages = [];
         }
+        messages.push(msg);
+        await fs.writeJson(msgFile, messages, { spaces: 2 });
+        // 更新 Session Meta
+        const nextMeta = {
+            ...sessionMeta,
+            updatedAt: Date.now(),
+            lastActiveAt: Date.now()
+        };
+        this.sessions.set(sessionId, nextMeta);
+        await this.persistIndex();
     }
     async clearMessages(sessionId) {
         await this.ensureReady();
-        const session = await this.getSession(sessionId);
-        if (!session)
+        const sessionMeta = this.sessions.get(sessionId);
+        if (!sessionMeta)
             throw new Error(`Session ${sessionId} not found`);
         await fs.writeJson(this.getMessagesFile(sessionId), [], { spaces: 2 });
         // Update timestamp
-        const metas = await this.loadIndex();
-        const idx = metas.findIndex(m => m.id === sessionId);
-        if (idx >= 0) {
-            metas[idx] = {
-                ...metas[idx],
-                updatedAt: Date.now(),
-                lastActiveAt: Date.now()
-            };
-            await this.saveIndex(metas);
-            this.metaCache.set(sessionId, metas[idx]);
-        }
+        const nextMeta = {
+            ...sessionMeta,
+            updatedAt: Date.now(),
+            lastActiveAt: Date.now()
+        };
+        this.sessions.set(sessionId, nextMeta);
+        await this.persistIndex();
     }
     async deleteSession(id) {
         await this.ensureReady();
-        const metas = await this.loadIndex();
-        const next = metas.filter(m => m.id !== id);
-        if (next.length === metas.length)
+        if (!this.sessions.has(id))
             throw new Error('Session not found');
-        await this.saveIndex(next);
-        this.metaCache.delete(id);
-        await fs.remove(this.getSessionDir(id));
+        this.sessions.delete(id);
+        await this.persistIndex();
+        try {
+            await fs.remove(this.getSessionDir(id));
+        }
+        catch (e) {
+            console.error(`[ShortTermMemory] Failed to delete session dir ${id}:`, e);
+        }
     }
     async cleanupOldSessions(maxAgeDays) {
         await this.ensureReady();
-        const metas = await this.loadIndex();
         const now = Date.now();
         const msPerDay = 24 * 60 * 60 * 1000;
-        const keep = [];
         const toDelete = [];
-        for (const meta of metas) {
+        for (const meta of this.sessions.values()) {
             const updatedAt = typeof meta.updatedAt === 'number' ? meta.updatedAt : 0;
             const ageDays = (now - updatedAt) / msPerDay;
             if (ageDays > maxAgeDays)
-                toDelete.push(meta);
-            else
-                keep.push(meta);
+                toDelete.push(meta.id);
         }
-        for (const meta of toDelete) {
+        for (const id of toDelete) {
+            this.sessions.delete(id);
             try {
-                await fs.remove(this.getSessionDir(meta.id));
-                this.metaCache.delete(meta.id);
+                await fs.remove(this.getSessionDir(id));
             }
             catch (e) {
-                console.error(`[ShortTermMemory] Failed to delete session ${meta.id}:`, e);
+                console.error(`[ShortTermMemory] Failed to delete session ${id}:`, e);
             }
         }
         if (toDelete.length > 0) {
-            keep.sort((a, b) => (b.updatedAt ?? 0) - (a.updatedAt ?? 0));
-            await this.saveIndex(keep);
+            await this.persistIndex();
         }
         return toDelete.length;
     }

package/dist/server/index.js

@@ -547,8 +547,10 @@ eventBus.onEvent('message', async (event) => {
     const { sessionId, payload, channel: channelName } = event;
     const content = payload.content;
     try {
+        console.log(`[EventBus] Processing message for session: ${sessionId}`);
         const session = await memory.getSession(sessionId);
         if (!session) {
+            console.error(`[EventBus] Session not found: ${sessionId}`);
             throw new Error('Session not found. Please create or select a session first.');
         }
         await memory.addMessage(sessionId, { role: 'user', content, timestamp: Date.now() });

package/package.json

@@ -2,7 +2,7 @@
   "name": "xiaozuoassistant",
   "private": false,
   "description": "Your personal, locally-hosted AI assistant for office productivity.",
-  "version": "0.1.69",
+  "version": "0.1.71",
   "author": "mantle.lau",
   "license": "MIT",
   "repository": {