@myassis/gateway 1.0.29 → 1.0.31

package/dist/routes/agent.js

@@ -261,8 +261,11 @@ router.post('/:id/sessions', ensureAgentManager, async (req, res) => {
             success: true,
             data: {
                 id: session.id,
+                agentId: session.agentId,
                 title: session.title,
                 selectModelId: session.selectModelId,
+                messageQueue: session.messageQueue,
+                messageQueueAutoExecute: session.messageQueueAutoExecute,
                 createdAt: session.createdAt,
                 updatedAt: session.updatedAt,
             }
@@ -285,14 +288,17 @@ router.put('/:id/sessions/:sessionId', ensureAgentManager, async (req, res) => {
         if (!agent) {
             return res.status(404).json({ success: false, error: 'Agent not found' });
         }
-        const { title, selectModelId, unreadCount } = req.body;
-        const session = agent.updateSession(req.params.sessionId, { title, selectModelId, unreadCount });
+        const { title, selectModelId, unreadCount, messageQueue, messageQueueAutoExecute } = req.body;
+        const session = agent.updateSession(req.params.sessionId, { title, selectModelId, unreadCount, messageQueue, messageQueueAutoExecute });
         res.json({
             success: true,
             data: {
                 id: session.id,
+                agentId: session.agentId,
                 title: session.title,
                 selectModelId: session.selectModelId,
+                messageQueue: session.messageQueue,
+                messageQueueAutoExecute: session.messageQueueAutoExecute,
                 createdAt: session.createdAt,
                 updatedAt: session.updatedAt,
             }

package/dist/services/agent/AgentManager.js

@@ -252,6 +252,8 @@ class AgentManager {
             unreadCount: s.unreadCount,
             createdAt: s.createdAt,
             updatedAt: s.updatedAt,
+            messageQueue: s.messageQueue,
+            messageQueueAutoExecute: s.messageQueueAutoExecute
         }));
     }
     /**

package/dist/services/llm/LLMClient.js

@@ -1,9 +1,20 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalModelSelector = exports.parseAruments = exports.LLMClient = void 0;
 const index_js_1 = require("../../stores/index.js");
 const shared_1 = require("@myassis/shared");
+const promises_1 = __importDefault(require("fs/promises"));
 const logger = (0, shared_1.getLogger)('LLMClient');
+function convertBase64ToImage(base64Img) {
+    // 去掉data:image/xxx;base64,前缀
+    const pureBase64 = base64Img.replace(/^data:image\/\w+;base64,/, '');
+    const buf = Buffer.from(pureBase64, 'base64');
+    // 写入文件
+    promises_1.default.writeFile('screenshot.png', buf);
+}
 /**
  * LLM 调用器类
  * 提供 Chat 和 streamChat 两种调用方式
@@ -126,293 +137,189 @@ class LLMClient {
         if (!apiKey) {
             throw new Error('No API Key');
         }
-        if (model.baseUrl.includes('coze.com')) {
-            // Coze API: 使用 query 字段，只支持文本
-            const lastMessage = this.messages[this.messages.length - 1];
-            let queryContent = lastMessage?.content || '';
-            // 如果有附件，在查询中添加附件信息
-            if (lastMessage?.attachments && lastMessage.attachments.length > 0) {
-                const attachmentInfos = lastMessage.attachments.map(a => `[${a.type === 'image' ? '图片' : '文件'}: ${a.name}](${a.url})`).join('\n');
-                queryContent += `\n\n${attachmentInfos}`;
-            }
-            return {
-                url: `${model.baseUrl}/chat`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Authorization': `Bearer ${apiKey}`,
-                },
-                body: {
-                    bot_id: model.modelId,
-                    conversation_id: '', // 非会话模式
-                    user: '',
-                    query: queryContent,
-                    stream,
-                },
-            };
-        }
-        else if (model.baseUrl.includes('anthropic.com')) {
-            return {
-                url: `${model.baseUrl}/v1/messages`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    'x-api-key': apiKey || '',
-                    'anthropic-version': '2023-06-01',
-                    'anthropic-dangerous-direct-browser-access': 'true',
-                },
-                body: {
-                    model: model.modelId,
-                    messages: this.messages.filter((m) => m.role !== 'system').map((m) => {
-                        // 处理工具消息
-                        if (m.role === 'tool') {
-                            return {
-                                role: 'user',
-                                content: [
-                                    {
-                                        type: 'tool_result',
-                                        tool_use_id: m.tool_call_id,
-                                        content: m.content,
-                                    }
-                                ],
-                            };
+        // OpenAI compatible API
+        let existAttachments = false;
+        let existScreenShot = false;
+        const body = {
+            model: model.modelId,
+            messages: this.messages.map((m, index) => {
+                if (m.role === 'tool') {
+                    if (m.tool_call_name == 'screenshot') {
+                        if (index === this.messages.length - 1) {
+                            existScreenShot = true;
+                            const contentObj = JSON.parse(m.content);
+                            return [{
+                                    role: 'tool',
+                                    tool_call_id: m.tool_call_id,
+                                    content: JSON.stringify({
+                                        success: contentObj.success,
+                                        result_type: 'image',
+                                        image_url: contentObj.output,
+                                        text_for_llm: '工具生成了一张图片，图片地址已返回。'
+                                    }),
+                                }];
                         }
-                        // 处理用户消息中的附件
-                        if (m.role === 'user' && m.attachments && m.attachments.length > 0) {
-                            const contentArray = [];
-                            // 如果有文本内容，先添加文本
-                            if (m.content && m.content.trim()) {
-                                contentArray.push({
-                                    type: 'text',
-                                    text: m.content,
-                                });
-                            }
-                            // 添加附件
-                            for (const attachment of m.attachments) {
-                                if (attachment.type === 'image') {
-                                    // Anthropic 支持 base64 图片
-                                    // 假设 attachment.url 可能是 base64 格式或 URL 格式
-                                    if (attachment.url.startsWith('data:')) {
-                                        // base64 格式
-                                        const base64Data = attachment.url.split(',')[1];
-                                        const mimeType = attachment.mimeType || 'image/png';
-                                        contentArray.push({
-                                            type: 'image',
-                                            source: {
-                                                type: 'base64',
-                                                media_type: mimeType,
-                                                data: base64Data,
-                                            },
-                                        });
-                                    }
-                                    else {
-                                        // URL 格式 - Anthropic 也支持
-                                        contentArray.push({
-                                            type: 'image',
-                                            source: {
-                                                type: 'url',
-                                                media_type: attachment.mimeType || 'image/png',
-                                                url: attachment.url,
-                                            },
-                                        });
-                                    }
-                                }
-                                else {
-                                    // 其他文件类型 - Anthropic 不直接支持，添加为文本引用
-                                    const fileInfo = `[附件: ${attachment.name}](${attachment.url})`;
-                                    if (contentArray.length === 0) {
-                                        contentArray.push({
-                                            type: 'text',
-                                            text: fileInfo,
-                                        });
-                                    }
-                                    else {
-                                        const lastItem = contentArray[contentArray.length - 1];
-                                        if (lastItem.type === 'text') {
-                                            lastItem.text += `\n${fileInfo}`;
-                                        }
-                                        else {
-                                            contentArray.push({
-                                                type: 'text',
-                                                text: fileInfo,
-                                            });
-                                        }
-                                    }
-                                }
-                            }
-                            return {
-                                role: 'user',
-                                content: contentArray,
-                            };
+                        else {
+                            return [{
+                                    role: 'tool',
+                                    tool_call_id: m.tool_call_id,
+                                    content: m.content.substring(0, 100) + '...（内容过长已截断）',
+                                }];
                         }
-                        // 普通用户消息（无附件）
-                        return {
-                            role: m.role,
-                            content: m.content,
-                        };
-                    }),
-                    stream,
-                    max_tokens: model.maxTokens || 4096,
-                },
-            };
-        }
-        else {
-            // OpenAI compatible API
-            let existAttachments = false;
-            const body = {
-                model: model.modelId,
-                messages: this.messages.map((m) => {
-                    if (m.role === 'tool') {
+                    }
+                    else {
                         return [{
                                 role: 'tool',
                                 tool_call_id: m.tool_call_id,
                                 content: m.content,
                             }];
                     }
-                    // 助手调用工具的消息：必须保留 tool_calls！！（你之前丢了，导致报错）
-                    if (m.role === 'assistant' && m.tool_calls) {
-                        return [{
-                                role: 'assistant',
-                                content: m.content || null,
-                                tool_calls: m.tool_calls.map(m => {
-                                    return {
-                                        id: m.id,
-                                        function: {
-                                            name: m.toolName,
-                                            arguments: m.input
-                                        },
-                                        type: 'function'
-                                    };
-                                }),
-                            }];
-                    }
-                    if (m.role === 'assistant' && m.toolCalls) {
-                        let items = [];
-                        for (let toolCall of m.toolCalls) {
-                            const item = {
-                                role: 'assistant',
-                                content: toolCall.content,
-                                reasoning_content: toolCall.reasoningContent,
-                                tool_calls: []
-                            };
-                            const tools = [];
-                            for (let i = 0; i < toolCall.toolCalls.length; i++) {
-                                const toolCallItem = toolCall.toolCalls[i];
-                                if (toolCallItem.output != null) {
-                                    item.tool_calls.push({
-                                        id: toolCallItem.id,
-                                        function: {
-                                            name: toolCallItem.toolName,
-                                            arguments: toolCallItem.input
-                                        },
-                                        type: 'function'
-                                    });
-                                    tools.push({
-                                        role: 'tool',
-                                        tool_call_id: toolCallItem.id,
-                                        content: toolCallItem.output.substring(0, 100) + '...' + '(内容过长已截断)'
-                                    });
-                                }
-                            }
-                            if (item.tool_calls.length > 0) {
-                                items.push(item);
-                                items = items.concat(tools);
+                }
+                // 助手调用工具的消息：必须保留 tool_calls！！（你之前丢了，导致报错）
+                if (m.role === 'assistant' && m.tool_calls) {
+                    return [{
+                            role: 'assistant',
+                            content: m.content || null,
+                            tool_calls: m.tool_calls.map(m => {
+                                return {
+                                    id: m.id,
+                                    function: {
+                                        name: m.toolName,
+                                        arguments: m.input
+                                    },
+                                    type: 'function'
+                                };
+                            }),
+                        }];
+                }
+                if (m.role === 'assistant' && m.toolCalls) {
+                    let items = [];
+                    for (let toolCall of m.toolCalls) {
+                        const item = {
+                            role: 'assistant',
+                            content: toolCall.content,
+                            reasoning_content: toolCall.reasoningContent,
+                            tool_calls: []
+                        };
+                        const tools = [];
+                        for (let i = 0; i < toolCall.toolCalls.length; i++) {
+                            const toolCallItem = toolCall.toolCalls[i];
+                            if (toolCallItem.output != null) {
+                                item.tool_calls.push({
+                                    id: toolCallItem.id,
+                                    function: {
+                                        name: toolCallItem.toolName,
+                                        arguments: toolCallItem.input
+                                    },
+                                    type: 'function'
+                                });
+                                tools.push({
+                                    role: 'tool',
+                                    tool_call_id: toolCallItem.id,
+                                    content: toolCallItem.output.substring(0, 100) + '...' + '(内容过长已截断)'
+                                });
                             }
                         }
-                        if (m.content) {
-                            items.push({
-                                role: 'assistant',
-                                content: m.content
-                            });
+                        if (item.tool_calls.length > 0) {
+                            items.push(item);
+                            items = items.concat(tools);
                         }
-                        return items;
                     }
-                    // 处理用户消息中的附件
-                    if (m.role === 'user' && m.attachments && m.attachments.length > 0) {
-                        existAttachments = true;
-                        const contentArray = [];
-                        // 添加附件
-                        for (const attachment of m.attachments) {
-                            if (attachment.type === 'image') {
-                                // 图片附件
-                                contentArray.push({
-                                    type: 'image_url',
-                                    image_url: {
-                                        url: attachment.url,
-                                        detail: 'high',
-                                    },
-                                });
-                            }
-                            else if (attachment.type === 'audio') {
-                                // 音频附件 - 使用 file 类型
+                    if (m.content) {
+                        items.push({
+                            role: 'assistant',
+                            content: m.content
+                        });
+                    }
+                    return items;
+                }
+                // 处理用户消息中的附件
+                if (m.role === 'user' && m.attachments && m.attachments.length > 0) {
+                    existAttachments = true;
+                    const contentArray = [];
+                    // 添加附件
+                    for (const attachment of m.attachments) {
+                        if (attachment.type === 'image') {
+                            // 图片附件
+                            contentArray.push({
+                                type: 'image_url',
+                                image_url: {
+                                    url: attachment.url,
+                                    detail: 'high',
+                                },
+                            });
+                        }
+                        else if (attachment.type === 'audio') {
+                            // 音频附件 - 使用 file 类型
+                            contentArray.push({
+                                type: 'input_audio',
+                                input_audio: {
+                                    data: attachment.url, // 如果是 base64 格式
+                                    format: attachment.mimeType?.split('/')[1] || 'wav',
+                                },
+                            });
+                        }
+                        else {
+                            // 其他文件类型：video, file - 添加为文本引用
+                            const fileInfo = `[附件: ${attachment.name}](${attachment.url})`;
+                            if (contentArray.length === 0) {
                                 contentArray.push({
-                                    type: 'input_audio',
-                                    input_audio: {
-                                        data: attachment.url, // 如果是 base64 格式
-                                        format: attachment.mimeType?.split('/')[1] || 'wav',
-                                    },
+                                    type: 'text',
+                                    text: fileInfo,
                                 });
                             }
                             else {
-                                // 其他文件类型：video, file - 添加为文本引用
-                                const fileInfo = `[附件: ${attachment.name}](${attachment.url})`;
-                                if (contentArray.length === 0) {
+                                // 如果已经有文本，将文件信息追加到文本中
+                                const lastItem = contentArray[contentArray.length - 1];
+                                if (lastItem.type === 'text') {
+                                    lastItem.text += `\n${fileInfo}`;
+                                }
+                                else {
                                     contentArray.push({
                                         type: 'text',
                                         text: fileInfo,
                                     });
                                 }
-                                else {
-                                    // 如果已经有文本，将文件信息追加到文本中
-                                    const lastItem = contentArray[contentArray.length - 1];
-                                    if (lastItem.type === 'text') {
-                                        lastItem.text += `\n${fileInfo}`;
-                                    }
-                                    else {
-                                        contentArray.push({
-                                            type: 'text',
-                                            text: fileInfo,
-                                        });
-                                    }
-                                }
                             }
                         }
-                        // 如果有文本内容，添加文本
-                        if (m.content && m.content.trim()) {
-                            contentArray.push({
-                                type: 'text',
-                                text: m.content,
-                            });
-                        }
-                        return [{
-                                role: m.role,
-                                content: contentArray,
-                            }];
                     }
-                    // 普通消息（无附件）
+                    // 如果有文本内容，添加文本
+                    if (m.content && m.content.trim()) {
+                        contentArray.push({
+                            type: 'text',
+                            text: m.content,
+                        });
+                    }
                     return [{
                             role: m.role,
-                            content: m.content,
+                            content: contentArray,
                         }];
-                }).flatMap(x => x),
-                stream,
-                enable_thinking: true,
-            };
-            if (this.tools && this.tools.length > 0) {
-                body.tools = this.tools;
-            }
-            const tokens = JSON.stringify(body).length;
-            logger.debug('tokens', tokens);
-            if (tokens > 200000 && !existAttachments) {
-                throw Error('exceed max message tokens');
-            }
-            return {
-                url: `${model.baseUrl}/chat/completions`,
-                headers: {
-                    'Content-Type': 'application/json',
-                    'Authorization': `Bearer ${apiKey}`,
-                },
-                body,
-            };
+                }
+                // 普通消息（无附件）
+                return [{
+                        role: m.role,
+                        content: m.content,
+                    }];
+            }).flatMap(x => x),
+            stream,
+            enable_thinking: true,
+        };
+        if (this.tools && this.tools.length > 0) {
+            body.tools = this.tools;
         }
+        const tokens = JSON.stringify(body).length;
+        logger.debug('tokens', tokens);
+        if (tokens > 200000 && !existAttachments && !existScreenShot) {
+            throw Error('exceed max message tokens');
+        }
+        return {
+            url: `${model.baseUrl}/chat/completions`,
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': `Bearer ${apiKey}`,
+            },
+            body,
+        };
     }
     /**
      * 执行流式请求

package/dist/services/session/Session.js

@@ -39,6 +39,8 @@ class Session {
     title;
     selectModelId;
     messages;
+    messageQueue;
+    messageQueueAutoExecute;
     voiceState;
     createdAt;
     updatedAt;
@@ -58,6 +60,8 @@ class Session {
         this.title = data.title || 'New Chat';
         this.selectModelId = data.selectModelId;
         this.messages = [];
+        this.messageQueue = data.messageQueue || [];
+        this.messageQueueAutoExecute = data.messageQueueAutoExecute ?? true;
         this.voiceState = data.voiceState || { isRecording: false, isPlaying: false };
         this.lastMessageSummary = data.lastMessageSummary ?? null;
         this.lastMessageSummaryAt = data.lastMessageSummaryAt ?? null;
@@ -390,7 +394,9 @@ class Session {
             lastMessageSummary: this.lastMessageSummary,
             lastMessageSummaryAt: this.lastMessageSummaryAt,
             unreadCount: this.unreadCount,
-            isCurrent: this.isCurrent
+            isCurrent: this.isCurrent,
+            messageQueue: this.messageQueue,
+            messageQueueAutoExecute: this.messageQueueAutoExecute
         };
     }
     getStreamDelay(streamSpeed) {

package/dist/services/session/SessionManager.js

@@ -63,7 +63,9 @@ class SessionManager {
             updatedAt: data.updatedAt,
             isCurrent: data.isCurrent,
             lastMessageSummary: data.lastMessageSummary,
-            lastMessageSummaryAt: data.lastMessageSummaryAt
+            lastMessageSummaryAt: data.lastMessageSummaryAt,
+            messageQueue: data.messageQueue,
+            messageQueueAutoExecute: data.messageQueueAutoExecute
         });
         session.loadMessages();
         return session;
@@ -171,6 +173,10 @@ class SessionManager {
             session.agentId = updates.agentId;
         if (updates.unreadCount !== undefined)
             session.unreadCount = updates.unreadCount;
+        if (updates.messageQueue !== undefined)
+            session.messageQueue = updates.messageQueue;
+        if (updates.messageQueueAutoExecute !== undefined)
+            session.messageQueueAutoExecute = updates.messageQueueAutoExecute;
         session.updatedAt = Date.now();
         session.save();
         return session;

package/dist/services/session/SessionStore.js

@@ -82,17 +82,17 @@ class SessionStore {
     // ========== Session Operations ==========
     insertSession(session) {
         this.db.prepare(`
-      INSERT INTO sessions (id, user_id, agent_id, title, select_model_id, voice_state, created_at, updated_at,last_message_summary,last_message_summary_at,unread_count,is_current)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?)
-    `).run(session.id, session.userId, session.agentId || null, session.title, session.selectModelId || '', JSON.stringify(session.voiceState), session.createdAt, session.updatedAt, session.lastMessageSummary, session.lastMessageSummaryAt, session.unreadCount || 0, session.isCurrent ? 1 : 0);
+      INSERT INTO sessions (id, user_id, agent_id, title, select_model_id, voice_state, created_at, updated_at,last_message_summary,last_message_summary_at,unread_count,is_current,message_queue,message_queue_auto_execute)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?)
+    `).run(session.id, session.userId, session.agentId || null, session.title, session.selectModelId || '', JSON.stringify(session.voiceState), session.createdAt, session.updatedAt, session.lastMessageSummary, session.lastMessageSummaryAt, session.unreadCount || 0, session.isCurrent ? 1 : 0, JSON.stringify(session.messageQueue || []), session.messageQueueAutoExecute === false ? 0 : 1);
     }
     updateSession(session) {
         this.db.prepare(`
       UPDATE sessions 
       SET user_id = ?, agent_id = ?, title = ?, select_model_id = ?,
-          voice_state = ?, updated_at = ?,last_message_summary=?,last_message_summary_at=?,unread_count=?,is_current=?
+          voice_state = ?, updated_at = ?,last_message_summary=?,last_message_summary_at=?,unread_count=?,is_current=?,message_queue=?,message_queue_auto_execute=?
       WHERE id = ?
-    `).run(session.userId, session.agentId || null, session.title, session.selectModelId || '', JSON.stringify(session.voiceState), session.updatedAt, session.lastMessageSummary, session.lastMessageSummaryAt, session.unreadCount || 0, session.isCurrent ? 1 : 0, session.id);
+    `).run(session.userId, session.agentId || null, session.title, session.selectModelId || '', JSON.stringify(session.voiceState), session.updatedAt, session.lastMessageSummary, session.lastMessageSummaryAt, session.unreadCount || 0, session.isCurrent ? 1 : 0, JSON.stringify(session.messageQueue || []), session.messageQueueAutoExecute === false ? 0 : 1, session.id);
     }
     // 支持部分更新的 updateSession
     updateSessionPartial(id, data) {
@@ -106,6 +106,14 @@ class SessionStore {
             updates.push('select_model_id = ?');
             values.push(data.selectModelId || '');
         }
+        if (data.messageQueue !== undefined) {
+            updates.push('message_queue = ?');
+            values.push(JSON.stringify(data.messageQueue || []));
+        }
+        if (data.messageQueueAutoExecute !== undefined) {
+            updates.push('message_queue_auto_execute = ?');
+            values.push(data.messageQueueAutoExecute ? 1 : 0);
+        }
         if (updates.length === 0)
             return;
         updates.push('updated_at = ?');
@@ -185,7 +193,9 @@ class SessionStore {
             lastMessageSummary: row.last_message_summary,
             lastMessageSummaryAt: row.last_message_summary_at,
             unreadCount: row.unread_count,
-            isCurrent: !!row.is_current
+            isCurrent: !!row.is_current,
+            messageQueueAutoExecute: row.message_queue_auto_execute !== 0,
+            messageQueue: JSON.parse(row.message_queue || '[]'),
         };
     }
     /**

package/dist/services/tools/screenshot.js

@@ -15,7 +15,7 @@ exports.screenshotTool = {
             const base64 = imgBuffer.toString('base64');
             return {
                 success: true,
-                output: JSON.stringify({ image: `data:image/jpeg;base64,${base64}`, size: imgBuffer.length }),
+                output: `data:image/jpeg;base64,${base64}`,
             };
         }
         catch (error) {

package/migrations/013_add_message_queue_auto_execute_to_sessions.sql

@@ -0,0 +1 @@
+ALTER TABLE sessions ADD COLUMN message_queue_auto_execute INTEGER DEFAULT 1;

package/migrations/014_add_message_queue.sql

@@ -0,0 +1 @@
+ALTER TABLE sessions ADD COLUMN message_queue TEXT DEFAULT '[]';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myassis/gateway",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "我的助手 Gateway Service - 本地 AI 网关服务，支持认证、WebSocket 实时通信和任务调度",
   "main": "dist/index.js",
   "bin": {