@nocobase/plugin-ai 2.1.0-beta.2 → 2.1.0-beta.5

package/dist/server/ai-employees/ai-employee.js

@@ -471,7 +471,7 @@ class AIEmployee {
       if (err.name === "GraphRecursionError") {
         this.sendSpecificError({ name: err.name, message: err.message });
       } else {
-        this.sendErrorResponse(err.message);
+        this.sendErrorResponse(provider.parseResponseError(err));
       }
     } finally {
       this.ctx.res.end();
@@ -813,70 +813,59 @@ If information is missing, clearly state it in the summary.</Important>`;
     } else {
       return;
     }
-    const toolCalls = await this.aiToolMessagesRepo.find({
-      filter: {
+    const toolMessages = (await this.aiToolMessagesModel.findAll({
+      where: {
+        sessionId: this.sessionId,
         messageId,
         invokeStatus: {
-          $ne: "confirmed"
+          [import_database.Op.ne]: "confirmed"
         }
       }
-    });
-    if (!toolCalls || import_lodash.default.isEmpty(toolCalls)) {
+    })).map((it) => it.toJSON());
+    if (!toolMessages || import_lodash.default.isEmpty(toolMessages)) {
       return;
     }
     const { model, service } = await this.getLLMService();
     const toolCallMap = await this.getToolCallMap(messageId);
     const now = /* @__PURE__ */ new Date();
-    const toolMessageContent = "The user rejected this tool invocation and needs to continue modifying the parameters.";
-    await this.db.sequelize.transaction(async (transaction) => {
-      for (const toolCall of toolCalls) {
-        const [updated] = await this.aiToolMessagesModel.update(
+    const toolMessageContent = "The user ignored the application for tools usage and will continued to ask questions";
+    return await this.db.sequelize.transaction(async (transaction) => {
+      for (const toolMessage of toolMessages) {
+        await this.aiToolMessagesModel.update(
           {
-            invokeStatus: "done",
-            status: "error",
+            invokeStatus: "confirmed",
+            status: "success",
             content: toolMessageContent,
-            invokeStartTime: toolCall.invokeStartTime ?? now,
-            invokeEndTime: toolCall.invokeEndTime ?? now
+            invokeStartTime: toolMessage.invokeStartTime ?? now,
+            invokeEndTime: toolMessage.invokeEndTime ?? now
           },
           {
             where: {
-              id: toolCall.id,
-              invokeStatus: toolCall.invokeStatus
+              id: toolMessage.id,
+              invokeStatus: toolMessage.invokeStatus
             },
             transaction
           }
         );
-        if (updated === 0) {
-          continue;
-        }
-        await this.db.getRepository("aiConversations.messages", this.sessionId).create({
-          values: toolCalls.map((toolCall2) => ({
-            messageId: this.plugin.snowflake.generate(),
-            role: "tool",
-            content: {
-              type: "text",
-              content: toolMessageContent
-            },
-            metadata: {
-              model,
-              provider: service.provider,
-              toolCall: toolCallMap.get(toolCall2.toolCallId),
-              autoCall: toolCall2.auto
-            },
-            transaction
-          }))
-        });
-        await this.aiToolMessagesRepo.update({
-          filter: {
-            messageId,
-            toolCallId: toolCall.toolCallId
+      }
+      return await this.db.getRepository("aiConversations.messages", this.sessionId).create({
+        values: toolMessages.map((toolMessage) => ({
+          messageId: this.plugin.snowflake.generate(),
+          role: "tool",
+          content: {
+            type: "text",
+            content: toolMessageContent
           },
-          values: {
-            invokeStatus: "confirmed"
+          metadata: {
+            model,
+            provider: service.provider,
+            toolCall: toolCallMap.get(toolMessage.toolCallId),
+            toolCallId: toolMessage.toolCallId,
+            autoCall: toolMessage.auto
           },
           transaction
-        });
-      }
+        }))
+      });
     });
   }
   get logger() {
@@ -948,28 +937,34 @@ If information is missing, clearly state it in the summary.</Important>`;
             content = workContextStr + "\n" + content;
           }
         }
-        const contents = [];
+        const contentBlocks = [];
         if (attachments == null ? void 0 : attachments.length) {
           for (const attachment of attachments) {
             const parsed = await provider.parseAttachment(this.ctx, attachment);
-            contents.push(parsed);
+            contentBlocks.push(parsed);
           }
           if (content) {
-            contents.push({
+            contentBlocks.push({
               type: "text",
               text: content
             });
           }
         }
-        formattedMessages.push({
-          role: "user",
-          content: contents.length ? contents : content,
-          additional_kwargs: {
-            userContent,
-            attachments,
-            workContext
-          }
-        });
+        const role = "user";
+        const additional_kwargs = { userContent, attachments, workContext };
+        if (contentBlocks.length) {
+          formattedMessages.push({
+            role,
+            additional_kwargs,
+            contentBlocks
+          });
+        } else {
+          formattedMessages.push({
+            role,
+            additional_kwargs,
+            content
+          });
+        }
         continue;
       }
       if (msg.role === "tool") {

package/dist/server/collections/lc-checkpoint-blobs.js

@@ -72,7 +72,8 @@ var lc_checkpoint_blobs_default = (0, import_database.defineCollection)({
     },
     {
       name: "blob",
-      type: "blob"
+      type: "blob",
+      length: "long"
     }
   ]
 });

package/dist/server/collections/lc-checkpoint-writes.js

@@ -84,6 +84,7 @@ var lc_checkpoint_writes_default = (0, import_database.defineCollection)({
     {
       name: "blob",
       type: "blob",
+      length: "long",
       allowNull: false
     }
   ]

package/dist/server/llm-providers/openai/completions.js

@@ -40,7 +40,7 @@ class OpenAICompletionsProvider extends import_provider.LLMProvider {
     const { responseFormat, structuredOutput } = this.modelOptions || {};
     const { schema } = structuredOutput || {};
     const responseFormatOptions = {
-      type: responseFormat
+      type: responseFormat ?? "text"
     };
     if (responseFormat === "json_schema" && schema) {
       responseFormatOptions["json_schema"] = schema;

package/dist/server/llm-providers/provider.d.ts

@@ -59,6 +59,7 @@ export declare abstract class LLMProvider {
         query: string;
     }[];
     parseResponseMetadata(output: LLMResult): any;
+    parseResponseError(err: any): any;
 }
 export interface EmbeddingProviderOptions {
     app: Application;

package/dist/server/llm-providers/provider.js

@@ -138,9 +138,12 @@ class LLMProvider {
       };
     } else {
       return {
-        type: "input_file",
-        filename: attachment.filename,
-        file_data: data
+        type: "file",
+        mimeType: attachment.mimetype,
+        metadata: {
+          filename: attachment.filename
+        },
+        data
       };
     }
   }
@@ -205,6 +208,9 @@ class LLMProvider {
   parseResponseMetadata(output) {
     return [null, null];
   }
+  parseResponseError(err) {
+    return (err == null ? void 0 : err.message) ?? "Unexpected LLM service error";
+  }
 }
 class EmbeddingProvider {
   constructor(opts) {

package/dist/server/migrations/20250517214622-init-settings.js

@@ -33,7 +33,7 @@ var import_server = require("@nocobase/server");
 class init_settings_default extends import_server.Migration {
   on = "afterLoad";
   // 'beforeLoad' or 'afterLoad'
-  appVersion = "<2.0.0";
+  appVersion = "<2.1.0";
   async up() {
     const aiSettings = await this.db.getRepository("aiSettings").findOne();
     if (aiSettings) {

package/dist/server/migrations/20250923221107-setup-build-in.js

@@ -33,7 +33,7 @@ var import_server = require("@nocobase/server");
 class setup_build_in_default extends import_server.Migration {
   on = "afterSync";
   // 'beforeLoad' or 'afterLoad'
-  appVersion = "<2.0.0";
+  appVersion = "<2.1.0";
   async up() {
     await this.plugin.setupBuiltIn();
   }

package/dist/server/migrations/20260107000000-reset-builtin-about.js

@@ -32,7 +32,7 @@ module.exports = __toCommonJS(reset_builtin_about_exports);
 var import_server = require("@nocobase/server");
 class reset_builtin_about_default extends import_server.Migration {
   on = "afterSync";
-  appVersion = "<2.0.0-beta.7";
+  appVersion = "<2.1.0";
   async up() {
     const repo = this.db.getRepository("aiEmployees");
     await repo.update({

package/dist/server/migrations/20260131000000-add-model-options.js

@@ -32,7 +32,7 @@ module.exports = __toCommonJS(add_model_options_exports);
 var import_server = require("@nocobase/server");
 class add_model_options_default extends import_server.Migration {
   on = "afterLoad";
-  appVersion = "<2.0.0";
+  appVersion = "<2.1.0";
   async up() {
     const collection = this.db.getCollection("llmServices");
     if (!collection) {

package/dist/server/migrations/20260225220347-alter-checkpoint-blob-field.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 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 { Migration } from '@nocobase/server';
+export default class extends Migration {
+    on: string;
+    appVersion: string;
+    up(): Promise<void>;
+    alterBlobField(collectionName: string, fieldName: string): Promise<void>;
+}

package/dist/server/migrations/20260225220347-alter-checkpoint-blob-field.js

@@ -0,0 +1,63 @@
+/**
+ * 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 alter_checkpoint_blob_field_exports = {};
+__export(alter_checkpoint_blob_field_exports, {
+  default: () => alter_checkpoint_blob_field_default
+});
+module.exports = __toCommonJS(alter_checkpoint_blob_field_exports);
+var import_server = require("@nocobase/server");
+class alter_checkpoint_blob_field_default extends import_server.Migration {
+  on = "afterSync";
+  // 'beforeLoad' or 'afterLoad'
+  appVersion = "<2.1.0";
+  async up() {
+    if (!this.db.isMySQLCompatibleDialect()) {
+      return;
+    }
+    await this.alterBlobField("lcCheckpointWrites", "blob");
+    await this.alterBlobField("lcCheckpointBlobs", "blob");
+  }
+  async alterBlobField(collectionName, fieldName) {
+    var _a;
+    const collection = this.db.getCollection(collectionName);
+    if (!collection) {
+      return;
+    }
+    const field = collection.getField(fieldName);
+    if (!field) {
+      return;
+    }
+    if (((_a = field.options) == null ? void 0 : _a.length) !== "long") {
+      return;
+    }
+    await collection.sync({
+      force: false,
+      alter: true
+    });
+    this.app.log.info(`alter collection [${collectionName}] field [${fieldName}]`);
+  }
+}

package/dist/server/plugin.js

@@ -169,6 +169,7 @@ class PluginAIServer extends import_server.Plugin {
     this.app.acl.allow("ai", "listAllEnabledModels", "loggedIn");
     this.app.acl.allow("aiEmployees", "listByUser", "loggedIn");
     this.app.acl.allow("aiEmployees", "updateUserPrompt", "loggedIn");
+    this.app.acl.allow("aiTools", "list", "loggedIn");
     const workflowSnippet = this.app.acl.snippetManager.snippets.get("pm.workflow.workflows");
     if (workflowSnippet) {
       workflowSnippet.actions.push("ai:listModels");

package/dist/server/resource/aiConversations.js

@@ -400,7 +400,22 @@ var aiConversations_default = {
           model,
           legacy
         );
-        await aiEmployee.cancelToolCall();
+        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 (shouldStream) {
           await aiEmployee.stream({ userMessages: messages, messageId: editingMessageId });
         } else {

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-beta.2",
+  "version": "2.1.0-beta.5",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-ai",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/action-ai",
@@ -51,5 +51,5 @@
   "keywords": [
     "AI"
   ],
-  "gitHead": "d80433799fb4a8d59ded4d7eea114d585a137ea0"
+  "gitHead": "9c70818fb54a8fbd36378192bc4bbe45c2634905"
 }

package/LICENSE.txt

@@ -1,172 +0,0 @@
-Updated Date: October 2, 2025
-
-NocoBase License Agreement
-
-NOCOBASE PTE. LTD.，a Singaporean Exempt Private Company Limited by Shares with its principal place of business located at 112 ROBINSON ROAD, #03-01, SINGAPORE ("The Company") https://www.nocobase.com/ issues this License Agreement ("Agreement") to you. You, as an individual or a company ("The User"), will be deemed to voluntarily accept all terms of this Agreement by using NocoBase (including but not limited to obtaining NocoBase source code or installation package in any form, installing and using NocoBase, purchasing NocoBase commercial license and services, purchasing NocoBase commercial plugins). If the User does not agree to any term of this Agreement, or cannot accurately understand our interpretation of the relevant terms, please stop using it immediately.
-
-This Agreement applies to any use, quotation, contract, invoice, and all software delivered by the Company. The User and the Company or NocoBase's agents can no longer sign a separate license agreement for the sale and delivery of the software.
-
-The Company reserves the right to formulate and modify this Agreement from time to time as needed. If there are changes, the Company will announce them in the form of website announcements, without further individual notification. The changed Agreement will automatically take effect once it is announced, becoming part of this Agreement.
-
-==============
-1. Definitions
-==============
-
-1.1 "Software" refers to the NocoBase kernel and plugins placed in the same code repository as the kernel, including their source code, installation packages, images, and all their modifications, updates, and upgrades.
-
-1.2 "Community Edition" refers to the free version of the Software provided to the User through public channels.
-
-1.3 "Commercial Edition" refers to the paid version of the Software purchased by the User from the Company or its agents, downloaded through exclusive channels, and includes additional benefits. It consists of three versions: Standard Edition, Professional Edition, and Enterprise Edition.
-
-1.4 "Marketplace" refers to the marketplace provided by the Company for selling Software plugins and solutions.
-
-1.5 "Commercial Plugin" refers to the paid plugins sold in the Marketplace.
-
-1.6 "Upper Layer Application" refers to a specific business use case application serving internal or external customers of the User, developed based on Software and Commercial Plugins, such as ERP/CRM.
-
-1.7 "Customer" refers to the clients who purchase the User's Upper Layer Application.
-
-1.8 "Third-Party Open Source Software" refers to open source software provided with Software and Commercial Plugins. They are licensed through various published open source software licenses or copyright notices accompanying such software.
-
-===================================
-2. Intellectual Property Protection
-===================================
-
-Except for Third-Party Open Source Software, the Company owns all copyrights, trademark rights, patent rights, trade secrets, and other intellectual property rights of the Software, and has registered and protected them in relevant countries and regions according to the "Paris Convention" or "TRIPS Agreement", ensuring that the intellectual property rights of the Software and Commercial Plugins are internationally recognized and protected.
-
-=============
-3. Disclaimer
-=============
-
-3.1 The User shall not use the Software and Commercial Plugins to engage in activities that contravene applicable laws and regulations or offend against public order or religious prohibitions. All legal liabilities and consequences arising from the User’s use shall be borne by the User.
-
-3.2 The Company shall not be liable for any direct, indirect, special, incidental, or consequential damages (including but not limited to loss of profits, business interruption, data loss, or business information disclosure) caused by the User's use of the Software and Commercial Plugins, even if it has been previously informed of the possibility of such damages.
-
-===============
-4. License Type
-===============
-
-4.1 This Agreement serves as the unified license agreement for NocoBase Software, applying to both the Community Edition and the Commercial Editions.
-
-4.2 For the Community Edition, this Agreement incorporates and references the full text of the GNU Affero General Public License v3.0 (“AGPL-3.0”, available at: https://www.gnu.org/licenses/agpl-3.0.html ). Community Edition users must comply with the AGPL-3.0 License as well as the supplementary terms set forth in this Agreement. In case of any inconsistency between AGPL-3.0 and this Agreement, the supplementary terms of this Agreement shall prevail.
-
-4.3 For the Commercial Edition (including Standard, Professional, and Enterprise Editions), only the Commercial License terms contained in this Agreement apply. Commercial Edition users are not subject to AGPL-3.0 obligations.
-
-4.4 For Commercial Plugins, only the Commercial Plugin License terms contained in this Agreement apply.
-
-================================================
-5. Rights and Obligations of Open Source License
-================================================
-
-5.1 The Software can be used for commercial purposes.
-
-5.2 The User can sell plugins developed for the Software in the Marketplace.
-
-5.3 Outside the Marketplace, changes and plugins to the Software developed by the User or third parties, and third-party applications developed based on the Software must all be open-sourced under the AGPL-3.0 license.
-
-5.4 It is not allowed to remove or change the brand, name, link, version number, license, and other information about NocoBase on the Software interface, except for the main LOGO in the upper left corner of the page.
-
-5.5 It is not allowed to remove or change all intellectual property statements about NocoBase in the code.
-
-5.6 It is not allowed to provide to the public any form of no-code, zero-code, or low-code platform SaaS/PaaS products using the original or modified Software.
-
-5.7 Comply with all requirements of the AGPL-3.0 License, including but not limited to:  
-(a) Any modifications, extensions, or derivative works of the Software must be released under the AGPL-3.0 License;  
-(b) If Upper Layer Applications are provided as a network service (including SaaS or PaaS), the complete corresponding source code must be made available to all users of the service;  
-(c) The Software may not be combined with other software under incompatible licenses in a manner that would violate the AGPL-3.0 License;  
-(d) No additional contractual restrictions may be imposed when redistributing the Software.  
-
-===============================
-6. Rights of Commercial License
-===============================
-
-6.1 Obtain a permanent commercial license of the Software.
-
-6.2 Get software upgrades and exclusive technical support during the upgrade validity period.
-
-6.3 The licensed Software can be used for commercial purposes with no restrictions on the number of applications and users.
-
-6.4 Changes and plugins to the Software, and applications integrated with the Software do not need to be open sourced.
-
-6.5 Can remove or change the brand, name, link, version number, license, and other information about NocoBase on the Software interface.
-
-6.6 Can sell plugins developed for Software in the Marketplace.
-
-6.7 The User holding a Professional or Enterprise Edition License can sell Upper Layer Application to its Customers.
-
-6.8 Exemption from AGPL-3.0 obligations, including but not limited to:  
-(a) the requirement to release source code of modifications, extensions, or derivative works;  
-(b) the requirement to provide source code when offering the Software as a network service;  
-(c) restrictions on combining the Software with other software under different license terms; and  
-(d) limitations on adding contractual terms for redistribution.  
-The User remains bound by this Agreement and by its commercial license contract.
-
-6.9 If there are other agreements in the contract for the above rights, the contract agreement shall prevail.
-
-====================================
-7. Obligations of Commercial License
-====================================
-
-7.1 It is not allowed to remove or change all intellectual property statements about NocoBase in the code.
-
-7.2 It is not allowed to sell, transfer, lease, share, gift, or distribute the Commercial License.
-
-7.3 It is not allowed to sell, transfer, lease, share, or distribute any form of no-code, zero-code, low-code platform, or developer tools developed based on Software.
-
-7.4 It is not allowed to provide any form of no-code, zero-code, low-code platform SaaS/PaaS products to the public using the original or modified Software.
-
-7.5 It is not allowed for the User holding a Standard Edition license to sell Upper Layer Application to Customers without a Commercial license.
-
-7.6 It is not allowed for the User holding a Professional or Enterprise Edition license to sell Upper Layer Application to Customers without a Commercial license with access to further development and configuration.
-
-7.7 It is not allowed to publicly sell plugins developed for Software outside of the Marketplace.
-
-7.8 If there is a violation of the above obligations or the terms of this Agreement, the rights owned by the User will be immediately terminated, the paid fees will not be refunded, and the Company reserves the right to pursue the User's legal responsibility.
-
-7.9 If there are other agreements in the contract for the above obligations, the contract agreement shall prevail.
-
-======================================
-8. Rights of Commercial Plugin License
-======================================
-
-8.1 Obtain a permanent Commercial Plugin License for the Commercial Plugin.
-
-8.2 Receive plugin upgrades and exclusive technical support during the upgrade validity period.
-
-8.3 Can be used for commercial purposes without restrictions on the number of applications or users.
-
-8.4 The User holding a Professional or Enterprise Edition License can use the Commercial Plugin in Upper Layer Applications sold to its customers.
-
-8.5 Exemption from AGPL-3.0 obligations. 
-
-8.6 If there are other agreements in the contract regarding the above rights, the contract agreement shall prevail.
-
-===========================================
-9. Obligations of Commercial Plugin License
-===========================================
-
-9.1 It is not allowed to remove or change any intellectual property statements about NocoBase and the plugin authors in the code.
-
-9.2 It is not allowed to sell, transfer, lease, share, or gift the Commercial Plugin.
-
-9.3 It is not allowed to use reverse engineering, decompilation, or other methods to attempt to discover the source code of Commercial Plugins without obtaining a source code license.
-
-9.4 It is not allowed to disclose the source code of Commercial Plugins to any third party.
-
-9.5 It is not allowed for the User holding a Community or Standard Edition license to use Commercial Plugins in Upper Layer Applications sold to its customers. Such Commercial Plugins are limited to internal use within the licensed company only.  
-
-9.6 If there is any violation of the above obligations or the terms of this Agreement, the rights owned by the User will be immediately terminated, the paid fees will not be refunded, and the Company reserves the right to pursue the User's legal responsibility.
-
-9.7 If there are other agreements in the contract regarding the above obligations, the contract agreement shall prevail.
-
-=============================================================
-10. Legal Jurisdiction, Interpretation, and Dispute Resolution
-=============================================================
-
-10.1 Except for Mainland China, the interpretation, application, and all matters related to this agreement are subject to the jurisdiction of Singapore law.
-
-10.2 Any dispute related to this Agreement should first be resolved through friendly negotiation. If the negotiation fails to resolve the dispute, the dispute should be submitted to the International Chamber of Commerce (ICC) for arbitration. The arbitration venue should be Singapore, conducted in English.
-
-10.3 All terms and conditions of this Agreement shall be deemed enforceable to the maximum extent permitted by applicable law. If any term of this Agreement is deemed invalid by any applicable law, the invalidity of that term does not affect the validity of any other term of this Agreement, and it should be deemed that the invalid term has been modified as much as possible to make it valid and enforceable, or if the term cannot be modified, it should be deemed to have been deleted from this Agreement.
-
-10.4 The arbitration award is final, binding on both parties, and can be enforced in any court with jurisdiction.