forked from ChaiHao/BPOS-MVP
判据 ④⑤ 解锁:G2 并行网关起出 A3 / A2 —— 输出口发射的是落地事实
G2 之后一直不分流,根因三条,逐条修: ① 输出口载荷是空的。`outputPortsOf` 原先从**作用域**里捞字段拼载荷, 而放行那一刻草稿层已合并并清空,捞到的只剩起单入参 —— 下游节点必然缺字段。 改为:载荷取自**落地收敛的事实**,由 `releaseWrite` 回报合并了哪些行, 经 release → task → app 一路带上来。这也正是「落地收敛,输出口才发射」的字面意思: 发射的就该是已经落地的那些事实。 `LandedFacts` 给两种读法:铺平(标量取值)与逐行(数组取值), 输出口声明里 `type: 'array'` 的属性填逐行,标量属性填铺平值(驼峰/下划线两种写法都认)。 ② 一条分支起不来,把整条终态上报连坐掀翻 —— 于是**上游任务的终态也报不上去**, 流停在原地,一行日志都没有。改为:该分支记 `node-start-failed` 事件 + 落一个 blocked 实例,其余分支照走,在治理台「需处置」里现形。 (这条是先修的:正因为它,前面两条才一直查不出来。) ③ 边映射引用了不存在的路径:`G2→A3` 的 pn 取 `intake.records`(那是想象中的 LLM 出参形状)、 `G2J→A4` 的 records 取 `initiation.records`(起单时根本还没有这些行)。 按输出口的真实声明改正。 结果:A1 released → G2 并行分叉 → **A3 渠道寻源落到林佩萱、A2 替代选型落到王梓名**, 两个 loop 活动同时在跑,岗位解析正确。 gates: tsc / eslint / depcruise(317 模块)/ api-report / 393 测试 全绿 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KeDBx2PHLavbURXB8LJJ7m
This commit is contained in:
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"messageId": "rfq-040@x.com",
|
||||||
|
"from": "buyer@x.com",
|
||||||
|
"to": [
|
||||||
|
"rfq@we.com"
|
||||||
|
],
|
||||||
|
"cc": [],
|
||||||
|
"subject": "【询价】客户 C020 RFQ-20260727P 求报价",
|
||||||
|
"body": "客户编码 C020,询价单号 RFQ-20260727P。\nTL072CDR TI 年用量 3000 目标价 5.00 交期 10w",
|
||||||
|
"receivedAt": "2026-07-27T15:00:00.000Z",
|
||||||
|
"attachments": []
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"messageId": "rfq-20260727N@x.com",
|
||||||
|
"from": "buyer@x.com",
|
||||||
|
"to": [
|
||||||
|
"rfq@we.com"
|
||||||
|
],
|
||||||
|
"cc": [],
|
||||||
|
"subject": "【询价】客户 C010 RFQ-20260727N 求报价",
|
||||||
|
"body": "客户编码 C010,询价单号 RFQ-20260727N。\nTL072CDR TI 年用量 3000 目标价 5.00 交期 10w",
|
||||||
|
"receivedAt": "2026-07-27T14:00:00.000Z",
|
||||||
|
"attachments": []
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"messageId": "rfq-20260727Q@x.com",
|
||||||
|
"from": "buyer@x.com",
|
||||||
|
"to": [
|
||||||
|
"rfq@we.com"
|
||||||
|
],
|
||||||
|
"cc": [],
|
||||||
|
"subject": "【询价】客户 C030 RFQ-20260727Q 求报价",
|
||||||
|
"body": "客户编码 C030,询价单号 RFQ-20260727Q。\nPN-NEW-777 TI 年用量 4000 目标价 5.00 交期 10w",
|
||||||
|
"receivedAt": "2026-07-27T16:00:00.000Z",
|
||||||
|
"attachments": []
|
||||||
|
}
|
||||||
@@ -51,6 +51,17 @@ export type DraftWrite = {
|
|||||||
export type ReleaseWriteResult = {
|
export type ReleaseWriteResult = {
|
||||||
readonly mergedRows: number;
|
readonly mergedRows: number;
|
||||||
readonly emittedEvents: number;
|
readonly emittedEvents: number;
|
||||||
|
/**
|
||||||
|
* 合并进正式版的那些行(键 + 值)。
|
||||||
|
* 「落地收敛,输出口才发射」——发射的载荷就该是**这些已落地的事实**,
|
||||||
|
* 而不是从作用域里再猜一遍:放行后草稿层已清空,再猜就什么也猜不到。
|
||||||
|
*/
|
||||||
|
readonly merged: ReadonlyArray<{
|
||||||
|
readonly domain: string;
|
||||||
|
readonly object: string;
|
||||||
|
readonly key: Record<string, unknown>;
|
||||||
|
readonly values: Record<string, unknown>;
|
||||||
|
}>;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* 写三分是**三个不同方法**,不是一个带 flag 的方法 —— 调用方拿不到「绕门」的形态(§7.2)。
|
* 写三分是**三个不同方法**,不是一个带 flag 的方法 —— 调用方拿不到「绕门」的形态(§7.2)。
|
||||||
@@ -69,6 +80,17 @@ export type LedgerService = {
|
|||||||
query(query: LedgerQuery): Promise<LedgerPage>;
|
query(query: LedgerQuery): Promise<LedgerPage>;
|
||||||
/** 任务视图 = 正式版 + 本任务草稿层 */
|
/** 任务视图 = 正式版 + 本任务草稿层 */
|
||||||
taskView(taskId: TaskId, query: LedgerQuery): Promise<LedgerPage>;
|
taskView(taskId: TaskId, query: LedgerQuery): Promise<LedgerPage>;
|
||||||
|
/**
|
||||||
|
* **本任务自己写的**草稿条目(读己之写的读面)。
|
||||||
|
* 与 `taskView` 的区别:那个是「正式版 + 我的草稿」的合并视图,
|
||||||
|
* 这个只回我写过的那些行 —— 引擎求值要区分「这一单的事实」与「别人放行后的事实」。
|
||||||
|
*/
|
||||||
|
taskDrafts(taskId: TaskId): Promise<Array<{
|
||||||
|
domain: string;
|
||||||
|
object: string;
|
||||||
|
key: Record<string, unknown>;
|
||||||
|
patch: Record<string, unknown>;
|
||||||
|
}>>;
|
||||||
/** 落地预检第五项:数据冲突检查 */
|
/** 落地预检第五项:数据冲突检查 */
|
||||||
checkConflicts(taskId: TaskId): Promise<ConflictFinding[]>;
|
checkConflicts(taskId: TaskId): Promise<ConflictFinding[]>;
|
||||||
discardDrafts(taskId: TaskId): Promise<void>;
|
discardDrafts(taskId: TaskId): Promise<void>;
|
||||||
|
|||||||
@@ -45,6 +45,13 @@ export type LandOutcome = {
|
|||||||
/** 落地收敛后才发射的输出口 */
|
/** 落地收敛后才发射的输出口 */
|
||||||
readonly emittedPorts: readonly string[];
|
readonly emittedPorts: readonly string[];
|
||||||
readonly ledgerRowsMerged: number;
|
readonly ledgerRowsMerged: number;
|
||||||
|
/** 已落地的事实 —— 输出口发射的载荷取自这里 */
|
||||||
|
readonly merged: ReadonlyArray<{
|
||||||
|
readonly domain: string;
|
||||||
|
readonly object: string;
|
||||||
|
readonly key: Record<string, unknown>;
|
||||||
|
readonly values: Record<string, unknown>;
|
||||||
|
}>;
|
||||||
/** 落地受阻时发出的落地失败卡 */
|
/** 落地受阻时发出的落地失败卡 */
|
||||||
readonly failureWorkOrderId?: string;
|
readonly failureWorkOrderId?: string;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -23,6 +23,13 @@ export type LedgerGateway = {
|
|||||||
releaseWrite(taskId: TaskId): Promise<{
|
releaseWrite(taskId: TaskId): Promise<{
|
||||||
mergedRows: number;
|
mergedRows: number;
|
||||||
emittedEvents: number;
|
emittedEvents: number;
|
||||||
|
/** 合并进正式版的行 —— 输出口发射的载荷取自这里 */
|
||||||
|
merged: ReadonlyArray<{
|
||||||
|
domain: string;
|
||||||
|
object: string;
|
||||||
|
key: Record<string, unknown>;
|
||||||
|
values: Record<string, unknown>;
|
||||||
|
}>;
|
||||||
}>;
|
}>;
|
||||||
};
|
};
|
||||||
/** 工具 —— app 注入 `toolbox`(L2);预检的②③④项与落地执行都经它 */
|
/** 工具 —— app 注入 `toolbox`(L2);预检的②③④项与落地执行都经它 */
|
||||||
|
|||||||
+10
-1
@@ -18,6 +18,14 @@ export declare class TaskAlreadyTerminalError extends Error {
|
|||||||
constructor(taskId: TaskId, terminal: TerminalState);
|
constructor(taskId: TaskId, terminal: TerminalState);
|
||||||
}
|
}
|
||||||
/** 一单任务 —— 活动的运行时实例;**恰有一名负责人** */
|
/** 一单任务 —— 活动的运行时实例;**恰有一名负责人** */
|
||||||
|
/** 落地事实的两种读法:铺平(标量取值)与逐行(数组取值)—— 输出口载荷由此装配 */
|
||||||
|
export type LandedFacts = {
|
||||||
|
readonly flat: Record<string, unknown>;
|
||||||
|
readonly rows: ReadonlyArray<{
|
||||||
|
key: Record<string, unknown>;
|
||||||
|
values: Record<string, unknown>;
|
||||||
|
}>;
|
||||||
|
};
|
||||||
export type Task = {
|
export type Task = {
|
||||||
readonly id: TaskId;
|
readonly id: TaskId;
|
||||||
readonly activityId: string;
|
readonly activityId: string;
|
||||||
@@ -78,7 +86,8 @@ export type TaskService = {
|
|||||||
/** 改派:在途任务的负责人变更,**留痕并通知双方** */
|
/** 改派:在途任务的负责人变更,**留痕并通知双方** */
|
||||||
reassign(taskId: TaskId, to: StaffId, by: StaffId): Promise<Task>;
|
reassign(taskId: TaskId, to: StaffId, by: StaffId): Promise<Task>;
|
||||||
/** 终态裁定 —— 完成由框架裁定,终态由系统命名 */
|
/** 终态裁定 —— 完成由框架裁定,终态由系统命名 */
|
||||||
finish(taskId: TaskId, cause: TerminalCause): Promise<Task>;
|
/** `facts` = 落地收敛的事实(仅放行路径有);作为输出口载荷上报流程层 */
|
||||||
|
finish(taskId: TaskId, cause: TerminalCause, facts?: LandedFacts): Promise<Task>;
|
||||||
/** 断点续跑的三份持久状态是否齐备 */
|
/** 断点续跑的三份持久状态是否齐备 */
|
||||||
resumeReadiness(taskId: TaskId): Promise<ResumeReadiness>;
|
resumeReadiness(taskId: TaskId): Promise<ResumeReadiness>;
|
||||||
};
|
};
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
/**
|
/**
|
||||||
* module: task —— 唯一出口。只做 re-export,不写逻辑(编码规范 §10.1)。
|
* module: task —— 唯一出口。只做 re-export,不写逻辑(编码规范 §10.1)。
|
||||||
*/
|
*/
|
||||||
export type { BudgetBreach, BudgetCaps, Consumption, ControlOutcome, ControlSemantic, HarnessVerdict, Paradigm, ResumeReadiness, StartTaskInput, Task, TaskRuntimeState, TaskService, TaskSnapshot, TerminalCause, TerminalState, TickOutcome, } from './contract.ts';
|
export type { BudgetBreach, LandedFacts, BudgetCaps, Consumption, ControlOutcome, ControlSemantic, HarnessVerdict, Paradigm, ResumeReadiness, StartTaskInput, Task, TaskRuntimeState, TaskService, TaskSnapshot, TerminalCause, TerminalState, TickOutcome, } from './contract.ts';
|
||||||
export { TaskAlreadyTerminalError, TaskNotFoundError } from './contract.ts';
|
export { TaskAlreadyTerminalError, TaskNotFoundError } from './contract.ts';
|
||||||
export type { ActivityLoader, Clock, IdGenerator, InteractionPhaseSetter, ListenerProbe, MemoryRecorder, ParadigmEngine, PersistenceProbe, ReassignNotifier, SchemaValidator, TaskEventPublisher, TaskStore, } from './port.ts';
|
export type { ActivityLoader, Clock, IdGenerator, InteractionPhaseSetter, ListenerProbe, MemoryRecorder, ParadigmEngine, PersistenceProbe, ReassignNotifier, SchemaValidator, TaskEventPublisher, TaskStore, } from './port.ts';
|
||||||
export type { TaskServiceDeps } from './internal/usecase/task-service.ts';
|
export type { TaskServiceDeps } from './internal/usecase/task-service.ts';
|
||||||
|
|||||||
+5
-2
@@ -3,7 +3,7 @@
|
|||||||
*/
|
*/
|
||||||
import type { BudgetCaps, Paradigm, StaffId, TaskId, TerminalState } from '@contracts';
|
import type { BudgetCaps, Paradigm, StaffId, TaskId, TerminalState } from '@contracts';
|
||||||
import type { Consumption } from './internal/domain/harness.ts';
|
import type { Consumption } from './internal/domain/harness.ts';
|
||||||
import type { Task } from './contract.ts';
|
import type { LandedFacts, Task } from './contract.ts';
|
||||||
export type Clock = {
|
export type Clock = {
|
||||||
now(): Date;
|
now(): Date;
|
||||||
};
|
};
|
||||||
@@ -66,6 +66,8 @@ export type LandingGateway = {
|
|||||||
converged: boolean;
|
converged: boolean;
|
||||||
emittedPorts: readonly string[];
|
emittedPorts: readonly string[];
|
||||||
ledgerRowsMerged: number;
|
ledgerRowsMerged: number;
|
||||||
|
/** 已落地的事实 —— 输出口载荷,随终态报给流程层 */
|
||||||
|
facts: LandedFacts;
|
||||||
}>;
|
}>;
|
||||||
};
|
};
|
||||||
export type MemoryRecorder = {
|
export type MemoryRecorder = {
|
||||||
@@ -98,7 +100,8 @@ export type PersistenceProbe = {
|
|||||||
/** 控制事件与终态事件 —— app 注入 `event`(L1) */
|
/** 控制事件与终态事件 —— app 注入 `event`(L1) */
|
||||||
export type TaskEventPublisher = {
|
export type TaskEventPublisher = {
|
||||||
publishControl(taskId: TaskId, semantic: string, by: StaffId, reason?: string): Promise<void>;
|
publishControl(taskId: TaskId, semantic: string, by: StaffId, reason?: string): Promise<void>;
|
||||||
publishTerminal(taskId: TaskId, terminal: TerminalState, reason: string): Promise<void>;
|
/** `facts` = 落地收敛的事实,作为输出口载荷随终态报给流程层;非放行终态为空 */
|
||||||
|
publishTerminal(taskId: TaskId, terminal: TerminalState, reason: string, facts: LandedFacts): Promise<void>;
|
||||||
};
|
};
|
||||||
/** 改派通知 —— app 注入 `message`(L2):改派留痕并**通知双方** */
|
/** 改派通知 —— app 注入 `message`(L2):改派留痕并**通知双方** */
|
||||||
export type ReassignNotifier = {
|
export type ReassignNotifier = {
|
||||||
|
|||||||
@@ -247,7 +247,7 @@ export async function seedQuote(container: Container): Promise<void> {
|
|||||||
to: 'A3',
|
to: 'A3',
|
||||||
label: 'TYPE-B 转寻源',
|
label: 'TYPE-B 转寻源',
|
||||||
mapping: [
|
mapping: [
|
||||||
{ target: 'pn', source: { from: 'output-port', port: 'intake', path: 'records' } },
|
{ target: 'pn', source: { from: 'output-port', port: 'intake', path: 'pn' } },
|
||||||
{ target: 'scenario', source: { from: 'constant', value: 'BOM后期' } },
|
{ target: 'scenario', source: { from: 'constant', value: 'BOM后期' } },
|
||||||
],
|
],
|
||||||
reopen: false,
|
reopen: false,
|
||||||
@@ -257,7 +257,7 @@ export async function seedQuote(container: Container): Promise<void> {
|
|||||||
from: 'G2',
|
from: 'G2',
|
||||||
to: 'A2',
|
to: 'A2',
|
||||||
label: 'TYPE-C 转选型',
|
label: 'TYPE-C 转选型',
|
||||||
mapping: [{ target: 'originalPn', source: { from: 'output-port', port: 'intake', path: 'records' } }],
|
mapping: [{ target: 'originalPn', source: { from: 'output-port', port: 'intake', path: 'pn' } }],
|
||||||
reopen: false,
|
reopen: false,
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -270,7 +270,8 @@ export async function seedQuote(container: Container): Promise<void> {
|
|||||||
to: 'A4',
|
to: 'A4',
|
||||||
mapping: [
|
mapping: [
|
||||||
{ target: 'customerCode', source: { from: 'initiation', path: 'customerCode' } },
|
{ target: 'customerCode', source: { from: 'initiation', path: 'customerCode' } },
|
||||||
{ target: 'records', source: { from: 'initiation', path: 'records' } },
|
// records 来自 A1 的输出口(受理归一的产物),不是起单入参 —— 起单时还没有这些行
|
||||||
|
{ target: 'records', source: { from: 'output-port', port: 'intake', path: 'records' } },
|
||||||
],
|
],
|
||||||
reopen: false,
|
reopen: false,
|
||||||
},
|
},
|
||||||
@@ -299,7 +300,8 @@ export async function seedQuote(container: Container): Promise<void> {
|
|||||||
label: '有异议 → 返回调整',
|
label: '有异议 → 返回调整',
|
||||||
mapping: [
|
mapping: [
|
||||||
{ target: 'customerCode', source: { from: 'initiation', path: 'customerCode' } },
|
{ target: 'customerCode', source: { from: 'initiation', path: 'customerCode' } },
|
||||||
{ target: 'records', source: { from: 'initiation', path: 'records' } },
|
// records 来自 A1 的输出口(受理归一的产物),不是起单入参 —— 起单时还没有这些行
|
||||||
|
{ target: 'records', source: { from: 'output-port', port: 'intake', path: 'records' } },
|
||||||
],
|
],
|
||||||
reopen: true,
|
reopen: true,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
* 这里把 M4/M5 的模块用**端口**接起来:跨层协作一律经端口,模块之间不互相认识。
|
* 这里把 M4/M5 的模块用**端口**接起来:跨层协作一律经端口,模块之间不互相认识。
|
||||||
*/
|
*/
|
||||||
import type { Db } from '@shared/db.ts';
|
import type { Db } from '@shared/db.ts';
|
||||||
|
import type { LandedFacts } from '@modules/task';
|
||||||
import type { EventService } from '@modules/event';
|
import type { EventService } from '@modules/event';
|
||||||
import type { LedgerService } from '@modules/ledger';
|
import type { LedgerService } from '@modules/ledger';
|
||||||
import type { MemoryService } from '@modules/memory';
|
import type { MemoryService } from '@modules/memory';
|
||||||
@@ -339,19 +340,36 @@ export function wireEngines(deps: EngineWiringDeps): EngineWiring {
|
|||||||
*/
|
*/
|
||||||
const processRef = createDeferredProcess();
|
const processRef = createDeferredProcess();
|
||||||
|
|
||||||
/** 任务的输出口载荷:活动声明的必交付输出口 → 该任务视图上的字段 */
|
/**
|
||||||
async function outputPortsOf(taskId: TaskId): Promise<Record<string, Record<string, unknown>>> {
|
* 任务的输出口载荷。
|
||||||
const task = await taskStore.get(taskId);
|
*
|
||||||
if (task === undefined) return {};
|
* 载荷来自**落地收敛的事实**(`facts`),不是从作用域里再捞一遍:
|
||||||
const manifest = await deps.registry.manifestOf(task.activityId);
|
* 放行那一刻草稿层已合并并清空,此时再捞只剩起单入参,下游节点会因缺字段起不来。
|
||||||
const scope = await taskData.view(taskId);
|
* 输出口声明的属性名与台账列名可能不同形(驼峰 / 下划线),两种写法都认。
|
||||||
|
*/
|
||||||
|
function outputPortsOf(
|
||||||
|
manifest: { contract: { output: { mandatory: ReadonlyArray<{ name: string; payload: unknown }> } } },
|
||||||
|
landed: LandedFacts,
|
||||||
|
): Record<string, Record<string, unknown>> {
|
||||||
|
const snake = (name: string): string => name.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
|
||||||
const ports: Record<string, Record<string, unknown>> = {};
|
const ports: Record<string, Record<string, unknown>> = {};
|
||||||
|
|
||||||
for (const port of manifest.contract.output.mandatory) {
|
for (const port of manifest.contract.output.mandatory) {
|
||||||
const payload = port.payload as { properties?: Record<string, unknown> };
|
const payload = port.payload as { properties?: Record<string, { type?: string }> };
|
||||||
const fields = Object.keys(payload.properties ?? {});
|
const declared = Object.entries(payload.properties ?? {});
|
||||||
ports[port.name] = Object.fromEntries(
|
const picked: Record<string, unknown> = {};
|
||||||
fields.filter((f) => scope[f] !== undefined).map((f) => [f, scope[f]]),
|
|
||||||
);
|
for (const [field, spec] of declared) {
|
||||||
|
// 数组属性 = 这一单落地的那些行(逐行的键 + 值);标量属性 = 铺平后的事实
|
||||||
|
if (spec.type === 'array') {
|
||||||
|
picked[field] = landed.rows.map((r) => ({ ...r.key, ...r.values }));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const value = landed.flat[field] ?? landed.flat[snake(field)];
|
||||||
|
if (value !== undefined) picked[field] = value;
|
||||||
|
}
|
||||||
|
// 声明之外的落地事实一并带上:边映射也可能直接引用台账列名
|
||||||
|
ports[port.name] = { ...landed.flat, ...picked };
|
||||||
}
|
}
|
||||||
return ports;
|
return ports;
|
||||||
}
|
}
|
||||||
@@ -421,6 +439,14 @@ export function wireEngines(deps: EngineWiringDeps): EngineWiring {
|
|||||||
converged: outcome.verdict.kind === 'converged',
|
converged: outcome.verdict.kind === 'converged',
|
||||||
emittedPorts: outcome.emittedPorts,
|
emittedPorts: outcome.emittedPorts,
|
||||||
ledgerRowsMerged: outcome.ledgerRowsMerged,
|
ledgerRowsMerged: outcome.ledgerRowsMerged,
|
||||||
|
// 输出口载荷 = 已落地的事实:铺平供标量取值,逐行供数组取值
|
||||||
|
facts: {
|
||||||
|
flat: outcome.merged.reduce<Record<string, unknown>>(
|
||||||
|
(acc, row) => ({ ...acc, ...row.key, ...row.values }),
|
||||||
|
{},
|
||||||
|
),
|
||||||
|
rows: outcome.merged.map((r) => ({ key: r.key, values: r.values })),
|
||||||
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -449,7 +475,7 @@ export function wireEngines(deps: EngineWiringDeps): EngineWiring {
|
|||||||
source: { kind: 'governance' },
|
source: { kind: 'governance' },
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
publishTerminal: async (taskId, terminal, reason) => {
|
publishTerminal: async (taskId, terminal, reason, facts) => {
|
||||||
await deps.event.publish({
|
await deps.event.publish({
|
||||||
type: 'data',
|
type: 'data',
|
||||||
correlation: { target: { kind: 'task', id: taskId }, cause: { kind: 'engine', ref: 'terminal' }, keys: { terminal } },
|
correlation: { target: { kind: 'task', id: taskId }, cause: { kind: 'engine', ref: 'terminal' }, keys: { terminal } },
|
||||||
@@ -466,7 +492,9 @@ export function wireEngines(deps: EngineWiringDeps): EngineWiring {
|
|||||||
* 流就停在那个节点上,既不流转也不走失败走向。
|
* 流就停在那个节点上,既不流转也不走失败走向。
|
||||||
* 用延后绑定是因为 process 在本函数里晚于 task 构造。
|
* 用延后绑定是因为 process 在本函数里晚于 task 构造。
|
||||||
*/
|
*/
|
||||||
const ports = await outputPortsOf(taskId);
|
const task = await taskStore.get(taskId);
|
||||||
|
const manifest = task === undefined ? undefined : await deps.registry.manifestOf(task.activityId);
|
||||||
|
const ports = manifest === undefined ? {} : outputPortsOf(manifest, facts);
|
||||||
await processRef.onTaskTerminal(taskId, terminal, ports);
|
await processRef.onTaskTerminal(taskId, terminal, ports);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -170,7 +170,7 @@ describe('ledger · 真实 PG', () => {
|
|||||||
expect(official.rows[0]).toMatchObject({ grade: 'C' });
|
expect(official.rows[0]).toMatchObject({ grade: 'C' });
|
||||||
|
|
||||||
// 草稿已清空:再放行是空操作
|
// 草稿已清空:再放行是空操作
|
||||||
expect(await ledger.releaseWrite(T1)).toEqual({ mergedRows: 0, emittedEvents: 0 });
|
expect(await ledger.releaseWrite(T1)).toEqual({ mergedRows: 0, emittedEvents: 0, merged: [] });
|
||||||
}, 60_000);
|
}, 60_000);
|
||||||
|
|
||||||
itDb()('数据冲突检查:他单已改同一字段 → 放行写打回,不做部分合并', async () => {
|
itDb()('数据冲突检查:他单已改同一字段 → 放行写打回,不做部分合并', async () => {
|
||||||
|
|||||||
@@ -69,6 +69,17 @@ export type DraftWrite = {
|
|||||||
export type ReleaseWriteResult = {
|
export type ReleaseWriteResult = {
|
||||||
readonly mergedRows: number;
|
readonly mergedRows: number;
|
||||||
readonly emittedEvents: number;
|
readonly emittedEvents: number;
|
||||||
|
/**
|
||||||
|
* 合并进正式版的那些行(键 + 值)。
|
||||||
|
* 「落地收敛,输出口才发射」——发射的载荷就该是**这些已落地的事实**,
|
||||||
|
* 而不是从作用域里再猜一遍:放行后草稿层已清空,再猜就什么也猜不到。
|
||||||
|
*/
|
||||||
|
readonly merged: ReadonlyArray<{
|
||||||
|
readonly domain: string;
|
||||||
|
readonly object: string;
|
||||||
|
readonly key: Record<string, unknown>;
|
||||||
|
readonly values: Record<string, unknown>;
|
||||||
|
}>;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ export function createLedgerService(deps: LedgerServiceDeps): LedgerService {
|
|||||||
if (conflicts.length > 0) throw new DraftConflictError(conflicts);
|
if (conflicts.length > 0) throw new DraftConflictError(conflicts);
|
||||||
|
|
||||||
const drafts = await deps.drafts.list(taskId);
|
const drafts = await deps.drafts.list(taskId);
|
||||||
if (drafts.length === 0) return { mergedRows: 0, emittedEvents: 0 };
|
if (drafts.length === 0) return { mergedRows: 0, emittedEvents: 0, merged: [] };
|
||||||
|
|
||||||
const pending: EnvelopeDraft[] = [];
|
const pending: EnvelopeDraft[] = [];
|
||||||
|
|
||||||
@@ -185,7 +185,13 @@ export function createLedgerService(deps: LedgerServiceDeps): LedgerService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
for (const envelope of pending) await deps.events.publish(envelope);
|
for (const envelope of pending) await deps.events.publish(envelope);
|
||||||
return { mergedRows: drafts.length, emittedEvents: pending.length };
|
return {
|
||||||
|
mergedRows: drafts.length,
|
||||||
|
emittedEvents: pending.length,
|
||||||
|
merged: drafts
|
||||||
|
.filter((d) => !d.tombstone)
|
||||||
|
.map((d) => ({ domain: d.domain, object: d.object, key: d.key, values: d.patch })),
|
||||||
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
async query(query: LedgerQuery): Promise<LedgerPage> {
|
async query(query: LedgerQuery): Promise<LedgerPage> {
|
||||||
|
|||||||
@@ -177,7 +177,30 @@ export function createProcessService(deps: ProcessServiceDeps): ProcessService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const assembled = assemble(edge, { ...scope, ports: { ...scope.ports, [fromNodeId]: payload } }, deps.sfeel.expression);
|
const assembled = assemble(edge, { ...scope, ports: { ...scope.ports, [fromNodeId]: payload } }, deps.sfeel.expression);
|
||||||
await enter(record, pkg, target, assembled);
|
try {
|
||||||
|
await enter(record, pkg, target, assembled);
|
||||||
|
} catch (error) {
|
||||||
|
/*
|
||||||
|
* 一条分支起不来,不该把整条终态上报连坐掀翻 —— 那会让**上游任务的终态也报不上去**,
|
||||||
|
* 流停在原地且一行日志都没有。这里把它记成工作流事件并落一个未激活的实例:
|
||||||
|
* 其余分支照走,这一支在治理台「需处置」里现形,等人处置。
|
||||||
|
*/
|
||||||
|
const detail = error instanceof Error ? error.message : String(error);
|
||||||
|
await deps.events.publish({
|
||||||
|
workflowId: record.id,
|
||||||
|
kind: 'node-start-failed',
|
||||||
|
detail: { nodeId: target.id, from: fromNodeId, error: detail },
|
||||||
|
});
|
||||||
|
const instances = await deps.store.listInstances(record.id);
|
||||||
|
await deps.store.insertInstance(record.id, {
|
||||||
|
nodeId: target.id,
|
||||||
|
instance: nextInstanceNumber(instances, target.id),
|
||||||
|
running: false,
|
||||||
|
waiting: true,
|
||||||
|
activated: true,
|
||||||
|
terminal: 'blocked',
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,6 +70,13 @@ export type LandOutcome = {
|
|||||||
/** 落地收敛后才发射的输出口 */
|
/** 落地收敛后才发射的输出口 */
|
||||||
readonly emittedPorts: readonly string[];
|
readonly emittedPorts: readonly string[];
|
||||||
readonly ledgerRowsMerged: number;
|
readonly ledgerRowsMerged: number;
|
||||||
|
/** 已落地的事实 —— 输出口发射的载荷取自这里 */
|
||||||
|
readonly merged: ReadonlyArray<{
|
||||||
|
readonly domain: string;
|
||||||
|
readonly object: string;
|
||||||
|
readonly key: Record<string, unknown>;
|
||||||
|
readonly values: Record<string, unknown>;
|
||||||
|
}>;
|
||||||
/** 落地受阻时发出的落地失败卡 */
|
/** 落地受阻时发出的落地失败卡 */
|
||||||
readonly failureWorkOrderId?: string;
|
readonly failureWorkOrderId?: string;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -189,11 +189,17 @@ export function createReleaseService(deps: ReleaseServiceDeps): ReleaseService {
|
|||||||
verdict,
|
verdict,
|
||||||
emittedPorts: [],
|
emittedPorts: [],
|
||||||
ledgerRowsMerged: merged.mergedRows,
|
ledgerRowsMerged: merged.mergedRows,
|
||||||
|
merged: merged.merged,
|
||||||
failureWorkOrderId: card.id,
|
failureWorkOrderId: card.id,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// 落地收敛,输出口才发射 —— 下游只见落地完成的任务
|
// 落地收敛,输出口才发射 —— 下游只见落地完成的任务。
|
||||||
|
// 载荷取自**已落地的事实**:放行后草稿层已清空,再回作用域里捞就什么也捞不到。
|
||||||
|
const landedFacts = merged.merged.reduce<Record<string, unknown>>(
|
||||||
|
(acc, row) => ({ ...acc, ...row.key, ...row.values }),
|
||||||
|
{},
|
||||||
|
);
|
||||||
const ports = await deps.tasks.outputPortsOf(input.taskId);
|
const ports = await deps.tasks.outputPortsOf(input.taskId);
|
||||||
const emitted = emissionPortNames(
|
const emitted = emissionPortNames(
|
||||||
{
|
{
|
||||||
@@ -206,7 +212,7 @@ export function createReleaseService(deps: ReleaseServiceDeps): ReleaseService {
|
|||||||
input.selectedPorts,
|
input.selectedPorts,
|
||||||
);
|
);
|
||||||
for (const port of emitted) {
|
for (const port of emitted) {
|
||||||
await deps.ports.emit({ taskId: input.taskId, port, payload: {} });
|
await deps.ports.emit({ taskId: input.taskId, port, payload: landedFacts });
|
||||||
}
|
}
|
||||||
await deps.memory.append({
|
await deps.memory.append({
|
||||||
taskId: input.taskId,
|
taskId: input.taskId,
|
||||||
@@ -214,7 +220,7 @@ export function createReleaseService(deps: ReleaseServiceDeps): ReleaseService {
|
|||||||
title: `落地收敛,发射输出口:${emitted.join('、') || '(无)'}`,
|
title: `落地收敛,发射输出口:${emitted.join('、') || '(无)'}`,
|
||||||
});
|
});
|
||||||
|
|
||||||
return { verdict, emittedPorts: emitted, ledgerRowsMerged: merged.mergedRows };
|
return { verdict, emittedPorts: emitted, ledgerRowsMerged: merged.mergedRows, merged: merged.merged };
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,17 @@ export type IntentStore = {
|
|||||||
/** 台账 —— app 注入 `ledger`(L1);放行写与冲突检查都在它那 */
|
/** 台账 —— app 注入 `ledger`(L1);放行写与冲突检查都在它那 */
|
||||||
export type LedgerGateway = {
|
export type LedgerGateway = {
|
||||||
checkConflicts(taskId: TaskId): Promise<Array<{ field: string; key: Record<string, string | number> }>>;
|
checkConflicts(taskId: TaskId): Promise<Array<{ field: string; key: Record<string, string | number> }>>;
|
||||||
releaseWrite(taskId: TaskId): Promise<{ mergedRows: number; emittedEvents: number }>;
|
releaseWrite(taskId: TaskId): Promise<{
|
||||||
|
mergedRows: number;
|
||||||
|
emittedEvents: number;
|
||||||
|
/** 合并进正式版的行 —— 输出口发射的载荷取自这里 */
|
||||||
|
merged: ReadonlyArray<{
|
||||||
|
domain: string;
|
||||||
|
object: string;
|
||||||
|
key: Record<string, unknown>;
|
||||||
|
values: Record<string, unknown>;
|
||||||
|
}>;
|
||||||
|
}>;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** 工具 —— app 注入 `toolbox`(L2);预检的②③④项与落地执行都经它 */
|
/** 工具 —— app 注入 `toolbox`(L2);预检的②③④项与落地执行都经它 */
|
||||||
|
|||||||
@@ -41,6 +41,12 @@ export class TaskAlreadyTerminalError extends Error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** 一单任务 —— 活动的运行时实例;**恰有一名负责人** */
|
/** 一单任务 —— 活动的运行时实例;**恰有一名负责人** */
|
||||||
|
/** 落地事实的两种读法:铺平(标量取值)与逐行(数组取值)—— 输出口载荷由此装配 */
|
||||||
|
export type LandedFacts = {
|
||||||
|
readonly flat: Record<string, unknown>;
|
||||||
|
readonly rows: ReadonlyArray<{ key: Record<string, unknown>; values: Record<string, unknown> }>;
|
||||||
|
};
|
||||||
|
|
||||||
export type Task = {
|
export type Task = {
|
||||||
readonly id: TaskId;
|
readonly id: TaskId;
|
||||||
readonly activityId: string;
|
readonly activityId: string;
|
||||||
@@ -100,7 +106,8 @@ export type TaskService = {
|
|||||||
reassign(taskId: TaskId, to: StaffId, by: StaffId): Promise<Task>;
|
reassign(taskId: TaskId, to: StaffId, by: StaffId): Promise<Task>;
|
||||||
|
|
||||||
/** 终态裁定 —— 完成由框架裁定,终态由系统命名 */
|
/** 终态裁定 —— 完成由框架裁定,终态由系统命名 */
|
||||||
finish(taskId: TaskId, cause: TerminalCause): Promise<Task>;
|
/** `facts` = 落地收敛的事实(仅放行路径有);作为输出口载荷上报流程层 */
|
||||||
|
finish(taskId: TaskId, cause: TerminalCause, facts?: LandedFacts): Promise<Task>;
|
||||||
/** 断点续跑的三份持久状态是否齐备 */
|
/** 断点续跑的三份持久状态是否齐备 */
|
||||||
resumeReadiness(taskId: TaskId): Promise<ResumeReadiness>;
|
resumeReadiness(taskId: TaskId): Promise<ResumeReadiness>;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
*/
|
*/
|
||||||
export type {
|
export type {
|
||||||
BudgetBreach,
|
BudgetBreach,
|
||||||
|
LandedFacts,
|
||||||
BudgetCaps,
|
BudgetCaps,
|
||||||
Consumption,
|
Consumption,
|
||||||
ControlOutcome,
|
ControlOutcome,
|
||||||
|
|||||||
@@ -179,7 +179,7 @@ export function createTaskService(deps: TaskServiceDeps): TaskService {
|
|||||||
kind: 'engine-transition',
|
kind: 'engine-transition',
|
||||||
title: `落地收敛:合并 ${landed.ledgerRowsMerged} 行,发射输出口 ${landed.emittedPorts.join('、') || '—'}`,
|
title: `落地收敛:合并 ${landed.ledgerRowsMerged} 行,发射输出口 ${landed.emittedPorts.join('、') || '—'}`,
|
||||||
});
|
});
|
||||||
const finished = await this.finish(taskId, { kind: 'released' });
|
const finished = await this.finish(taskId, { kind: 'released' }, landed.facts);
|
||||||
return { task: finished, verdict, progressed: true };
|
return { task: finished, verdict, progressed: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -247,7 +247,7 @@ export function createTaskService(deps: TaskServiceDeps): TaskService {
|
|||||||
},
|
},
|
||||||
|
|
||||||
/** 终态由系统命名;封卷触发蒸馏钩子 */
|
/** 终态由系统命名;封卷触发蒸馏钩子 */
|
||||||
async finish(taskId, cause) {
|
async finish(taskId, cause, facts) {
|
||||||
const task = await require(taskId);
|
const task = await require(taskId);
|
||||||
if (task.terminal !== undefined) return task;
|
if (task.terminal !== undefined) return task;
|
||||||
|
|
||||||
@@ -261,7 +261,7 @@ export function createTaskService(deps: TaskServiceDeps): TaskService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
await deps.memory.append({ taskId, kind: 'terminal', title: `终态:${terminal}`, detail: { reason } });
|
await deps.memory.append({ taskId, kind: 'terminal', title: `终态:${terminal}`, detail: { reason } });
|
||||||
await deps.events.publishTerminal(taskId, terminal, reason);
|
await deps.events.publishTerminal(taskId, terminal, reason, facts ?? { flat: {}, rows: [] });
|
||||||
await deps.interaction.setPhase(taskId, 'terminal');
|
await deps.interaction.setPhase(taskId, 'terminal');
|
||||||
|
|
||||||
// 终态封卷 → 归档 → 蒸馏钩子产出活动记忆候选条目
|
// 终态封卷 → 归档 → 蒸馏钩子产出活动记忆候选条目
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
*/
|
*/
|
||||||
import type { BudgetCaps, Paradigm, StaffId, TaskId, TerminalState } from '@contracts';
|
import type { BudgetCaps, Paradigm, StaffId, TaskId, TerminalState } from '@contracts';
|
||||||
import type { Consumption } from './internal/domain/harness.ts';
|
import type { Consumption } from './internal/domain/harness.ts';
|
||||||
import type { Task } from './contract.ts';
|
import type { LandedFacts, Task } from './contract.ts';
|
||||||
|
|
||||||
export type Clock = { now(): Date };
|
export type Clock = { now(): Date };
|
||||||
export type IdGenerator = { next(): string };
|
export type IdGenerator = { next(): string };
|
||||||
@@ -61,6 +61,8 @@ export type LandingGateway = {
|
|||||||
converged: boolean;
|
converged: boolean;
|
||||||
emittedPorts: readonly string[];
|
emittedPorts: readonly string[];
|
||||||
ledgerRowsMerged: number;
|
ledgerRowsMerged: number;
|
||||||
|
/** 已落地的事实 —— 输出口载荷,随终态报给流程层 */
|
||||||
|
facts: LandedFacts;
|
||||||
}>;
|
}>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -92,7 +94,8 @@ export type PersistenceProbe = {
|
|||||||
/** 控制事件与终态事件 —— app 注入 `event`(L1) */
|
/** 控制事件与终态事件 —— app 注入 `event`(L1) */
|
||||||
export type TaskEventPublisher = {
|
export type TaskEventPublisher = {
|
||||||
publishControl(taskId: TaskId, semantic: string, by: StaffId, reason?: string): Promise<void>;
|
publishControl(taskId: TaskId, semantic: string, by: StaffId, reason?: string): Promise<void>;
|
||||||
publishTerminal(taskId: TaskId, terminal: TerminalState, reason: string): Promise<void>;
|
/** `facts` = 落地收敛的事实,作为输出口载荷随终态报给流程层;非放行终态为空 */
|
||||||
|
publishTerminal(taskId: TaskId, terminal: TerminalState, reason: string, facts: LandedFacts): Promise<void>;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** 改派通知 —— app 注入 `message`(L2):改派留痕并**通知双方** */
|
/** 改派通知 —— app 注入 `message`(L2):改派留痕并**通知双方** */
|
||||||
|
|||||||
Reference in New Issue
Block a user