Archived
human-tool / ledger / loop-engine / release / task / interaction 六模块与 app 层(desk 路由、engines、consumers、 data-order-landing、case-stamp、reset-runs、seed-activities、容器与 server 装配),web 的 desk-task (ViewRegion / chat-bubbles / review-face)与 app.css、ui-kit 图标;契约 card / manifest; 迁移 0034_task_seq 与迁移日志;api-report 快照;CLAUDE.md 快照、debt、活动开发规范、HTML 报告规范同步。 逐条口径见 CLAUDE.md 快照(2026-08-27 下午至晚)。另一会话做的,一直留在工作树没入库;与同批另两条提交互相依赖。 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0167qWjeyBwvfdGovd7FWbCu
131 lines
4.6 KiB
TypeScript
131 lines
4.6 KiB
TypeScript
/**
|
|
* 任务视图与草稿层叠加 —— 纯逻辑,零 IO(编码规范 §7.2 / §5.3)。
|
|
*
|
|
* 语义出处 OS 09 / AM 10.3:
|
|
* 任务视图 = 正式版 + 本任务草稿层(**读己之写**:本任务可见、正式版不可见、不产生数据事件);
|
|
* 环内推进读任务视图,不依赖事件;跨任务监听只认正式版事件。
|
|
*/
|
|
import type { LedgerKey, LedgerRow } from '@contracts';
|
|
|
|
export type DraftEntry = {
|
|
readonly key: LedgerKey;
|
|
readonly patch: LedgerRow;
|
|
readonly tombstone: boolean;
|
|
/** 草稿建立时读到的基线值 —— 放行前的数据冲突检查用 */
|
|
readonly baseline: LedgerRow;
|
|
/**
|
|
* **这一行已经落过地了**(2026-08-27,数据工单确认即入库)——
|
|
* 它仍是「本单写下的行」(任务视图、`mine:`、`_rows` 这些读面照旧认它),
|
|
* 只是那一笔已经在一道更早的门(数据工单的确认)上并进了正式表:
|
|
* 放行时不再写它、不再为它抛事件、不拿它做冲突检查。
|
|
* 再往这一行写一笔(人在件上改、模型 write)就把这个记号擦掉 —— 新的那一笔照旧等放行。
|
|
* 缺省 = 没落过(老条目与不关心这一维的调用方不必填)。
|
|
*/
|
|
readonly landed?: boolean;
|
|
};
|
|
|
|
/** 主键的规范化串:字段名排序后拼接,保证同一行的键恒等 */
|
|
export function keyOf(key: LedgerKey): string {
|
|
return Object.keys(key)
|
|
.sort()
|
|
.map((k) => `${k}=${String(key[k])}`)
|
|
.join('|');
|
|
}
|
|
|
|
/**
|
|
* 叠加:正式版行 + 本任务草稿 patch → 任务视图行。
|
|
* 草稿新增的行(正式版没有)也出现在视图里;tombstone 的行从视图中消失。
|
|
*/
|
|
export function overlay(
|
|
official: readonly LedgerRow[],
|
|
drafts: readonly DraftEntry[],
|
|
primaryKey: readonly string[],
|
|
): LedgerRow[] {
|
|
const draftByKey = new Map(drafts.map((d) => [keyOf(d.key), d]));
|
|
const seen = new Set<string>();
|
|
const out: LedgerRow[] = [];
|
|
|
|
for (const row of official) {
|
|
const k = keyOf(pickKey(row, primaryKey));
|
|
seen.add(k);
|
|
const draft = draftByKey.get(k);
|
|
if (draft === undefined) {
|
|
out.push(row);
|
|
continue;
|
|
}
|
|
if (draft.tombstone) continue;
|
|
out.push({ ...row, ...draft.patch });
|
|
}
|
|
|
|
for (const draft of drafts) {
|
|
const k = keyOf(draft.key);
|
|
if (seen.has(k) || draft.tombstone) continue;
|
|
out.push({ ...draft.key, ...draft.patch });
|
|
}
|
|
|
|
return out;
|
|
}
|
|
|
|
export function pickKey(row: LedgerRow, primaryKey: readonly string[]): LedgerKey {
|
|
const key: Record<string, string | number> = {};
|
|
for (const field of primaryKey) {
|
|
const value = row[field];
|
|
if (typeof value === 'string' || typeof value === 'number') key[field] = value;
|
|
else if (value !== undefined && value !== null) key[field] = String(value);
|
|
}
|
|
return key;
|
|
}
|
|
|
|
/* ── 数据冲突检查(落地预检第五项,OS 7.3) ────────────────────────── */
|
|
|
|
export type ConflictFinding = {
|
|
readonly key: LedgerKey;
|
|
readonly field: string;
|
|
readonly baseline: unknown;
|
|
readonly official: unknown;
|
|
readonly draft: unknown;
|
|
};
|
|
|
|
/**
|
|
* 草稿层所改字段与正式版的并发冲突:**他单已改同一字段即预检不过**,
|
|
* 打回环内基于新正式版重拟。
|
|
*
|
|
* 判据:草稿建立时读到的基线值 ≠ 当前正式版值 ⇒ 冲突。
|
|
* 只检查草稿实际修改过的字段 —— 没碰的字段被别人改了不算冲突。
|
|
*/
|
|
export function detectConflicts(
|
|
drafts: readonly DraftEntry[],
|
|
officialByKey: ReadonlyMap<string, LedgerRow>,
|
|
): ConflictFinding[] {
|
|
const findings: ConflictFinding[] = [];
|
|
for (const draft of drafts) {
|
|
// 已落地的行放行时不会再写 —— 别单后来改了它,也不是「我这一笔要盖掉别人」
|
|
if (draft.landed === true) continue;
|
|
const official = officialByKey.get(keyOf(draft.key));
|
|
if (official === undefined) continue; // 草稿新增的行,无从冲突
|
|
for (const field of Object.keys(draft.patch)) {
|
|
const baseline = draft.baseline[field];
|
|
const current = official[field];
|
|
if (!sameValue(baseline, current)) {
|
|
findings.push({
|
|
key: draft.key,
|
|
field,
|
|
baseline,
|
|
official: current,
|
|
draft: draft.patch[field],
|
|
});
|
|
}
|
|
}
|
|
}
|
|
return findings;
|
|
}
|
|
|
|
function sameValue(a: unknown, b: unknown): boolean {
|
|
if (a === b) return true;
|
|
if (a === null || a === undefined) return b === null || b === undefined;
|
|
if (b === null || b === undefined) return false;
|
|
if (a instanceof Date && b instanceof Date) return a.getTime() === b.getTime();
|
|
if (typeof a === 'object' || typeof b === 'object') return JSON.stringify(a) === JSON.stringify(b);
|
|
return String(a) === String(b);
|
|
}
|