flow-comet 1.6.1 → 1.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.flow-comet/skills/flow-comet/INSTALLED_VERSION +1 -1
- package/.flow-comet/skills/flow-comet/SKILL.md +94 -46
- package/.flow-comet/skills/flow-comet/reference/KNOWN-ISSUES-template.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/commit-discipline.md +32 -0
- package/.flow-comet/skills/flow-comet/reference/dirty-worktree.md +1 -1
- package/.flow-comet/skills/flow-comet/{GUIDANCE.md → reference/entry-detail.md} +22 -30
- package/.flow-comet/skills/flow-comet/reference/fix-loop.md +57 -0
- package/.flow-comet/skills/flow-comet/reference/platform-facts.md +58 -0
- package/.flow-comet/skills/flow-comet/reference/replan.md +23 -0
- package/.flow-comet/skills/flow-comet/reference/workflow-protocol.json +1 -1
- package/.flow-comet/skills/flow-comet/scripts/comet-check.mjs +5 -4
- package/.flow-comet/skills/flow-comet/scripts/comet-hook-guard.mjs +260 -17
- package/.flow-comet/skills/flow-comet/scripts/context-init.mjs +129 -3
- package/.flow-comet/skills/flow-comet/scripts/context-scan.mjs +396 -0
- package/.flow-comet/skills/flow-comet/scripts/evolve.mjs +778 -0
- package/.flow-comet/skills/flow-comet/scripts/guard-self-test.mjs +5432 -194
- package/.flow-comet/skills/flow-comet/scripts/health.mjs +664 -0
- package/.flow-comet/skills/flow-comet/scripts/route-node.mjs +51 -4
- package/.flow-comet/skills/flow-comet/scripts/state-schema.mjs +68 -0
- package/.flow-comet/skills/flow-comet/scripts/system-test.mjs +1479 -11
- package/.flow-comet/skills/flow-comet/scripts/time-utils.mjs +133 -0
- package/.flow-comet/skills/flow-comet/scripts/workflow-guard.mjs +197 -5
- package/.flow-comet/skills/flow-comet/scripts/workflow-handoff.mjs +115 -6
- package/.flow-comet/skills/flow-comet/scripts/workflow-state.mjs +261 -29
- package/.flow-comet/skills/flow-comet-archive/SKILL.md +10 -19
- package/.flow-comet/skills/flow-comet-change/SKILL.md +10 -1
- package/.flow-comet/skills/flow-comet-compose/SKILL.md +1 -1
- package/.flow-comet/skills/flow-comet-design/SKILL.md +8 -6
- package/.flow-comet/skills/flow-comet-evolve/SKILL.md +46 -11
- package/.flow-comet/skills/flow-comet-execute/SKILL.md +58 -16
- package/.flow-comet/skills/flow-comet-health/SKILL.md +57 -16
- package/.flow-comet/skills/flow-comet-integration/SKILL.md +8 -5
- package/.flow-comet/skills/flow-comet-open/SKILL.md +5 -1
- package/.flow-comet/skills/flow-comet-plan/GUIDANCE.md +1 -1
- package/.flow-comet/skills/flow-comet-plan/SKILL.md +8 -8
- package/.flow-comet/skills/flow-comet-review/SKILL.md +9 -12
- package/.flow-comet/skills/flow-comet-subagent-execute/SKILL.md +59 -16
- package/.flow-comet/skills/flow-comet-task/SKILL.md +3 -2
- package/.flow-comet/skills/flow-comet-ui-design/SKILL.md +29 -4
- package/.flow-comet/skills/flow-comet-verify/SKILL.md +8 -17
- package/README.md +5 -5
- package/package.json +1 -1
- package/scripts/dsh-bridge.mjs +59 -26
- package/scripts/prepare-env.mjs +165 -1
- package/.flow-comet/skills/flow-comet/reference/TEST-MATRIX.md +0 -116
- package/.flow-comet/skills/flow-comet/reference/composition-report.md +0 -65
- package/.flow-comet/skills/flow-comet/reference/dsh-platform.md +0 -184
- package/.flow-comet/skills/flow-comet/reference/resolved-skills.json +0 -661
- package/.flow-comet/skills/flow-comet/reference/skill-review.md +0 -13
- package/.flow-comet/skills/flow-comet/reference/subagents/script-author.md +0 -7
- package/.flow-comet/skills/flow-comet/reference/worktree-notes.md +0 -70
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
// time-utils.mjs: 时间形态 / 解析 / 到期阈值的单一权威(单源纪律 · L-067)
|
|
2
|
+
//
|
|
3
|
+
// 为什么单独成域:时间戳曾散落各脚本以 `new Date().toISOString()` 生成、以字符串拼接消费——
|
|
4
|
+
// 同一事实的多个表达在时区面必然分叉(L-096:`date` 读数在 UTC 与 +0800 间抖动,目测判时得出过
|
|
5
|
+
// 相反结论)。本模块是「生成 / 解析 / 阈值比较 / 归档窗口判定」的唯一实现:
|
|
6
|
+
// · 生成:本地时间 + 显式偏移 `YYYY-MM-DDTHH:mm:ss±HH:mm`(人读为本地时间、机器可无损解析)
|
|
7
|
+
// · 解析:`Date.parse` + 分量回环校验(兼容历史 `Z` 形态;`2026-02-30` 一类不可自洽形态拒绝)
|
|
8
|
+
// · 阈值:天差比较 + evolve 到期窗口(> 60 天,或该时刻之后新增 ≥ 5 个带 §9 的归档 change)
|
|
9
|
+
// 消费方(workflow-state 的 config set / status;evolve 的扫描范围与元数据写入)一律 import 本模块——
|
|
10
|
+
// 在其它脚本内联第二份格式化 / 解析表达式即违反单源纪律(守卫按表达式形态扫描,注释互指同源不作数)。
|
|
11
|
+
//
|
|
12
|
+
// 边界:本模块只管「时间与到期判据」,不做 I/O(不读 state、不扫目录);调用方负责取字段与遍历文件。
|
|
13
|
+
|
|
14
|
+
// 时间戳形态:秒级为最小精度,毫秒可选;时区必须是显式 `Z` 或 `±HH:mm`(`+0800` / 裸本地时间 /
|
|
15
|
+
// 纯日期一律非法——纯日期无法表达「时刻」,进 state 会让天差判定退化为猜测)。
|
|
16
|
+
const TIMESTAMP_SHAPE = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.(\d{1,3}))?(Z|([+-])(\d{2}):(\d{2}))$/;
|
|
17
|
+
// 归档目录名日期前缀(flow-kit 7-integration 约定:archive/<YYYY-MM-DD>-<change-id>)
|
|
18
|
+
const ARCHIVE_DATE_PREFIX = /^(\d{4}-\d{2}-\d{2})(?:-|$)/;
|
|
19
|
+
// 一天的毫秒数(天差换算与阈值比较的唯一常量,不在调用点重写这个字面量)
|
|
20
|
+
const MS_PER_DAY = 24 * 60 * 60 * 1000;
|
|
21
|
+
|
|
22
|
+
function pad2(value) {
|
|
23
|
+
return String(value).padStart(2, '0');
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
function toDate(value) {
|
|
27
|
+
if (value instanceof Date) return value;
|
|
28
|
+
if (typeof value === 'number' && Number.isFinite(value)) return new Date(value);
|
|
29
|
+
return new Date(NaN);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
// 本地时间 + 显式偏移(人读为本地时间、机器可无损解析)。传入 Date 或 epoch 毫秒;非法时间一律抛出
|
|
33
|
+
// (fail-closed:不生成可疑时间戳)。
|
|
34
|
+
export function formatLocalTimestamp(value = new Date()) {
|
|
35
|
+
const date = toDate(value);
|
|
36
|
+
if (Number.isNaN(date.getTime())) throw new Error('formatLocalTimestamp: 非法时间值');
|
|
37
|
+
const offsetMinutes = -date.getTimezoneOffset();
|
|
38
|
+
const sign = offsetMinutes < 0 ? '-' : '+';
|
|
39
|
+
const abs = Math.abs(offsetMinutes);
|
|
40
|
+
return date.getFullYear() + '-' + pad2(date.getMonth() + 1) + '-' + pad2(date.getDate())
|
|
41
|
+
+ 'T' + pad2(date.getHours()) + ':' + pad2(date.getMinutes()) + ':' + pad2(date.getSeconds())
|
|
42
|
+
+ sign + pad2(Math.floor(abs / 60)) + ':' + pad2(abs % 60);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
// 本地日期 `YYYY-MM-DD`(工件名 `<日期>-<KIND>.md` 与日期粒度比较用)。
|
|
46
|
+
export function formatLocalDate(value = new Date()) {
|
|
47
|
+
const date = toDate(value);
|
|
48
|
+
if (Number.isNaN(date.getTime())) throw new Error('formatLocalDate: 非法时间值');
|
|
49
|
+
return date.getFullYear() + '-' + pad2(date.getMonth() + 1) + '-' + pad2(date.getDate());
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
// 当前时刻的标准形态(新写入路径统一走本函数,不自行拼接)。
|
|
53
|
+
export function nowTimestamp() {
|
|
54
|
+
return formatLocalTimestamp(new Date());
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
// 解析为标准形态或历史 `Z` 形态 → epoch 毫秒;非法(含形态不符、日历不可自洽)→ NaN,不抛。
|
|
58
|
+
// 分量回环校验是判别力所在:V8 对 `2026-02-30T00:00:00Z` 会静默滚到 3 月 2 日——只查 Date.parse
|
|
59
|
+
// 是否 NaN 会把它当合法值写进 state,到期判定随之失真。
|
|
60
|
+
export function parseTimestamp(value) {
|
|
61
|
+
if (typeof value !== 'string') return NaN;
|
|
62
|
+
const text = value.trim();
|
|
63
|
+
const parts = TIMESTAMP_SHAPE.exec(text);
|
|
64
|
+
if (!parts) return NaN;
|
|
65
|
+
const ms = Date.parse(text);
|
|
66
|
+
if (Number.isNaN(ms)) return NaN;
|
|
67
|
+
const [, year, month, day, hour, minute, second, fraction, zone, sign, offsetHour, offsetMinute] = parts;
|
|
68
|
+
let offsetMinutes = 0;
|
|
69
|
+
if (zone !== 'Z') {
|
|
70
|
+
if (Number(offsetHour) > 23 || Number(offsetMinute) > 59) return NaN;
|
|
71
|
+
offsetMinutes = (Number(offsetHour) * 60 + Number(offsetMinute)) * (sign === '-' ? -1 : 1);
|
|
72
|
+
}
|
|
73
|
+
const millis = fraction ? Number((fraction + '00').slice(0, 3)) : 0; // `.5` / `.50` / `.500` → 500ms
|
|
74
|
+
// 回环:把 epoch 还原成「书写时区」的墙钟分量,逐项与字面量比对(不一致 = 日历滚动过,如 2026-02-30)
|
|
75
|
+
const wallClock = new Date(ms + offsetMinutes * 60000);
|
|
76
|
+
const written = [Number(year), Number(month) - 1, Number(day), Number(hour), Number(minute), Number(second), millis];
|
|
77
|
+
const restored = [wallClock.getUTCFullYear(), wallClock.getUTCMonth(), wallClock.getUTCDate(),
|
|
78
|
+
wallClock.getUTCHours(), wallClock.getUTCMinutes(), wallClock.getUTCSeconds(), wallClock.getUTCMilliseconds()];
|
|
79
|
+
return written.every((value, index) => value === restored[index]) ? ms : NaN;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
// 形态与日历均合法 → true。state 字段校验与 config set 写通道共用本判定(fail-closed 单一来源)。
|
|
83
|
+
export function isValidTimestamp(value) {
|
|
84
|
+
return !Number.isNaN(parseTimestamp(value));
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
// 距该时刻已过多少天(小数)。reference 缺省 = 现在(epoch 毫秒或可解析时间戳)。
|
|
88
|
+
// 非法输入 → NaN(调用方按「不可判」处理,不得据此判到期)。
|
|
89
|
+
export function daysSince(timestamp, reference = Date.now()) {
|
|
90
|
+
const at = parseTimestamp(timestamp);
|
|
91
|
+
if (Number.isNaN(at)) return NaN;
|
|
92
|
+
const ref = reference instanceof Date ? reference.getTime() : reference;
|
|
93
|
+
const referenceMs = typeof ref === 'number' && Number.isFinite(ref) ? ref : parseTimestamp(ref);
|
|
94
|
+
if (Number.isNaN(referenceMs)) return NaN;
|
|
95
|
+
return (referenceMs - at) / MS_PER_DAY;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
// 归档目录名 → 归档日期 `YYYY-MM-DD`;非约定命名或日期不可自洽 → null。
|
|
99
|
+
// 取目录名而非 mtime:目录名随提交固化(跨 clone / checkout 稳定),mtime 会被检出重写——
|
|
100
|
+
// 用 mtime 判「归档于何时」在全新检出上会把整仓历史当成新增(L-096 的「mtime 判时」用于
|
|
101
|
+
// 判活场景,归档窗口判据需要的是**随工件固化的时刻标签**)。
|
|
102
|
+
export function archiveDateFromName(dirName) {
|
|
103
|
+
if (typeof dirName !== 'string') return null;
|
|
104
|
+
const parts = ARCHIVE_DATE_PREFIX.exec(dirName.trim());
|
|
105
|
+
if (!parts) return null;
|
|
106
|
+
return isValidTimestamp(parts[1] + 'T00:00:00Z') ? parts[1] : null;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
// 「该归档 change 在该时刻之后归档」判定:日期粒度、严格在其后(与 flow-kit A-evolve
|
|
110
|
+
// 「只扫该日期之后归档的 change」同源)。任一输入不可判 → false(不放行 → 不误报新)。
|
|
111
|
+
export function isArchivedAfterTimestamp(dirName, timestamp) {
|
|
112
|
+
const archiveDate = archiveDateFromName(dirName);
|
|
113
|
+
const at = parseTimestamp(timestamp);
|
|
114
|
+
if (archiveDate === null || Number.isNaN(at)) return false;
|
|
115
|
+
return archiveDate > formatLocalDate(new Date(at));
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
// 到期阈值(与 flow-kit A-evolve / 7-integration 的「约 60 天后,或新增 ≥ 5 个有 §9 内容的
|
|
119
|
+
// change 之后」同值)。两个常量是 status 到期提示与 evolve 技能文本的共同来源。
|
|
120
|
+
export const EVOLVE_STALE_DAYS = 60;
|
|
121
|
+
export const EVOLVE_DUE_NEW_ARCHIVE_CHANGES = 5;
|
|
122
|
+
|
|
123
|
+
// ---------- 到期窗口的输入面:§9 沉淀段在场判定 ----------
|
|
124
|
+
// 为什么在「时间」模块里:AC-18 的到期判据 = 时间阈值 + 窗口内「带 §9 的归档 change」计数——两者
|
|
125
|
+
// 同为**到期窗口判据**的组成部分。若 §9 在场判定在 status 提示与 evolve 扫描各写一份,两个消费面
|
|
126
|
+
// 会各自漂移(L-067:注释互指同源不是同步机制),故由本模块唯一表达,消费方 import。
|
|
127
|
+
// 上游锚 = flow-kit 7-integration 的 `grep -c '^### 9\.' DESIGN.md`;本仓归档 DESIGN.md 用
|
|
128
|
+
// `## 9.` 形态,故层级放宽到 2~4 并容忍 `§9` 写法。只作「有无」判定,不解析条目内容。
|
|
129
|
+
const SECTION9_HEADING = /^#{2,4}\s*§?\s*9\s*[.、·]/m;
|
|
130
|
+
|
|
131
|
+
export function hasSection9(text) {
|
|
132
|
+
return typeof text === 'string' && SECTION9_HEADING.test(text);
|
|
133
|
+
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { constants as fsConstants, promises as fs } from 'fs';
|
|
3
3
|
import path from 'path';
|
|
4
4
|
import { fileURLToPath } from 'url';
|
|
5
|
-
import { validateStateFields, verifyFailuresFor, setVerifyFailuresFor, RUNTIME_STATE_PATH, LEGACY_RUNTIME_STATE_PATH, resolveProtocolPathWithState, hasProtocolCliArg } from './state-schema.mjs';
|
|
5
|
+
import { validateStateFields, verifyFailuresFor, setVerifyFailuresFor, RUNTIME_STATE_PATH, LEGACY_RUNTIME_STATE_PATH, resolveProtocolPathWithState, hasProtocolCliArg, handoffRequestWithdrawn } from './state-schema.mjs';
|
|
6
6
|
import { readProtocolFile, validateProtocolSchema, NODE_PROTOCOL_FILES, workflowPathInside, inspectWorkflowProtectedPath, readWorkflowProtectedFile, workflowFileObjectIdentity, workflowSameFileObject, workflowSameFileStat } from './protocol-utils.mjs';
|
|
7
7
|
import { taskOpeningAttrs, taskBlocks as extractTaskBlocks } from './task-parsing.mjs';
|
|
8
8
|
import { resolveNextNode, resolveFixRollbackDecision, resolveFixRollbackState, applyFixRollbackRound, resolveFixReturnNode, EXECUTE_FAMILY_NODE_IDS, TASK_SET_SIGNATURE_ALGO, taskSetSignature, parseTaskSetSignature, sameTaskSetSignature, taskSetSignatureVersionSkew, classifyFixReturnCause, normalizeHeading, FIX_SECTION_TITLE_FALLBACK, analyzeDependencyGraph, findParallelWriteConflicts } from './route-node.mjs';
|
|
@@ -645,6 +645,26 @@ function hasNonEmptyHandoffResult(evidence) {
|
|
|
645
645
|
);
|
|
646
646
|
}
|
|
647
647
|
|
|
648
|
+
// AC-8 在飞委托判定(验证隔离「同一时刻只有一个写者」)——handoffRequests 中存在条目而
|
|
649
|
+
// handoffResult 无对应记录 = 写者未收工的既有可判形态。判据单处求值(出口校验唯一消费方)。
|
|
650
|
+
// 三态收敛:无 evidence['subagent-execute'] / 无 handoffRequests 条目 ⇒ 返回空数组(调用方零输出,
|
|
651
|
+
// 不制造噪音);全部有对应 result ⇒ 同样空数组(放行)。锚定既有字段,零新增 state 顶层字段。
|
|
652
|
+
// 已撤回的 request 不构成在飞委托(2026-10-07 补撤回通道):零提交复验失败 / 写边界被拒之后
|
|
653
|
+
// request 可能留在「有 request 无 result」态而命令面无从撤回——`workflow-handoff.mjs withdraw`
|
|
654
|
+
// 在原地落留痕(withdrawnAt + withdrawnBy,历史不删),守卫据此放行出口。判据复用
|
|
655
|
+
// state-schema.mjs 的单一实现(撤回留痕两字段齐备才算撤回),本文件不另写一份。
|
|
656
|
+
function inFlightHandoffRequests(evidence) {
|
|
657
|
+
const requests = evidence && typeof evidence === 'object' ? evidence.handoffRequests : null;
|
|
658
|
+
if (!requests || typeof requests !== 'object' || Array.isArray(requests)) return [];
|
|
659
|
+
const results = evidence.handoffResult && typeof evidence.handoffResult === 'object' && !Array.isArray(evidence.handoffResult)
|
|
660
|
+
? evidence.handoffResult
|
|
661
|
+
: {};
|
|
662
|
+
return Object.keys(requests).filter((taskId) => {
|
|
663
|
+
if (handoffRequestWithdrawn(requests[taskId])) return false;
|
|
664
|
+
return results[taskId] === undefined || results[taskId] === null;
|
|
665
|
+
});
|
|
666
|
+
}
|
|
667
|
+
|
|
648
668
|
function schemaMap(protocol) {
|
|
649
669
|
return new Map((protocol.outputSchemas ?? []).map((schema) => [schema.id, schema]));
|
|
650
670
|
}
|
|
@@ -805,6 +825,7 @@ let templateSectionPatternsCache = null;
|
|
|
805
825
|
|
|
806
826
|
const TEMPLATE_FALLBACK_SECTION_PATTERNS = {
|
|
807
827
|
changeWhy: /^##\s*Why\b/im,
|
|
828
|
+
changeVisualTone: /^##\s*视觉调性/im,
|
|
808
829
|
requirementUserStory: /^##\s*用户故事/im,
|
|
809
830
|
requirementAcceptance: /##\s*(验收准则|验收标准|AC|Acceptance Criteria)/i,
|
|
810
831
|
designDecisionList: /^##\s*\d*\.?\s*决策清单/m,
|
|
@@ -859,6 +880,131 @@ async function templateSectionPatterns() {
|
|
|
859
880
|
return result;
|
|
860
881
|
}
|
|
861
882
|
|
|
883
|
+
// ===== ui-design 适用性门控(前端判据 · 结构级,不做语义)=====
|
|
884
|
+
// 协议 design 节点的 ui-design 绑定为 guarded,但它「仅前端」适用 ⇒ 出口自动补 required-skill
|
|
885
|
+
// 声明对该绑定失效(须真实 skill-load 声明),判据不成立(非前端)时按 advisory 处理并在出口
|
|
886
|
+
// 输出可见跳过行(不留假绿:跳过是显式记录,非静默省略)。
|
|
887
|
+
// 键控(enforcement 是这道门的单一表达处):门只在「协议登记了该绑定 ∧ enforcement === 'guarded'」
|
|
888
|
+
// 时存在——协议副本删掉绑定或把等级调回 advisory ⇒ 门不适用(留可见「门未启用」行,不静默消失),
|
|
889
|
+
// 相应路径逐字回到未登记绑定的原语义。门禁侧不持有第二份键表:登记表 APPLICABILITY_GATED_BINDINGS
|
|
890
|
+
// 按 `<nodeId>.<skill>` 键控,工件门与出口自动补写共用下方 applicabilityGatedBinding 查询。
|
|
891
|
+
// 判据必须结构性可判:CHANGE.md 的「视觉调性」段在场且段内不含**结构形态**的「不适用」标记 ⇒
|
|
892
|
+
// 前端;段缺席 / 段内以结构形态标注 ⇒ 非前端。段名基准从 flow-kit/templates/CHANGE.md 派生
|
|
893
|
+
// (与 C2/M3 同源,模板缺失 → 内置骨架名),不做段名第二实现。
|
|
894
|
+
const UI_DESIGN_SKILL = 'flow-comet-ui-design';
|
|
895
|
+
const APPLICABILITY_GATED_BINDINGS = new Set(['design.' + UI_DESIGN_SKILL]);
|
|
896
|
+
const VISUAL_TONE_NOT_APPLICABLE = '不适用';
|
|
897
|
+
|
|
898
|
+
// 负向标记的结构约束(三种形态,共用同一词形边界)——裸子串会让「不适用于暗色主题」这类自然句子
|
|
899
|
+
// 关掉整道门(fail-open),故标记必须落在结构锚位且成词形边界:
|
|
900
|
+
// 形态 A 独立行:整行(去块引用 / 列表符 / 加粗)就是标记,可带括注理由与尾标点;
|
|
901
|
+
// 形态 B 行首:行以标记开头(如「不适用 —— CLI 工具,无用户可见界面。」);
|
|
902
|
+
// 形态 C 字段值位:`<适用性标签>: 不适用`——标签限本约定的短标签表(适用性 / 前端 / 视觉调性 …),
|
|
903
|
+
// 不通配任意字段名:`- 暗色主题:不适用` 这类「某子维度不适用」的字段不得关掉整道门。
|
|
904
|
+
// 词形边界 = 标记后为行尾 / 空白 / 标点 / 括注引号——「不适用于…」的「于」不是边界。
|
|
905
|
+
const TONE_MARKER_TAIL = String.raw`(?=$|[\s,。;、,;.::!!??…—()()【】「」『』“”"'])`;
|
|
906
|
+
const TONE_MARKER_LEAD = String.raw`^[>\s]*(?:[-*+]\s+)?(?:\*\*)?`;
|
|
907
|
+
const TONE_MARKER_FIELD_LABELS = '适用性|适用范围|是否前端|视觉调性|前端|界面|适用';
|
|
908
|
+
const TONE_MARKER_ALONE_LINE = new RegExp(TONE_MARKER_LEAD + VISUAL_TONE_NOT_APPLICABLE
|
|
909
|
+
+ String.raw`(?:\*\*)?(?:\s*[((][^))]*[))])?[。.;;,,]?\s*$`);
|
|
910
|
+
const TONE_MARKER_LINE_HEAD = new RegExp(TONE_MARKER_LEAD + VISUAL_TONE_NOT_APPLICABLE
|
|
911
|
+
+ String.raw`(?:\*\*)?` + TONE_MARKER_TAIL);
|
|
912
|
+
const TONE_MARKER_FIELD_VALUE = new RegExp(String.raw`(?:^|[\s|])(?:\*\*)?(?:`
|
|
913
|
+
+ TONE_MARKER_FIELD_LABELS + String.raw`)(?:\*\*)?\s*[::]\s*(?:\*\*)?`
|
|
914
|
+
+ VISUAL_TONE_NOT_APPLICABLE + String.raw`(?:\*\*)?` + TONE_MARKER_TAIL);
|
|
915
|
+
|
|
916
|
+
// 「视觉调性」段正文(段标题之后、下一个 H2 之前;段缺席 → null)
|
|
917
|
+
async function visualToneSectionBody(changeName) {
|
|
918
|
+
if (!changeName) return null;
|
|
919
|
+
let text;
|
|
920
|
+
try {
|
|
921
|
+
text = await fs.readFile(path.join(runRoot, '.specs', changeName, 'CHANGE.md'), 'utf8');
|
|
922
|
+
} catch {
|
|
923
|
+
return null;
|
|
924
|
+
}
|
|
925
|
+
const headingPattern = (await templateSectionPatterns())
|
|
926
|
+
.pick('change', ['视觉调性'], TEMPLATE_FALLBACK_SECTION_PATTERNS.changeVisualTone);
|
|
927
|
+
let body = null;
|
|
928
|
+
for (const line of String(text).replace(/\uFEFF/g, '').split(/\r?\n/)) {
|
|
929
|
+
if (/^##\s+/.test(line)) {
|
|
930
|
+
if (body !== null) break; // 到达下一个 H2 → 本段结束
|
|
931
|
+
if (headingPattern.test(line)) body = '';
|
|
932
|
+
continue;
|
|
933
|
+
}
|
|
934
|
+
if (body !== null) body += line + '\n';
|
|
935
|
+
}
|
|
936
|
+
return body;
|
|
937
|
+
}
|
|
938
|
+
|
|
939
|
+
// 段内负向标记命中(逐行判定——判据限段内):命中 → 返回命中行片段(去空白 + 超长截断),
|
|
940
|
+
// 未命中 → null。片段回显进出口的跳过行,跳过因此自证(不是「段内某处出现过什么字面」)。
|
|
941
|
+
function visualToneNotApplicableHit(body) {
|
|
942
|
+
for (const rawLine of String(body).split(/\r?\n/)) {
|
|
943
|
+
const line = rawLine.trim();
|
|
944
|
+
if (line === '') continue;
|
|
945
|
+
if (TONE_MARKER_ALONE_LINE.test(line)
|
|
946
|
+
|| TONE_MARKER_LINE_HEAD.test(line)
|
|
947
|
+
|| TONE_MARKER_FIELD_VALUE.test(line)) {
|
|
948
|
+
return line.length > 60 ? line.slice(0, 60) + '…' : line;
|
|
949
|
+
}
|
|
950
|
+
}
|
|
951
|
+
return null;
|
|
952
|
+
}
|
|
953
|
+
|
|
954
|
+
// 登记表查询(唯一键表,键形 `<nodeId>.<skill>`):该节点 + 技能是否受适用性门控
|
|
955
|
+
function isRegisteredApplicabilityBinding(node, skill) {
|
|
956
|
+
return APPLICABILITY_GATED_BINDINGS.has(node.id + '.' + skill);
|
|
957
|
+
}
|
|
958
|
+
|
|
959
|
+
// 适用性门控绑定的单一查询:在场 ∧ enforcement === 'guarded' ∧ 登记在表 → 协议绑定;否则 null。
|
|
960
|
+
// 工件门、出口自动补写与缺声明恢复指引共用本查询——enforcement 是该门的单一表达处。
|
|
961
|
+
function applicabilityGatedBinding(node, skill) {
|
|
962
|
+
if (!isRegisteredApplicabilityBinding(node, skill)) return null;
|
|
963
|
+
return (node.requiredSkillCalls ?? []).find((call) => call.skill === skill && call.enforcement === 'guarded') ?? null;
|
|
964
|
+
}
|
|
965
|
+
|
|
966
|
+
// 前端判据:{ applicable, reason }——applicable=true 表示本 change 判为前端项目
|
|
967
|
+
async function frontendCriterion(changeName) {
|
|
968
|
+
const body = await visualToneSectionBody(changeName);
|
|
969
|
+
if (body === null) return { applicable: false, reason: '「视觉调性」段缺席(判非前端)' };
|
|
970
|
+
const hit = visualToneNotApplicableHit(body);
|
|
971
|
+
if (hit !== null) {
|
|
972
|
+
return { applicable: false, reason: '「视觉调性」段标注「不适用」(判非前端;命中片段: ' + hit + ')' };
|
|
973
|
+
}
|
|
974
|
+
return { applicable: true, reason: '「视觉调性」段在场且未标注「不适用」(判前端;无结构形态标记)' };
|
|
975
|
+
}
|
|
976
|
+
|
|
977
|
+
// design 出口 ui-design 工件门(按协议绑定键控:登记 ∧ 等级 = guarded ∧ 判据成立)——判据成立 ⇒
|
|
978
|
+
// 要求 UI-DESIGN.md 在场:新 change 缺件 BLOCKED + 恢复指引,旧 change WARN 渐进不阻断(不静默
|
|
979
|
+
// 放行);判据不成立(非前端)⇒ 可见跳过行(含命中片段)后照常放行;协议删掉该绑定或等级非
|
|
980
|
+
// guarded ⇒ 门未启用(同样可见输出),行为回到未登记绑定的原语义——闸门开关由协议表达。
|
|
981
|
+
async function checkUiDesignArtifact(node, state) {
|
|
982
|
+
if (!state.activeChange || !isRegisteredApplicabilityBinding(node, UI_DESIGN_SKILL)) return;
|
|
983
|
+
if (!applicabilityGatedBinding(node, UI_DESIGN_SKILL)) {
|
|
984
|
+
const protocolState = (node.requiredSkillCalls ?? []).some((call) => call.skill === UI_DESIGN_SKILL)
|
|
985
|
+
? '协议 ' + node.id + ' 绑定等级 = advisory,非 guarded'
|
|
986
|
+
: '协议 ' + node.id + ' 节点未登记 ' + UI_DESIGN_SKILL + ' 绑定';
|
|
987
|
+
console.error('UI-DESIGN: 门未启用(' + protocolState + ')');
|
|
988
|
+
return;
|
|
989
|
+
}
|
|
990
|
+
const frontend = await frontendCriterion(state.activeChange);
|
|
991
|
+
if (!frontend.applicable) {
|
|
992
|
+
console.error('UI-DESIGN: skipped(非前端)——' + frontend.reason + ',不要求 UI-DESIGN.md');
|
|
993
|
+
return;
|
|
994
|
+
}
|
|
995
|
+
const artifact = path.join(runRoot, '.specs', state.activeChange, 'UI-DESIGN.md');
|
|
996
|
+
if (await fileExists(artifact)) return;
|
|
997
|
+
const recovery = '补 .specs/' + state.activeChange + '/UI-DESIGN.md(加载 ' + UI_DESIGN_SKILL + ' 并按其协议产出 design token / 反 AI-slop 自检),'
|
|
998
|
+
+ '或在 .specs/' + state.activeChange + '/CHANGE.md 的「视觉调性」段以结构形态标注「不适用」(非前端项目)后重试 exit design';
|
|
999
|
+
if (isNewChange(state)) {
|
|
1000
|
+
console.error('BLOCKED: design 出口缺 UI-DESIGN.md——' + frontend.reason + ',前端项目须产出 UI-DESIGN.md');
|
|
1001
|
+
console.error('恢复: ' + recovery);
|
|
1002
|
+
process.exit(1);
|
|
1003
|
+
}
|
|
1004
|
+
console.error('UI-DESIGN WARN: 缺 .specs/' + state.activeChange + '/UI-DESIGN.md——' + frontend.reason + '(旧 change 渐进不阻断;新 change 将强制)');
|
|
1005
|
+
console.error('恢复: ' + recovery);
|
|
1006
|
+
}
|
|
1007
|
+
|
|
862
1008
|
// Fix 段标题从 <runRoot>/flow-kit/templates/TASK.md 派生(单一模板源 + 模块级缓存 + runRoot 键控):
|
|
863
1009
|
// 扫描模板全部 H2,用 route-node 共享 heading 归一(单一权威,含闭合 ATX)识别 Fix 段标题;
|
|
864
1010
|
// 无匹配(模板缺失 / 读取失败 / 无 Fix 段)返回 undefined,由回程分类器的内置 fallback 常量兜底。
|
|
@@ -1490,6 +1636,8 @@ async function main() {
|
|
|
1490
1636
|
} catch {}
|
|
1491
1637
|
}
|
|
1492
1638
|
}
|
|
1639
|
+
// design 出口 ui-design 工件门(按协议绑定键控:登记 ∧ 等级 = guarded ∧ 判据成立)——见 checkUiDesignArtifact
|
|
1640
|
+
await checkUiDesignArtifact(node, state);
|
|
1493
1641
|
// plan exit 校验 TASK 含 task 块和 verify 字段
|
|
1494
1642
|
if (node.id === 'plan' && state.activeChange) {
|
|
1495
1643
|
const taskFile = path.join(runRoot, '.specs', state.activeChange, 'TASK.md');
|
|
@@ -1514,7 +1662,11 @@ async function main() {
|
|
|
1514
1662
|
// 波次散文一致性检测: 波次散文一致性检测(WARN 渐进)——## 波次划分 的 Wave 行任务带 [P] 标记
|
|
1515
1663
|
// (并行语义)但 XML 任务无 parallel="true" → WARN(散文与机器路由依据不一致,以任务
|
|
1516
1664
|
// 标记为准)。容错:无并行语义的 Wave 行不参与比对;解析不到波次段跳过(不误报)。
|
|
1517
|
-
|
|
1665
|
+
// 段尾判定 = 下一个段标题(\n## )或分隔线(\n---)或**输入末尾**。JS 正则没有 \Z:
|
|
1666
|
+
// \Z 是「未知转义 ⇒ 字面字符 Z」,惰性匹配一遇段内大写 Z 就提前收尾,段被静默截断
|
|
1667
|
+
// (含 ZERO- 一类机检标记的 TASK 会整段漏检)。串尾一律用 (?![\s\S]) 真断言——
|
|
1668
|
+
// 它只是「此处之后已无任何字符」,不受行首/行尾标志影响,与「多行模式下的 $」语义无歧义。
|
|
1669
|
+
const waveSection = content.match(/##\s*波次划分\s*\n([\s\S]*?)(?=\n##\s|\n---|(?![\s\S]))/);
|
|
1518
1670
|
if (waveSection) {
|
|
1519
1671
|
const proseParallelIds = [];
|
|
1520
1672
|
for (const line of waveSection[1].split('\n')) {
|
|
@@ -1676,6 +1828,26 @@ async function main() {
|
|
|
1676
1828
|
}
|
|
1677
1829
|
}
|
|
1678
1830
|
}
|
|
1831
|
+
// W1-E: 验证隔离「同一时刻只有一个写者」出口校验(AC-8 · 判级决策见 ADR-014)——读
|
|
1832
|
+
// state.evidence['subagent-execute'].handoffRequests:存在条目且**至少一个无对应 handoffResult**
|
|
1833
|
+
// ⇒ 在飞委托(写者未收工,跑全量判据会被未提交中间态污染):新 change BLOCKED(含恢复指引
|
|
1834
|
+
// 「待写入者收工后重跑 / 已作废则撤回」)/ 旧 change WARN 渐进;全部有对应 result ⇒ 放行;
|
|
1835
|
+
// 已撤回(withdrawnAt + withdrawnBy 齐备)的 request 不构成在飞委托 ⇒ 放行;无该证据对象 ⇒ 零输出。
|
|
1836
|
+
// 落点 = 出口校验流(与其余 violations / WARN 同风格,不新增独立命令面);判据经
|
|
1837
|
+
// inFlightHandoffRequests 单处求值(与 W1-D 的 result 侧契约校验正交,不重复判定)。
|
|
1838
|
+
if (EXECUTE_FAMILY_NODE_IDS.has(node.id)) {
|
|
1839
|
+
const inFlight = inFlightHandoffRequests(state.evidence?.['subagent-execute']);
|
|
1840
|
+
if (inFlight.length > 0) {
|
|
1841
|
+
const inFlightDetail = '存在在飞委托(handoffRequests 有 request 无对应 handoffResult): '
|
|
1842
|
+
+ inFlight.join(', ') + '——验证隔离要求同一时刻只有一个写者(写者未收工)';
|
|
1843
|
+
if (isNewChange(state)) {
|
|
1844
|
+
console.error('BLOCKED: ' + inFlightDetail);
|
|
1845
|
+
console.error('恢复: 待写入者收工后重跑——子代理回传后用 workflow-handoff.mjs result <task-id> <Return Contract> 记录结果再重试 exit;若该委托已作废(零提交复验失败 / 写边界被拒后遗弃),用 workflow-handoff.mjs withdraw <task-id> --by <来源> [--reason <原因>] 撤回后再重试 exit(撤回留痕 withdrawnAt/withdrawnBy,已撤回 = 终态,历史不删)');
|
|
1846
|
+
process.exit(1);
|
|
1847
|
+
}
|
|
1848
|
+
console.error('WARN: ' + inFlightDetail + '(旧 change 渐进不阻断;待写入者收工后重跑全量判据;已作废的委托可用 workflow-handoff.mjs withdraw <task-id> --by <来源> 撤回)');
|
|
1849
|
+
}
|
|
1850
|
+
}
|
|
1679
1851
|
// W1-B: execute / subagent-execute 出口校验每份 SUMMARY 含三个必填段 + 6 维自查非空 + 自检方法
|
|
1680
1852
|
if (EXECUTE_FAMILY_NODE_IDS.has(node.id)) {
|
|
1681
1853
|
const changeDir = path.join(runRoot, '.specs', state.activeChange ?? '');
|
|
@@ -1686,7 +1858,9 @@ async function main() {
|
|
|
1686
1858
|
try {
|
|
1687
1859
|
const content = await fs.readFile(path.join(changeDir, f), 'utf8');
|
|
1688
1860
|
// 段终止 lookahead 用 \n##\s(而非 \n##):###/#### 级子标题(如 "### 🟢 R1")是段内内容,不是段结束
|
|
1689
|
-
|
|
1861
|
+
// 段尾同样 = 段标题 / 分隔线 / 输入末尾;末尾一律写 (?![\s\S]),不得写 \Z
|
|
1862
|
+
// (JS 无 \Z——它是「字面字符 Z」,且本正则带 i 标志,连小写 z 都会命中,段被静默截断)
|
|
1863
|
+
const sixDim = content.match(/##\s*6\s*维自查[\s\S]*?(?=\n##\s|\n---|(?![\s\S]))/i);
|
|
1690
1864
|
// C1: 6 维自查段非空——去掉所有标题行后剩余实质内容 ≥ 10 字符
|
|
1691
1865
|
// 按行过滤标题(/^\s*#/)比正则替换稳健:任何标题格式(emoji 🟢/中英文/数字)都不计入内容
|
|
1692
1866
|
const dimBody = sixDim ? sixDim[0].split('\n').filter(l => !/^\s*#/.test(l)).join('').trim() : '';
|
|
@@ -2236,7 +2410,9 @@ async function main() {
|
|
|
2236
2410
|
if (broken.length > 0) {
|
|
2237
2411
|
if (planNewFormat) {
|
|
2238
2412
|
if (isNewChange(state)) {
|
|
2239
|
-
|
|
2413
|
+
// 文案的集合字符串**从判据常量派生**(不得在此再写一遍字面集合——第二处同口径表达会在
|
|
2414
|
+
// 判据演进时静默落后于实现;构造方式不改变渲染结果)。
|
|
2415
|
+
console.error('BLOCKED: TASK.md 任务缺 7 字段(' + TASK7_REQUIRED.join('/') + '): ' + broken.join('; '));
|
|
2240
2416
|
console.error('恢复: 对照 flow-kit/templates/TASK.md 补齐每个 <task> 的缺字段后重试 exit;新 change 强制任务块结构完整');
|
|
2241
2417
|
process.exit(1);
|
|
2242
2418
|
}
|
|
@@ -2299,11 +2475,17 @@ async function main() {
|
|
|
2299
2475
|
}
|
|
2300
2476
|
}
|
|
2301
2477
|
|
|
2302
|
-
// 自动补 required-skill completedChecks——节点被完成即视为其实现 skill
|
|
2478
|
+
// 自动补 required-skill completedChecks——节点被完成即视为其实现 skill 已加载。
|
|
2479
|
+
// 分派(ui-design 门):仅「guarded 且适用性判据成立(判前端)」的登记绑定在**新 change**
|
|
2480
|
+
// 上停止自动补——该绑定须真实 skill-load 声明,由下方 missingRequiredSkillChecks 拦截;
|
|
2481
|
+
// 判据不成立(非前端)、旧 change(渐进兼容——自动补写保持原语义,工件门照常 WARN)或未登记
|
|
2482
|
+
// 的绑定 → 逐字保持原自动补语义(其它节点/绑定不受影响)。
|
|
2303
2483
|
if ((node.requiredSkillCalls ?? []).length > 0) {
|
|
2304
2484
|
const checks = Array.isArray(evidence.completedChecks) ? evidence.completedChecks : [];
|
|
2305
2485
|
for (const binding of node.requiredSkillCalls ?? []) {
|
|
2306
2486
|
const check = 'required-skill:' + node.id + '.' + binding.skill;
|
|
2487
|
+
const applicabilityGated = applicabilityGatedBinding(node, binding.skill) !== null;
|
|
2488
|
+
if (applicabilityGated && isNewChange(state) && (await frontendCriterion(state.activeChange)).applicable) continue;
|
|
2307
2489
|
if (!checks.includes(check)) checks.push(check);
|
|
2308
2490
|
}
|
|
2309
2491
|
evidence.completedChecks = checks;
|
|
@@ -2329,6 +2511,16 @@ async function main() {
|
|
|
2329
2511
|
const missingRequired = missingRequiredSkillChecks(node, evidence);
|
|
2330
2512
|
if (missingRequired.length > 0) {
|
|
2331
2513
|
console.error('BLOCKED: missing required Skill evidence: ' + missingRequired.join(', '));
|
|
2514
|
+
// ui-design 门:适用性门控绑定缺的是「真实 skill-load 声明」(出口不再自动补写)——给出补齐路径
|
|
2515
|
+
// (判据与该门同源:applicabilityGatedBinding 查询,不在此另写键表)
|
|
2516
|
+
for (const binding of node.requiredSkillCalls ?? []) {
|
|
2517
|
+
const check = 'required-skill:' + node.id + '.' + binding.skill;
|
|
2518
|
+
if (missingRequired.includes(check) && applicabilityGatedBinding(node, binding.skill) !== null) {
|
|
2519
|
+
console.error('恢复: ' + check + ' 不再由出口自动补写(guarded + 适用性判据成立)——先加载 ' + binding.skill
|
|
2520
|
+
+ ' 并运行 workflow-state.mjs skill-load ' + node.id + ' ' + binding.skill
|
|
2521
|
+
+ ' --prompt <flow-kit/prompts/ 协议文件> 声明已加载后重试 exit');
|
|
2522
|
+
}
|
|
2523
|
+
}
|
|
2332
2524
|
process.exit(1);
|
|
2333
2525
|
}
|
|
2334
2526
|
const missingAugmentations = missingAugmentationChecks(node, evidence);
|
|
@@ -3,7 +3,7 @@ import { execFileSync } from 'child_process';
|
|
|
3
3
|
import { promises as fs } from 'fs';
|
|
4
4
|
import path from 'path';
|
|
5
5
|
import { fileURLToPath } from 'url';
|
|
6
|
-
import { validateStateFields, looksLikeObjectLiteral, RUNTIME_DIR, RUNTIME_STATE_FILE_NAME, resolveProtocolPathWithState } from './state-schema.mjs';
|
|
6
|
+
import { validateStateFields, looksLikeObjectLiteral, writeJsonAtomic, RUNTIME_DIR, RUNTIME_STATE_FILE_NAME, resolveProtocolPathWithState, handoffRequestWithdrawn } from './state-schema.mjs';
|
|
7
7
|
import { EXECUTE_FAMILY_NODE_IDS, protocolNodeEnabled, resolveDelegationTarget, taskDependencyEligibility } from './route-node.mjs';
|
|
8
8
|
import {
|
|
9
9
|
readProtocolFile,
|
|
@@ -11,12 +11,16 @@ import {
|
|
|
11
11
|
inspectWorkflowPathSegments,
|
|
12
12
|
} from './protocol-utils.mjs';
|
|
13
13
|
import { taskAttrsById, taskBlocks, taskOpeningAttrs } from './task-parsing.mjs';
|
|
14
|
+
// 时间形态单一权威(新增写入路径一律走本模块,禁自行拼接):撤回留痕的时刻生成走 nowTimestamp,
|
|
15
|
+
// 人可见回显走 formatLocalTimestamp(本地时间 + 显式偏移),解析走 parseTimestamp。
|
|
16
|
+
import { nowTimestamp, formatLocalTimestamp, parseTimestamp } from './time-utils.mjs';
|
|
14
17
|
|
|
15
18
|
// workflow-handoff.mjs: Record subagent handoff evidence
|
|
16
19
|
// evidence 统一记录在 subagent-execute 名下作为委托证据库——execute(串行委托)与 subagent-execute(并行委托)共用。不改成节点参数,保持最小改动。
|
|
17
20
|
// Usage:
|
|
18
21
|
// node workflow-handoff.mjs request <task-id> <description> [--write-files <files...>] -- record handoff request (W2-D: optional writeFiles allow-list)
|
|
19
22
|
// node workflow-handoff.mjs result <task-id> <result-or-JSON> -- record handoff result (W1-D: JSON Return Contract; W2-D: commitHash subset check; : completedChecks 规范化; redEvidence 时间顺序校验)
|
|
23
|
+
// node workflow-handoff.mjs withdraw <task-id> --by <source> [--reason <text>] -- 撤回被遗弃的 request(前置:目标无 handoffResult——已收工者拒绝撤回;留痕:withdrawnAt + withdrawnBy;已撤回 = 终态)
|
|
20
24
|
// node workflow-handoff.mjs status -- show all handoff evidence
|
|
21
25
|
|
|
22
26
|
// 归属门禁读取协议用:与其它脚本同源(packageRoot 默认协议;env 可覆盖),不消费 request 参数。
|
|
@@ -234,7 +238,12 @@ async function revalidateResultZeroCommit(state, taskId, handoffReq) {
|
|
|
234
238
|
// 避免 WARN 声称已撤销而 state 仍是旧值。
|
|
235
239
|
await writeState(state);
|
|
236
240
|
const reasonText = ZERO_COMMIT_REVOKE_REASON_TEXT[verdict.reason] || verdict.reason;
|
|
237
|
-
|
|
241
|
+
// 人可见时间戳一律本地时间 + 显式偏移(时间纪律):revokedAt 是既有的机器字段(历史 Z 形态,
|
|
242
|
+
// 同族迁移窗口内保持原样),但把它原样拼进这条给人看的消息即违反人可见口径——此处按标准形态
|
|
243
|
+
// 回显;历史值不可解析时回显原值(可见降级,不静默改写、不谎称已格式化)。
|
|
244
|
+
const revokedAtMs = parseTimestamp(handoffReq.revokedAt);
|
|
245
|
+
const revokedAtDisplay = Number.isNaN(revokedAtMs) ? String(handoffReq.revokedAt) : formatLocalTimestamp(revokedAtMs);
|
|
246
|
+
const detail = '任务 ' + taskId + ' 零提交资格 result 重验失败(' + reasonText + ')——request evidence noCommit=false, revokedAt=' + revokedAtDisplay + ', revokeReason=' + verdict.reason;
|
|
238
247
|
if (state.newChange === true) {
|
|
239
248
|
// 新 change 只落 request 资格撤销;此刻尚未默认 handoffResult,确保「不落 result」不是文案承诺
|
|
240
249
|
console.error('HANDOFF ERROR: ' + detail + ';新 change 不落 result,出口校验不再豁免缺 commitHash。恢复: 修正 write_files / .gitignore 与路径形态后重新 request,或回传含合法 commitHash 的 Return Contract');
|
|
@@ -256,8 +265,10 @@ async function writeState(state) {
|
|
|
256
265
|
console.error('BLOCKED: state 字段类型非法: ' + bad[0]);
|
|
257
266
|
process.exit(1);
|
|
258
267
|
}
|
|
259
|
-
|
|
260
|
-
|
|
268
|
+
// 落盘形态与引擎其余 state 写入对齐:同一原子写导出(原先直写会让同一 state 文件出现
|
|
269
|
+
// 「脚本通道原子、handoff 非原子」两种形态——半写窗口正是该文件最不可接受的损坏面)。
|
|
270
|
+
// 错误语义不变:写失败照常上抛(临时文件已清理),调用方按既有 fail-closed 处理。
|
|
271
|
+
await writeJsonAtomic(statePath, state);
|
|
261
272
|
}
|
|
262
273
|
|
|
263
274
|
// ---------- request 归属门禁(只读判定) ----------
|
|
@@ -494,10 +505,24 @@ async function main() {
|
|
|
494
505
|
// 记 noCommit:true;不具资格 → 不记 noCommit、不阻断原流程(保持既有完整提交子集校验)。
|
|
495
506
|
const literalIgnoredEligible = taskResolved && writeFiles.length > 0
|
|
496
507
|
&& (await classifyWriteFilesProvablyIgnored(writeFiles)).eligible;
|
|
508
|
+
// 撤回后再委托:新 request 覆盖当前态,但**不静默删除**撤回历史——已撤回记录的留痕转入
|
|
509
|
+
// previousWithdrawals 数组(加法式保留,可审计「撤回 → 重新委托」的顺序)。
|
|
510
|
+
const priorRecord = state.evidence['subagent-execute'].handoffRequests[taskId];
|
|
511
|
+
const priorWithdrawals = priorRecord && Array.isArray(priorRecord.previousWithdrawals)
|
|
512
|
+
? priorRecord.previousWithdrawals
|
|
513
|
+
: [];
|
|
514
|
+
const carriedWithdrawals = handoffRequestWithdrawn(priorRecord)
|
|
515
|
+
? [...priorWithdrawals, {
|
|
516
|
+
withdrawnAt: priorRecord.withdrawnAt,
|
|
517
|
+
withdrawnBy: priorRecord.withdrawnBy,
|
|
518
|
+
...(priorRecord.withdrawReason ? { withdrawReason: priorRecord.withdrawReason } : {}),
|
|
519
|
+
}]
|
|
520
|
+
: priorWithdrawals;
|
|
497
521
|
state.evidence['subagent-execute'].handoffRequests[taskId] = {
|
|
498
522
|
description, requestedAt: new Date().toISOString(),
|
|
499
523
|
...(writeFiles.length ? { writeFiles } : {}),
|
|
500
|
-
...(zeroEligible || literalIgnoredEligible ? { noCommit: true } : {})
|
|
524
|
+
...(zeroEligible || literalIgnoredEligible ? { noCommit: true } : {}),
|
|
525
|
+
...(carriedWithdrawals.length ? { previousWithdrawals: carriedWithdrawals } : {})
|
|
501
526
|
};
|
|
502
527
|
await writeState(state);
|
|
503
528
|
if (literalIgnoredEligible) {
|
|
@@ -549,6 +574,16 @@ async function main() {
|
|
|
549
574
|
state.evidence['subagent-execute'] = state.evidence['subagent-execute'] || {};
|
|
550
575
|
const handoffReq = state.evidence['subagent-execute'].handoffRequests?.[taskId];
|
|
551
576
|
const hasRequest = !!handoffReq && typeof handoffReq === 'object';
|
|
577
|
+
// 已撤回 = 终态(撤回通道的闭合半边):撤回后的 request 不再接受 result——否则被撤回的委托
|
|
578
|
+
// 可被事后「复活」,撤回语义与守卫的放行判据(同一判据)分叉。要重新委托该任务须重新 request
|
|
579
|
+
// (新 request 记录会覆盖该 taskId 的当前态,撤回留痕以「撤回后重新委托」的顺序可审计)。
|
|
580
|
+
if (handoffRequestWithdrawn(handoffReq)) {
|
|
581
|
+
console.error('BLOCKED: 任务 ' + taskId + ' 的委托已撤回(终态)——不再接受 result'
|
|
582
|
+
+ '(withdrawnAt=' + handoffReq.withdrawnAt + ', withdrawnBy=' + handoffReq.withdrawnBy + ')'
|
|
583
|
+
+ ';恢复: 若该任务仍需执行,重新发起 workflow-handoff.mjs request ' + taskId
|
|
584
|
+
+ ' <description> 后再回传结果');
|
|
585
|
+
process.exit(1);
|
|
586
|
+
}
|
|
552
587
|
// m-13:result 重验在默认 handoffResult 之前——新 change 失败路径只落 request.noCommit=false,
|
|
553
588
|
// 不落下空 handoffResult 充当 result 载体;重验通过/旧 change 之后才初始化结果容器。
|
|
554
589
|
if (await revalidateResultZeroCommit(state, taskId, handoffReq) === 'block') process.exit(1);
|
|
@@ -678,6 +713,80 @@ async function main() {
|
|
|
678
713
|
return;
|
|
679
714
|
}
|
|
680
715
|
|
|
716
|
+
if (action === 'withdraw') {
|
|
717
|
+
// 撤回通道(受支持的出口解卡路径):零提交复验失败 / 写边界被拒之后,request 可能留在
|
|
718
|
+
// 「有 request 无 result」态而命令面无从撤回——守卫的出口校验据此永久卡住。本动作在原记录上
|
|
719
|
+
// **加法式**落留痕(withdrawnAt 时间戳 + withdrawnBy 来源,可选 withdrawReason),**不删除**
|
|
720
|
+
// 任何历史字段(description / requestedAt / writeFiles / noCommit 原样保留);守卫按同一判据
|
|
721
|
+
// (state-schema.handoffRequestWithdrawn)把已撤回的 request 排除在在飞委托之外。
|
|
722
|
+
// 已撤回 = **终态**:重复撤回被拒(不改写既有留痕),已撤回的 request 也不再接受 result。
|
|
723
|
+
// 适用面自洽(前置拒绝):可撤回的只有**在飞且被遗弃**的 request——已在册 handoffResult 的
|
|
724
|
+
// 委托(已收工)不在其列:对已收工的委托落撤回落痕,只会在同一 taskId 上造出「result 与
|
|
725
|
+
// withdrawnAt/withdrawnBy 并存」的组合态,而没有任何判据消费它(守卫的在飞判据只读 request
|
|
726
|
+
// 侧,越俎代庖检测只读 result 侧)。判据与守卫的在飞判据**互补**(同一把尺子,不另立一份):
|
|
727
|
+
// 无对应 result = 未收工 = 可撤回;显式 null 占位与「键缺失」同读为未收工(守卫在飞判据按
|
|
728
|
+
// undefined / null,越俎代庖检测按 falsy),故不阻断撤回——不给「出口拦 + 撤回拒」留下
|
|
729
|
+
// 无出口的死角。本拒绝**不删改**任何既有记录(request / result 一律原样),恢复指引见下方报文。
|
|
730
|
+
const taskId = process.argv[3];
|
|
731
|
+
const withdrawArgs = process.argv.slice(4);
|
|
732
|
+
let withdrawnBy = null;
|
|
733
|
+
let withdrawReason = null;
|
|
734
|
+
for (let i = 0; i < withdrawArgs.length; i++) {
|
|
735
|
+
const arg = withdrawArgs[i];
|
|
736
|
+
if (arg === '--by') { withdrawnBy = withdrawArgs[i + 1]; i += 1; continue; }
|
|
737
|
+
if (typeof arg === 'string' && arg.startsWith('--by=')) { withdrawnBy = arg.slice('--by='.length); continue; }
|
|
738
|
+
if (arg === '--reason') { withdrawReason = withdrawArgs[i + 1]; i += 1; continue; }
|
|
739
|
+
if (typeof arg === 'string' && arg.startsWith('--reason=')) { withdrawReason = arg.slice('--reason='.length); continue; }
|
|
740
|
+
}
|
|
741
|
+
if (!taskId) {
|
|
742
|
+
console.error('Usage: workflow-handoff.mjs withdraw <task-id> --by <source> [--reason <text>]');
|
|
743
|
+
process.exit(1);
|
|
744
|
+
}
|
|
745
|
+
if (typeof withdrawnBy !== 'string' || withdrawnBy.trim() === '') {
|
|
746
|
+
console.error('Usage: workflow-handoff.mjs withdraw <task-id> --by <source> [--reason <text>]——撤回须留痕来源(--by 不可缺省)');
|
|
747
|
+
process.exit(1);
|
|
748
|
+
}
|
|
749
|
+
const handoff = state.evidence?.['subagent-execute'];
|
|
750
|
+
const target = handoff && typeof handoff === 'object' && handoff.handoffRequests && typeof handoff.handoffRequests === 'object'
|
|
751
|
+
? handoff.handoffRequests[taskId]
|
|
752
|
+
: null;
|
|
753
|
+
if (!target || typeof target !== 'object') {
|
|
754
|
+
console.error('HANDOFF ERROR: 任务 ' + taskId + ' 无对应 request 记录——无可撤回的委托(撤回只作用于已记录的 request,不新建记录)');
|
|
755
|
+
process.exit(1);
|
|
756
|
+
}
|
|
757
|
+
if (handoffRequestWithdrawn(target)) {
|
|
758
|
+
console.error('HANDOFF ERROR: 任务 ' + taskId + ' 的委托已撤回(终态)——不得重复撤回、不得改写既有撤回留痕'
|
|
759
|
+
+ '(withdrawnAt=' + target.withdrawnAt + ', withdrawnBy=' + target.withdrawnBy + ')');
|
|
760
|
+
process.exit(1);
|
|
761
|
+
}
|
|
762
|
+
// 前置拒绝(适用面自洽):目标已收工(handoffResult 在场且非空占位)⇒ 拒绝撤回,报文写清
|
|
763
|
+
// 「为什么拒」与恢复指引。**不删改**任何既有记录:本路径在 writeState 之前退出,state 字节零改写。
|
|
764
|
+
const deliveredResult = handoff && typeof handoff === 'object' && handoff.handoffResult
|
|
765
|
+
&& typeof handoff.handoffResult === 'object' && !Array.isArray(handoff.handoffResult)
|
|
766
|
+
? handoff.handoffResult[taskId]
|
|
767
|
+
: undefined;
|
|
768
|
+
if (deliveredResult !== undefined && deliveredResult !== null) {
|
|
769
|
+
console.error('HANDOFF ERROR: 任务 ' + taskId + ' 的委托已收工(handoffResult 在场)——撤回只适用于被遗弃的'
|
|
770
|
+
+ ' request(零提交复验失败 / 写边界被拒之后遗弃的在飞 request),已收工的委托无须撤回:其 result 已在册;'
|
|
771
|
+
+ '恢复: 如需更正该任务的结果,走既有通道重新发起 workflow-handoff.mjs request ' + taskId
|
|
772
|
+
+ ' <description> 后回传新的 result(新记录覆盖该任务的当前态,历史记录不删除)');
|
|
773
|
+
process.exit(1);
|
|
774
|
+
}
|
|
775
|
+
// 新写入路径统一走时间单一权威(本地时间 + 显式偏移):不在此自行拼接时刻字面。
|
|
776
|
+
target.withdrawnAt = nowTimestamp();
|
|
777
|
+
target.withdrawnBy = withdrawnBy.trim();
|
|
778
|
+
if (typeof withdrawReason === 'string' && withdrawReason.trim() !== '') {
|
|
779
|
+
target.withdrawReason = withdrawReason.trim();
|
|
780
|
+
}
|
|
781
|
+
await writeState(state);
|
|
782
|
+
console.error('HANDOFF 撤回留痕: ' + taskId + ' — withdrawnAt=' + target.withdrawnAt
|
|
783
|
+
+ ', withdrawnBy=' + target.withdrawnBy
|
|
784
|
+
+ (target.withdrawReason ? ', withdrawReason=' + target.withdrawReason : '')
|
|
785
|
+
+ '(原 request 字段原样保留;已撤回 = 终态,守卫不再将其计为在飞委托)');
|
|
786
|
+
console.log('HANDOFF WITHDRAW: ' + taskId);
|
|
787
|
+
return;
|
|
788
|
+
}
|
|
789
|
+
|
|
681
790
|
if (action === 'status') {
|
|
682
791
|
const handoff = state.evidence?.['subagent-execute'] || {};
|
|
683
792
|
console.log(JSON.stringify({
|
|
@@ -688,7 +797,7 @@ async function main() {
|
|
|
688
797
|
return;
|
|
689
798
|
}
|
|
690
799
|
|
|
691
|
-
console.error('Unknown action: ' + action + '. Use: request, result, status');
|
|
800
|
+
console.error('Unknown action: ' + action + '. Use: request, result, withdraw, status');
|
|
692
801
|
process.exit(1);
|
|
693
802
|
}
|
|
694
803
|
|