diff --git a/.data/attachments/inbound/rfq-040@x.com.eml b/.data/attachments/inbound/rfq-040@x.com.eml new file mode 100644 index 0000000..d7a01a4 --- /dev/null +++ b/.data/attachments/inbound/rfq-040@x.com.eml @@ -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": [] +} \ No newline at end of file diff --git a/.data/attachments/inbound/rfq-20260727N@x.com.eml b/.data/attachments/inbound/rfq-20260727N@x.com.eml new file mode 100644 index 0000000..48a840e --- /dev/null +++ b/.data/attachments/inbound/rfq-20260727N@x.com.eml @@ -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": [] +} \ No newline at end of file diff --git a/.data/attachments/inbound/rfq-20260727Q@x.com.eml b/.data/attachments/inbound/rfq-20260727Q@x.com.eml new file mode 100644 index 0000000..84e9626 --- /dev/null +++ b/.data/attachments/inbound/rfq-20260727Q@x.com.eml @@ -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": [] +} \ No newline at end of file diff --git a/api-report/apps/api/src/modules/ledger/contract.d.ts b/api-report/apps/api/src/modules/ledger/contract.d.ts index ea3141b..6b8f7c7 100644 --- a/api-report/apps/api/src/modules/ledger/contract.d.ts +++ b/api-report/apps/api/src/modules/ledger/contract.d.ts @@ -51,6 +51,17 @@ export type DraftWrite = { export type ReleaseWriteResult = { readonly mergedRows: number; readonly emittedEvents: number; + /** + * 合并进正式版的那些行(键 + 值)。 + * 「落地收敛,输出口才发射」——发射的载荷就该是**这些已落地的事实**, + * 而不是从作用域里再猜一遍:放行后草稿层已清空,再猜就什么也猜不到。 + */ + readonly merged: ReadonlyArray<{ + readonly domain: string; + readonly object: string; + readonly key: Record; + readonly values: Record; + }>; }; /** * 写三分是**三个不同方法**,不是一个带 flag 的方法 —— 调用方拿不到「绕门」的形态(§7.2)。 @@ -69,6 +80,17 @@ export type LedgerService = { query(query: LedgerQuery): Promise; /** 任务视图 = 正式版 + 本任务草稿层 */ taskView(taskId: TaskId, query: LedgerQuery): Promise; + /** + * **本任务自己写的**草稿条目(读己之写的读面)。 + * 与 `taskView` 的区别:那个是「正式版 + 我的草稿」的合并视图, + * 这个只回我写过的那些行 —— 引擎求值要区分「这一单的事实」与「别人放行后的事实」。 + */ + taskDrafts(taskId: TaskId): Promise; + patch: Record; + }>>; /** 落地预检第五项:数据冲突检查 */ checkConflicts(taskId: TaskId): Promise; discardDrafts(taskId: TaskId): Promise; diff --git a/api-report/apps/api/src/modules/release/contract.d.ts b/api-report/apps/api/src/modules/release/contract.d.ts index ab0524e..393e63f 100644 --- a/api-report/apps/api/src/modules/release/contract.d.ts +++ b/api-report/apps/api/src/modules/release/contract.d.ts @@ -45,6 +45,13 @@ export type LandOutcome = { /** 落地收敛后才发射的输出口 */ readonly emittedPorts: readonly string[]; readonly ledgerRowsMerged: number; + /** 已落地的事实 —— 输出口发射的载荷取自这里 */ + readonly merged: ReadonlyArray<{ + readonly domain: string; + readonly object: string; + readonly key: Record; + readonly values: Record; + }>; /** 落地受阻时发出的落地失败卡 */ readonly failureWorkOrderId?: string; }; diff --git a/api-report/apps/api/src/modules/release/port.d.ts b/api-report/apps/api/src/modules/release/port.d.ts index 2c24b84..6c50205 100644 --- a/api-report/apps/api/src/modules/release/port.d.ts +++ b/api-report/apps/api/src/modules/release/port.d.ts @@ -23,6 +23,13 @@ export type LedgerGateway = { releaseWrite(taskId: TaskId): Promise<{ mergedRows: number; emittedEvents: number; + /** 合并进正式版的行 —— 输出口发射的载荷取自这里 */ + merged: ReadonlyArray<{ + domain: string; + object: string; + key: Record; + values: Record; + }>; }>; }; /** 工具 —— app 注入 `toolbox`(L2);预检的②③④项与落地执行都经它 */ diff --git a/api-report/apps/api/src/modules/task/contract.d.ts b/api-report/apps/api/src/modules/task/contract.d.ts index 57e2831..736cc24 100644 --- a/api-report/apps/api/src/modules/task/contract.d.ts +++ b/api-report/apps/api/src/modules/task/contract.d.ts @@ -18,6 +18,14 @@ export declare class TaskAlreadyTerminalError extends Error { constructor(taskId: TaskId, terminal: TerminalState); } /** 一单任务 —— 活动的运行时实例;**恰有一名负责人** */ +/** 落地事实的两种读法:铺平(标量取值)与逐行(数组取值)—— 输出口载荷由此装配 */ +export type LandedFacts = { + readonly flat: Record; + readonly rows: ReadonlyArray<{ + key: Record; + values: Record; + }>; +}; export type Task = { readonly id: TaskId; readonly activityId: string; @@ -78,7 +86,8 @@ export type TaskService = { /** 改派:在途任务的负责人变更,**留痕并通知双方** */ reassign(taskId: TaskId, to: StaffId, by: StaffId): Promise; /** 终态裁定 —— 完成由框架裁定,终态由系统命名 */ - finish(taskId: TaskId, cause: TerminalCause): Promise; + /** `facts` = 落地收敛的事实(仅放行路径有);作为输出口载荷上报流程层 */ + finish(taskId: TaskId, cause: TerminalCause, facts?: LandedFacts): Promise; /** 断点续跑的三份持久状态是否齐备 */ resumeReadiness(taskId: TaskId): Promise; }; diff --git a/api-report/apps/api/src/modules/task/index.d.ts b/api-report/apps/api/src/modules/task/index.d.ts index de9809a..e76d1fe 100644 --- a/api-report/apps/api/src/modules/task/index.d.ts +++ b/api-report/apps/api/src/modules/task/index.d.ts @@ -1,7 +1,7 @@ /** * 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 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'; diff --git a/api-report/apps/api/src/modules/task/port.d.ts b/api-report/apps/api/src/modules/task/port.d.ts index db1c296..27b4136 100644 --- a/api-report/apps/api/src/modules/task/port.d.ts +++ b/api-report/apps/api/src/modules/task/port.d.ts @@ -3,7 +3,7 @@ */ import type { BudgetCaps, Paradigm, StaffId, TaskId, TerminalState } from '@contracts'; 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; }; @@ -66,6 +66,8 @@ export type LandingGateway = { converged: boolean; emittedPorts: readonly string[]; ledgerRowsMerged: number; + /** 已落地的事实 —— 输出口载荷,随终态报给流程层 */ + facts: LandedFacts; }>; }; export type MemoryRecorder = { @@ -98,7 +100,8 @@ export type PersistenceProbe = { /** 控制事件与终态事件 —— app 注入 `event`(L1) */ export type TaskEventPublisher = { publishControl(taskId: TaskId, semantic: string, by: StaffId, reason?: string): Promise; - publishTerminal(taskId: TaskId, terminal: TerminalState, reason: string): Promise; + /** `facts` = 落地收敛的事实,作为输出口载荷随终态报给流程层;非放行终态为空 */ + publishTerminal(taskId: TaskId, terminal: TerminalState, reason: string, facts: LandedFacts): Promise; }; /** 改派通知 —— app 注入 `message`(L2):改派留痕并**通知双方** */ export type ReassignNotifier = { diff --git a/apps/api/src/app/seed-quote.ts b/apps/api/src/app/seed-quote.ts index c48fa53..cc7f4aa 100644 --- a/apps/api/src/app/seed-quote.ts +++ b/apps/api/src/app/seed-quote.ts @@ -247,7 +247,7 @@ export async function seedQuote(container: Container): Promise { to: 'A3', label: 'TYPE-B 转寻源', 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后期' } }, ], reopen: false, @@ -257,7 +257,7 @@ export async function seedQuote(container: Container): Promise { from: 'G2', to: 'A2', 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, }, @@ -270,7 +270,8 @@ export async function seedQuote(container: Container): Promise { to: 'A4', mapping: [ { 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, }, @@ -299,7 +300,8 @@ export async function seedQuote(container: Container): Promise { label: '有异议 → 返回调整', mapping: [ { 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, }, diff --git a/apps/api/src/app/wiring/engines.ts b/apps/api/src/app/wiring/engines.ts index ffd2aa8..540df99 100644 --- a/apps/api/src/app/wiring/engines.ts +++ b/apps/api/src/app/wiring/engines.ts @@ -4,6 +4,7 @@ * 这里把 M4/M5 的模块用**端口**接起来:跨层协作一律经端口,模块之间不互相认识。 */ import type { Db } from '@shared/db.ts'; +import type { LandedFacts } from '@modules/task'; import type { EventService } from '@modules/event'; import type { LedgerService } from '@modules/ledger'; import type { MemoryService } from '@modules/memory'; @@ -339,19 +340,36 @@ export function wireEngines(deps: EngineWiringDeps): EngineWiring { */ const processRef = createDeferredProcess(); - /** 任务的输出口载荷:活动声明的必交付输出口 → 该任务视图上的字段 */ - async function outputPortsOf(taskId: TaskId): Promise>> { - const task = await taskStore.get(taskId); - if (task === undefined) return {}; - const manifest = await deps.registry.manifestOf(task.activityId); - const scope = await taskData.view(taskId); + /** + * 任务的输出口载荷。 + * + * 载荷来自**落地收敛的事实**(`facts`),不是从作用域里再捞一遍: + * 放行那一刻草稿层已合并并清空,此时再捞只剩起单入参,下游节点会因缺字段起不来。 + * 输出口声明的属性名与台账列名可能不同形(驼峰 / 下划线),两种写法都认。 + */ + function outputPortsOf( + manifest: { contract: { output: { mandatory: ReadonlyArray<{ name: string; payload: unknown }> } } }, + landed: LandedFacts, + ): Record> { + const snake = (name: string): string => name.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`); const ports: Record> = {}; + for (const port of manifest.contract.output.mandatory) { - const payload = port.payload as { properties?: Record }; - const fields = Object.keys(payload.properties ?? {}); - ports[port.name] = Object.fromEntries( - fields.filter((f) => scope[f] !== undefined).map((f) => [f, scope[f]]), - ); + const payload = port.payload as { properties?: Record }; + const declared = Object.entries(payload.properties ?? {}); + const picked: Record = {}; + + 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; } @@ -421,6 +439,14 @@ export function wireEngines(deps: EngineWiringDeps): EngineWiring { converged: outcome.verdict.kind === 'converged', emittedPorts: outcome.emittedPorts, ledgerRowsMerged: outcome.ledgerRowsMerged, + // 输出口载荷 = 已落地的事实:铺平供标量取值,逐行供数组取值 + facts: { + flat: outcome.merged.reduce>( + (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' }, }); }, - publishTerminal: async (taskId, terminal, reason) => { + publishTerminal: async (taskId, terminal, reason, facts) => { await deps.event.publish({ type: 'data', 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 构造。 */ - 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); }, }, diff --git a/apps/api/src/modules/ledger/__tests__/ledger-store.it.test.ts b/apps/api/src/modules/ledger/__tests__/ledger-store.it.test.ts index 0b1da09..ba6a603 100644 --- a/apps/api/src/modules/ledger/__tests__/ledger-store.it.test.ts +++ b/apps/api/src/modules/ledger/__tests__/ledger-store.it.test.ts @@ -170,7 +170,7 @@ describe('ledger · 真实 PG', () => { 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); itDb()('数据冲突检查:他单已改同一字段 → 放行写打回,不做部分合并', async () => { diff --git a/apps/api/src/modules/ledger/contract.ts b/apps/api/src/modules/ledger/contract.ts index 6573f84..e6797f6 100644 --- a/apps/api/src/modules/ledger/contract.ts +++ b/apps/api/src/modules/ledger/contract.ts @@ -69,6 +69,17 @@ export type DraftWrite = { export type ReleaseWriteResult = { readonly mergedRows: number; readonly emittedEvents: number; + /** + * 合并进正式版的那些行(键 + 值)。 + * 「落地收敛,输出口才发射」——发射的载荷就该是**这些已落地的事实**, + * 而不是从作用域里再猜一遍:放行后草稿层已清空,再猜就什么也猜不到。 + */ + readonly merged: ReadonlyArray<{ + readonly domain: string; + readonly object: string; + readonly key: Record; + readonly values: Record; + }>; }; /** diff --git a/apps/api/src/modules/ledger/internal/usecase/ledger-service.ts b/apps/api/src/modules/ledger/internal/usecase/ledger-service.ts index eef5c04..69eebc1 100644 --- a/apps/api/src/modules/ledger/internal/usecase/ledger-service.ts +++ b/apps/api/src/modules/ledger/internal/usecase/ledger-service.ts @@ -154,7 +154,7 @@ export function createLedgerService(deps: LedgerServiceDeps): LedgerService { if (conflicts.length > 0) throw new DraftConflictError(conflicts); 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[] = []; @@ -185,7 +185,13 @@ export function createLedgerService(deps: LedgerServiceDeps): LedgerService { }); 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 { diff --git a/apps/api/src/modules/process/internal/usecase/process-service.ts b/apps/api/src/modules/process/internal/usecase/process-service.ts index b1a6a54..f0587a9 100644 --- a/apps/api/src/modules/process/internal/usecase/process-service.ts +++ b/apps/api/src/modules/process/internal/usecase/process-service.ts @@ -177,7 +177,30 @@ export function createProcessService(deps: ProcessServiceDeps): ProcessService { } 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', + }); + } } } diff --git a/apps/api/src/modules/release/contract.ts b/apps/api/src/modules/release/contract.ts index 6ab20e4..10aa4b9 100644 --- a/apps/api/src/modules/release/contract.ts +++ b/apps/api/src/modules/release/contract.ts @@ -70,6 +70,13 @@ export type LandOutcome = { /** 落地收敛后才发射的输出口 */ readonly emittedPorts: readonly string[]; readonly ledgerRowsMerged: number; + /** 已落地的事实 —— 输出口发射的载荷取自这里 */ + readonly merged: ReadonlyArray<{ + readonly domain: string; + readonly object: string; + readonly key: Record; + readonly values: Record; + }>; /** 落地受阻时发出的落地失败卡 */ readonly failureWorkOrderId?: string; }; diff --git a/apps/api/src/modules/release/internal/usecase/release-service.ts b/apps/api/src/modules/release/internal/usecase/release-service.ts index 685a9f4..1727d89 100644 --- a/apps/api/src/modules/release/internal/usecase/release-service.ts +++ b/apps/api/src/modules/release/internal/usecase/release-service.ts @@ -189,11 +189,17 @@ export function createReleaseService(deps: ReleaseServiceDeps): ReleaseService { verdict, emittedPorts: [], ledgerRowsMerged: merged.mergedRows, + merged: merged.merged, failureWorkOrderId: card.id, }; } - // 落地收敛,输出口才发射 —— 下游只见落地完成的任务 + // 落地收敛,输出口才发射 —— 下游只见落地完成的任务。 + // 载荷取自**已落地的事实**:放行后草稿层已清空,再回作用域里捞就什么也捞不到。 + const landedFacts = merged.merged.reduce>( + (acc, row) => ({ ...acc, ...row.key, ...row.values }), + {}, + ); const ports = await deps.tasks.outputPortsOf(input.taskId); const emitted = emissionPortNames( { @@ -206,7 +212,7 @@ export function createReleaseService(deps: ReleaseServiceDeps): ReleaseService { input.selectedPorts, ); 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({ taskId: input.taskId, @@ -214,7 +220,7 @@ export function createReleaseService(deps: ReleaseServiceDeps): ReleaseService { title: `落地收敛,发射输出口:${emitted.join('、') || '(无)'}`, }); - return { verdict, emittedPorts: emitted, ledgerRowsMerged: merged.mergedRows }; + return { verdict, emittedPorts: emitted, ledgerRowsMerged: merged.mergedRows, merged: merged.merged }; }, }; } diff --git a/apps/api/src/modules/release/port.ts b/apps/api/src/modules/release/port.ts index 86ad816..7e0ded5 100644 --- a/apps/api/src/modules/release/port.ts +++ b/apps/api/src/modules/release/port.ts @@ -16,7 +16,17 @@ export type IntentStore = { /** 台账 —— app 注入 `ledger`(L1);放行写与冲突检查都在它那 */ export type LedgerGateway = { checkConflicts(taskId: TaskId): Promise }>>; - releaseWrite(taskId: TaskId): Promise<{ mergedRows: number; emittedEvents: number }>; + releaseWrite(taskId: TaskId): Promise<{ + mergedRows: number; + emittedEvents: number; + /** 合并进正式版的行 —— 输出口发射的载荷取自这里 */ + merged: ReadonlyArray<{ + domain: string; + object: string; + key: Record; + values: Record; + }>; + }>; }; /** 工具 —— app 注入 `toolbox`(L2);预检的②③④项与落地执行都经它 */ diff --git a/apps/api/src/modules/task/contract.ts b/apps/api/src/modules/task/contract.ts index 4c83579..1e3c81c 100644 --- a/apps/api/src/modules/task/contract.ts +++ b/apps/api/src/modules/task/contract.ts @@ -41,6 +41,12 @@ export class TaskAlreadyTerminalError extends Error { } /** 一单任务 —— 活动的运行时实例;**恰有一名负责人** */ +/** 落地事实的两种读法:铺平(标量取值)与逐行(数组取值)—— 输出口载荷由此装配 */ +export type LandedFacts = { + readonly flat: Record; + readonly rows: ReadonlyArray<{ key: Record; values: Record }>; +}; + export type Task = { readonly id: TaskId; readonly activityId: string; @@ -100,7 +106,8 @@ export type TaskService = { reassign(taskId: TaskId, to: StaffId, by: StaffId): Promise; /** 终态裁定 —— 完成由框架裁定,终态由系统命名 */ - finish(taskId: TaskId, cause: TerminalCause): Promise; + /** `facts` = 落地收敛的事实(仅放行路径有);作为输出口载荷上报流程层 */ + finish(taskId: TaskId, cause: TerminalCause, facts?: LandedFacts): Promise; /** 断点续跑的三份持久状态是否齐备 */ resumeReadiness(taskId: TaskId): Promise; }; diff --git a/apps/api/src/modules/task/index.ts b/apps/api/src/modules/task/index.ts index f1a8f75..705aac8 100644 --- a/apps/api/src/modules/task/index.ts +++ b/apps/api/src/modules/task/index.ts @@ -3,6 +3,7 @@ */ export type { BudgetBreach, + LandedFacts, BudgetCaps, Consumption, ControlOutcome, diff --git a/apps/api/src/modules/task/internal/usecase/task-service.ts b/apps/api/src/modules/task/internal/usecase/task-service.ts index 3ba1d62..a9dad71 100644 --- a/apps/api/src/modules/task/internal/usecase/task-service.ts +++ b/apps/api/src/modules/task/internal/usecase/task-service.ts @@ -179,7 +179,7 @@ export function createTaskService(deps: TaskServiceDeps): TaskService { kind: 'engine-transition', 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 }; } @@ -247,7 +247,7 @@ export function createTaskService(deps: TaskServiceDeps): TaskService { }, /** 终态由系统命名;封卷触发蒸馏钩子 */ - async finish(taskId, cause) { + async finish(taskId, cause, facts) { const task = await require(taskId); 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.events.publishTerminal(taskId, terminal, reason); + await deps.events.publishTerminal(taskId, terminal, reason, facts ?? { flat: {}, rows: [] }); await deps.interaction.setPhase(taskId, 'terminal'); // 终态封卷 → 归档 → 蒸馏钩子产出活动记忆候选条目 diff --git a/apps/api/src/modules/task/port.ts b/apps/api/src/modules/task/port.ts index 4c46242..88fddf1 100644 --- a/apps/api/src/modules/task/port.ts +++ b/apps/api/src/modules/task/port.ts @@ -3,7 +3,7 @@ */ import type { BudgetCaps, Paradigm, StaffId, TaskId, TerminalState } from '@contracts'; 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 IdGenerator = { next(): string }; @@ -61,6 +61,8 @@ export type LandingGateway = { converged: boolean; emittedPorts: readonly string[]; ledgerRowsMerged: number; + /** 已落地的事实 —— 输出口载荷,随终态报给流程层 */ + facts: LandedFacts; }>; }; @@ -92,7 +94,8 @@ export type PersistenceProbe = { /** 控制事件与终态事件 —— app 注入 `event`(L1) */ export type TaskEventPublisher = { publishControl(taskId: TaskId, semantic: string, by: StaffId, reason?: string): Promise; - publishTerminal(taskId: TaskId, terminal: TerminalState, reason: string): Promise; + /** `facts` = 落地收敛的事实,作为输出口载荷随终态报给流程层;非放行终态为空 */ + publishTerminal(taskId: TaskId, terminal: TerminalState, reason: string, facts: LandedFacts): Promise; }; /** 改派通知 —— app 注入 `message`(L2):改派留痕并**通知双方** */