@nocobase/plugin-workflow 2.0.57 → 2.0.58

package/dist/externalVersion.js

@@ -11,8 +11,8 @@ module.exports = {
   "react": "18.2.0",
   "@formily/core": "2.3.7",
   "@formily/react": "2.3.7",
-  "@nocobase/client": "2.0.57",
-  "@nocobase/utils": "2.0.57",
+  "@nocobase/client": "2.0.58",
+  "@nocobase/utils": "2.0.58",
   "antd": "5.24.2",
   "@ant-design/icons": "5.6.1",
   "react-router-dom": "6.30.1",
@@ -20,20 +20,20 @@ module.exports = {
   "lodash": "4.18.1",
   "@dnd-kit/core": "6.1.0",
   "@formily/shared": "2.3.7",
-  "@nocobase/flow-engine": "2.0.57",
-  "@nocobase/plugin-mobile": "2.0.57",
+  "@nocobase/flow-engine": "2.0.58",
+  "@nocobase/plugin-mobile": "2.0.58",
   "sequelize": "6.35.2",
-  "@nocobase/server": "2.0.57",
-  "@nocobase/database": "2.0.57",
-  "@nocobase/data-source-manager": "2.0.57",
-  "@nocobase/logger": "2.0.57",
-  "@nocobase/evaluators": "2.0.57",
+  "@nocobase/server": "2.0.58",
+  "@nocobase/database": "2.0.58",
+  "@nocobase/data-source-manager": "2.0.58",
+  "@nocobase/logger": "2.0.58",
+  "@nocobase/evaluators": "2.0.58",
   "@formily/antd-v5": "1.2.3",
   "@formily/reactive": "2.3.7",
   "@emotion/css": "11.13.0",
   "@formily/json-schema": "2.3.7",
-  "@nocobase/actions": "2.0.57",
+  "@nocobase/actions": "2.0.58",
   "dayjs": "1.11.13",
-  "@nocobase/plugin-workflow-test": "2.0.57",
-  "@nocobase/test": "2.0.57"
+  "@nocobase/plugin-workflow-test": "2.0.58",
+  "@nocobase/test": "2.0.58"
 };

package/dist/node_modules/cron-parser/package.json

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2026-05-25T22:01:52.509Z"}
+{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2026-05-28T02:36:20.282Z"}

package/dist/node_modules/lru-cache/package.json

@@ -1 +1 @@
-{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2026-05-25T22:01:52.167Z"}
+{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2026-05-28T02:36:19.962Z"}

package/dist/node_modules/nodejs-snowflake/package.json

@@ -1 +1 @@
-{"name":"nodejs-snowflake","collaborators":["Utkarsh Srivastava <utkarsh@sagacious.dev>"],"description":"Generate time sortable 64 bits unique ids for distributed systems (inspired from twitter snowflake)","version":"2.0.1","license":"Apache 2.0","repository":{"type":"git","url":"https://github.com/utkarsh-pro/nodejs-snowflake.git"},"files":["nodejs_snowflake_bg.wasm","nodejs_snowflake.js","nodejs_snowflake.d.ts"],"main":"nodejs_snowflake.js","types":"nodejs_snowflake.d.ts","_lastModified":"2026-05-25T22:01:51.959Z"}
+{"name":"nodejs-snowflake","collaborators":["Utkarsh Srivastava <utkarsh@sagacious.dev>"],"description":"Generate time sortable 64 bits unique ids for distributed systems (inspired from twitter snowflake)","version":"2.0.1","license":"Apache 2.0","repository":{"type":"git","url":"https://github.com/utkarsh-pro/nodejs-snowflake.git"},"files":["nodejs_snowflake_bg.wasm","nodejs_snowflake.js","nodejs_snowflake.d.ts"],"main":"nodejs_snowflake.js","types":"nodejs_snowflake.d.ts","_lastModified":"2026-05-28T02:36:19.751Z"}

package/dist/server/Dispatcher.d.ts

@@ -8,13 +8,17 @@
  */
 import { Transactionable } from 'sequelize';
 import type { QueueEventOptions } from '@nocobase/server';
-import Processor from './Processor';
+import Processor, { ProcessorRerunOptions } from './Processor';
 import type { ExecutionModel, JobModel, WorkflowModel } from './types';
 import type PluginWorkflowServer from './Plugin';
 type Pending = {
     execution: ExecutionModel;
     job?: JobModel;
     loaded?: boolean;
+    rerun?: ProcessorRerunOptions;
+};
+type RunOptions = {
+    dispatch?: boolean;
 };
 export type EventOptions = {
     eventKey?: string;
@@ -41,16 +45,18 @@ export default class Dispatcher {
     getEventsCount(): number;
     trigger(workflow: WorkflowModel, context: object, options?: EventOptions): void | Promise<Processor | null>;
     private prepare;
-    resume(job: any): Promise<void>;
+    resume(job: JobModel): Promise<void>;
     start(execution: ExecutionModel): Promise<void>;
     beforeStop(): Promise<void>;
     dispatch(): void;
-    run(pending: Pending): Promise<void>;
+    run(pending: Pending, options?: RunOptions): Promise<void>;
     private triggerSync;
     private validateEvent;
     private createExecution;
     private acquirePendingExecution;
     private acquireQueueingExecution;
+    private getExecutionLockKey;
+    private isLockAcquireError;
     private process;
 }
 export {};

package/dist/server/Dispatcher.js

@@ -115,7 +115,7 @@ class Dispatcher {
           logger.info(`preparing execution for event`);
           try {
             const execution = await this.createExecution(...event);
-            if (!(execution == null ? void 0 : execution.dispatched)) {
+            if (!execution.dispatched) {
               if (this.plugin.serving() && !this.executing && !this.pending.length) {
                 logger.info(`local pending list is empty, adding execution (${execution.id}) to pending list`);
                 this.pending.push({ execution });
@@ -196,11 +196,12 @@ class Dispatcher {
     this.executing = (async () => {
       let next = null;
       let execution = null;
+      let pending = null;
       if (this.pending.length) {
-        const pending = this.pending.shift();
+        pending = this.pending.shift();
         execution = pending.loaded ? pending.execution : await this.acquirePendingExecution(pending.execution);
         if (execution) {
-          next = [execution, pending.job];
+          next = [execution, pending.job, pending.rerun];
           this.plugin.getLogger(next[0].workflowId).info(`pending execution (${next[0].id}) ready to process`);
         }
       } else {
@@ -216,7 +217,14 @@ class Dispatcher {
         }
       }
       if (next) {
-        await this.process(...next);
+        try {
+          await this.process(next[0], next[1], { rerun: next[2] });
+        } catch (error) {
+          this.plugin.getLogger(next[0].workflowId).error(`execution (${next[0].id}) process failed`, { error });
+          if (pending && this.isLockAcquireError(error)) {
+            this.pending.unshift({ ...pending, execution: next[0], loaded: true });
+          }
+        }
       }
       setImmediate(() => {
         this.executing = null;
@@ -227,9 +235,11 @@ class Dispatcher {
       });
     })();
   }
-  async run(pending) {
+  async run(pending, options = {}) {
     this.pending.push(pending);
-    this.dispatch();
+    if (options.dispatch !== false) {
+      this.dispatch();
+    }
   }
   async triggerSync(workflow, context, { deferred, ...options } = {}) {
     let execution;
@@ -252,7 +262,7 @@ class Dispatcher {
     if (!triggerValid) {
       return false;
     }
-    const { stack } = options;
+    const { stack = [] } = options;
     let valid = true;
     if ((stack == null ? void 0 : stack.length) > 0) {
       const existed = await workflow.countExecutions({
@@ -282,7 +292,7 @@ class Dispatcher {
         await transaction.commit();
       }
       (_a = options.onTriggerFail) == null ? void 0 : _a.call(options, workflow, context, options);
-      return Promise.reject(new Error("event is not valid"));
+      throw new Error("event is not valid");
     }
     let execution;
     try {
@@ -391,26 +401,42 @@ class Dispatcher {
     }
     return fetched;
   }
-  async process(execution, job, options = {}) {
-    var _a, _b;
+  getExecutionLockKey(executionId) {
+    return `workflow:execution:${executionId}`;
+  }
+  isLockAcquireError(error) {
+    return error instanceof Error && error.constructor.name === "LockAcquireError";
+  }
+  async process(execution, job = null, options = {}) {
+    const { rerun, ...processorOptions } = options;
     const logger = this.plugin.getLogger(execution.workflowId);
-    if (!execution.dispatched) {
-      const transaction = await this.plugin.useDataSourceTransaction("main", options.transaction);
-      await execution.update({ dispatched: true, status: import_constants.EXECUTION_STATUS.STARTED }, { transaction });
-      logger.info(`execution (${execution.id}) from pending list updated to started`);
-    }
-    const processor = this.plugin.createProcessor(execution, options);
-    logger.info(`execution (${execution.id}) ${job ? "resuming" : "starting"}...`);
-    try {
-      await (job ? processor.resume(job) : processor.start());
-      logger.info(`execution (${execution.id}) finished with status: ${execution.status}`);
-      logger.debug(`execution (${execution.id}) details:`, { execution });
-      if (execution.status && ((_b = (_a = execution.workflow.options) == null ? void 0 : _a.deleteExecutionOnStatus) == null ? void 0 : _b.includes(execution.status))) {
-        await execution.destroy({ transaction: processor.mainTransaction });
+    const run = async () => {
+      var _a, _b, _c;
+      if (!execution.dispatched) {
+        const transaction = await this.plugin.useDataSourceTransaction("main", processorOptions.transaction);
+        await execution.update({ dispatched: true, status: import_constants.EXECUTION_STATUS.STARTED }, { transaction });
+        logger.info(`execution (${execution.id}) from pending list updated to started`);
       }
-    } catch (err) {
-      logger.error(`execution (${execution.id}) error: ${err.message}`, err);
+      const processor = this.plugin.createProcessor(execution, processorOptions);
+      logger.info(`execution (${execution.id}) ${rerun ? "rerunning" : job ? "resuming" : "starting"}...`);
+      try {
+        await (rerun ? processor.rerun(rerun) : job ? processor.resume(job) : processor.start());
+        logger.info(`execution (${execution.id}) finished with status: ${execution.status}`);
+        logger.debug(`execution (${execution.id}) details:`, { execution });
+        if (execution.status && ((_c = (_b = (_a = execution.workflow) == null ? void 0 : _a.options) == null ? void 0 : _b.deleteExecutionOnStatus) == null ? void 0 : _c.includes(execution.status))) {
+          await execution.destroy({ transaction: processor.mainTransaction });
+        }
+      } catch (err) {
+        logger.error(`execution (${execution.id}) error: ${err.message}`, err);
+      }
+      return processor;
+    };
+    const lock = await this.plugin.app.lockManager.tryAcquire(this.getExecutionLockKey(execution.id), 6e4);
+    try {
+      return await lock.runExclusive(run, 6e4);
+    } catch (error) {
+      logger.error(`execution (${execution.id}) could not acquire process lock`, { error });
+      throw error;
     }
-    return processor;
   }
 }

package/dist/server/Plugin.d.ts

@@ -63,7 +63,8 @@ export default class PluginWorkflowServer extends Plugin {
     load(): Promise<void>;
     private toggle;
     trigger(workflow: WorkflowModel, context: object, options?: EventOptions): void | Promise<Processor | null>;
-    run(pending: Parameters<Dispatcher['run']>[0]): Promise<void>;
+    run(pending: Parameters<Dispatcher['run']>[0], options?: Parameters<Dispatcher['run']>[1]): Promise<void>;
+    dispatch(): void;
     resume(job: any): Promise<void>;
     /**
      * Start a deferred execution

package/dist/server/Plugin.js

@@ -406,8 +406,11 @@ class PluginWorkflowServer extends import_server.Plugin {
   trigger(workflow, context, options = {}) {
     return this.dispatcher.trigger(workflow, context, options);
   }
-  async run(pending) {
-    return this.dispatcher.run(pending);
+  async run(pending, options) {
+    return this.dispatcher.run(pending, options);
+  }
+  dispatch() {
+    return this.dispatcher.dispatch();
   }
   async resume(job) {
     return this.dispatcher.resume(job);

package/dist/server/Processor.d.ts

@@ -10,6 +10,13 @@ import { Transaction, Transactionable } from '@nocobase/database';
 import { Logger } from '@nocobase/logger';
 import type Plugin from './Plugin';
 import type { ExecutionModel, FlowNodeModel, JobModel } from './types';
+export type ProcessorRunOptions = {
+    rerun?: true;
+};
+export type ProcessorRerunOptions = {
+    nodeId?: string | number;
+    overwrite?: boolean;
+};
 export interface ProcessorOptions extends Transactionable {
     plugin: Plugin;
     [key: string]: any;
@@ -47,6 +54,7 @@ export default class Processor {
     private jobsMapByNodeKey;
     private jobResultsMapByNodeKey;
     private jobsToSave;
+    private rerunContext;
     /**
      * @experimental
      */
@@ -57,8 +65,18 @@ export default class Processor {
     prepare(): Promise<void>;
     start(): Promise<void>;
     resume(job: JobModel): Promise<void>;
+    resolveRerun(options?: ProcessorRerunOptions): {
+        node: FlowNodeModel;
+        input: JobModel | {
+            result: any;
+        };
+        targetJob: JobModel;
+    };
+    rerun(options?: ProcessorRerunOptions): Promise<any>;
+    private getRerunNode;
+    private getRerunInput;
     private exec;
-    run(node: any, input?: any): any;
+    run(node: any, input?: any, options?: ProcessorRunOptions): any;
     end(node: any, job: JobModel): Promise<any>;
     private recall;
     exit(s?: number | true): Promise<any>;

package/dist/server/Processor.js

@@ -82,6 +82,7 @@ class Processor {
   jobsMapByNodeKey = {};
   jobResultsMapByNodeKey = {};
   jobsToSave = /* @__PURE__ */ new Map();
+  rerunContext = null;
   /**
    * @experimental
    */
@@ -122,6 +123,9 @@ class Processor {
     if (!execution.workflow) {
       execution.workflow = plugin.enabledCache.get(execution.workflowId) || await execution.getWorkflow({ transaction });
     }
+    if (!execution.workflow) {
+      throw new Error(`workflow (#${execution.workflowId}) not found for execution (#${execution.id})`);
+    }
     const nodes = execution.workflow.nodes || await execution.workflow.getNodes({ transaction });
     execution.workflow.nodes = nodes;
     this.makeNodes(nodes);
@@ -173,11 +177,64 @@ class Processor {
     const node = this.nodesMap.get(job.nodeId);
     await this.recall(node, job);
   }
-  async exec(instruction, node, prevJob) {
+  resolveRerun(options = {}) {
+    const node = this.getRerunNode(options.nodeId);
+    const targetJob = this.jobsMapByNodeKey[node.key];
+    if (options.nodeId != null && !targetJob) {
+      throw new Error(`job of node (#${node.id}) not found in execution (#${this.execution.id})`);
+    }
+    if (options.nodeId == null && options.overwrite && !targetJob) {
+      throw new Error(`job of head node (#${node.id}) not found in execution (#${this.execution.id})`);
+    }
+    const input = this.getRerunInput(node);
+    return { node, input, targetJob };
+  }
+  async rerun(options = {}) {
+    const { execution } = this;
+    if (execution.status !== import_constants.EXECUTION_STATUS.STARTED) {
+      throw new Error(`execution (#${execution.id}) is not started`);
+    }
+    await this.prepare();
+    const { node, input, targetJob } = this.resolveRerun(options);
+    this.rerunContext = {
+      overwrite: options.overwrite === true,
+      targetJob
+    };
+    try {
+      return await this.run(node, input, { rerun: true });
+    } finally {
+      this.rerunContext = null;
+    }
+  }
+  getRerunNode(nodeId) {
+    if (nodeId != null) {
+      const node = this.nodesMap.get(nodeId) || this.nodes.find((item) => String(item.id) === String(nodeId));
+      if (!node) {
+        throw new Error(`node (#${nodeId}) not found in workflow (#${this.execution.workflowId})`);
+      }
+      return node;
+    }
+    const head = this.nodes.find((item) => !item.upstream);
+    if (!head) {
+      throw new Error(`head node not found in workflow (#${this.execution.workflowId})`);
+    }
+    return head;
+  }
+  getRerunInput(node) {
+    if (!node.upstream) {
+      return { result: this.execution.context };
+    }
+    const upstreamJob = this.jobsMapByNodeKey[node.upstream.key];
+    if (!upstreamJob) {
+      throw new Error(`upstream job of node (#${node.id}) not found in execution (#${this.execution.id})`);
+    }
+    return upstreamJob;
+  }
+  async exec(instruction, node, prevJob, options) {
     let job;
     try {
       this.logger.debug(`config of node`, { data: node.config, workflowId: node.workflowId });
-      job = await instruction(node, prevJob, this);
+      job = await instruction(node, prevJob, this, options);
       if (job === null) {
         return this.exit();
       }
@@ -219,7 +276,7 @@ class Processor {
     }
     return this.end(node, savedJob);
   }
-  async run(node, input) {
+  async run(node, input, options) {
     const { instructions } = this.options.plugin;
     const instruction = instructions.get(node.type);
     if (!instruction) {
@@ -231,7 +288,7 @@ class Processor {
     this.logger.info(`execution (${this.execution.id}) run instruction [${node.type}] for node (${node.id})`, {
       workflowId: node.workflowId
     });
-    return this.exec(instruction.run.bind(instruction), node, input);
+    return this.exec(instruction.run.bind(instruction), node, input, options);
   }
   // parent node should take over the control
   async end(node, job) {
@@ -325,12 +382,21 @@ class Processor {
    * @experimental
    */
   saveJob(payload) {
+    var _a;
     const { database } = this.execution.constructor;
     const { model } = database.getCollection("jobs");
     let job;
     if (payload instanceof model) {
       job = payload;
       job.set("updatedAt", /* @__PURE__ */ new Date());
+    } else if (((_a = this.rerunContext) == null ? void 0 : _a.overwrite) && this.rerunContext.targetJob && this.rerunContext.targetJob.nodeId === payload.nodeId) {
+      job = this.rerunContext.targetJob;
+      job.set({
+        status: payload.status,
+        result: Object.prototype.hasOwnProperty.call(payload, "result") ? payload.result : null,
+        meta: Object.prototype.hasOwnProperty.call(payload, "meta") ? payload.meta : null,
+        updatedAt: /* @__PURE__ */ new Date()
+      });
     } else {
       job = model.build(
         {

package/dist/server/actions/executions.d.ts

@@ -6,6 +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 { Context } from '@nocobase/actions';
-export declare function destroy(context: Context, next: any): Promise<void>;
-export declare function cancel(context: Context, next: any): Promise<never>;
+import { Context, Next } from '@nocobase/actions';
+export declare function destroy(context: Context, next: Next): Promise<void>;
+export declare function cancel(context: Context, next: Next): Promise<never>;
+export declare function rerun(context: Context, next: Next): Promise<never>;

package/dist/server/actions/executions.js

@@ -37,12 +37,20 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var executions_exports = {};
 __export(executions_exports, {
   cancel: () => cancel,
-  destroy: () => destroy
+  destroy: () => destroy,
+  rerun: () => rerun
 });
 module.exports = __toCommonJS(executions_exports);
 var import_actions = __toESM(require("@nocobase/actions"));
 var import_database = require("@nocobase/database");
+var import_Plugin = __toESM(require("../Plugin"));
 var import_constants = require("../constants");
+function getExecutionLockKey(executionId) {
+  return `workflow:execution:${executionId}`;
+}
+function isLockAcquireError(error) {
+  return error instanceof Error && error.constructor.name === "LockAcquireError";
+}
 async function destroy(context, next) {
   context.action.mergeParams({
     filter: {
@@ -67,30 +75,90 @@ async function cancel(context, next) {
   if (execution.status) {
     return context.throw(400);
   }
-  await context.db.sequelize.transaction(async (transaction) => {
-    await execution.update(
+  try {
+    const lock = await context.app.lockManager.tryAcquire(getExecutionLockKey(execution.id));
+    await lock.runExclusive(async () => {
+      await context.db.sequelize.transaction(async (transaction) => {
+        await execution.update(
+          {
+            status: import_constants.EXECUTION_STATUS.ABORTED
+          },
+          { transaction }
+        );
+        const pendingJobs = execution.jobs.filter((job) => job.status === import_constants.JOB_STATUS.PENDING);
+        await JobRepo.update({
+          values: {
+            status: import_constants.JOB_STATUS.ABORTED
+          },
+          filter: {
+            id: pendingJobs.map((job) => job.id)
+          },
+          individualHooks: false,
+          transaction
+        });
+      });
+    }, 6e4);
+  } catch (error) {
+    if (isLockAcquireError(error)) {
+      return context.throw(409, "Execution is being processed");
+    }
+    throw error;
+  }
+  context.body = execution;
+  await next();
+}
+async function rerun(context, next) {
+  const workflowPlugin = context.app.pm.get(import_Plugin.default);
+  const { filterByTk, values = {} } = context.action.params;
+  const { nodeId, overwrite } = values;
+  const ExecutionRepo = context.db.getRepository("executions");
+  const execution = await ExecutionRepo.findOne({
+    filterByTk
+  });
+  if (!execution) {
+    return context.throw(404);
+  }
+  if (execution.status !== import_constants.EXECUTION_STATUS.STARTED) {
+    return context.throw(409, "Only started executions can be rerun");
+  }
+  try {
+    const lock = await context.app.lockManager.tryAcquire(getExecutionLockKey(execution.id));
+    await lock.runExclusive(async () => {
+      const processor = workflowPlugin.createProcessor(execution);
+      await processor.prepare();
+      processor.resolveRerun({
+        nodeId,
+        overwrite: overwrite === true
+      });
+    }, 6e4);
+    await workflowPlugin.run(
       {
-        status: import_constants.EXECUTION_STATUS.ABORTED
+        execution,
+        loaded: true,
+        rerun: {
+          nodeId,
+          overwrite: overwrite === true
+        }
       },
-      { transaction }
+      { dispatch: false }
     );
-    const pendingJobs = execution.jobs.filter((job) => job.status === import_constants.JOB_STATUS.PENDING);
-    await JobRepo.update({
-      values: {
-        status: import_constants.JOB_STATUS.ABORTED
-      },
-      filter: {
-        id: pendingJobs.map((job) => job.id)
-      },
-      individualHooks: false,
-      transaction
-    });
-  });
+    workflowPlugin.dispatch();
+  } catch (error) {
+    if (isLockAcquireError(error)) {
+      return context.throw(409, "Execution is being processed");
+    }
+    if (error instanceof Error) {
+      return context.throw(400, error.message);
+    }
+    throw error;
+  }
   context.body = execution;
+  context.status = 202;
   await next();
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cancel,
-  destroy
+  destroy,
+  rerun
 });

package/dist/server/actions/jobs.js

@@ -41,6 +41,12 @@ __export(jobs_exports, {
 module.exports = __toCommonJS(jobs_exports);
 var import_actions = require("@nocobase/actions");
 var import_Plugin = __toESM(require("../Plugin"));
+function getExecutionLockKey(executionId) {
+  return `workflow:execution:${executionId}`;
+}
+function isLockAcquireError(error) {
+  return error instanceof Error && error.constructor.name === "LockAcquireError";
+}
 async function resume(context, next) {
   const repository = import_actions.utils.getRepositoryFromParams(context);
   const workflowPlugin = context.app.pm.get(import_Plugin.default);
@@ -51,8 +57,21 @@ async function resume(context, next) {
   if (!job) {
     return context.throw(404, "Job not found");
   }
+  if (!job.execution) {
+    job.execution = await job.getExecution();
+  }
   workflowPlugin.getLogger(job.workflowId).warn(`Resuming job #${job.id}...`);
-  await job.update(values);
+  try {
+    const lock = await context.app.lockManager.tryAcquire(getExecutionLockKey(job.execution.id));
+    await lock.runExclusive(async () => {
+      await job.update(values);
+    }, 6e4);
+  } catch (error) {
+    if (isLockAcquireError(error)) {
+      return context.throw(409, "Execution is being processed");
+    }
+    throw error;
+  }
   context.body = job;
   context.status = 202;
   await next();

package/dist/server/instructions/index.d.ts

@@ -24,7 +24,9 @@ export interface IJob {
  * 3. `void` | Promise<void>: processor will do nothing, and terminate the current execution without any action.
  */
 export type InstructionResult = IJob | Promise<IJob> | Promise<void> | Promise<null> | null | void;
-export type Runner = (node: FlowNodeModel, input: any, processor: Processor) => InstructionResult;
+export type Runner = (node: FlowNodeModel, input: any, processor: Processor, options?: {
+    rerun?: true;
+}) => InstructionResult;
 export type InstructionInterface = {
     run: Runner;
     resume?: Runner;
@@ -37,6 +39,8 @@ export type InstructionInterface = {
 export declare abstract class Instruction implements InstructionInterface {
     workflow: Plugin;
     constructor(workflow: Plugin);
-    abstract run(node: FlowNodeModel, input: any, processor: Processor): InstructionResult;
+    abstract run(node: FlowNodeModel, input: any, processor: Processor, options?: {
+        rerun?: true;
+    }): InstructionResult;
 }
 export default Instruction;

package/package.json

@@ -6,7 +6,7 @@
   "description": "A powerful BPM tool that provides foundational support for business automation, with the capability to extend unlimited triggers and nodes.",
   "description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
   "description.ru-RU": "Мощный инструмент BPM, обеспечивающий базовую поддержку автоматизации бизнес-процессов с возможностью неограниченного расширения триггеров и узлов.",
-  "version": "2.0.57",
+  "version": "2.0.58",
   "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/workflow",
@@ -48,7 +48,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "629bf05e63bca0cbd60fffb87057d45bda5d9222",
+  "gitHead": "158b99ec4f71555fc5125f61cfcf357763994da0",
   "keywords": [
     "Workflow"
   ]