@nocobase/plugin-ai 2.1.0-alpha.40 → 2.1.0-alpha.46

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

@@ -37,7 +37,7 @@ class OpenAIResponsesProvider extends import_provider.LLMProvider {
     return "https://api.openai.com/v1";
   }
   createModel() {
-    const { baseURL, apiKey } = this.serviceOptions || {};
+    const { apiKey } = this.serviceOptions || {};
     const { responseFormat, structuredOutput } = this.modelOptions || {};
     const { schema } = structuredOutput || {};
     const responseFormatOptions = {
@@ -56,7 +56,7 @@ class OpenAIResponsesProvider extends import_provider.LLMProvider {
         }
       },
       configuration: {
-        baseURL: baseURL || this.baseURL
+        baseURL: this.getResolvedBaseURL()
       },
       verbose: false,
       useResponsesApi: true

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

@@ -91,6 +91,8 @@ export declare abstract class LLMProvider {
     parseResponseMetadata(output: LLMResult): any;
     parseResponseError(err: any): any;
     protected get documentLoader(): CachedDocumentLoader;
+    protected getResolvedBaseURL(): string;
+    protected buildRequestURL(pathname: string): string;
     protected get aiPlugin(): PluginAIServer;
 }
 export interface EmbeddingProviderOptions {
@@ -107,6 +109,6 @@ export declare abstract class EmbeddingProvider {
     abstract createEmbedding(): EmbeddingsInterface;
     protected abstract getDefaultUrl(): string;
     protected get apiKey(): any;
-    protected get baseURL(): any;
+    protected get baseURL(): string;
     protected get model(): any;
 }

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

@@ -40,12 +40,26 @@ __export(provider_exports, {
   LLMProvider: () => LLMProvider
 });
 module.exports = __toCommonJS(provider_exports);
-var import_axios = __toESM(require("axios"));
-var import_utils = require("../utils");
+var import_utils = require("@nocobase/utils");
+var import_utils2 = require("../utils");
 var import_stream = require("@langchain/core/utils/stream");
 var import_document_loader = require("../document-loader");
 var import_node_path = __toESM(require("node:path"));
 var import_reasoning = require("./common/reasoning");
+function normalizeBaseURL(baseURL) {
+  (0, import_utils.checkUrlAgainstWhitelist)(baseURL);
+  return new URL(baseURL).toString().replace(/\/$/, "");
+}
+function resolveServiceOptions(serviceOptions, app) {
+  const rendered = app.environment.renderJsonTemplate(serviceOptions ?? {});
+  if ((rendered == null ? void 0 : rendered.baseURL) != null) {
+    if (typeof rendered.baseURL !== "string") {
+      throw new Error("baseURL must be a string");
+    }
+    rendered.baseURL = normalizeBaseURL(rendered.baseURL);
+  }
+  return rendered;
+}
 class LLMProvider {
   app;
   serviceOptions;
@@ -57,7 +71,7 @@ class LLMProvider {
   constructor(opts) {
     const { app, serviceOptions, modelOptions } = opts;
     this.app = app;
-    this.serviceOptions = app.environment.renderJsonTemplate(serviceOptions);
+    this.serviceOptions = resolveServiceOptions(serviceOptions, app);
     if (modelOptions) {
       this.modelOptions = modelOptions;
       this.chatModel = this.createModel();
@@ -69,7 +83,7 @@ class LLMProvider {
   prepareChain(context) {
     var _a, _b, _c, _d;
     let chain = this.chatModel;
-    const toolDefinitions = (_a = context.tools) == null ? void 0 : _a.map(import_utils.buildTool);
+    const toolDefinitions = (_a = context.tools) == null ? void 0 : _a.map(import_utils2.buildTool);
     if ((_b = this.builtInTools()) == null ? void 0 : _b.length) {
       const tools = [...this.builtInTools()];
       if (!this.isToolConflict() && (toolDefinitions == null ? void 0 : toolDefinitions.length)) {
@@ -88,11 +102,15 @@ class LLMProvider {
     return chain;
   }
   async invoke(context, options) {
-    var _a;
+    var _a, _b;
     const builder = this.getModelRequestBuilder((_a = this.modelOptions) == null ? void 0 : _a.model);
     const request = (builder == null ? void 0 : builder({ context, options })) || { context, options };
     const chain = this.prepareChain(request.context);
-    const { modelKwargs, modelRequestParams, options: requestOptions, ...restOptions } = request.options || {};
+    const requestInvokeOptions = (options == null ? void 0 : options.signal) ? {
+      ...request.options || {},
+      signal: ((_b = request.options) == null ? void 0 : _b.signal) ?? options.signal
+    } : request.options;
+    const { modelKwargs, modelRequestParams, options: requestOptions, ...restOptions } = requestInvokeOptions || {};
     const invokeOptions = modelKwargs ? {
       ...restOptions,
       [import_reasoning.MODEL_KWARGS_KEY]: modelKwargs,
@@ -114,18 +132,19 @@ class LLMProvider {
     var _a, _b, _c, _d;
     const options = this.serviceOptions || {};
     const apiKey = options.apiKey;
-    let baseURL = options.baseURL || this.baseURL;
-    if (!baseURL) {
-      return { code: 400, errMsg: "baseURL is required" };
+    let url;
+    try {
+      url = this.buildRequestURL("models");
+    } catch (e) {
+      return { code: 400, errMsg: e instanceof Error ? e.message : String(e) };
     }
     if (!apiKey) {
       return { code: 400, errMsg: "API Key required" };
     }
-    if (baseURL && baseURL.endsWith("/")) {
-      baseURL = baseURL.slice(0, -1);
-    }
     try {
-      const res = await import_axios.default.get(`${baseURL}/models`, {
+      const res = await (0, import_utils.serverRequest)({
+        method: "GET",
+        url,
         headers: {
           Authorization: `Bearer ${apiKey}`
         }
@@ -139,10 +158,10 @@ class LLMProvider {
     }
   }
   parseResponseMessage(message) {
-    return (0, import_utils.parseResponseMessage)(message);
+    return (0, import_utils2.parseResponseMessage)(message);
   }
   parseResponseChunk(chunk) {
-    return (0, import_utils.stripToolCallTags)(chunk);
+    return (0, import_utils2.stripToolCallTags)(chunk);
   }
   async parseAttachment(ctx, attachment) {
     if (this.isApiSupportedAttachment(attachment)) {
@@ -177,7 +196,7 @@ class LLMProvider {
   async convertToContent(ctx, attachment) {
     const fileManager = this.app.pm.get("file-manager");
     const url = await fileManager.getFileURL(attachment);
-    const data = await (0, import_utils.encodeFile)(ctx, decodeURIComponent(url));
+    const data = await (0, import_utils2.encodeFile)(ctx, decodeURIComponent(url));
     if (attachment.mimetype.startsWith("image/")) {
       return {
         placement: "contentBlocks",
@@ -203,17 +222,16 @@ class LLMProvider {
     }
   }
   async loadDocument(ctx, attachment) {
-    const referer = ctx.get("referer") || "";
-    const ua = ctx.get("user-agent") || "";
     const safeFilename = attachment.filename ? import_node_path.default.basename(attachment.filename) : "document";
-    const parsed = await this.documentLoader.load(attachment, {
+    const loaderOptions = typeof ctx.get === "function" ? {
       requestOptions: {
         headers: {
-          Referer: referer,
-          "User-Agent": ua
+          Referer: ctx.get("referer") || "",
+          "User-Agent": ctx.get("user-agent") || ""
         }
       }
-    });
+    } : void 0;
+    const parsed = await this.documentLoader.load(attachment, loaderOptions);
     if (!parsed.supported) {
       return {
         placement: "system",
@@ -303,6 +321,22 @@ ${parsed.text}
   get documentLoader() {
     return this.aiPlugin.documentLoaders.cached;
   }
+  getResolvedBaseURL() {
+    var _a;
+    const baseURL = ((_a = this.serviceOptions) == null ? void 0 : _a.baseURL) ?? this.baseURL;
+    if (!baseURL) {
+      throw new Error("baseURL is required");
+    }
+    if (typeof baseURL !== "string") {
+      throw new Error("baseURL must be a string");
+    }
+    return normalizeBaseURL(baseURL);
+  }
+  buildRequestURL(pathname) {
+    const url = new URL(pathname.replace(/^\/+/, ""), `${this.getResolvedBaseURL()}/`).toString();
+    (0, import_utils.checkUrlAgainstWhitelist)(url);
+    return url;
+  }
   get aiPlugin() {
     return this.app.pm.get("ai");
   }
@@ -312,7 +346,7 @@ class EmbeddingProvider {
     this.opts = opts;
     const { app, serviceOptions, modelOptions } = this.opts;
     this.app = app;
-    this.serviceOptions = app.environment.renderJsonTemplate(serviceOptions ?? {});
+    this.serviceOptions = resolveServiceOptions(serviceOptions, app);
     this.modelOptions = modelOptions;
   }
   app;
@@ -331,7 +365,10 @@ class EmbeddingProvider {
     if (!baseURL) {
       throw new Error("baseURL is required");
     }
-    return baseURL;
+    if (typeof baseURL !== "string") {
+      throw new Error("baseURL must be a string");
+    }
+    return normalizeBaseURL(baseURL);
   }
   get model() {
     const { model } = this.modelOptions ?? {};

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

@@ -38,7 +38,7 @@ class XAIProvider extends import_provider.LLMProvider {
     return "https://api.x.ai/v1";
   }
   createModel() {
-    const { baseURL, apiKey } = this.serviceOptions || {};
+    const { apiKey } = this.serviceOptions || {};
     const { responseFormat, structuredOutput, ...restModelOptions } = this.modelOptions || {};
     const { schema } = structuredOutput || {};
     const responseFormatOptions = {
@@ -50,7 +50,7 @@ class XAIProvider extends import_provider.LLMProvider {
     return new import_xai.ChatXAI({
       apiKey,
       ...restModelOptions,
-      baseURL: baseURL || this.baseURL,
+      baseURL: this.getResolvedBaseURL(),
       modelKwargs: {
         response_format: responseFormatOptions
       }

package/dist/server/resource/ai.js

@@ -39,7 +39,10 @@ __export(ai_exports, {
   default: () => ai_default
 });
 module.exports = __toCommonJS(ai_exports);
+var import_package = require("../../../package.json");
 var import_lodash = __toESM(require("lodash"));
+const getModelsListFailedMessage = "Get models list failed, you can enter a model name manually.";
+const testFlightFailedMessage = "LLM service test failed. Please check the service configuration.";
 const aiResource = {
   name: "ai",
   actions: {
@@ -98,10 +101,7 @@ const aiResource = {
         const res = await provider.listModels();
         if (res.errMsg) {
           ctx.log.error(res.errMsg);
-          ctx.throw(
-            res.code || 500,
-            `${ctx.t("Get models list failed, you can enter a model name manually.")} ${res.errMsg}`
-          );
+          ctx.throw(res.code || 500, ctx.t(getModelsListFailedMessage, { ns: import_package.name }));
         }
         ctx.body = res.models || [];
       }
@@ -122,10 +122,7 @@ const aiResource = {
       const res = await providerClient.listModels();
       if (res.errMsg) {
         ctx.log.error(res.errMsg);
-        ctx.throw(
-          res.code || 500,
-          `${ctx.t("Get models list failed, you can enter a model name manually.")} ${res.errMsg}`
-        );
+        ctx.throw(res.code || 500, ctx.t(getModelsListFailedMessage, { ns: import_package.name }));
       }
       const models = res.models || [];
       if (model) {
@@ -151,7 +148,12 @@ const aiResource = {
           responseFormat: "text"
         }
       });
-      ctx.body = await providerClient.testFlight();
+      const result = await providerClient.testFlight();
+      if (result.status === "error") {
+        ctx.log.error(result.message);
+        result.message = ctx.t(testFlightFailedMessage, { ns: import_package.name });
+      }
+      ctx.body = result;
       return next();
     },
     listAllEnabledModels: async (ctx, next) => {

package/dist/server/utils.d.ts

@@ -20,7 +20,7 @@ export declare function parseResponseMessage(row: Model): {
 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>;
+export declare const buildTool: (toolsEntry: ToolsEntry) => import("@langchain/core/dist/tools").DynamicTool<any, unknown>;
 export declare class ResourceActionError extends Error {
     readonly status: number;
     constructor(status: number, message: string, options?: ErrorOptions);

package/dist/server/workflow/nodes/employee/constants.d.ts

@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+export declare const AI_WORKFLOW_TASK_STATUS: {
+    readonly PROCESSING: "processing";
+    readonly PENDING_ACCEPTANCE: "pending_acceptance";
+    readonly PENDING_APPROVAL: "pending_approval";
+    readonly APPROVED: "approved";
+    readonly REJECTED: "rejected";
+    readonly ABORTED: "aborted";
+};
+export type AIWorkflowTaskStatus = (typeof AI_WORKFLOW_TASK_STATUS)[keyof typeof AI_WORKFLOW_TASK_STATUS];
+export declare const REQUIRES_APPROVAL: {
+    readonly NO_REQUIRED: "no_required";
+    readonly AI_DECISION: "ai_decision";
+    readonly HUMAN_DECISION: "human_decision";
+};
+export type RequiresApproval = (typeof REQUIRES_APPROVAL)[keyof typeof REQUIRES_APPROVAL];

package/dist/server/workflow/nodes/employee/constants.js

@@ -0,0 +1,50 @@
+/**
+ * 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 constants_exports = {};
+__export(constants_exports, {
+  AI_WORKFLOW_TASK_STATUS: () => AI_WORKFLOW_TASK_STATUS,
+  REQUIRES_APPROVAL: () => REQUIRES_APPROVAL
+});
+module.exports = __toCommonJS(constants_exports);
+const AI_WORKFLOW_TASK_STATUS = {
+  PROCESSING: "processing",
+  PENDING_ACCEPTANCE: "pending_acceptance",
+  PENDING_APPROVAL: "pending_approval",
+  APPROVED: "approved",
+  REJECTED: "rejected",
+  ABORTED: "aborted"
+};
+const REQUIRES_APPROVAL = {
+  NO_REQUIRED: "no_required",
+  AI_DECISION: "ai_decision",
+  HUMAN_DECISION: "human_decision"
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AI_WORKFLOW_TASK_STATUS,
+  REQUIRES_APPROVAL
+});

package/dist/server/workflow/nodes/employee/handler.js

@@ -31,6 +31,7 @@ __export(handler_exports, {
 });
 module.exports = __toCommonJS(handler_exports);
 var import_plugin_workflow = require("@nocobase/plugin-workflow");
+var import_constants = require("./constants");
 const registerOnJobAbortedHandler = (plugin) => {
   plugin.db.on("jobs.afterBulkUpdate", async (options) => {
     const { model, attributes, where, transaction } = options;
@@ -47,15 +48,35 @@ const registerOnJobAbortedHandler = (plugin) => {
     if (!aiWorkflowTasks.length) {
       return;
     }
+    const sessionIds = aiWorkflowTasks.map((task) => task.sessionId).filter(Boolean);
     for (const aiWorkflowTask of aiWorkflowTasks) {
       await plugin.db.getRepository("aiWorkflowTasks").update({
-        values: { status: "aborted" },
+        values: { status: import_constants.AI_WORKFLOW_TASK_STATUS.ABORTED },
         filter: {
           id: aiWorkflowTask.id
         },
         transaction
       });
     }
+    if (sessionIds.length) {
+      await plugin.db.getRepository("aiToolMessages").update({
+        values: {
+          invokeStatus: "done",
+          status: "error",
+          content: "Workflow execution aborted.",
+          invokeEndTime: /* @__PURE__ */ new Date()
+        },
+        filter: {
+          sessionId: {
+            $in: sessionIds
+          },
+          invokeStatus: {
+            $in: ["init", "interrupted", "waiting", "pending"]
+          }
+        },
+        transaction
+      });
+    }
   });
 };
 const registerAIEmployeeTaskNotification = (plugin) => {
@@ -74,7 +95,7 @@ const registerAIEmployeeTaskNotification = (plugin) => {
       if (!(assignees == null ? void 0 : assignees.length)) {
         return;
       }
-      if (values.status === "pending_acceptance") {
+      if (values.status === import_constants.AI_WORKFLOW_TASK_STATUS.PENDING_ACCEPTANCE) {
         await plugin.db.getRepository("usersAiWorkflowTasks").update({
           values: {
             read: false

package/dist/server/workflow/nodes/employee/index.d.ts

@@ -11,6 +11,7 @@ export declare class AIEmployeeInstruction extends Instruction {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<void>;
     resume(node: FlowNodeModel, job: any, processor: Processor): any;
     private createWorkflowTask;
+    private abortAIWorkflowTask;
     private checkApproval;
 }
 export * from './handler';

package/dist/server/workflow/nodes/employee/index.js

@@ -46,6 +46,7 @@ var import_ai_employee = require("../../../ai-employees/ai-employee");
 var import_files = require("./files");
 var import_utils = require("@nocobase/utils");
 var import_ai = require("@nocobase/ai");
+var import_constants = require("./constants");
 __reExport(employee_exports, require("./handler"), module.exports);
 __reExport(employee_exports, require("./tools"), module.exports);
 class AIEmployeeInstruction extends import_plugin_workflow.Instruction {
@@ -56,7 +57,7 @@ class AIEmployeeInstruction extends import_plugin_workflow.Instruction {
       skillSettings,
       webSearch,
       model,
-      requiresApproval = "no_required",
+      requiresApproval = import_constants.REQUIRES_APPROVAL.NO_REQUIRED,
       userId,
       files
     } = processor.getParsedValue(node.config, node.id);
@@ -80,10 +81,12 @@ ${typeof message.system === "object" ? JSON.stringify(message.system) : message.
       nodeKey: node.key,
       upstreamId: (input == null ? void 0 : input.id) ?? null
     });
+    const abortHandle = processor.createBackgroundAbortHandle();
     await processor.exit();
     const runner = async () => {
       var _a, _b, _c, _d, _e;
       try {
+        abortHandle.throwIfAborted();
         if (skillSettings && skillSettings.skillsVersion == null) {
           skillSettings.skillsVersion = 2;
         }
@@ -169,6 +172,7 @@ ${typeof message.system === "object" ? JSON.stringify(message.system) : message.
           ];
           if (retry > 0) {
             if (retry < 2) {
+              abortHandle.throwIfAborted();
               const firstUserMessage = await this.workflow.db.getRepository("aiConversations.messages", conversation.sessionId).findOne({
                 filter: {
                   role: "user"
@@ -176,9 +180,10 @@ ${typeof message.system === "object" ? JSON.stringify(message.system) : message.
                 sort: ["messageId"]
               });
               const messageId = firstUserMessage == null ? void 0 : firstUserMessage.messageId;
-              result = await aiEmployee.invoke({ messageId, userMessages });
+              result = await aiEmployee.invoke({ messageId, userMessages, signal: abortHandle.signal });
             } else {
               result = await aiEmployee.invoke({
+                signal: abortHandle.signal,
                 userMessages: [
                   {
                     role: "user",
@@ -194,15 +199,28 @@ Do not send another normal assistant response without invoking it.
               });
             }
           } else {
-            result = await aiEmployee.invoke({ userMessages });
+            result = await aiEmployee.invoke({ userMessages, signal: abortHandle.signal });
           }
+          abortHandle.throwIfAborted();
           isToolInvoke = result.messages.filter((it) => it.type === "ai").flatMap((it) => it.tool_calls).some((it) => it.name === toolName);
         } while (!isToolInvoke && retry++ < 2);
         if (!isToolInvoke) {
           throw new Error("AI employee not do job correctly");
         }
-        await this.checkApproval({ requiresApproval, conversation, aiWorkflowTasks, result, aiEmployee, toolName });
+        await this.checkApproval({
+          requiresApproval,
+          conversation,
+          aiWorkflowTasks,
+          result,
+          aiEmployee,
+          toolName,
+          signal: abortHandle.signal
+        });
       } catch (e) {
+        if ((0, import_plugin_workflow.isWorkflowTimeoutError)(e) || abortHandle.signal.aborted) {
+          await this.abortAIWorkflowTask(id);
+          return;
+        }
         processor.logger.error(`ai employee invoke failed, ${e.message}`, {
           node: node.id,
           stack: e.stack,
@@ -211,24 +229,21 @@ Do not send another normal assistant response without invoking it.
         const job = await this.workflow.app.db.getRepository("jobs").findOne({
           filterByTk: id
         });
+        if (!job) {
+          await this.abortAIWorkflowTask(id);
+          return;
+        }
+        if (job.status !== import_plugin_workflow.JOB_STATUS.PENDING) {
+          return;
+        }
         job.set({
           status: import_plugin_workflow.JOB_STATUS.ERROR,
           result: e.message
         });
-        const aiWorkflowTask = await this.workflow.db.getRepository("aiWorkflowTasks").findOne({
-          filter: {
-            jobId: id
-          }
-        });
-        if (aiWorkflowTask) {
-          await this.workflow.db.getRepository("aiWorkflowTasks").update({
-            values: { status: "aborted" },
-            filter: {
-              id: aiWorkflowTask.id
-            }
-          });
-        }
+        await this.abortAIWorkflowTask(id);
         await this.workflow.resume(job);
+      } finally {
+        abortHandle.dispose();
       }
     };
     runner();
@@ -270,7 +285,7 @@ Do not send another normal assistant response without invoking it.
           workflowTitle: (_a = processor.execution.workflow) == null ? void 0 : _a.title,
           nodeTitle: node.title,
           requiresApproval,
-          status: "processing",
+          status: import_constants.AI_WORKFLOW_TASK_STATUS.PROCESSING,
           sessionId: conversation.sessionId,
           jobId,
           executionId: processor.execution.id,
@@ -293,15 +308,55 @@ Do not send another normal assistant response without invoking it.
       return { conversation, aiWorkflowTasks };
     });
   }
+  async abortAIWorkflowTask(jobId) {
+    const tasks = await this.workflow.db.getRepository("aiWorkflowTasks").find({
+      filter: {
+        jobId
+      },
+      fields: ["id", "sessionId"]
+    });
+    const sessionIds = tasks.map((task) => task.sessionId).filter(Boolean);
+    await this.workflow.db.getRepository("aiWorkflowTasks").update({
+      values: { status: import_constants.AI_WORKFLOW_TASK_STATUS.ABORTED },
+      filter: {
+        jobId,
+        status: {
+          $ne: import_constants.AI_WORKFLOW_TASK_STATUS.ABORTED
+        }
+      }
+    });
+    if (sessionIds.length) {
+      await this.workflow.db.getRepository("aiToolMessages").update({
+        values: {
+          invokeStatus: "done",
+          status: "error",
+          content: "Workflow execution aborted.",
+          invokeEndTime: /* @__PURE__ */ new Date()
+        },
+        filter: {
+          sessionId: {
+            $in: sessionIds
+          },
+          invokeStatus: {
+            $in: ["init", "interrupted", "waiting", "pending"]
+          }
+        }
+      });
+    }
+  }
   async checkApproval({
     requiresApproval,
     conversation,
     aiWorkflowTasks,
     result,
     aiEmployee,
-    toolName
+    toolName,
+    signal
   }) {
     var _a;
+    if (signal == null ? void 0 : signal.aborted) {
+      throw signal.reason ?? new import_plugin_workflow.WorkflowTimeoutError();
+    }
     const ai = this.workflow.app.pm.get(import_plugin.default);
     const aiToolMessage = await this.workflow.db.getRepository("aiToolMessages").findOne({
       filter: {
@@ -337,23 +392,26 @@ Do not send another normal assistant response without invoking it.
         return;
       }
       const userDecisions = await ai.aiConversationsManager.getUserDecisions(result.messageId);
-      await aiEmployee.invoke({ userDecisions });
+      await aiEmployee.invoke({ userDecisions, signal });
+      if (signal == null ? void 0 : signal.aborted) {
+        throw signal.reason ?? new import_plugin_workflow.WorkflowTimeoutError();
+      }
       await this.workflow.db.getRepository("aiWorkflowTasks").update({
-        values: { status: "approved" },
+        values: { status: import_constants.AI_WORKFLOW_TASK_STATUS.APPROVED },
         filter: {
           id: aiWorkflowTasks.id,
           status: {
-            $ne: "aborted"
+            $ne: import_constants.AI_WORKFLOW_TASK_STATUS.ABORTED
           }
         }
       });
-    } else if (requiresApproval !== "no_required") {
+    } else if (requiresApproval !== import_constants.REQUIRES_APPROVAL.NO_REQUIRED) {
       await this.workflow.db.getRepository("aiWorkflowTasks").update({
-        values: { status: "pending_acceptance" },
+        values: { status: import_constants.AI_WORKFLOW_TASK_STATUS.PENDING_ACCEPTANCE },
         filter: {
           id: aiWorkflowTasks.id,
           status: {
-            $ne: "aborted"
+            $ne: import_constants.AI_WORKFLOW_TASK_STATUS.ABORTED
           }
         }
       });

package/dist/server/workflow/nodes/employee/tools.d.ts

@@ -6,7 +6,7 @@
  * 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 { DynamicToolsProvider } from '@nocobase/ai';
-import { Plugin } from '@nocobase/server';
+import type { DynamicToolsProvider } from '@nocobase/ai';
+import type { Plugin } from '@nocobase/server';
 export type WorkflowTaskToolProvider = (plugin: Plugin) => DynamicToolsProvider;
 export declare const getWorkflowTasks: WorkflowTaskToolProvider;