@yss123/cage-approval 0.2.0 → 0.3.1

package/dist/task-stages.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 前后加签的持久阶段与前向迁移，由审批引擎在批准事务内调用。
+ * 父子关系保存在任务上，不改写实例步骤或 AI run；实例锁保证激活和决定/取消不会交错提交。
+ * 所有追加票都是必签，any 的原票胜出只替代原票责任，不能吞掉已创建的加签。
+ */
+import { type Transaction } from 'kysely';
+/**
+ * 批准后激活可运行任务并追加系统阶段记录，激活也递增 revision 使旧页面失效。
+ * before 全部完成才唤醒仍 waiting 的父票；父票已被 any 跳过则不复活。
+ * after 在 all 中等待自己的父票批准，在 any 中等待任意原票批准；追加票自身仍全部必签。
+ */
+export declare function activateSignatures(tx: Transaction<any>, inst: any, task: any, anyMode: boolean, userId: string): Promise<void>;
+/** 前向升级：旧任务保持 direct、无父任务与签序，旧数据不会被转换为候选池或合并票数。 */
+export declare const APPROVAL_TASK_STAGES_MIGRATION: {
+    name: string;
+    sql: string;
+};

package/dist/task-stages.js

@@ -0,0 +1,47 @@
+/**
+ * 前后加签的持久阶段与前向迁移，由审批引擎在批准事务内调用。
+ * 父子关系保存在任务上，不改写实例步骤或 AI run；实例锁保证激活和决定/取消不会交错提交。
+ * 所有追加票都是必签，any 的原票胜出只替代原票责任，不能吞掉已创建的加签。
+ */
+import { sql } from 'kysely';
+import { recordTaskAction } from './task-actions.js';
+/**
+ * 批准后激活可运行任务并追加系统阶段记录，激活也递增 revision 使旧页面失效。
+ * before 全部完成才唤醒仍 waiting 的父票；父票已被 any 跳过则不复活。
+ * after 在 all 中等待自己的父票批准，在 any 中等待任意原票批准；追加票自身仍全部必签。
+ */
+export async function activateSignatures(tx, inst, task, anyMode, userId) {
+    const activated = [];
+    if (task.sign_position === 'before') {
+        const unfinished = await tx.selectFrom('flow.approval_task').select('id').where('parent_task_id', '=', task.parent_task_id)
+            .where('sign_position', '=', 'before').where('status', 'in', ['pending', 'waiting']).executeTakeFirst();
+        if (!unfinished) {
+            const parent = await tx.updateTable('flow.approval_task').set({ status: 'pending', revision: sql `revision + 1` })
+                .where('id', '=', task.parent_task_id).where('instance_id', '=', inst.id).where('status', '=', 'waiting').returning('id').execute();
+            activated.push(...parent.map(row => row.id));
+        }
+    }
+    if (task.task_kind === 'original') {
+        const children = await tx.updateTable('flow.approval_task').set({ status: 'pending', revision: sql `revision + 1` })
+            .where('instance_id', '=', inst.id).where('step', '=', task.step).where('sign_position', '=', 'after').where('status', '=', 'waiting')
+            .$if(!anyMode, query => query.where('parent_task_id', '=', task.id)).returning('id').execute();
+        activated.push(...children.map(row => row.id));
+    }
+    if (activated.length)
+        await recordTaskAction(tx, inst, task.id, userId, 'activated', null, { taskIds: activated, cause: 'signature_dependency_approved' });
+}
+/** 前向升级：旧任务保持 direct、无父任务与签序，旧数据不会被转换为候选池或合并票数。 */
+export const APPROVAL_TASK_STAGES_MIGRATION = {
+    name: 'cage:approval_task_stages_002',
+    sql: `
+ALTER TABLE flow.approval_task ALTER COLUMN assignee DROP NOT NULL;
+ALTER TABLE flow.approval_task ADD COLUMN assignment text NOT NULL DEFAULT 'direct' CHECK (assignment IN ('direct','candidate'));
+ALTER TABLE flow.approval_task ADD COLUMN parent_task_id uuid REFERENCES flow.approval_task(id);
+ALTER TABLE flow.approval_task ADD COLUMN sign_position text CHECK (sign_position IN ('parallel','before','after'));
+ALTER TABLE flow.approval_task ADD CONSTRAINT approval_task_assignee_required CHECK (assignee IS NOT NULL OR assignment = 'candidate');
+ALTER TABLE flow.approval_task ADD CONSTRAINT approval_task_signature_parent CHECK ((parent_task_id IS NULL AND sign_position IS NULL) OR (parent_task_id IS NOT NULL AND sign_position IS NOT NULL AND task_kind = 'additional' AND assignment = 'direct'));
+CREATE INDEX approval_task_candidates_idx ON flow.approval_task(tenant_id, created_at DESC) WHERE assignment = 'candidate' AND assignee IS NULL AND status = 'pending';
+CREATE INDEX approval_task_parent_idx ON flow.approval_task(parent_task_id) WHERE parent_task_id IS NOT NULL;
+`,
+};
+//# sourceMappingURL=task-stages.js.map

package/dist/task-stages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-stages.js","sourceRoot":"","sources":["../src/task-stages.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,GAAG,EAAoB,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EAAoB,EAAE,IAAS,EAAE,IAAS,EAAE,OAAgB,EAAE,MAAc;IACnH,MAAM,SAAS,GAAa,EAAE,CAAC;IAC/B,IAAI,IAAI,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;QACpC,MAAM,UAAU,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC;aACxH,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC1G,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,CAAA,cAAc,EAAE,CAAC;iBAC9G,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACtI,SAAS,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IACD,IAAI,IAAI,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,CAAA,cAAc,EAAE,CAAC;aAChH,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,SAAS,CAAC;aACrI,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QACjG,SAAS,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,SAAS,CAAC,MAAM;QAAE,MAAM,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,CAAC,CAAC;AAC7J,CAAC;AAED,mDAAmD;AACnD,MAAM,CAAC,MAAM,8BAA8B,GAAG;IAC5C,IAAI,EAAE,+BAA+B;IACrC,GAAG,EAAE;;;;;;;;;CASN;CACA,CAAC"}

package/dist/types.d.ts

@@ -1,13 +1,17 @@
 import type { ApprovalEngine } from '@yss123/cage-kernel/worker';
+/** 引擎交给桥接层的业务结论；结果不会直接更新业务表，必须解析到绑定命令重新校验。 */
 export interface ApprovalOutcome {
     process: string;
     tenantId: string;
     /** 单据 id */
     businessKey: string;
-    outcome: 'approved' | 'rejected';
+    outcome: 'approved' | 'rejected' | 'returned';
     /** 最后一位审批人：结论命令以流程身份执行，代表这个人（职责分离、额度按他判断） */
-    lastApprover: string;
+    lastApprover?: string;
+    /** 审批所针对的单据提交版本；提供时命令拒绝把旧审批结论应用到已变化的对象。 */
+    expectedVersion?: number;
 }
+/** 外部引擎适配约定；调用方负责可信回调来源，桥接层负责重新核对结论命令及真人权限。 */
 export interface ApprovalAdapter extends ApprovalEngine {
     /** 注册流程结束回调 */
     onCompleted(cb: (r: ApprovalOutcome) => Promise<void>): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yss123/cage-approval",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "审批适配接口、桥接与代码内封闭路由（可选）",
   "type": "module",
   "main": "dist/index.js",
@@ -18,7 +18,7 @@
     "fastify": "^5.6.0",
     "kysely": "^0.28.5",
     "zod": "^4.1.5",
-    "@yss123/cage-kernel": "0.2.0"
+    "@yss123/cage-kernel": "0.3.1"
   },
   "license": "MIT",
   "repository": {