@myassis/gateway 1.0.1 → 1.0.2

package/dist/services/TaskService.js

@@ -7,10 +7,11 @@
  * - platformApply === currentPlatform → 本地 SQLite 存储（localTaskService）
  * - platformApply !== currentPlatform → 服务器 API（tasksApi）
  */
+import { authStore } from '@/stores';
 import { tasksApi } from '../api';
 import { localTaskService } from './LocalTaskService';
-import { getLogger } from '@pocketclaw/shared';
-import { getPlatform } from '@pocketclaw/shared/dist/utils/system.js';
+import { getLogger } from '@myassis/shared';
+import { getPlatform } from '@myassis/shared/dist/utils/system.js';
 // 当前网关平台标识
 const CURRENT_PLATFORM = process.env.GATEWAY_PLATFORM || getPlatform();
 const logger = getLogger('TaskService');
@@ -29,7 +30,7 @@ class TaskService {
     /**
      * 创建任务（自动路由）
      */
-    async createTask(data) {
+    async createTask(data, token) {
         const isLocal = isLocalTask(data.platformApply);
         logger.info('[TaskService] 创建任务', {
             title: data.title,
@@ -73,19 +74,19 @@ class TaskService {
                     ? (typeof data.endTime === 'object' ? new Date(data.endTime).toISOString() : data.endTime)
                     : undefined,
                 platform_apply: data.platformApply,
-            });
+            }, token);
             return { id: String(result.id || result), isLocal: false };
         }
     }
     /**
      * 获取任务（自动路由 - 先本地后服务器）
      */
-    async getTask(taskId) {
+    async getTask(taskId, token) {
         const localTask = localTaskService.getTask(taskId);
         if (localTask)
             return localTask;
         try {
-            const result = await tasksApi.get(taskId);
+            const result = await tasksApi.get(taskId, token);
             return this.transformServerTask(result);
         }
         catch (error) {
@@ -99,12 +100,14 @@ class TaskService {
     async listTasks(params) {
         const localResult = localTaskService.listTasks(params);
         let serverTasks = [];
+        const userId = params.userId;
+        const token = authStore.get(userId).accessToken;
         try {
             const serverResult = await tasksApi.list({
-                status: params?.status,
-                page: params?.page ? String(params.page) : undefined,
-                pageSize: params?.pageSize ? String(params.pageSize) : undefined,
-            });
+                status: params.status,
+                page: params.page ? String(params.page) : undefined,
+                pageSize: params.pageSize ? String(params.pageSize) : undefined,
+            }, token);
             if (Array.isArray(serverResult)) {
                 serverTasks = serverResult.map(t => this.transformServerTask(t)).filter(Boolean);
             }
@@ -126,7 +129,7 @@ class TaskService {
     /**
      * 更新任务（自动路由）
      */
-    async updateTask(taskId, data) {
+    async updateTask(taskId, data, token) {
         const localTask = localTaskService.getTask(taskId);
         if (localTask) {
             const result = localTaskService.updateTask(taskId, data);
@@ -151,7 +154,7 @@ class TaskService {
                         ? (typeof data.endTime === 'object' ? new Date(data.endTime).toISOString() : data.endTime)
                         : undefined,
                     status: data.status,
-                });
+                }, token);
                 return true;
             }
             catch (error) {
@@ -163,14 +166,14 @@ class TaskService {
     /**
      * 删除任务（自动路由）
      */
-    async deleteTask(taskId) {
+    async deleteTask(taskId, token) {
         const localTask = localTaskService.getTask(taskId);
         if (localTask) {
             return localTaskService.deleteTask(taskId);
         }
         else {
             try {
-                await tasksApi.delete(taskId);
+                await tasksApi.delete(taskId, token);
                 return true;
             }
             catch (error) {
@@ -182,7 +185,7 @@ class TaskService {
     /**
      * 更新任务状态
      */
-    async updateTaskStatus(taskId, status) {
+    async updateTaskStatus(taskId, status, token) {
         const localTask = localTaskService.getTask(taskId);
         if (localTask) {
             await localTaskService.updateTaskStatus(taskId, status);
@@ -190,7 +193,7 @@ class TaskService {
         }
         else {
             try {
-                await tasksApi.updateStatus(taskId, { status });
+                await tasksApi.updateStatus(taskId, { status }, token);
                 return true;
             }
             catch (error) {
@@ -202,14 +205,14 @@ class TaskService {
     /**
      * 完成任务
      */
-    async completeTask(taskId) {
-        return this.updateTaskStatus(taskId, 'completed');
+    async completeTask(taskId, token) {
+        return this.updateTaskStatus(taskId, 'completed', token);
     }
     /**
      * 取消任务
      */
-    async cancelTask(taskId) {
-        return this.updateTaskStatus(taskId, 'cancelled');
+    async cancelTask(taskId, token) {
+        return this.updateTaskStatus(taskId, 'cancelled', token);
     }
     /**
      * 转换服务器任务格式

package/dist/services/WebSocketService.js

@@ -4,7 +4,7 @@
  */
 import { WebSocketServer, WebSocket } from 'ws';
 import { authStore } from '../stores/index.js';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('WebSocketService');
 class WebSocketService {
     wss = null;
@@ -93,13 +93,23 @@ class WebSocketService {
     }
     /**
      * 从请求中提取用户标识
-     * Desktop 不存储 token，Gateway 直接信任连接并使用已登录用户的 ID
+     * 支持两种方式：
+     * 1. URL 查询参数 ?token=xxx（Desktop WebSocket 连接）
+     * 2. 直接使用 authStore 中的用户 ID
      */
     getClientKey(req) {
-        // 直接使用 authStore 中的用户 ID（Gateway 登录后的用户）
-        const userId = authStore.getUserId();
-        if (userId) {
-            return String(userId);
+        // 优先从 URL 查询参数中提取 token
+        let token = null;
+        const url = req.url || '';
+        const match = url.match(/[?&]token=([^&]+)/);
+        if (match) {
+            token = decodeURIComponent(match[1]);
+        }
+        if (token) {
+            const userId = authStore.getUserId(token);
+            if (userId) {
+                return String(userId);
+            }
         }
         return null;
     }

package/dist/services/agent/Agent.js

@@ -1,5 +1,5 @@
 import { v4 as uuidv4 } from 'uuid';
-import { sessionManager } from '../session/SessionManager';
+import { getSessionManager } from '../session/SessionManager';
 /**
  * Agent - Business logic entity
  * Represents an AI agent with independent system prompt and multiple sessions
@@ -16,7 +16,7 @@ export class Agent {
     updatedAt;
     isCurrent; // 是否是当前正在查看的 Agent
     store;
-    constructor(data, store, agentManager) {
+    constructor(data, store) {
         this.id = data.id;
         this.userId = data.userId;
         this.name = data.name;
@@ -33,14 +33,14 @@ export class Agent {
      * Get all sessions under this agent
      */
     getSessions() {
-        const allSessions = sessionManager.getUserSessions();
+        const allSessions = getSessionManager(this.userId).getUserSessions();
         return allSessions.filter(s => s.agentId === this.id);
     }
     /**
      * Create new session under this agent
      */
     createSession(config = {}) {
-        const session = sessionManager.createSession({
+        const session = getSessionManager(this.userId).createSession({
             id: config.id || uuidv4(),
             title: config.title || '新会话',
             selectModelId: config.selectModelId,
@@ -55,7 +55,7 @@ export class Agent {
         const session = this.getSession(sessionId);
         if (!session)
             return null;
-        return sessionManager.updateSession(sessionId, data);
+        return getSessionManager(this.userId).updateSession(sessionId, data);
     }
     /**
      * Delete session under this agent
@@ -64,13 +64,13 @@ export class Agent {
         const session = this.getSession(sessionId);
         if (!session)
             return false;
-        return sessionManager.deleteSession(sessionId);
+        return getSessionManager(this.userId).deleteSession(sessionId);
     }
     /**
      * Get session under this agent
      */
     getSession(sessionId) {
-        const session = sessionManager.getSession(sessionId);
+        const session = getSessionManager(this.userId).getSession(sessionId);
         if (session && session.agentId === this.id) {
             return session;
         }

package/dist/services/agent/AgentManager.js

@@ -1,8 +1,8 @@
 import { v4 as uuidv4 } from 'uuid';
 import { Agent } from './Agent';
-import { sessionManager } from '../session/SessionManager';
+import { getSessionManager } from '../session/SessionManager';
 import { authStore } from '@/stores/authStore';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 import appConfig from '@/config';
 const logger = getLogger('AgentManager');
 /**
@@ -13,8 +13,10 @@ export class AgentManager {
     store;
     agents = null;
     initialized = false;
-    constructor(store) {
+    userId;
+    constructor(store, userId) {
         this.store = store;
+        this.userId = userId;
     }
     /**
      * Initialize - Load all agents from database on startup
@@ -34,12 +36,12 @@ export class AgentManager {
         // Load all agents from database
         const agentDataList = this.store.findByUserId(userId);
         for (const agentData of agentDataList) {
-            const agent = new Agent(agentData, this.store, this);
+            const agent = new Agent(agentData, this.store);
             this.agents.set(agent.id, agent);
         }
-        // If no agents exist, create default "MyClaw" agent
+        // If no agents exist, create default "我的助手" agent
         if (this.agents.size === 0) {
-            logger.info('No agents found, creating default "MyClaw" agent');
+            logger.info('No agents found, creating default "我的助手" agent');
             this.createDefaultAgent(userId);
         }
         // Ensure exactly one agent has isCurrent=true
@@ -58,11 +60,11 @@ export class AgentManager {
      * Get current user ID
      */
     getCurrentUserId() {
-        const user = authStore.getUser();
+        const user = authStore.getUser(this.userId);
         return user ? String(user.id) : null;
     }
     /**
-     * Create default "MyClaw" agent
+     * Create default "我的助手" agent
      */
     createDefaultAgent(userId) {
         const agentData = {
@@ -78,7 +80,7 @@ export class AgentManager {
             isCurrent: true,
         };
         this.store.insert(agentData);
-        const agent = new Agent(agentData, this.store, this);
+        const agent = new Agent(agentData, this.store);
         this.agents.set(agent.id, agent);
         // Create default session
         agent.createSession({ title: '新会话' });
@@ -95,7 +97,7 @@ export class AgentManager {
             return [];
         const agentDataList = this.store.findByUserId(userId);
         return agentDataList.map(data => {
-            const sessions = sessionManager.getUserSessions();
+            const sessions = getSessionManager(this.userId).getUserSessions();
             const agentSessions = sessions
                 .filter(s => s.agentId === data.id)
                 .map(s => ({
@@ -146,7 +148,7 @@ export class AgentManager {
             updatedAt: Date.now(),
         };
         this.store.insert(agentData);
-        const agent = new Agent(agentData, this.store, this);
+        const agent = new Agent(agentData, this.store);
         this.agents.set(agent.id, agent);
         // Create default session
         agent.createSession({ title: '新会话' });
@@ -186,7 +188,7 @@ export class AgentManager {
         // Delete all sessions under this agent
         const sessions = agent.getSessions();
         for (const session of sessions) {
-            sessionManager.deleteSession(session.id);
+            getSessionManager(this.userId).deleteSession(session.id);
         }
         // Delete agent
         this.store.delete(agentId);
@@ -233,12 +235,15 @@ export class AgentManager {
      * Get sessions under an agent
      */
     getAgentSessions(agentId) {
-        const sessions = sessionManager.getUserSessions();
+        const sessions = getSessionManager(this.userId).getUserSessions();
         return sessions
             .filter(s => s.agentId === agentId)
             .map(s => ({
             id: s.id,
             title: s.title,
+            selectModelId: s.selectModelId,
+            isCurrent: s.isCurrent,
+            unreadCount: s.unreadCount,
             createdAt: s.createdAt,
             updatedAt: s.updatedAt,
         }));
@@ -258,8 +263,11 @@ export class AgentManager {
     }
 }
 // Export singleton
-export let agentManager;
-export function initAgentManager(store) {
-    agentManager = new AgentManager(store);
-    return agentManager;
+export let agentManagerMap = new Map();
+export function initAgentManager(store, userId) {
+    if (agentManagerMap.has(userId)) {
+        return agentManagerMap.get(userId);
+    }
+    agentManagerMap.set(userId, new AgentManager(store, userId));
+    return agentManagerMap.get(userId);
 }

package/dist/services/agent/AgentStore.js

@@ -1,4 +1,4 @@
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('AgentStore');
 /**
  * AgentStore - Data access layer

package/dist/services/dataService.js

@@ -10,7 +10,7 @@
 import { authApi, skillsApi, skillHubApi, modelsApi, settingsApi } from '../api';
 import { authStore, memoryStore, persistStore } from '../stores';
 import { taskService } from './TaskService';
-import { getLogger } from '@pocketclaw/shared';
+import { getLogger } from '@myassis/shared';
 const logger = getLogger('DataService');
 // ============ 认证服务 ============
 export const authService = {
@@ -20,7 +20,7 @@ export const authService = {
         if (response.success && response.data) {
             const expiresIn = response.data.expiresIn || 86400;
             authStore.save({
-                token: response.data.accessToken,
+                accessToken: response.data.accessToken,
                 refreshToken: response.data.refreshToken,
                 expiresIn,
                 expiresAt: Date.now() + expiresIn * 1000,
@@ -40,7 +40,7 @@ export const authService = {
         if (response.success && response.data) {
             const expiresIn = response.data.expiresIn || 86400;
             authStore.save({
-                token: response.data.accessToken,
+                accessToken: response.data.accessToken,
                 refreshToken: response.data.refreshToken,
                 expiresIn,
                 expiresAt: Date.now() + expiresIn * 1000,
@@ -50,9 +50,9 @@ export const authService = {
         return response;
     },
     // 登出
-    logout: async () => {
+    logout: async (token) => {
         try {
-            await authApi.logout();
+            await authApi.logout(token);
         }
         catch (e) {
             // 忽略错误
@@ -61,19 +61,15 @@ export const authService = {
         return { success: true };
     },
     // 获取当前用户
-    me: () => authApi.me(),
+    me: (token) => authApi.me(token),
     // 更新资料
-    updateProfile: (data) => authApi.updateProfile(data),
+    updateProfile: (data, token) => authApi.updateProfile(data, token),
     // 修改密码
-    changePassword: (oldPassword, newPassword) => authApi.changePassword({ oldPassword, newPassword }),
+    changePassword: (oldPassword, newPassword, token) => authApi.changePassword({ oldPassword, newPassword }, token),
     // 删除账号
-    deleteAccount: (password) => authApi.deleteAccount({ password }),
-    // 获取认证状态
-    isAuthenticated: () => authStore.isAuthenticated(),
+    deleteAccount: (password, token) => authApi.deleteAccount({ password }, token),
     // 获取当前用户（从内存）
-    getUser: () => authStore.get()?.user || null,
-    // 获取 Token
-    getToken: () => authStore.getToken(),
+    getUser: (token) => authStore.get(token)?.user || null,
     // 刷新 Token
     refresh: async (refreshToken) => {
         const response = await authApi.refresh(refreshToken);
@@ -81,21 +77,15 @@ export const authService = {
             authStore.updateToken(response.accessToken, response.refreshToken);
         }
         return response;
-    },
-    // 检查认证（供 Desktop 使用）
-    checkAuth: async () => {
-        const isAuth = authStore.isAuthenticated();
-        const user = authStore.get()?.user || null;
-        return { success: true, authenticated: isAuth, user };
     }
 };
 // ============ 技能服务 (用户已安装的技能) ============
 export const skillsService = {
-    list: async () => await skillsApi.list(),
-    get: (skillId) => skillsApi.get(skillId),
-    install: async (skillHubId) => {
+    list: async (token) => await skillsApi.list(token),
+    get: (skillId, token) => skillsApi.get(skillId, token),
+    install: async (skillHubId, token) => {
         // 1. 从技能库获取技能详情
-        const hubResult = await skillHubApi.get(skillHubId);
+        const hubResult = await skillHubApi.get(skillHubId, token);
         if (!hubResult.success || !hubResult.data) {
             return { success: false, error: '获取技能详情失败' };
         }
@@ -110,26 +100,26 @@ export const skillsService = {
             isActive: true,
             apiKeyRequired: hub.apiKeyRequired || false,
         };
-        const response = await skillsApi.create(skillData);
+        const response = await skillsApi.create(skillData, token);
         if (response.success) {
             // 3. 增加安装计数
-            await skillHubApi.install(skillHubId);
+            await skillHubApi.install(skillHubId, token);
         }
         return response;
     },
-    update: (skillId, data) => skillsApi.update(skillId, data),
-    uninstall: async (skillId) => await skillsApi.uninstall(skillId),
-    setApiKey: (skillId, apiKey) => {
+    update: (skillId, data, token) => skillsApi.update(skillId, data, token),
+    uninstall: async (skillId, token) => await skillsApi.uninstall(skillId, token),
+    setApiKey: (skillId, apiKey, token) => {
         persistStore.setSkillApiKey(skillId, apiKey);
         return { success: true };
     },
-    getApiKey: async (skillId) => {
+    getApiKey: async (skillId, token) => {
         const apikey = persistStore.getSkillApiKey(skillId);
         if (!apikey) {
             // 判断是否有内置 apikey
-            const skill = (await skillsService.get(skillId)).data;
+            const skill = (await skillsService.get(skillId, token)).data;
             if (skill.templateId) {
-                const skillHub = (await skillHubService.get(skill.templateId)).data;
+                const skillHub = (await skillHubService.get(skill.templateId, token)).data;
                 if (skillHub?.builtinApikey) {
                     persistStore.setSkillApiKey(skillId, skillHub.builtinApikey);
                     return { success: true, apiKey: skillHub.builtinApikey };
@@ -138,13 +128,13 @@ export const skillsService = {
         }
         return { success: true, apiKey: apikey?.apiKey };
     },
-    rate: (skillId, score) => skillsApi.rate(skillId, { score }),
-    parse: (content) => skillsApi.parse({ content }),
-    create: async (data) => {
-        const response = await skillsApi.create(data);
+    rate: (skillId, score, token) => skillsApi.rate(skillId, { score }, token),
+    parse: (content, token) => skillsApi.parse({ content }, token),
+    create: async (data, token) => {
+        const response = await skillsApi.create(data, token);
         if (response.success) {
             // 创建成功后更新技能列表缓存
-            const listResponse = await skillsApi.list();
+            const listResponse = await skillsApi.list(token);
             if (listResponse.success) {
                 memoryStore.set('skills', listResponse.data);
             }
@@ -154,28 +144,28 @@ export const skillsService = {
 };
 // ============ 技能库服务 (可安装的技能) ============
 export const skillHubService = {
-    list: (params) => skillHubApi.list(params),
-    get: (hubId) => skillHubApi.get(hubId),
-    categories: () => skillHubApi.categories(),
-    preinstalled: () => skillHubApi.preinstalled(),
-    user: () => skillHubApi.user(),
-    checkUsed: (hubId) => skillHubApi.checkUsed(hubId),
-    rate: (hubId, rating) => skillHubApi.rate(hubId, rating),
-    userRating: (hubId) => skillHubApi.userRating(hubId),
-    install: (hubId) => skillHubApi.install(hubId),
-    use: (hubId) => skillHubApi.use(hubId),
+    list: (token, params) => skillHubApi.list(params, token),
+    get: (hubId, token) => skillHubApi.get(hubId, token),
+    categories: (token) => skillHubApi.categories(token),
+    preinstalled: (token) => skillHubApi.preinstalled(token),
+    user: (token) => skillHubApi.user(token),
+    checkUsed: (hubId, token) => skillHubApi.checkUsed(hubId, token),
+    rate: (hubId, rating, token) => skillHubApi.rate(hubId, rating, token),
+    userRating: (hubId, token) => skillHubApi.userRating(hubId, token),
+    install: (hubId, token) => skillHubApi.install(hubId, token),
+    use: (hubId, token) => skillHubApi.use(hubId, token),
 };
 // ============ 模型服务 ============
 export const modelsService = {
-    list: () => modelsApi.list(),
-    get: (modelId) => modelsApi.get(modelId),
-    create: (data) => modelsApi.create(data),
-    update: (modelId, data) => modelsApi.update(modelId, data),
-    delete: (modelId) => modelsApi.delete(modelId),
-    setPrimary: (modelId) => modelsApi.setPrimary(modelId),
+    list: (token) => modelsApi.list(token),
+    get: (modelId, token) => modelsApi.get(modelId, token),
+    create: (data, token) => modelsApi.create(data, token),
+    update: (modelId, data, token) => modelsApi.update(modelId, data, token),
+    delete: (modelId, token) => modelsApi.delete(modelId, token),
+    setPrimary: (modelId, token) => modelsApi.setPrimary(modelId, token),
 };
 export const tasksService = {
-    list: async (params, userId) => {
+    list: async (userId, params) => {
         const result = await taskService.listTasks({
             status: params?.status,
             userId,
@@ -184,13 +174,13 @@ export const tasksService = {
         });
         return { success: true, data: result.tasks, total: result.total };
     },
-    get: async (taskId) => {
-        const task = await taskService.getTask(taskId);
+    get: async (taskId, token) => {
+        const task = await taskService.getTask(taskId, token);
         if (!task)
             return { success: false, error: 'Task not found' };
         return { success: true, data: task };
     },
-    create: async (data, userId) => {
+    create: async (data, userId, token) => {
         const uid = userId || data?.userId || 'local';
         try {
             const result = await taskService.createTask({
@@ -206,7 +196,7 @@ export const tasksService = {
                 endTime: data.endTime,
                 platformApply: data.platformApply,
                 pushToken: data.pushToken,
-            });
+            }, token);
             return { success: true, data: { id: result.id, isLocal: result.isLocal } };
         }
         catch (error) {
@@ -214,7 +204,7 @@ export const tasksService = {
             return { success: false, error: error.message };
         }
     },
-    update: async (taskId, data) => {
+    update: async (taskId, data, token) => {
         try {
             const result = await taskService.updateTask(taskId, {
                 title: data.title,
@@ -229,7 +219,7 @@ export const tasksService = {
                 status: data.status,
                 platformApply: data.platformApply,
                 pushToken: data.pushToken,
-            });
+            }, token);
             return { success: result };
         }
         catch (error) {
@@ -237,9 +227,9 @@ export const tasksService = {
             return { success: false, error: error.message };
         }
     },
-    delete: async (taskId) => {
+    delete: async (taskId, token) => {
         try {
-            const result = await taskService.deleteTask(taskId);
+            const result = await taskService.deleteTask(taskId, token);
             return { success: result };
         }
         catch (error) {
@@ -247,9 +237,9 @@ export const tasksService = {
             return { success: false, error: error.message };
         }
     },
-    cancel: async (taskId) => {
+    cancel: async (taskId, token) => {
         try {
-            const result = await taskService.cancelTask(taskId);
+            const result = await taskService.cancelTask(taskId, token);
             return { success: result };
         }
         catch (error) {
@@ -257,9 +247,9 @@ export const tasksService = {
             return { success: false, error: error.message };
         }
     },
-    updateStatus: async (taskId, status) => {
+    updateStatus: async (taskId, status, token) => {
         try {
-            const result = await taskService.updateTaskStatus(taskId, status);
+            const result = await taskService.updateTaskStatus(taskId, status, token);
             return { success: result };
         }
         catch (error) {
@@ -270,21 +260,21 @@ export const tasksService = {
 };
 // ============ 设置服务 ============
 export const settingsService = {
-    get: async () => {
+    get: async (token) => {
         const settings = memoryStore.get('settings'); // 预热缓存
         if (settings) {
             return { success: true, data: settings };
         }
         else {
-            const response = await settingsApi.get();
+            const response = await settingsApi.get(token);
             if (response.success) {
                 memoryStore.set('settings', response.data); // 更新缓存
             }
             return response;
         }
     },
-    update: async (data) => {
-        const response = await settingsApi.update(data);
+    update: async (data, token) => {
+        const response = await settingsApi.update(data, token);
         if (response.success) {
             memoryStore.set('settings', response.data); // 更新缓存
         }

package/dist/services/index.js

@@ -3,7 +3,7 @@ export { authService, skillsService, skillHubService, modelsService, settingsSer
 // Re-export tasksService from dataService (server-only tasks)
 export { tasksService } from './dataService';
 // Re-export session manager
-export { sessionManager } from './session';
+export { getSessionManager } from './session';
 // Re-export task services
 export { taskSchedulerService } from './TaskSchedulerService';
 export { taskService } from './TaskService';