@nocobase/plugin-ai 2.1.0-beta.14 → 2.1.0-beta.16

package/dist/server/resource/aiConversations.js

@@ -75,15 +75,20 @@ var aiConversations_default = {
       if (!userId) {
         return ctx.throw(403);
       }
+      const filter = ctx.action.params.filter || {};
       ctx.action.mergeParams({
         filter: {
-          userId
+          ...filter,
+          userId,
+          from: filter.from ?? "main-agent",
+          category: "chat"
         }
       });
       return import_actions.default.list(ctx, next);
     },
     async create(ctx, next) {
       var _a;
+      const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
       if (!userId) {
         return ctx.throw(403);
@@ -93,43 +98,39 @@ var aiConversations_default = {
       if (!employee) {
         ctx.throw(400, "AI employee not found");
       }
-      const repo = ctx.db.getRepository("aiConversations");
-      ctx.body = await repo.create({
-        values: {
+      try {
+        ctx.body = await plugin.aiConversationsManager.create({
           userId,
           aiEmployee,
           options: {
             systemMessage,
             skillSettings,
             conversationSettings
-          },
-          thread: 1
+          }
+        });
+      } catch (error) {
+        if (error.message === "AI employee not found") {
+          ctx.throw(400, error.message);
         }
-      });
+        throw error;
+      }
       await next();
     },
     async update(ctx, next) {
       var _a;
+      const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
       if (!userId) {
         return ctx.throw(403);
       }
       const { filterByTk: sessionId } = ctx.action.params;
       const { title } = ctx.action.params.values || {};
-      const repo = ctx.db.getRepository("aiConversations");
-      ctx.body = await repo.update({
-        filter: {
-          userId,
-          sessionId
-        },
-        values: {
-          title
-        }
-      });
+      ctx.body = await plugin.aiConversationsManager.update({ userId, sessionId, title });
       await next();
     },
     async updateOptions(ctx, next) {
       var _a;
+      const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
       if (!userId) {
         return ctx.throw(403);
@@ -142,34 +143,18 @@ var aiConversations_default = {
       if (!systemMessage && !skillSettings && !conversationSettings) {
         return ctx.throw(400, "invalid options");
       }
-      const conversation = await ctx.db.getRepository("aiConversations").findOne({
-        filter: {
+      try {
+        ctx.body = await plugin.aiConversationsManager.update({
+          userId,
           sessionId,
-          userId
+          options: { systemMessage, skillSettings, conversationSettings }
+        });
+      } catch (error) {
+        if (error.message === "invalid sessionId") {
+          ctx.throw(400, error.message);
         }
-      });
-      if (!conversation) {
-        ctx.throw(400, "invalid sessionId");
-      }
-      const options = conversation.options ?? {};
-      if (systemMessage) {
-        options["systemMessage"] = systemMessage;
+        throw error;
       }
-      if (skillSettings) {
-        options["skillSettings"] = skillSettings;
-      }
-      if (conversationSettings) {
-        options["conversationSettings"] = conversationSettings;
-      }
-      ctx.body = await ctx.db.getRepository("aiConversations").update({
-        filter: {
-          userId,
-          sessionId
-        },
-        values: {
-          options
-        }
-      });
       await next();
     },
     async destroy(ctx, next) {
@@ -197,92 +182,24 @@ var aiConversations_default = {
         ctx.throw(400);
       }
       const paginate = ((_b = ctx.action.params) == null ? void 0 : _b.paginate) === "false" ? false : true;
-      const conversation = await ctx.db.getRepository("aiConversations").findOne({
-        filter: {
+      try {
+        ctx.body = await plugin.aiConversationsManager.getMessages({
+          userId,
           sessionId,
-          userId
+          cursor,
+          paginate
+        });
+      } catch (error) {
+        if (error.message === "invalid sessionId") {
+          ctx.throw(400);
         }
-      });
-      if (!conversation) {
-        ctx.throw(400);
+        throw error;
       }
-      const pageSize = 10;
-      const maxLimit = 200;
-      const messageRepository = ctx.db.getRepository("aiConversations.messages", sessionId);
-      const filter = {
-        role: {
-          $notIn: ["tool"]
-        }
-      };
-      if (paginate && cursor) {
-        filter["messageId"] = {
-          $lt: cursor
-        };
-      }
-      const rows = await messageRepository.find({
-        sort: ["-messageId"],
-        limit: paginate ? pageSize + 1 : maxLimit,
-        filter
-      });
-      const hasMore = paginate && rows.length > pageSize;
-      const data = hasMore ? rows.slice(0, -1) : rows;
-      const newCursor = data.length ? data[data.length - 1].messageId : null;
-      const toolCallIds = data.filter((row) => {
-        var _a2;
-        return ((_a2 = row == null ? void 0 : row.toolCalls) == null ? void 0 : _a2.length) ?? 0 > 0;
-      }).flatMap((row) => row.toolCalls).map((toolCall) => toolCall.id);
-      const toolMessages = await ctx.db.getRepository("aiToolMessages").find({
-        filter: {
-          sessionId,
-          toolCallId: {
-            $in: toolCallIds
-          }
-        }
-      });
-      const toolMessageKey = (messageId, toolCallId) => `${messageId}:${toolCallId}`;
-      const toolMessageMap = new Map(
-        toolMessages.map((toolMessage) => [
-          toolMessageKey(toolMessage.messageId, toolMessage.toolCallId),
-          toolMessage
-        ])
-      );
-      const toolsList = await plugin.ai.toolsManager.listTools();
-      const toolsMap = new Map(toolsList.map((t) => [t.definition.name, t]));
-      ctx.body = {
-        rows: data.map((row) => {
-          var _a2, _b2;
-          if (((_a2 = row == null ? void 0 : row.toolCalls) == null ? void 0 : _a2.length) ?? 0 > 0) {
-            for (const toolCall of row.toolCalls) {
-              const tools = toolsMap.get(toolCall.name);
-              const toolMessage = toolMessageMap.get(toolMessageKey(row.messageId, toolCall.id));
-              toolCall.invokeStatus = toolMessage == null ? void 0 : toolMessage.invokeStatus;
-              toolCall.auto = toolMessage == null ? void 0 : toolMessage.auto;
-              toolCall.status = toolMessage == null ? void 0 : toolMessage.status;
-              toolCall.content = toolMessage == null ? void 0 : toolMessage.content;
-              toolCall.execution = tools == null ? void 0 : tools.execution;
-              toolCall.willInterrupt = (tools == null ? void 0 : tools.execution) === "frontend" || (toolMessage == null ? void 0 : toolMessage.auto) === false;
-              toolCall.defaultPermission = tools == null ? void 0 : tools.defaultPermission;
-            }
-          }
-          const providerOptions = plugin.aiManager.llmProviders.get((_b2 = row.metadata) == null ? void 0 : _b2.provider);
-          if (!providerOptions) {
-            return (0, import_utils.parseResponseMessage)(row);
-          }
-          const Provider = providerOptions.provider;
-          const provider = new Provider({
-            app: ctx.app
-          });
-          return provider.parseResponseMessage(row);
-        }),
-        ...paginate && {
-          hasMore,
-          cursor: newCursor
-        }
-      };
       await next();
     },
     async updateToolArgs(ctx, next) {
       var _a;
+      const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
       if (!userId) {
         return ctx.throw(403);
@@ -295,11 +212,9 @@ var aiConversations_default = {
       if (!sessionId) {
         ctx.throw(400);
       }
-      const conversation = await ctx.db.getRepository("aiConversations").findOne({
-        filter: {
-          sessionId,
-          userId
-        }
+      const conversation = await plugin.aiConversationsManager.getConversation({
+        sessionId,
+        userId
       });
       if (!conversation) {
         ctx.throw(400);
@@ -326,11 +241,12 @@ var aiConversations_default = {
       await next();
     },
     async sendMessages(ctx, next) {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
       if (!userId) {
         return ctx.throw(403);
       }
+      const plugin = ctx.app.pm.get("ai");
       const {
         sessionId,
         aiEmployee: employeeName,
@@ -364,11 +280,9 @@ var aiConversations_default = {
         return next();
       }
       try {
-        const conversation = await ctx.db.getRepository("aiConversations").findOne({
-          filter: {
-            sessionId,
-            userId
-          }
+        const conversation = await plugin.aiConversationsManager.getConversation({
+          sessionId,
+          userId
         });
         if (!conversation) {
           if (shouldStream) {
@@ -403,29 +317,42 @@ var aiConversations_default = {
           return next();
         }
         const legacy = conversation.thread === 0;
-        const aiEmployee = new import_ai_employee.AIEmployee(
+        const aiEmployee = new import_ai_employee.AIEmployee({
           ctx,
           employee,
           sessionId,
-          (_b = conversation.options) == null ? void 0 : _b.systemMessage,
-          (_c = conversation.options) == null ? void 0 : _c.skillSettings,
+          systemMessage: (_b = conversation.options) == null ? void 0 : _b.systemMessage,
+          skillSettings: (_c = conversation.options) == null ? void 0 : _c.skillSettings,
+          tools: (_d = conversation.options) == null ? void 0 : _d.tools,
           webSearch,
           model,
           legacy
-        );
+        });
         if (!editingMessageId) {
-          const toolMessages = await aiEmployee.cancelToolCall();
-          if (toolMessages == null ? void 0 : toolMessages.length) {
-            for (let i = toolMessages.length - 1; i >= 0; i--) {
-              const toolMessage = toolMessages[i];
-              messages.unshift({
-                role: toolMessage.role,
-                content: toolMessage.content,
-                toolCalls: toolMessage.toolCalls,
-                attachments: toolMessage.attachments,
-                workContext: toolMessage.workContext,
-                metadata: toolMessage.metadata
-              });
+          if (await plugin.subAgentsDispatcher.isInterrupted(ctx)) {
+            const userDecisions = await plugin.subAgentsDispatcher.reject(ctx);
+            if (userDecisions) {
+              if (shouldStream) {
+                await aiEmployee.stream({ userDecisions });
+              } else {
+                ctx.body = await aiEmployee.invoke({ userDecisions });
+              }
+              return;
+            }
+          } else {
+            const toolMessages = await aiEmployee.cancelToolCall();
+            if (toolMessages == null ? void 0 : toolMessages.length) {
+              for (let i = toolMessages.length - 1; i >= 0; i--) {
+                const toolMessage = toolMessages[i];
+                messages.unshift({
+                  role: toolMessage.role,
+                  content: toolMessage.content,
+                  toolCalls: toolMessage.toolCalls,
+                  attachments: toolMessage.attachments,
+                  workContext: toolMessage.workContext,
+                  metadata: toolMessage.metadata
+                });
+              }
             }
           }
         }
@@ -442,8 +369,9 @@ var aiConversations_default = {
           ctx.status = 500;
           ctx.body = { error: err.message || "Tool call error" };
         }
+      } finally {
+        await next();
       }
-      await next();
     },
     async abort(ctx, next) {
       var _a;
@@ -453,11 +381,9 @@ var aiConversations_default = {
       }
       const { sessionId } = ctx.action.params.values || {};
       const plugin = ctx.app.pm.get("ai");
-      const conversation = await ctx.db.getRepository("aiConversations").findOne({
-        filter: {
-          sessionId,
-          userId
-        }
+      const conversation = await plugin.aiConversationsManager.getConversation({
+        sessionId,
+        userId
       });
       if (!conversation) {
         ctx.throw(404, "conversation not found");
@@ -466,7 +392,8 @@ var aiConversations_default = {
       await next();
     },
     async resendMessages(ctx, next) {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
+      const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
       if (!userId) {
         return ctx.throw(403);
@@ -479,11 +406,9 @@ var aiConversations_default = {
         return next();
       }
       try {
-        const conversation = await ctx.db.getRepository("aiConversations").findOne({
-          filter: {
-            sessionId,
-            userId
-          }
+        const conversation = await plugin.aiConversationsManager.getConversation({
+          sessionId,
+          userId
         });
         if (!conversation) {
           sendErrorResponse(ctx, "conversation not found");
@@ -528,15 +453,16 @@ var aiConversations_default = {
           sendErrorResponse(ctx, "AI employee not found");
           return next();
         }
-        const aiEmployee = new import_ai_employee.AIEmployee(
+        const aiEmployee = new import_ai_employee.AIEmployee({
           ctx,
           employee,
           sessionId,
-          (_b = conversation.options) == null ? void 0 : _b.systemMessage,
-          (_c = conversation.options) == null ? void 0 : _c.skillSettings,
+          systemMessage: (_b = conversation.options) == null ? void 0 : _b.systemMessage,
+          skillSettings: (_c = conversation.options) == null ? void 0 : _c.skillSettings,
+          tools: (_d = conversation.options) == null ? void 0 : _d.tools,
           webSearch,
           model
-        );
+        });
         await aiEmployee.stream({ messageId, userMessages: resendMessages.length ? resendMessages : void 0 });
       } catch (err) {
         ctx.log.error(err);
@@ -555,16 +481,14 @@ var aiConversations_default = {
       if (!sessionId) {
         ctx.throw(400);
       }
-      const conversation = await ctx.db.getRepository("aiConversations").findOne({
-        filter: {
-          sessionId,
-          userId
-        }
+      const conversation = await plugin.aiConversationsManager.getConversation({
+        sessionId,
+        userId
       });
       if (!conversation) {
         ctx.throw(400);
       }
-      const message = await ctx.db.getRepository("aiConversations.messages", sessionId).findOne({
+      const message = await ctx.db.getRepository("aiMessages").findOne({
         filter: {
           messageId
         }
@@ -578,7 +502,7 @@ var aiConversations_default = {
       }
       const aiToolMessagesModel = ctx.db.getModel("aiToolMessages");
       const toolCall = await aiToolMessagesModel.findOne({
-        where: { sessionId, messageId, toolCallId }
+        where: { sessionId: message.sessionId, messageId: message.messageId, toolCallId }
       });
       if (!toolCall) {
         ctx.throw(400);
@@ -590,8 +514,8 @@ var aiConversations_default = {
         },
         {
           where: {
-            sessionId,
-            messageId,
+            sessionId: message.sessionId,
+            messageId: message.messageId,
             toolCallId,
             invokeStatus: "interrupted"
           }
@@ -600,8 +524,8 @@ var aiConversations_default = {
       const toolCallIds = toolCalls.map((x) => x.id);
       const toolMessages = await ctx.db.getRepository("aiToolMessages").find({
         filter: {
-          sessionId,
-          messageId,
+          sessionId: message.sessionId,
+          messageId: message.messageId,
           toolCallId: {
             $in: toolCallIds
           }
@@ -610,7 +534,7 @@ var aiConversations_default = {
       const toolMessageMap = new Map(
         toolMessages.map((toolMessage) => [toolMessage.toolCallId, toolMessage])
       );
-      const toolsList = await plugin.ai.toolsManager.listTools();
+      const toolsList = await plugin.ai.toolsManager.listTools({ sessionId: message.sessionId });
       const toolsMap = new Map(toolsList.map((t) => [t.definition.name, t]));
       for (const toolCall2 of toolCalls) {
         const tools = toolsMap.get(toolCall2.name);
@@ -630,23 +554,22 @@ var aiConversations_default = {
       await next();
     },
     async resumeToolCall(ctx, next) {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
       if (!userId) {
         return ctx.throw(403);
       }
       setupSSEHeaders(ctx);
+      const plugin = ctx.app.pm.get("ai");
       const { sessionId, messageId, model, webSearch } = ctx.action.params.values || {};
       if (!sessionId) {
         sendErrorResponse(ctx, "sessionId is required");
         return next();
       }
       try {
-        const conversation = await ctx.db.getRepository("aiConversations").findOne({
-          filter: {
-            sessionId,
-            userId
-          }
+        const conversation = await plugin.aiConversationsManager.getConversation({
+          sessionId,
+          userId
         });
         if (!conversation) {
           sendErrorResponse(ctx, "conversation not found");
@@ -659,7 +582,7 @@ var aiConversations_default = {
         }
         let message;
         if (messageId) {
-          message = await ctx.db.getRepository("aiConversations.messages", sessionId).findOne({
+          message = await ctx.db.getRepository("aiMessages").findOne({
             filter: {
               messageId
             }
@@ -678,16 +601,17 @@ var aiConversations_default = {
           sendErrorResponse(ctx, "No tool calls found");
           return next();
         }
-        const aiEmployee = new import_ai_employee.AIEmployee(
+        const aiEmployee = new import_ai_employee.AIEmployee({
           ctx,
           employee,
           sessionId,
-          (_b = conversation.options) == null ? void 0 : _b.systemMessage,
-          (_c = conversation.options) == null ? void 0 : _c.skillSettings,
+          systemMessage: (_b = conversation.options) == null ? void 0 : _b.systemMessage,
+          skillSettings: (_c = conversation.options) == null ? void 0 : _c.skillSettings,
+          tools: (_d = conversation.options) == null ? void 0 : _d.tools,
           webSearch,
           model
-        );
-        const userDecisions = await aiEmployee.getUserDecisions(messageId);
+        });
+        const userDecisions = await plugin.aiConversationsManager.getUserDecisions(messageId);
         await aiEmployee.stream({
           userDecisions
         });

package/dist/server/resource/aiEmployees.js

@@ -50,14 +50,13 @@ const list = async (ctx, next) => {
   const builtInManager = plugin.builtInManager;
   await import_actions.default.list(ctx, () => {
   });
-  const locale = ctx.getCurrentLocale();
   let data = ctx.body.rows;
   if (paginate === "false" || paginate === false) {
     data = ctx.body;
   }
   data.forEach((row) => {
     if (row.builtIn) {
-      builtInManager.setupBuiltInInfo(locale, row);
+      builtInManager.setupBuiltInInfo(ctx, row);
     }
   });
   await next();
@@ -108,19 +107,18 @@ const listByUser = async (ctx, next) => {
       [sequelize.fn("COALESCE", sequelize.col("userConfigs.sort"), sequelize.col("aiEmployees.sort")), "ASC"]
     ]
   });
-  const locale = ctx.getCurrentLocale();
   rows.forEach((row) => {
     if (row.builtIn) {
-      builtInManager.setupBuiltInInfo(locale, row);
+      builtInManager.setupBuiltInInfo(ctx, row);
     }
   });
   ctx.body = rows.map((row) => {
     var _a, _b;
-    const skillSettings = row.skillSettings ?? { skills: [] };
+    const skillSettings = row.skillSettings ?? { tools: [] };
     for (const tool of tools) {
-      skillSettings.skills.push({
+      skillSettings.tools.push({
         name: tool.definition.name,
-        auto: tool.defaultPermission === "ALLOW"
+        autoCall: tool.defaultPermission === "ALLOW"
       });
     }
     return {

package/dist/server/resource/aiMcpClients.d.ts

@@ -0,0 +1,11 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { ResourceOptions } from '@nocobase/resourcer';
+export declare const aiMcpClients: ResourceOptions;
+export default aiMcpClients;

package/dist/server/resource/aiMcpClients.js

@@ -0,0 +1,78 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var aiMcpClients_exports = {};
+__export(aiMcpClients_exports, {
+  aiMcpClients: () => aiMcpClients,
+  default: () => aiMcpClients_default
+});
+module.exports = __toCommonJS(aiMcpClients_exports);
+const aiMcpClients = {
+  name: "aiMcpClients",
+  actions: {
+    testConnection: async (ctx, next) => {
+      const values = ctx.action.params.values;
+      if (!values) {
+        ctx.body = {
+          success: false,
+          error: "No configuration provided"
+        };
+        await next();
+        return;
+      }
+      const plugin = ctx.app.pm.get("ai");
+      const result = await plugin.ai.mcpManager.testConnection(values);
+      ctx.body = result;
+      await next();
+    },
+    rebuildClient: async (ctx, next) => {
+      const plugin = ctx.app.pm.get("ai");
+      await plugin.ai.mcpManager.rebuildClient();
+      ctx.body = { success: true };
+      await next();
+    },
+    listTools: async (ctx, next) => {
+      const plugin = ctx.app.pm.get("ai");
+      ctx.body = await plugin.ai.mcpManager.listMCPTools();
+      await next();
+    },
+    updateToolPermission: async (ctx, next) => {
+      const { toolName, permission } = ctx.action.params.values || {};
+      if (!toolName || !permission) {
+        ctx.throw(400, "toolName and permission are required");
+      }
+      const plugin = ctx.app.pm.get("ai");
+      await plugin.ai.mcpManager.updateMCPToolPermission(toolName, permission);
+      ctx.body = { success: true };
+      await next();
+    }
+  }
+};
+var aiMcpClients_default = aiMcpClients;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  aiMcpClients
+});

package/dist/server/{ai-employees/built-in/ai-coding/document/example/js-column/index.d.ts → resource/aiSkills.d.ts}

@@ -6,10 +6,6 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-declare const _default: {
-    'en-US': {
-        name: string;
-        content: string;
-    }[];
-};
-export default _default;
+import { ResourceOptions } from '@nocobase/resourcer';
+export declare const aiSkills: ResourceOptions;
+export default aiSkills;