@nocobase/plugin-ai 2.1.0-alpha.13 → 2.1.0-alpha.14

package/dist/server/resource/aiConversations.js

@@ -75,55 +75,61 @@ 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"
         }
       });
       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);
+      }
       const { aiEmployee, systemMessage, skillSettings, conversationSettings } = ctx.action.params.values || {};
       const employee = await getAIEmployee(ctx, aiEmployee.username);
       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);
@@ -136,34 +142,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;
-      }
-      if (skillSettings) {
-        options["skillSettings"] = skillSettings;
+        throw error;
       }
-      if (conversationSettings) {
-        options["conversationSettings"] = conversationSettings;
-      }
-      ctx.body = await ctx.db.getRepository("aiConversations").update({
-        filter: {
-          userId,
-          sessionId
-        },
-        values: {
-          options
-        }
-      });
       await next();
     },
     async destroy(ctx, next) {
@@ -191,88 +181,19 @@ 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) {
@@ -320,7 +241,12 @@ var aiConversations_default = {
       await next();
     },
     async sendMessages(ctx, next) {
-      var _a, _b;
+      var _a, _b, _c;
+      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,
@@ -355,7 +281,10 @@ var aiConversations_default = {
       }
       try {
         const conversation = await ctx.db.getRepository("aiConversations").findOne({
-          filterByTk: sessionId
+          filter: {
+            sessionId,
+            userId
+          }
         });
         if (!conversation) {
           if (shouldStream) {
@@ -390,29 +319,41 @@ 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,
-          (_a = conversation.options) == null ? void 0 : _a.systemMessage,
-          (_b = conversation.options) == null ? void 0 : _b.skillSettings,
+          systemMessage: (_b = conversation.options) == null ? void 0 : _b.systemMessage,
+          skillSettings: (_c = conversation.options) == null ? void 0 : _c.skillSettings,
           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
+                });
+              }
             }
           }
         }
@@ -429,17 +370,36 @@ 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;
+      const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
+      if (!userId) {
+        return ctx.throw(403);
+      }
       const { sessionId } = ctx.action.params.values || {};
       const plugin = ctx.app.pm.get("ai");
+      const conversation = await ctx.db.getRepository("aiConversations").findOne({
+        filter: {
+          sessionId,
+          userId
+        }
+      });
+      if (!conversation) {
+        ctx.throw(404, "conversation not found");
+      }
       plugin.aiEmployeesManager.abortConversation(sessionId);
       await next();
     },
     async resendMessages(ctx, next) {
-      var _a, _b;
+      var _a, _b, _c;
+      const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
+      if (!userId) {
+        return ctx.throw(403);
+      }
       setupSSEHeaders(ctx);
       const { sessionId, webSearch, model } = ctx.action.params.values || {};
       let { messageId } = ctx.action.params.values || {};
@@ -450,7 +410,8 @@ var aiConversations_default = {
       try {
         const conversation = await ctx.db.getRepository("aiConversations").findOne({
           filter: {
-            sessionId
+            sessionId,
+            userId
           }
         });
         if (!conversation) {
@@ -496,15 +457,15 @@ 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,
-          (_a = conversation.options) == null ? void 0 : _a.systemMessage,
-          (_b = conversation.options) == null ? void 0 : _b.skillSettings,
+          systemMessage: (_b = conversation.options) == null ? void 0 : _b.systemMessage,
+          skillSettings: (_c = conversation.options) == null ? void 0 : _c.skillSettings,
           webSearch,
           model
-        );
+        });
         await aiEmployee.stream({ messageId, userMessages: resendMessages.length ? resendMessages : void 0 });
       } catch (err) {
         ctx.log.error(err);
@@ -532,7 +493,7 @@ var aiConversations_default = {
       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
         }
@@ -546,7 +507,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);
@@ -558,8 +519,8 @@ var aiConversations_default = {
         },
         {
           where: {
-            sessionId,
-            messageId,
+            sessionId: message.sessionId,
+            messageId: message.messageId,
             toolCallId,
             invokeStatus: "interrupted"
           }
@@ -568,8 +529,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
           }
@@ -599,7 +560,12 @@ var aiConversations_default = {
     },
     async resumeToolCall(ctx, next) {
       var _a, _b, _c;
+      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");
@@ -609,7 +575,7 @@ var aiConversations_default = {
         const conversation = await ctx.db.getRepository("aiConversations").findOne({
           filter: {
             sessionId,
-            userId: (_a = ctx.auth) == null ? void 0 : _a.user.id
+            userId
           }
         });
         if (!conversation) {
@@ -623,7 +589,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
             }
@@ -642,16 +608,16 @@ 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,
           webSearch,
           model
-        );
-        const userDecisions = await aiEmployee.getUserDecisions(messageId);
+        });
+        const userDecisions = await plugin.aiConversationsManager.getUserDecisions(messageId);
         await aiEmployee.stream({
           userDecisions
         });

package/dist/server/types/ai-chat-conversation.type.d.ts

@@ -29,7 +29,10 @@ export type AIChatContext = {
         tool_call_id?: string;
         tool_calls?: AIToolCall[];
     }[];
-    decisions?: UserDecision[];
+    decisions?: {
+        interruptId?: string;
+        decisions: UserDecision[];
+    };
     tools?: any[];
     middleware?: any[];
     structuredOutput?: {
@@ -48,7 +51,10 @@ export type AIMessageRemoveOptions = {
 };
 export type AIChatContextOptions = {
     userMessages?: AIMessageInput[];
-    userDecisions?: UserDecision[];
+    userDecisions?: {
+        interruptId?: string;
+        decisions: UserDecision[];
+    };
     tools?: any[];
     middleware?: any[];
     getSystemPrompt?: (userMessages: AIMessageInput[]) => Promise<string>;

package/dist/server/types/ai-message.type.d.ts

@@ -10,6 +10,7 @@ export type AIMessage = {
     messageId: string;
     sessionId: string;
     role: string;
+    createdAt?: string | Date;
     content: AIMessageContent;
     toolCalls?: AIToolCall[];
     attachments?: unknown[];
@@ -44,8 +45,14 @@ export type AIMessageMetadata = {
     autoCallTools?: string[];
     autoCall?: boolean;
     interrupted?: boolean;
+    subAgentConversations?: SubAgentConversationMetadata[];
     [key: string]: unknown;
 };
+export type SubAgentConversationMetadata = {
+    sessionId: string;
+    toolCallId: string;
+    status: 'pending' | 'completed';
+};
 export type AIToolMessage = {
     id: string;
     sessionId: string;

package/dist/server/utils.d.ts

@@ -8,13 +8,16 @@
  */
 import { Model } from '@nocobase/database';
 import { Context } from '@nocobase/actions';
+import { ToolsEntry } from '@nocobase/ai';
 export declare function sendSSEError(ctx: Context, error: Error | string, errorName?: string): void;
 export declare function stripToolCallTags(content: string): string | null;
 export declare function parseResponseMessage(row: Model): {
     key: any;
+    createdAt: any;
     content: any;
     role: any;
 };
 export declare function encodeLocalFile(url: string): Promise<string>;
 export declare function encodeFile(ctx: Context, url: string): Promise<string>;
 export declare function parseVariables(ctx: Context, value: string): Promise<any>;
+export declare const buildTool: (toolsEntry: ToolsEntry) => import("@langchain/core/dist/tools").DynamicTool<any>;

package/dist/server/utils.js

@@ -36,6 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  buildTool: () => buildTool,
   encodeFile: () => encodeFile,
   encodeLocalFile: () => encodeLocalFile,
   parseResponseMessage: () => parseResponseMessage,
@@ -48,6 +49,7 @@ var import_path = __toESM(require("path"));
 var import_fs = __toESM(require("fs"));
 var import_axios = __toESM(require("axios"));
 var import_utils = require("@nocobase/utils");
+var import_langchain = require("langchain");
 function sendSSEError(ctx, error, errorName) {
   const body = typeof error === "string" ? error : error.message || "Unknown error";
   if (!ctx.res.headersSent) {
@@ -70,7 +72,7 @@ function stripToolCallTags(content) {
   return content.replace(/<[|｜]tool▁(?:calls▁begin|calls▁end|call▁begin|call▁end|sep)[|｜]>/g, "");
 }
 function parseResponseMessage(row) {
-  const { content: rawContent, messageId, metadata, role, toolCalls, attachments, workContext } = row;
+  const { content: rawContent, messageId, metadata, role, toolCalls, attachments, workContext, createdAt } = row;
   const content = {
     ...rawContent ?? {},
     content: stripToolCallTags(rawContent == null ? void 0 : rawContent.content),
@@ -84,6 +86,7 @@ function parseResponseMessage(row) {
   }
   return {
     key: messageId,
+    createdAt,
     content,
     role
   };
@@ -151,8 +154,29 @@ async function parseVariables(ctx, value) {
     $nDate
   });
 }
+const noWriter = (chunk) => console.warn(`No writer in tools runtime, chunk:[${chunk}]`);
+const buildTool = (toolsEntry) => {
+  const {
+    invoke,
+    definition: { name, description, schema }
+  } = toolsEntry;
+  return (0, import_langchain.tool)(
+    (input, config) => {
+      const { context, toolCall } = config;
+      const writer = config["writer"] ?? noWriter;
+      return invoke(context.ctx, input, { toolCallId: toolCall.id, writer });
+    },
+    {
+      name,
+      description,
+      schema,
+      returnDirect: false
+    }
+  );
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  buildTool,
   encodeFile,
   encodeLocalFile,
   parseResponseMessage,

package/package.json

@@ -6,7 +6,7 @@
   "description": "Create AI employees with diverse skills to collaborate with humans, build systems, and handle business operations.",
   "description.ru-RU": "Поддержка интеграции с AI-сервисами: предоставляются AI-узлы для рабочих процессов, расширяя возможности бизнес-обработки.",
   "description.zh-CN": "创建各种技能的 AI 员工，与人类协同，搭建系统，处理业务。",
-  "version": "2.1.0-alpha.13",
+  "version": "2.1.0-alpha.14",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-ai",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/action-ai",
@@ -22,7 +22,9 @@
     "@nocobase/ai": "2.x",
     "@nocobase/client": "2.x",
     "@nocobase/flow-engine": "2.x",
+    "@nocobase/plugin-acl": "2.x",
     "@nocobase/plugin-data-source-manager": "2.x",
+    "@nocobase/plugin-file-manager": "2.x",
     "@nocobase/plugin-workflow": "2.x",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x"
@@ -59,5 +61,5 @@
   "keywords": [
     "AI"
   ],
-  "gitHead": "2807a8948412d9c235115a31a81a66f7c82dd173"
+  "gitHead": "d8735b541de0ff9557bba704de49c799b4962672"
 }