@myassis/gateway 1.0.1 → 1.0.3

package/dist/services/session/Session.js

@@ -1,15 +1,16 @@
 import { v4 as uuidv4 } from 'uuid';
-import { getLogger } from '@pocketclaw/shared';
-import { SessionStore } from './SessionStore';
+import { getLogger } from '@myassis/shared';
+import { SessionStore } from './SessionStore.js';
 import { AgentStore } from '@/services/agent/AgentStore';
+import { authStore } from '@/stores/authStore';
 import { toModel } from '@/services/models';
 import { executeTool, getToolDefinitions } from '@/services/tools';
-import { getSystemPromptAsync } from '../systemPrompt';
-import { LLMClient, parseAruments } from '../llm/LLMClient';
+import { getSystemPromptAsync } from '../systemPrompt.js';
+import { LLMClient, parseAruments } from '../llm/LLMClient.js';
 import { modelsService, settingsService } from '@/services/dataService';
-import { MemoryManager } from '../memory/MemoryManager';
-import { sessionManager } from './SessionManager';
+import { MemoryManager } from '../memory/MemoryManager.js';
 import { appConfig } from '@/config';
+import { getSessionManager } from './SessionManager.js';
 const logger = getLogger('Session');
 const sleep = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 // AgentStore 单例 - 需要通过 SessionStore 获取数据库实例
@@ -46,7 +47,6 @@ export class Session {
     unreadCount = 0;
     currentMessageId = null;
     abortController = null;
-    toolCalls;
     toInsertMessages;
     constructor(data) {
         this.id = data.id;
@@ -103,16 +103,13 @@ export class Session {
         return this.messages.reduce((total, msg) => total + msg.content.length, 0);
     }
     // ========== Message Operations ==========
-    /**
-     * Add user message
-     */
-    addUserMessage(content, userMessageId, attachments) {
+    getUserMessage(content, userMessageId, attachments) {
         // 将附件统一为 Attachment 对象格式
         const normalizedAttachments = (attachments || []).map((att) => {
             if (typeof att === 'string') {
                 // URL 字符串格式，转换为对象
                 const url = att;
-                const name = url.split('/').pop() || 'attachment';
+                const name = url.split('/').pop().split('?')[0] || 'attachment';
                 const ext = name.split('.').pop()?.toLowerCase() || '';
                 const imageExts = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp', 'svg'];
                 const videoExts = ['mp4', 'avi', 'mov', 'mkv', 'webm'];
@@ -145,6 +142,13 @@ export class Session {
             createdAt: Date.now(),
             modelName: ''
         };
+        return message;
+    }
+    /**
+     * Add user message
+     */
+    addUserMessage(content, userMessageId, attachments) {
+        const message = this.getUserMessage(content, userMessageId, attachments);
         this.messages.push(message);
         this.toInsertMessages.push(message);
         return message;
@@ -375,15 +379,27 @@ export class Session {
      * Stream chat response (SSE) - 使用 ModelSelector 根据选择的模型调用
      * 支持工具调用流程
      */
-    async streamChat(content, attachments = [], res, userMessageId, assistantMessageId) {
+    async streamChat(content, attachments = [], res, userMessageId, assistantMessageId, childAgent = false) {
+        // 如果正在生成，等待当前生成完成（最多等待 2 秒）
+        if (this.isGenerating) {
+            const maxWait = 2000;
+            const startTime = Date.now();
+            while (this.isGenerating && Date.now() - startTime < maxWait) {
+                await sleep(100);
+            }
+            // 超时后强制中断
+            if (this.isGenerating) {
+                this.stopGenerating();
+            }
+        }
         // Add user message
         this.getAbortController();
         this.isGenerating = true;
-        this.toolCalls = [];
-        const settings = await settingsService.get();
+        const token = authStore.get(this.userId).accessToken;
+        const settings = await settingsService.get(token);
         const streamDelay = this.getStreamDelay(settings.streamSpeed);
         this.currentMessageId = assistantMessageId;
-        const memoryManager = new MemoryManager(this, this.abortController.signal);
+        const memoryManager = new MemoryManager(this, this.abortController.signal, childAgent);
         const historyMessages = await memoryManager.getHistoryMessagesAsync();
         // SSE 辅助方法：res 为 null 时跳过写入（本地执行模式）
         const sendSSE = (res, data) => {
@@ -433,8 +449,13 @@ export class Session {
             messages.unshift({ role: 'system', content: systemPrompt, attachments: [] });
         }
         //插入用户消息
-        this.addUserMessage(content, userMessageId, attachments);
-        messages.push(this.messages.at(-1));
+        if (!childAgent) {
+            this.addUserMessage(content, userMessageId, attachments);
+            messages.push(this.messages.at(-1));
+        }
+        else {
+            messages.push(this.getUserMessage(content, userMessageId, attachments));
+        }
         let toolCall = null;
         let modelNames = [];
         //用于后续的消息滑动处理
@@ -450,6 +471,7 @@ export class Session {
                 message.reasoning_content = message.reasoning_content.substring(0, 100) + '...(内容过长已截断)';
             }
         };
+        const toolCalls = [];
         // 递归处理函数（支持多轮工具调用）
         const processModelResponse = async () => {
             if (!this.abortController || !this.abortController.signal || this.abortController.signal.aborted) {
@@ -460,7 +482,7 @@ export class Session {
             // 清理旧工具调用：只保留最近 keep 轮的完整上下文
             {
                 const MAX_TOOL_PAIRS = keep;
-                const allToolCallItems = this.toolCalls.flatMap(x => x.toolCalls);
+                const allToolCallItems = toolCalls.flatMap(x => x.toolCalls);
                 // 1) 清理 this.toolCalls 中超出 keep 的 output（供前端展示用）
                 allToolCallItems.forEach((item, index) => {
                     if (index < allToolCallItems.length - MAX_TOOL_PAIRS) {
@@ -498,7 +520,7 @@ export class Session {
             }
             // 获取本地工具定义
             const tools = getToolDefinitions();
-            const models = (await modelsService.list()).data.map(x => toModel(x));
+            const models = (await modelsService.list(token)).data.map(x => toModel(x));
             // 使用 LLMClient 进行流式调用
             if (!this.abortController || !this.abortController.signal || this.abortController.signal.aborted) {
                 throw Error('aborted');
@@ -568,7 +590,7 @@ export class Session {
                 }
                 // 执行工具调用并收集结果
                 const toolResults = [];
-                for (const pendingToolCall of llmResult.toolCalls) {
+                const startToolCall = async (pendingToolCall) => {
                     // 发送工具开始执行事件
                     const toolStartEvent = {
                         type: 'tool_call_execute',
@@ -581,7 +603,7 @@ export class Session {
                     };
                     sendSSE(res, toolStartEvent);
                     try {
-                        const result = await executeTool(pendingToolCall.toolName, parseAruments(pendingToolCall.input), this.id, this.currentMessageId);
+                        const result = await executeTool(pendingToolCall.toolName, parseAruments(pendingToolCall.input), this.id, this.currentMessageId, this.userId);
                         toolResults.push({
                             id: pendingToolCall.id,
                             name: pendingToolCall.toolName,
@@ -638,8 +660,9 @@ export class Session {
                         };
                         sendSSE(res, errorEvent);
                     }
-                }
-                this.toolCalls.push(toolCall);
+                };
+                await Promise.all(llmResult.toolCalls.map(x => startToolCall(x)));
+                toolCalls.push(toolCall);
                 // 将工具结果添加到消息历史（格式化为 tool 角色的消息）
                 for (const result of toolResults) {
                     const toolResultMessage = {
@@ -655,7 +678,7 @@ export class Session {
                     messages.push(toolResultMessage);
                 }
                 // 继续递归处理（带上工具结果继续调用模型）
-                await processModelResponse();
+                return await processModelResponse();
             }
             else {
                 // ========== 没有工具调用，保存消息并结束 ==========
@@ -672,34 +695,43 @@ export class Session {
                         await sleep(streamDelay);
                     }
                 }
-                this.addAssistantMessage(llmResult.content || llmResult.reasoningContent, this.toolCalls, [...new Set(modelNames)].join(','), this.currentMessageId);
+                if (!childAgent) {
+                    this.addAssistantMessage(llmResult.content || llmResult.reasoningContent, toolCalls, [...new Set(modelNames)].join(','), this.currentMessageId);
+                }
                 sendSSE(res, { type: 'complete', modelName: [...new Set(modelNames)].join(",") });
                 sendSSE(res, { type: '[DONE]' });
+                return llmResult.content;
             }
         };
         try {
-            await processModelResponse();
+            const result = await processModelResponse();
+            return { success: true, data: result };
         }
         catch (error) {
             logger.error('stream chat ', error);
-            if (this.toolCalls) {
-                this.addAssistantMessage('', this.toolCalls, [...new Set(modelNames)].join(','), this.currentMessageId);
-            }
-            if (error.message !== 'aborted') {
-                sendSSE(res, { type: 'error', error: error.message });
+            if (!childAgent) {
+                if (toolCalls) {
+                    this.addAssistantMessage('', toolCalls, [...new Set(modelNames)].join(','), this.currentMessageId);
+                }
+                if (error.message !== 'aborted') {
+                    sendSSE(res, { type: 'error', error: error.message });
+                }
             }
+            return { success: false, error: error.message };
         }
         finally {
-            this.isGenerating = false;
-            this.abortController = null;
-            if (res) {
-                res.end();
-            }
-            // 非当前查看的 session，助手回复完成后增加未读计数
-            sessionManager.onMessageComplete(this.id);
-            // 只在非 abort 的情况下保存（abort 由 stopGenerating 负责保存）
-            if (this.currentMessageId !== null) {
-                this.saveMessage();
+            if (!childAgent) {
+                this.isGenerating = false;
+                this.abortController = null;
+                if (res) {
+                    res.end();
+                }
+                // 非当前查看的 session，助手回复完成后增加未读计数
+                getSessionManager(this.userId).onMessageComplete(this.id);
+                // 只在非 abort 的情况下保存（abort 由 stopGenerating 负责保存）
+                if (this.currentMessageId !== null) {
+                    this.saveMessage();
+                }
             }
         }
     }
@@ -712,14 +744,6 @@ export class Session {
             this.abortController.abort();
             this.abortController = null;
         }
-        // stopGenerating 负责保存中断的消息，streamChat 的 finally 不再重复保存
-        if (this.currentMessageId) {
-            if (this.toolCalls && this.toolCalls.length > 0) {
-                this.addAssistantMessage('', this.toolCalls, this.currentMessageId);
-            }
-            this.saveMessage();
-            this.currentMessageId = null;
-        }
     }
     /**
      * 获取 AbortController 用于中断请求

package/dist/services/session/SessionManager.js

@@ -1,9 +1,9 @@
 import { v4 as uuidv4 } from 'uuid';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('SessionManager');
-import { sessionStore } from './SessionStore';
+import { sessionStore } from './SessionStore.js';
 import { authStore } from '@/stores/authStore';
-import { Session } from './Session';
+import { Session } from './Session.js';
 /**
  * SessionManager - Business logic layer
  * Manages sessions in memory
@@ -11,7 +11,9 @@ import { Session } from './Session';
 export class SessionManager {
     sessions = null;
     initialized = false;
-    constructor() {
+    userId;
+    constructor(userId) {
+        this.userId = userId;
     }
     /**
      * Initialize - Load all sessions from database on startup
@@ -40,7 +42,7 @@ export class SessionManager {
      * Get current user ID
      */
     getCurrentUserId() {
-        const user = authStore.getUser();
+        const user = authStore.getUser(this.userId);
         return user ? String(user.id) : null;
     }
     /**
@@ -251,5 +253,10 @@ export class SessionManager {
         return sessionStore.getMigrationStatus();
     }
 }
-// Export singleton
-export const sessionManager = new SessionManager();
+export let sessionManagerMap = new Map();
+export function getSessionManager(userId) {
+    if (!sessionManagerMap.has(userId)) {
+        sessionManagerMap.set(userId, new SessionManager(userId));
+    }
+    return sessionManagerMap.get(userId);
+}

package/dist/services/session/SessionStore.js

@@ -1,8 +1,8 @@
 import Database from 'better-sqlite3';
 import path from 'path';
 import fs from 'fs';
-import { getLogger } from '@pocketclaw/shared';
-import { MigrationManager } from './MigrationManager';
+import { getLogger } from '@myassis/shared';
+import { MigrationManager } from './MigrationManager.js';
 const logger = getLogger('SessionStore');
 /**
  * SessionStore - Data access layer
@@ -22,36 +22,10 @@ export class SessionStore {
         const migrationsDir = path.join(process.cwd(), 'migrations');
         this.migrationManager = new MigrationManager(this.db, migrationsDir);
         this.migrationManager.migrate();
-        this.ensureColumns();
         logger.info(`Initialized at ${dbPath}`);
         // 注册到全局供 Session 使用
         global.__sessionStore = this;
     }
-    /**
-     * Ensure required columns exist
-     */
-    ensureColumns() {
-        // Ensure agent_id column in sessions
-        const sessionTableInfo = this.db.prepare("PRAGMA table_info(sessions)").all();
-        const hasAgentId = sessionTableInfo.some(col => col.name === 'agent_id');
-        if (!hasAgentId) {
-            this.db.exec("ALTER TABLE sessions ADD COLUMN agent_id TEXT");
-            logger.info('Added agent_id column to sessions');
-        }
-        // Ensure tool_calls column in messages
-        const msgTableInfo = this.db.prepare("PRAGMA table_info(messages)").all();
-        const hasToolCalls = msgTableInfo.some(col => col.name === 'tool_calls');
-        if (!hasToolCalls) {
-            this.db.exec("ALTER TABLE messages ADD COLUMN tool_calls TEXT");
-            logger.info('Added tool_calls column to messages');
-        }
-        // Ensure feedback column in messages
-        const hasFeedback = msgTableInfo.some(col => col.name === 'feedback');
-        if (!hasFeedback) {
-            this.db.exec("ALTER TABLE messages ADD COLUMN feedback TEXT");
-            logger.info('Added feedback column to messages');
-        }
-    }
     /**
      * Provide transaction method
      */

package/dist/services/session/index.js

@@ -1,3 +1,3 @@
 // 导出 SessionManager（业务逻辑层）
-export { SessionManager, sessionManager } from './SessionManager';
-export { Session } from './Session';
+export { SessionManager, getSessionManager } from './SessionManager.js';
+export { Session } from './Session.js';

package/dist/services/systemPrompt.js

@@ -1,6 +1,7 @@
+import { authStore } from '@/stores';
 import os from 'os';
-import { settingsService, skillsService } from './dataService';
-import { getLogger } from '@pocketclaw/shared';
+import { settingsService, skillsService } from './dataService.js';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('SystemPrompt');
 // 预设的对话风格模板
 export const CHAT_STYLE_TEMPLATES = [
@@ -103,8 +104,9 @@ function getInstalledSkillsPrompt(skills) {
  */
 export async function getSystemPromptAsync(agent, customPrompt) {
     const osInfo = getOSInfo();
-    const settings = (await settingsService.get()).data;
-    const skills = (await skillsService.list()).data;
+    const token = authStore.get(agent.userId).accessToken;
+    const settings = (await settingsService.get(token)).data;
+    const skills = (await skillsService.list(token)).data;
     const skillPrompts = getInstalledSkillsPrompt(skills);
     const chineseLocalName = LANGUAGES.filter(x => x.code === settings.language)[0]?.chineseName ?? '简体中文';
     const date = new Date();
@@ -112,6 +114,7 @@ export async function getSystemPromptAsync(agent, customPrompt) {
   【当前运行环境】：${osInfo}。
   【当前时间】：${date.toLocaleString(settings.language)},weekday:${date.getDay()}。
   【语言】你的回复语言严格遵循用户设备系统语言：${chineseLocalName}，无论用户使用任何语言提问，你都只使用【${chineseLocalName}】进行完整回复，不要混用其他语言。
+  【尽力原则】充分分析用户需求，尽力满足，不要偷懒，不要得过且过，要诚实，不能胡编乱造。
   【工具调用】
   1.逐步思考，分步骤调用工具，工具调用前尽量返回content，明确当前工具调用的目的。
   2.工具调用的参数全部采用JSON语法，调用前先验证JSON语法正确后，再回复，切记未验证JSON语法就直接回复。
@@ -128,7 +131,7 @@ export async function getSystemPromptAsync(agent, customPrompt) {
   【解决问题思路】
   1.首先分析用户需求，根据需求罗列出实施计划。如果对需求不够明确，需要把计划罗列完后，让用户确认后再执行。
   2.按照计划分步执行
-  3.所有步骤完成后，验证结果，比如编写程序，则需要编译修改后的代码是否有问题
+  3.所有步骤完成后，验证结果，比如编写程序，则需要执行类型检查
   4.验证完全通过，总结完成情况，告诉用户
   【代码规范】
   ## 1 面向对象代码设计
@@ -141,6 +144,7 @@ export async function getSystemPromptAsync(agent, customPrompt) {
   ## 3 修改已经存在的代码文件
   1）修改Bug，找到Bug后精确替换，不要调整架构
   2）修改业务功能，删除旧的业务功能，重新添加新的，不要在旧的上面做修改，直接删除旧功能，然后添加新功能
+  【代码提交】务必类型检查通过
   ${skillPrompts}`;
     // 如果有自定义提示词，追加
     if (customPrompt) {

package/dist/services/task/PushTokenStore.js

@@ -2,9 +2,9 @@
  * PushTokenStore - 用户设备推送 Token 存储
  * 使用 SQLite 管理用户的多设备推送 Token
  */
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('PushTokenStore');
-import { sessionStore } from '../session/SessionStore';
+import { sessionStore } from '../session/SessionStore.js';
 export class PushTokenStore {
     db;
     constructor() {
@@ -25,26 +25,8 @@ export class PushTokenStore {
         UNIQUE(user_id, token)
       )
     `);
-        // 确保 device_id 和 device_name 列存在（向后兼容）
-        this.ensureColumns();
         logger.info('Tables initialized');
     }
-    ensureColumns() {
-        const tableInfo = this.db.prepare("PRAGMA table_info(push_tokens)").all();
-        const columnNames = tableInfo.map((col) => col.name);
-        if (!columnNames.includes('device_id')) {
-            this.db.exec("ALTER TABLE push_tokens ADD COLUMN device_id TEXT");
-            logger.info('Added column: device_id');
-        }
-        if (!columnNames.includes('device_name')) {
-            this.db.exec("ALTER TABLE push_tokens ADD COLUMN device_name TEXT");
-            logger.info('Added column: device_name');
-        }
-        if (!columnNames.includes('provider')) {
-            this.db.exec("ALTER TABLE push_tokens ADD COLUMN provider TEXT DEFAULT 'expo'");
-            logger.info('Added column: provider');
-        }
-    }
     /**
      * 添加或更新 Push Token
      */

package/dist/services/task/TaskStore.js

@@ -2,8 +2,8 @@
  * TaskStore - Gateway 任务数据访问层
  * 操作 SQLite 数据库，与 AgentStore/SessionStore 共享同一个数据库实例
  */
-import { getLogger } from '@pocketclaw/shared';
-import { sessionStore } from '../session/SessionStore';
+import { getLogger } from '@myassis/shared';
+import { sessionStore } from '../session/SessionStore.js';
 const logger = getLogger('TaskStore');
 function rowToTaskData(row) {
     return {
@@ -59,27 +59,8 @@ export class TaskStore {
         updated_at INTEGER NOT NULL
       )
     `);
-        // 确保必要列存在（向后兼容）
-        this.ensureColumns();
         logger.info('Tables initialized');
     }
-    ensureColumns() {
-        const tableInfo = this.db.prepare("PRAGMA table_info(tasks)").all();
-        const columnNames = tableInfo.map((col) => col.name);
-        const requiredColumns = [
-            { name: 'platform_apply', sql: 'ALTER TABLE tasks ADD COLUMN platform_apply TEXT' },
-            { name: 'push_token', sql: 'ALTER TABLE tasks ADD COLUMN push_token TEXT' },
-            { name: 'recurrence_rule', sql: 'ALTER TABLE tasks ADD COLUMN recurrence_rule TEXT' },
-            { name: 'interval_value', sql: 'ALTER TABLE tasks ADD COLUMN interval_value INTEGER' },
-            { name: 'interval_unit', sql: 'ALTER TABLE tasks ADD COLUMN interval_unit TEXT' },
-        ];
-        for (const col of requiredColumns) {
-            if (!columnNames.includes(col.name)) {
-                this.db.exec(col.sql);
-                logger.info(`Added column: ${col.name}`);
-            }
-        }
-    }
     // ========== Task Operations ==========
     insert(task) {
         this.db.prepare(`