npm - xiaozuoassistant - Versions diffs - 0.1.50 → 0.1.52 - Mend

xiaozuoassistant 0.1.50 → 0.1.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/config.json +2 -1
package/dist/client/assets/{browser-ponyfill-C0qLfQMC.js → browser-ponyfill-Bz0RS90l.js} +1 -1
package/dist/client/assets/index-BwZQ_7Ty.js +158 -0
package/dist/client/index.html +1 -1
package/dist/server/channels/base-channel.js +6 -0
package/dist/server/channels/web.js +21 -0
package/dist/server/config/loader.js +6 -2
package/dist/server/core/agents/runtime.js +5 -1
package/dist/server/core/brain.js +5 -2
package/dist/server/core/memories/manager.js +9 -0
package/dist/server/core/memories/short-term.js +68 -0
package/dist/server/core/task-queue.js +104 -0
package/dist/server/index.js +40 -39
package/package.json +1 -1
package/dist/client/assets/index-BfEuvtsz.js +0 -158

package/dist/client/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <link rel="icon" href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🍇</text></svg>" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>xiaozuoAssistant</title>
-    <script type="module" crossorigin src="/assets/index-BfEuvtsz.js"></script>
+    <script type="module" crossorigin src="/assets/index-BwZQ_7Ty.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-C72E_nIr.css">
   </head>
   <body>

package/dist/server/channels/base-channel.js CHANGED Viewed

@@ -2,6 +2,12 @@ export class BaseChannel {
     constructor() {
         this.messageHandler = null;
     }
+    sendEvent(sessionId, event, payload) {
+        const text = event === 'message'
+            ? String(payload?.content ?? '')
+            : `[${event}] ${typeof payload === 'string' ? payload : JSON.stringify(payload)}`;
+        void this.send(sessionId, text);
+    }
     onMessage(handler) {
         this.messageHandler = handler;
     }

package/dist/server/channels/web.js CHANGED Viewed

@@ -2,6 +2,7 @@ export class WebChannel {
     constructor(io) {
         this.name = 'web';
         this.messageHandler = null;
+        this.syncHandler = null;
         this.io = io;
     }
     async start() {
@@ -12,6 +13,20 @@ export class WebChannel {
                 socket.join(sessionId);
                 console.log(`Socket ${socket.id} joined session ${sessionId}`);
             });
+            socket.on('sync_session', async (data) => {
+                try {
+                    if (!this.syncHandler)
+                        return;
+                    const { sessionId, since } = data || {};
+                    if (!sessionId)
+                        return;
+                    const snapshot = await this.syncHandler(sessionId, since);
+                    socket.emit('session_sync', { sessionId, ...snapshot });
+                }
+                catch (e) {
+                    socket.emit('session_sync', { sessionId: data?.sessionId, messages: [], runs: [], error: String(e?.message || e) });
+                }
+            });
             // 当客户端发送消息
             socket.on('message', (data) => {
                 console.log(`[WebChannel] Received message from ${data.sessionId}: ${data.content}`);
@@ -39,7 +54,13 @@ export class WebChannel {
             timestamp: Date.now()
         });
     }
+    sendEvent(sessionId, event, payload) {
+        this.io.to(sessionId).emit(event, payload);
+    }
     onMessage(handler) {
         this.messageHandler = handler;
     }
+    setSyncHandler(handler) {
+        this.syncHandler = handler;
+    }
 }

package/dist/server/config/loader.js CHANGED Viewed

@@ -22,7 +22,8 @@ try {
             model: 'qwen-plus',
             temperature: 0.7,
             requestTimeoutMs: 600000,
-            maxRetries: 2
+            maxRetries: 2,
+            maxToolIterations: 200
         };
     }
     else {
@@ -32,6 +33,8 @@ try {
             loadedConfig.llm.requestTimeoutMs = 600000;
         if (loadedConfig.llm.maxRetries === undefined)
             loadedConfig.llm.maxRetries = 2;
+        if (loadedConfig.llm.maxToolIterations === undefined)
+            loadedConfig.llm.maxToolIterations = 200;
     }
     // Override with env vars if present (optional, but good for security)
     if (process.env.XIAOZUO_LLM_API_KEY)
@@ -51,7 +54,8 @@ catch (error) {
             model: 'qwen-plus',
             temperature: 0.7,
             requestTimeoutMs: 600000,
-            maxRetries: 2
+            maxRetries: 2,
+            maxToolIterations: 200
         },
         logging: { level: 'info' },
         scheduler: { memoryMaintenanceCron: '0 0 * * *' },

package/dist/server/core/agents/runtime.js CHANGED Viewed

@@ -32,7 +32,7 @@ export class AgentRuntime {
             console.log(`[Agent:${this.name}] Calling LLM...`);
             let response = await this.callLLM(messages);
             let iterations = 0;
-            const MAX_ITERATIONS = 10;
+            const MAX_ITERATIONS = config.llm.maxToolIterations ?? 200;
             while (response.choices[0].message.tool_calls && iterations < MAX_ITERATIONS) {
                 iterations++;
                 const toolCalls = response.choices[0].message.tool_calls;
@@ -68,6 +68,10 @@ export class AgentRuntime {
                 }
                 response = await this.callLLM(messages);
             }
+            if (response.choices[0].message.tool_calls && iterations >= MAX_ITERATIONS) {
+                const content = response.choices[0].message.content || 'No response generated.';
+                return `${content}\n\n（已到达回合上限，建议回复“继续”以接着执行；可在 config.json 设置 llm.maxToolIterations，当前=${MAX_ITERATIONS}）`;
+            }
             return response.choices[0].message.content || 'No response generated.';
         }
         catch (error) {

package/dist/server/core/brain.js CHANGED Viewed

@@ -45,7 +45,7 @@ export class Brain {
             if (process.env.DEBUG)
                 console.log('[Brain] LLM Response (snippet):', contentSnippet);
             let iterations = 0;
-            const MAX_ITERATIONS = 10;
+            const MAX_ITERATIONS = config.llm.maxToolIterations ?? 200;
             while (response.choices[0].message.tool_calls && iterations < MAX_ITERATIONS) {
                 iterations++;
                 const toolCalls = response.choices[0].message.tool_calls;
@@ -92,10 +92,13 @@ export class Brain {
                 if (process.env.DEBUG)
                     console.log('[Brain] LLM Response (after tool, snippet):', nextContentSnippet);
             }
+            const hitLimit = Boolean(response.choices[0].message.tool_calls) && iterations >= MAX_ITERATIONS;
             const finalContent = response.choices[0].message.content || 'I could not generate a response.';
             if (process.env.DEBUG)
                 console.log('[Brain] Final Response (snippet):', finalContent.substring(0, 100) + '...');
-            return finalContent;
+            if (!hitLimit)
+                return finalContent;
+            return `${finalContent}\n\n（已到达回合上限，建议回复“继续”以接着执行；可在 config.json 设置 llm.maxToolIterations，当前=${MAX_ITERATIONS}）`;
         }
         catch (error) {
             console.error('[Brain] Error in processing:', error);

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

@@ -44,6 +44,15 @@ export class MemoryManager {
         // structured info from the message. For MVP, we skip automatic extraction here
         // but provide the API for the Brain to call explicitly.
     }
+    async createRun(sessionId, userContent, runId) {
+        return this.shortTerm.createRun(sessionId, userContent, runId);
+    }
+    async updateRun(sessionId, runId, patch) {
+        return this.shortTerm.updateRun(sessionId, runId, patch);
+    }
+    async listRuns(sessionId) {
+        return this.shortTerm.listRuns(sessionId);
+    }
     async getHistory(sessionId) {
         return this.shortTerm.getMessages(sessionId);
     }

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

@@ -50,6 +50,9 @@ export class ShortTermMemory {
     getMessagesFile(sessionId) {
         return path.join(this.getSessionDir(sessionId), 'messages.json');
     }
+    getRunsFile(sessionId) {
+        return path.join(this.getSessionDir(sessionId), 'runs.json');
+    }
     async loadIndex() {
         try {
             const data = await fs.readJson(INDEX_FILE);
@@ -185,6 +188,71 @@ export class ShortTermMemory {
         }
         return { meta, messages };
     }
+    async createRun(sessionId, userContent, runId) {
+        await this.ensureReady();
+        const meta = await this.getSessionMeta(sessionId);
+        if (!meta)
+            throw new Error('Session not found');
+        const now = Date.now();
+        const id = runId || uuidv4();
+        const run = {
+            id,
+            sessionId,
+            status: 'queued',
+            userContent,
+            createdAt: now,
+            updatedAt: now
+        };
+        const file = this.getRunsFile(sessionId);
+        let runs = [];
+        try {
+            const existing = await fs.readJson(file);
+            runs = Array.isArray(existing) ? existing : [];
+        }
+        catch {
+            await fs.ensureDir(this.getSessionDir(sessionId));
+        }
+        runs.push(run);
+        await fs.writeJson(file, runs, { spaces: 2 });
+        return run;
+    }
+    async updateRun(sessionId, runId, patch) {
+        await this.ensureReady();
+        const file = this.getRunsFile(sessionId);
+        let runs = [];
+        try {
+            const existing = await fs.readJson(file);
+            runs = Array.isArray(existing) ? existing : [];
+        }
+        catch {
+            runs = [];
+        }
+        const idx = runs.findIndex(r => r.id === runId);
+        if (idx < 0)
+            throw new Error('Run not found');
+        const next = {
+            ...runs[idx],
+            ...patch,
+            status: patch.status || runs[idx].status,
+            updatedAt: patch.updatedAt ?? Date.now()
+        };
+        runs[idx] = next;
+        await fs.writeJson(file, runs, { spaces: 2 });
+        return next;
+    }
+    async listRuns(sessionId) {
+        await this.ensureReady();
+        const file = this.getRunsFile(sessionId);
+        try {
+            const existing = await fs.readJson(file);
+            const runs = Array.isArray(existing) ? existing : [];
+            runs.sort((a, b) => (b.createdAt ?? 0) - (a.createdAt ?? 0));
+            return runs;
+        }
+        catch {
+            return [];
+        }
+    }
     async getMessages(sessionId) {
         const session = await this.getSession(sessionId);
         return session ? session.messages : [];

package/dist/server/core/task-queue.js ADDED Viewed

@@ -0,0 +1,104 @@
+import { memory } from './memory.js';
+import { brain } from './brain.js';
+import { eventBus } from './event-bus.js';
+export class TaskQueue {
+    constructor() {
+        this.chains = new Map();
+    }
+    enqueue(task) {
+        const key = task.run.sessionId;
+        const prev = this.chains.get(key) || Promise.resolve();
+        const next = prev
+            .catch(() => { })
+            .then(() => this.process(task))
+            .finally(() => {
+            if (this.chains.get(key) === next)
+                this.chains.delete(key);
+        });
+        this.chains.set(key, next);
+    }
+    async process(task) {
+        const { run, channel } = task;
+        try {
+            const session = await memory.getSession(run.sessionId);
+            if (!session) {
+                await memory.updateRun(run.sessionId, run.id, { status: 'failed', error: 'Session not found', completedAt: Date.now() });
+                eventBus.emitEvent({
+                    type: 'run_status',
+                    payload: { runId: run.id, status: 'failed', error: 'Session not found' },
+                    channel,
+                    sessionId: run.sessionId,
+                    timestamp: Date.now()
+                });
+                return;
+            }
+            await memory.updateRun(run.sessionId, run.id, { status: 'running', updatedAt: Date.now() });
+            eventBus.emitEvent({
+                type: 'run_status',
+                payload: { runId: run.id, status: 'running' },
+                channel,
+                sessionId: run.sessionId,
+                timestamp: Date.now()
+            });
+            const context = await memory.getRelevantContext(run.userContent, run.sessionId);
+            const sessionAlias = session.meta.alias ? `Session Alias: ${session.meta.alias}` : '';
+            const workspaceLine = session.meta.workspace ? `Current Workspace: ${session.meta.workspace}` : '';
+            const enhancedSystemPrompt = `You are xiaozuoAssistant, a helpful AI assistant.
+${sessionAlias}
+${workspaceLine}
+Here is some relevant context from your memory:
+${context}`;
+            const ctx = {
+                sessionId: run.sessionId,
+                history: session.messages,
+                channel,
+                session: session.meta,
+                metadata: {
+                    workspace: session.meta.workspace,
+                    alias: session.meta.alias,
+                    runId: run.id
+                }
+            };
+            const responseContent = await brain.processMessage(session.messages, run.userContent, enhancedSystemPrompt, ctx);
+            await memory.addMessage(run.sessionId, { role: 'assistant', content: responseContent, timestamp: Date.now() });
+            await memory.updateRun(run.sessionId, run.id, { status: 'completed', completedAt: Date.now() });
+            eventBus.emitEvent({
+                type: 'run_status',
+                payload: { runId: run.id, status: 'completed' },
+                channel,
+                sessionId: run.sessionId,
+                timestamp: Date.now()
+            });
+            eventBus.emitEvent({
+                type: 'response',
+                payload: { content: responseContent, runId: run.id },
+                channel,
+                sessionId: run.sessionId,
+                timestamp: Date.now()
+            });
+        }
+        catch (e) {
+            const msg = String(e?.message || e);
+            try {
+                await memory.updateRun(run.sessionId, run.id, { status: 'failed', error: msg, completedAt: Date.now() });
+            }
+            catch {
+                // ignore
+            }
+            try {
+                await memory.addMessage(run.sessionId, { role: 'assistant', content: `Error: ${msg}`, timestamp: Date.now() });
+            }
+            catch {
+                // ignore
+            }
+            eventBus.emitEvent({
+                type: 'run_status',
+                payload: { runId: run.id, status: 'failed', error: msg },
+                channel,
+                sessionId: run.sessionId,
+                timestamp: Date.now()
+            });
+        }
+    }
+}
+export const taskQueue = new TaskQueue();

package/dist/server/index.js CHANGED Viewed

@@ -21,6 +21,8 @@ import { createOfficeAgent } from './agents/office.js';
 import { DelegateSkill } from './skills/delegate.js';
 import { createChannels } from './channels/create-channels.js';
 import { createHttpStack } from './server/create-http.js';
+import { taskQueue } from './core/task-queue.js';
+import { WebChannel } from './channels/web.js';
 // 解决 ES Module 中没有 __dirname 的问题
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -267,6 +269,19 @@ const pluginManager = new PluginManager(path.resolve(process.cwd(), 'plugins'));
 await pluginManager.loadPlugins();
 // 初始化通道
 const channels = createChannels({ app, io, config, pluginManager });
+for (const ch of channels) {
+    if (ch instanceof WebChannel) {
+        ch.setSyncHandler(async (sessionId, since) => {
+            const session = await memory.getSession(sessionId);
+            if (!session)
+                return { messages: [], runs: [] };
+            const runs = await memory.listRuns(sessionId);
+            const sinceTs = typeof since === 'number' ? since : 0;
+            const messages = (session.messages || []).filter((m) => (m.timestamp ?? 0) > sinceTs);
+            return { messages, runs };
+        });
+    }
+}
 // 启动通道并绑定事件
 channels.forEach(channel => {
     channel.start();
@@ -286,55 +301,27 @@ eventBus.onEvent('message', async (event) => {
     const { sessionId, payload, channel: channelName } = event;
     const content = payload.content;
     try {
-        // 1. 获取会话上下文
         const session = await memory.getSession(sessionId);
         if (!session) {
             throw new Error('Session not found. Please create or select a session first.');
         }
-        // 2. 记录用户消息
         await memory.addMessage(sessionId, { role: 'user', content, timestamp: Date.now() });
-        // 3. Brain 处理
-        // Use MemoryManager to retrieve full context (Short-term + Recent + Structured)
-        const context = await memory.getRelevantContext(content, sessionId);
-        // We pass the raw messages to processMessage for now, but Brain should ideally use the enhanced context.
-        // Let's modify Brain.processMessage to accept an optional context string or just prepend it.
-        // For this MVP, we will prepend the context to the system prompt or as a new system message.
-        // Or simpler: We just pass session.messages as before, but Brain needs to know about the context.
-        // Let's change how we call brain.processMessage.
-        // Construct a temporary history with enhanced context for the LLM
-        const sessionAlias = session.meta.alias ? `Session Alias: ${session.meta.alias}` : '';
-        const workspaceLine = session.meta.workspace ? `Current Workspace: ${session.meta.workspace}` : '';
-        const enhancedSystemPrompt = `You are xiaozuoAssistant, a helpful AI assistant.
-${sessionAlias}
-${workspaceLine}
-Here is some relevant context from your memory:
-${context}`;
-        // We need to inject this into the Brain.
-        // Since Brain.processMessage takes history, let's just pass the history but we need to tell Brain to use this system prompt.
-        // We can modify Brain to accept a system prompt override.
-        // Or we can just create a new method in Brain or pass it as an argument.
-        // Let's update Brain.processMessage signature in next step. For now, let's just pass the history.
-        const ctx = {
-            sessionId,
-            history: session.messages,
+        const run = await memory.createRun(sessionId, content);
+        eventBus.emitEvent({
+            type: 'run_ack',
+            payload: { runId: run.id },
             channel: channelName,
-            session: session.meta,
-            metadata: {
-                workspace: session.meta.workspace,
-                alias: session.meta.alias
-            }
-        };
-        const responseContent = await brain.processMessage(session.messages, content, enhancedSystemPrompt, ctx);
-        // 4. 记录 AI 响应
-        await memory.addMessage(sessionId, { role: 'assistant', content: responseContent, timestamp: Date.now() });
-        // 5. 发送响应事件
+            sessionId,
+            timestamp: Date.now()
+        });
         eventBus.emitEvent({
-            type: 'response',
-            payload: { content: responseContent },
+            type: 'run_status',
+            payload: { runId: run.id, status: 'queued' },
             channel: channelName,
-            sessionId: sessionId,
+            sessionId,
             timestamp: Date.now()
         });
+        taskQueue.enqueue({ run, channel: channelName });
     }
     catch (error) {
         console.error('Error processing message:', error);
@@ -361,6 +348,20 @@ eventBus.onEvent('response', (event) => {
         channel.send(sessionId, payload.content);
     }
 });
+eventBus.onEvent('run_ack', (event) => {
+    const { sessionId, payload, channel: channelName } = event;
+    const channel = channels.find(c => c.name === channelName);
+    if (channel?.sendEvent) {
+        channel.sendEvent(sessionId, 'run_ack', payload);
+    }
+});
+eventBus.onEvent('run_status', (event) => {
+    const { sessionId, payload, channel: channelName } = event;
+    const channel = channels.find(c => c.name === channelName);
+    if (channel?.sendEvent) {
+        channel.sendEvent(sessionId, 'run_status', payload);
+    }
+});
 eventBus.onEvent('error', (event) => {
     const { sessionId, payload, channel: channelName } = event;
     const channel = channels.find(c => c.name === channelName);

package/package.json CHANGED Viewed

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