flow-comet 1.6.4 → 1.7.0
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 +36 -6
- package/.flow-comet/skills/flow-comet/reference/artifact-template-overlay.md +154 -0
- package/.flow-comet/skills/flow-comet/reference/artifact-templates.json +387 -0
- package/.flow-comet/skills/flow-comet/reference/commit-discipline.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/entry-detail.md +29 -4
- package/.flow-comet/skills/flow-comet/reference/workflow-protocol.json +22 -0
- package/.flow-comet/skills/flow-comet/scripts/context-init.mjs +26 -23
- package/.flow-comet/skills/flow-comet/scripts/evolve.mjs +174 -0
- package/.flow-comet/skills/flow-comet/scripts/guard-self-test.mjs +17 -95
- package/.flow-comet/skills/flow-comet/scripts/health.mjs +28 -4
- package/.flow-comet/skills/flow-comet/scripts/items/a.mjs +136 -19
- package/.flow-comet/skills/flow-comet/scripts/items/b.mjs +54 -18
- package/.flow-comet/skills/flow-comet/scripts/items/c.mjs +6 -6
- package/.flow-comet/skills/flow-comet/scripts/items/e.mjs +52 -10
- package/.flow-comet/skills/flow-comet/scripts/items/h.mjs +25 -10
- package/.flow-comet/skills/flow-comet/scripts/items/l.mjs +4 -2
- package/.flow-comet/skills/flow-comet/scripts/items/m.mjs +21 -13
- package/.flow-comet/skills/flow-comet/scripts/items/n.mjs +163 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/ac-coverage.mjs +317 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-artifact-skeleton.mjs +448 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-evidence-gates.mjs +396 -27
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-gates.mjs +1035 -172
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-routing.mjs +129 -98
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-state-io.mjs +8 -6
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-template-fidelity.mjs +797 -232
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-uidesign.mjs +91 -22
- package/.flow-comet/skills/flow-comet/scripts/lib/lessons-hits.mjs +160 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/run-root.mjs +21 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/section-body.mjs +92 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-admin.mjs +69 -13
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-flow.mjs +454 -135
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-recovery.mjs +66 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-explain.mjs +109 -13
- package/.flow-comet/skills/flow-comet/scripts/lib/state-io.mjs +55 -2
- package/.flow-comet/skills/flow-comet/scripts/lib/state-skillmarkers.mjs +149 -34
- package/.flow-comet/skills/flow-comet/scripts/lib/system-fixtures.mjs +79 -9
- package/.flow-comet/skills/flow-comet/scripts/lib/task-graph.mjs +84 -31
- package/.flow-comet/skills/flow-comet/scripts/lib/test-fixtures.mjs +78 -8
- package/.flow-comet/skills/flow-comet/scripts/lib/test-helpers.mjs +60 -3
- package/.flow-comet/skills/flow-comet/scripts/lib/text-anchor-checks.mjs +167 -3
- package/.flow-comet/skills/flow-comet/scripts/lib/wave-projection.mjs +341 -0
- package/.flow-comet/skills/flow-comet/scripts/protocol-utils.mjs +287 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/a.mjs +1454 -16
- package/.flow-comet/skills/flow-comet/scripts/scenarios/b.mjs +1202 -8
- package/.flow-comet/skills/flow-comet/scripts/scenarios/c.mjs +1205 -77
- package/.flow-comet/skills/flow-comet/scripts/scenarios/d.mjs +753 -5
- package/.flow-comet/skills/flow-comet/scripts/scenarios/e.mjs +52 -11
- package/.flow-comet/skills/flow-comet/scripts/scenarios/f.mjs +582 -3
- package/.flow-comet/skills/flow-comet/scripts/scenarios/g.mjs +9 -1
- package/.flow-comet/skills/flow-comet/scripts/scenarios/i.mjs +5 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/j.mjs +22 -6
- package/.flow-comet/skills/flow-comet/scripts/scenarios/k.mjs +2 -0
- package/.flow-comet/skills/flow-comet/scripts/scenarios/l.mjs +18 -5
- package/.flow-comet/skills/flow-comet/scripts/scenarios/n.mjs +4100 -0
- package/.flow-comet/skills/flow-comet/scripts/state-schema.mjs +135 -0
- package/.flow-comet/skills/flow-comet/scripts/system-test.mjs +6 -5
- package/.flow-comet/skills/flow-comet/scripts/workflow-guard.mjs +203 -4
- package/.flow-comet/skills/flow-comet/scripts/workflow-handoff.mjs +312 -63
- package/.flow-comet/skills/flow-comet/scripts/workflow-state.mjs +5 -2
- package/.flow-comet/skills/flow-comet-archive/SKILL.md +6 -2
- package/.flow-comet/skills/flow-comet-change/SKILL.md +6 -2
- package/.flow-comet/skills/flow-comet-design/GUIDANCE.md +13 -3
- package/.flow-comet/skills/flow-comet-design/SKILL.md +15 -8
- package/.flow-comet/skills/flow-comet-dev/SKILL.md +1 -1
- package/.flow-comet/skills/flow-comet-evolve/SKILL.md +1 -0
- package/.flow-comet/skills/flow-comet-execute/SKILL.md +42 -15
- package/.flow-comet/skills/flow-comet-health/SKILL.md +1 -1
- package/.flow-comet/skills/flow-comet-integration/SKILL.md +1 -1
- package/.flow-comet/skills/flow-comet-open/GUIDANCE.md +14 -4
- package/.flow-comet/skills/flow-comet-open/SKILL.md +11 -9
- package/.flow-comet/skills/flow-comet-plan/GUIDANCE.md +13 -3
- package/.flow-comet/skills/flow-comet-plan/SKILL.md +21 -10
- package/.flow-comet/skills/flow-comet-requirement/SKILL.md +1 -1
- package/.flow-comet/skills/flow-comet-review/SKILL.md +33 -18
- package/.flow-comet/skills/flow-comet-subagent-execute/GUIDANCE.md +13 -3
- package/.flow-comet/skills/flow-comet-subagent-execute/SKILL.md +44 -16
- package/.flow-comet/skills/flow-comet-task/SKILL.md +3 -2
- package/.flow-comet/skills/flow-comet-test/SKILL.md +6 -2
- package/.flow-comet/skills/flow-comet-ui-design/SKILL.md +2 -2
- package/.flow-comet/skills/flow-comet-verify/SKILL.md +12 -8
- package/README.md +3 -3
- package/package.json +1 -1
- package/scripts/dsh-bridge.mjs +2 -2
- package/scripts/lib/installer-flowkit.mjs +43 -3
|
@@ -170,6 +170,141 @@ export function validateStateFields(state) {
|
|
|
170
170
|
return bad;
|
|
171
171
|
}
|
|
172
172
|
|
|
173
|
+
// ---------- payload 形状校验(record / handoff result 单一来源) ----------
|
|
174
|
+
// record 把解析后的 payload 原样展开进 evidence.<node>。字段类型错误此前一律静默落库:summary 写成
|
|
175
|
+
// 对象/数组/数字时,下游出口门禁只看到「没有非空字符串 summary」,于是报 requires evidence:
|
|
176
|
+
// <schema-id>——出错的是 record、报错的却是 exit,执行者得自己反推「载荷该写什么形状」。校验因此放在
|
|
177
|
+
// **写入前**:点名字段路径与当前类型,不落库、也不先做其它副作用(声明标记补写等)。
|
|
178
|
+
// 只做**类型**判定:取值是否合法(如 lessonsNomination.scanned 是否等于 SUMMARY 份数、提名编号是否
|
|
179
|
+
// 真实登记)仍归出口门禁——本表不复制、不新增业务规则;未知字段继续放行(前向兼容)。
|
|
180
|
+
// 字段集合 = evidence.<node> 上**被下游按特定类型消费**的字段(summary、completedChecks 元素、
|
|
181
|
+
// lessonsNomination.nominated 元素与 reasonIfNone,以及 lessonsNomination.scanned——出口按**数值**
|
|
182
|
+
// 与 SUMMARY 份数比对,字符串 "2" 落库后只会在 archive 出口才炸)。
|
|
183
|
+
const RECORD_PAYLOAD_SHAPES = [
|
|
184
|
+
{ field: 'summary', kind: 'non-empty-string' },
|
|
185
|
+
{ field: 'completedChecks', kind: 'string-array' },
|
|
186
|
+
{
|
|
187
|
+
field: 'lessonsNomination',
|
|
188
|
+
kind: 'object',
|
|
189
|
+
fields: [
|
|
190
|
+
// 扫描份数在出口按数值比对(份数相等才算留痕成立):数字以外的类型必须写入前就拒,否则
|
|
191
|
+
// "2" 能 record 成功、要等 archive 出口才因 "2" !== 2 拦下——错误延后暴露,正是本表要消灭的。
|
|
192
|
+
{ field: 'scanned', kind: 'number' },
|
|
193
|
+
{ field: 'nominated', kind: 'string-array' },
|
|
194
|
+
{ field: 'reasonIfNone', kind: 'string' },
|
|
195
|
+
],
|
|
196
|
+
},
|
|
197
|
+
];
|
|
198
|
+
|
|
199
|
+
// Return Contract(handoff result)的形状表——与 record 表共用下方同一判定器(不另写一份校验):
|
|
200
|
+
// 两条写通道(record 把载荷展开进 evidence.<node>,handoff result 把契约原样存进 handoffResult)
|
|
201
|
+
// 此前只有 record 在写入前判形状,畸形的 result 一律静默落库,问题延后到出口门禁才暴露——那里只会
|
|
202
|
+
// 报「缺 commitHash / 缺 greenEvidence」,或把对象元素判成「缺 completedChecks」,出错的是 result、
|
|
203
|
+
// 报错的却是 exit。字段集合 = 契约文档登记、且被下游按特定类型消费的字段:
|
|
204
|
+
// status 取值集合沿用契约文档既有枚举(DONE | DONE_WITH_CONCERNS | BLOCKED |
|
|
205
|
+
// NEEDS_CONTEXT),不在此新增取值;字段缺席放行(不声明状态的旧格式契约不被误拦)。
|
|
206
|
+
// completedChecks 字符串数组(对象元素 [{id, status}] 是既有踩坑形态)。
|
|
207
|
+
// redEvidence / greenEvidence 对象容器(容器内是否带 command 仍归出口门禁的渐进提示)。
|
|
208
|
+
// commitHash 零提交语义不变:任务无提交时允许缺席或显式空值(request 侧 noCommit 判据不受
|
|
209
|
+
// 本校验影响);一旦给值就必须是字符串——数字等错误类型不得靠「缺字段豁免」混过。
|
|
210
|
+
const RETURN_CONTRACT_PAYLOAD_SHAPES = [
|
|
211
|
+
{ field: 'status', kind: 'enum-string', values: ['DONE', 'DONE_WITH_CONCERNS', 'BLOCKED', 'NEEDS_CONTEXT'] },
|
|
212
|
+
{ field: 'completedChecks', kind: 'string-array' },
|
|
213
|
+
{ field: 'redEvidence', kind: 'object' },
|
|
214
|
+
{ field: 'greenEvidence', kind: 'object' },
|
|
215
|
+
{ field: 'commitHash', kind: 'optional-string' },
|
|
216
|
+
];
|
|
217
|
+
|
|
218
|
+
// 场景 → 形状表:record 与 handoff result 之间唯一的分界,判定器本身只有一处。
|
|
219
|
+
const PAYLOAD_SHAPES_BY_SCOPE = {
|
|
220
|
+
record: RECORD_PAYLOAD_SHAPES,
|
|
221
|
+
'return-contract': RETURN_CONTRACT_PAYLOAD_SHAPES,
|
|
222
|
+
};
|
|
223
|
+
|
|
224
|
+
// 报错文案的两个零件(同一句话只在这里拼):类型名沿用 JS/JSON 习惯(object / array / number…),
|
|
225
|
+
// 空值单独命名——「必须是字符串」对空串不成立,执行者需要看到的判据是「非空」。
|
|
226
|
+
function evidenceValueTypeName(value) {
|
|
227
|
+
if (value === null) return 'null';
|
|
228
|
+
if (Array.isArray(value)) return 'array';
|
|
229
|
+
return typeof value;
|
|
230
|
+
}
|
|
231
|
+
|
|
232
|
+
function evidenceTypeProblems(value, shape, fieldPath) {
|
|
233
|
+
const problems = [];
|
|
234
|
+
if (shape.kind === 'string' || shape.kind === 'non-empty-string') {
|
|
235
|
+
if (typeof value !== 'string') {
|
|
236
|
+
problems.push({ field: fieldPath, message: '必须是字符串(当前是 ' + evidenceValueTypeName(value) + ')' });
|
|
237
|
+
} else if (shape.kind === 'non-empty-string' && value.trim() === '') {
|
|
238
|
+
problems.push({ field: fieldPath, message: '必须是非空字符串(当前是' + (value === '' ? '空串' : '空白字符串') + ')' });
|
|
239
|
+
}
|
|
240
|
+
return problems;
|
|
241
|
+
}
|
|
242
|
+
if (shape.kind === 'number') {
|
|
243
|
+
// 数值字段:JSON 载荷不可能产出 NaN/Infinity,故 typeof 判定即是完整判据;取值是否等于
|
|
244
|
+
// SUMMARY 份数仍归出口门禁(本表不复制业务规则)。
|
|
245
|
+
if (typeof value !== 'number') {
|
|
246
|
+
problems.push({ field: fieldPath, message: '必须是数字(当前是 ' + evidenceValueTypeName(value) + ')' });
|
|
247
|
+
}
|
|
248
|
+
return problems;
|
|
249
|
+
}
|
|
250
|
+
if (shape.kind === 'optional-string') {
|
|
251
|
+
// 零提交:字段缺席 / 显式空值 = 「本次没有提交可回传」,放行;给值即必须字符串。
|
|
252
|
+
if (value === undefined || value === null || value === '') return problems;
|
|
253
|
+
if (typeof value !== 'string') {
|
|
254
|
+
problems.push({ field: fieldPath, message: '必须是字符串(当前是 ' + evidenceValueTypeName(value) + ')' });
|
|
255
|
+
}
|
|
256
|
+
return problems;
|
|
257
|
+
}
|
|
258
|
+
if (shape.kind === 'enum-string') {
|
|
259
|
+
if (typeof value !== 'string') {
|
|
260
|
+
problems.push({ field: fieldPath, message: '必须是字符串(当前是 ' + evidenceValueTypeName(value) + ')' });
|
|
261
|
+
return problems;
|
|
262
|
+
}
|
|
263
|
+
if (!shape.values.includes(value)) {
|
|
264
|
+
problems.push({
|
|
265
|
+
field: fieldPath,
|
|
266
|
+
message: '不属于允许取值(当前是 ' + value + ');允许取值: ' + shape.values.join(' | '),
|
|
267
|
+
});
|
|
268
|
+
}
|
|
269
|
+
return problems;
|
|
270
|
+
}
|
|
271
|
+
if (shape.kind === 'string-array') {
|
|
272
|
+
if (!Array.isArray(value)) {
|
|
273
|
+
problems.push({ field: fieldPath, message: '必须是字符串数组(当前是 ' + evidenceValueTypeName(value) + ')' });
|
|
274
|
+
return problems;
|
|
275
|
+
}
|
|
276
|
+
value.forEach((item, index) => {
|
|
277
|
+
if (typeof item !== 'string') {
|
|
278
|
+
problems.push({ field: fieldPath + '[' + index + ']', message: '必须是字符串(当前是 ' + evidenceValueTypeName(item) + ')' });
|
|
279
|
+
}
|
|
280
|
+
});
|
|
281
|
+
return problems;
|
|
282
|
+
}
|
|
283
|
+
// object:容器本身先判类型,再逐个子字段判——嵌套字段的路径带上前缀(lessonsNomination.nominated[0])
|
|
284
|
+
if (value === null || typeof value !== 'object' || Array.isArray(value)) {
|
|
285
|
+
problems.push({ field: fieldPath, message: '必须是对象(当前是 ' + evidenceValueTypeName(value) + ')' });
|
|
286
|
+
return problems;
|
|
287
|
+
}
|
|
288
|
+
for (const child of shape.fields ?? []) {
|
|
289
|
+
if (!Object.prototype.hasOwnProperty.call(value, child.field)) continue;
|
|
290
|
+
problems.push(...evidenceTypeProblems(value[child.field], child, fieldPath + '.' + child.field));
|
|
291
|
+
}
|
|
292
|
+
return problems;
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
// 返回形状问题数组(空 = 合法):调用方(record / handoff result)负责报文与退出码,本函数只描述事实。
|
|
296
|
+
// scope 只选择字段表(默认 record——既有调用方的语义不变),判定逻辑两个写通道共用同一份。
|
|
297
|
+
export function evidencePayloadProblems(payload, scope = 'record') {
|
|
298
|
+
const shapes = PAYLOAD_SHAPES_BY_SCOPE[scope] ?? RECORD_PAYLOAD_SHAPES;
|
|
299
|
+
const problems = [];
|
|
300
|
+
if (payload === null || typeof payload !== 'object' || Array.isArray(payload)) return problems;
|
|
301
|
+
for (const shape of shapes) {
|
|
302
|
+
if (!Object.prototype.hasOwnProperty.call(payload, shape.field)) continue;
|
|
303
|
+
problems.push(...evidenceTypeProblems(payload[shape.field], shape, shape.field));
|
|
304
|
+
}
|
|
305
|
+
return problems;
|
|
306
|
+
}
|
|
307
|
+
|
|
173
308
|
// ---------- verifyFailures 按 change 读写(单一来源——workflow-state verify-fail 与
|
|
174
309
|
// workflow-guard exit verify 共用) ----------
|
|
175
310
|
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
// system-test.mjs — flow-comet 系统测试集(真实命令序列覆盖 A~
|
|
2
|
+
// system-test.mjs — flow-comet 系统测试集(真实命令序列覆盖 A~N 十四类机制面)
|
|
3
3
|
//
|
|
4
4
|
// 定位:guard-self-test 是引擎脚本的场景级回归(夹具构造为主;场景数以该套件运行输出的
|
|
5
5
|
// ALL <n> SCENARIOS PASSED 为准);本套件是**系统级**测试——每个测试项走真实命令序列
|
|
6
6
|
// (init → record → guard exit → handoff → hook …),覆盖 flow-comet 全部机制面:
|
|
7
7
|
// A 状态机与路由 · B 声明机制 · C 委托链路 · D hook 写白名单 · E 自定义协议 ·
|
|
8
8
|
// F 自动初始化 · G 分支模式 · H verify 与归档 · I 异常路径 · J 文档一致性 ·
|
|
9
|
-
// K 安装器与平台 · L 执行遗漏防护 · M 侧命令与 ui-design
|
|
10
|
-
// 条目与夹具按组落在 items/a..
|
|
9
|
+
// K 安装器与平台 · L 执行遗漏防护 · M 侧命令与 ui-design 门 · N 加载链声明集合与安装器降级口径。
|
|
10
|
+
// 条目与夹具按组落在 items/a..n.mjs(本文件只做运行与收口)。
|
|
11
11
|
//
|
|
12
12
|
// 载体:每项 = 独立临时目录(内置协议副本预置到 <tmp>/reference/——受保护路径要求协议文件位于
|
|
13
13
|
// runRoot 内)+ spawnSync 真实命令序列 + 断言退出码与输出关键词;测试项跑完清理临时目录。
|
|
@@ -40,13 +40,14 @@ import { ENTRIES as GROUP_J } from './items/j.mjs';
|
|
|
40
40
|
import { ENTRIES as GROUP_K } from './items/k.mjs';
|
|
41
41
|
import { ENTRIES as GROUP_L } from './items/l.mjs';
|
|
42
42
|
import { ENTRIES as GROUP_M } from './items/m.mjs';
|
|
43
|
+
import { ENTRIES as GROUP_N } from './items/n.mjs';
|
|
43
44
|
// 分发面项的结果标记判据 + 子断言登记 + 三态映射(组内判据单源,运行器复用同一实现)
|
|
44
45
|
import { assertDistributionOutcome, createOutcomeRecorder, distributionState } from './items/k.mjs';
|
|
45
46
|
|
|
46
|
-
// 条目顺序 = 组顺序(A →
|
|
47
|
+
// 条目顺序 = 组顺序(A → N):逐项输出顺序是既有读数的一部分
|
|
47
48
|
const TEST_ITEMS = [
|
|
48
49
|
...GROUP_A, ...GROUP_B, ...GROUP_C, ...GROUP_D, ...GROUP_E, ...GROUP_F, ...GROUP_G,
|
|
49
|
-
...GROUP_H, ...GROUP_I, ...GROUP_J, ...GROUP_K, ...GROUP_L, ...GROUP_M,
|
|
50
|
+
...GROUP_H, ...GROUP_I, ...GROUP_J, ...GROUP_K, ...GROUP_L, ...GROUP_M, ...GROUP_N,
|
|
50
51
|
];
|
|
51
52
|
|
|
52
53
|
let passed = 0;
|
|
@@ -14,7 +14,16 @@ import {
|
|
|
14
14
|
setVerifyFailuresFor,
|
|
15
15
|
validateStateFields,
|
|
16
16
|
} from './state-schema.mjs';
|
|
17
|
-
import {
|
|
17
|
+
import {
|
|
18
|
+
NODE_CONDITIONAL_PROMPTS,
|
|
19
|
+
nodeTemplateDeclaration,
|
|
20
|
+
promptDeclarationConflict,
|
|
21
|
+
promptPointerLines,
|
|
22
|
+
promptPointerPath,
|
|
23
|
+
readProtocolFile,
|
|
24
|
+
templatePointerLines,
|
|
25
|
+
validateProtocolSchema,
|
|
26
|
+
} from './protocol-utils.mjs';
|
|
18
27
|
import {
|
|
19
28
|
EXECUTE_FAMILY_NODE_IDS,
|
|
20
29
|
TASK_SET_SIGNATURE_ALGO,
|
|
@@ -23,6 +32,13 @@ import {
|
|
|
23
32
|
taskSetSignature,
|
|
24
33
|
} from './route-node.mjs';
|
|
25
34
|
import { taskBlocks as extractTaskBlocks, taskOpeningAttrs } from './task-parsing.mjs';
|
|
35
|
+
// 声明标记目录的路径规则(活动路径 + 归档兜底)归状态族的路径上下文模块——入口只取它的活动形态
|
|
36
|
+
// (includeArchive: false,理由见 checkPromptDeclarations),不在这里另拼一份 .skill-loads 路径。
|
|
37
|
+
import { findSkillLoadsDir } from './lib/state-io.mjs';
|
|
38
|
+
// 一个标记可能声明多份协议(skill-load 的多个 --prompt 记在 protocols 数组,protocol 只留首个):
|
|
39
|
+
// 逐份取值的单源在状态族(与出口覆盖判据同一实现)——在这里另写一份 basename 提取,入口与出口
|
|
40
|
+
// 就会对「这个标记到底声明了哪几份协议」给出两种答案。
|
|
41
|
+
import { markerProtocolBasenames } from './lib/state-skillmarkers.mjs';
|
|
26
42
|
import {
|
|
27
43
|
fileExists,
|
|
28
44
|
packageRoot,
|
|
@@ -40,7 +56,7 @@ import {
|
|
|
40
56
|
printNext,
|
|
41
57
|
route,
|
|
42
58
|
} from './lib/guard-routing.mjs';
|
|
43
|
-
import { checkUiDesignArtifact } from './lib/guard-uidesign.mjs';
|
|
59
|
+
import { checkUiDesignArtifact, frontendCriterion } from './lib/guard-uidesign.mjs';
|
|
44
60
|
import {
|
|
45
61
|
runIntakeDocFidelityGate,
|
|
46
62
|
runSummaryTemplateFidelityGate,
|
|
@@ -63,10 +79,13 @@ import {
|
|
|
63
79
|
runRequirementAcGate,
|
|
64
80
|
runReviewExitGate,
|
|
65
81
|
runSkillLoadMarkerGate,
|
|
82
|
+
runStructuralPreflight,
|
|
66
83
|
runTaskSetSignatureExitGate,
|
|
67
84
|
runTransitionEvidenceGate,
|
|
68
85
|
} from './lib/guard-gates.mjs';
|
|
69
86
|
import {
|
|
87
|
+
guardDeclarationCommand,
|
|
88
|
+
nodeSkillLoadCommands,
|
|
70
89
|
runArtifactGate,
|
|
71
90
|
runDirectOverrideGate,
|
|
72
91
|
runEvidenceCompletionGate,
|
|
@@ -83,6 +102,69 @@ import {
|
|
|
83
102
|
const command = process.argv[2] ?? 'verify';
|
|
84
103
|
const nodeId = process.argv[3] ?? null;
|
|
85
104
|
const apply = process.argv.includes('--apply');
|
|
105
|
+
// 结构化预检(只读):只跑结构性门禁子集(清单在 guard-gates 的 runStructuralPreflight),
|
|
106
|
+
// 含本节点声明工件的存在性(缺件即 BLOCK,不再是「不在场就跳过」的静默通过)。
|
|
107
|
+
const preflight = process.argv.includes('--preflight');
|
|
108
|
+
|
|
109
|
+
// exit 的已知参数(白名单):--apply(落盘推进)/ --preflight(结构预检)/ --protocol [<path>]
|
|
110
|
+
// (全局协议选择,取值由 resolveProtocol 校验)。其余 `--*` 一律用法错误——静默忽略会把「参数
|
|
111
|
+
// 写错」变成「命令照跑」:`--bogus` 让一次只读预检被当成通过,`--prefligh`(笔误)既不做预检、
|
|
112
|
+
// 也不报错,静默改跑完整出口链。判据取白名单而非黑名单:新增参数必须先在此登记,参数面才不会
|
|
113
|
+
// 随实现漂移。
|
|
114
|
+
const EXIT_KNOWN_FLAGS = new Set(['--apply', '--preflight']);
|
|
115
|
+
function assertKnownExitArgs(argv) {
|
|
116
|
+
const args = argv.slice(3); // 跳过 node 可执行文件、本脚本、command
|
|
117
|
+
const unknown = [];
|
|
118
|
+
for (let index = 0; index < args.length; index += 1) {
|
|
119
|
+
const arg = args[index];
|
|
120
|
+
if (typeof arg !== 'string' || !arg.startsWith('--')) continue;
|
|
121
|
+
if (arg.startsWith('--protocol=')) continue;
|
|
122
|
+
if (arg === '--protocol') {
|
|
123
|
+
index += 1; // 取值:缺失时由 resolveProtocol 报「requires a path argument」,不在解析层抢报
|
|
124
|
+
continue;
|
|
125
|
+
}
|
|
126
|
+
if (!EXIT_KNOWN_FLAGS.has(arg)) unknown.push(arg);
|
|
127
|
+
}
|
|
128
|
+
if (unknown.length > 0) {
|
|
129
|
+
throw new Error('用法错误: exit 收到未知参数 ' + unknown.join(' ')
|
|
130
|
+
+ '——exit 只接受 <node> 与 --apply / --preflight / --protocol <path>'
|
|
131
|
+
+ '(用法: workflow-guard.mjs exit <node> [--apply] [--preflight])');
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
// exit 的位置参数面(与上面的旗标白名单同属一道 fail-closed 判定):argv[3] 是唯一的位置参数
|
|
136
|
+
// (节点名),其后不再接受任何裸位置参数;单横线开头的 token(单横线笔误的 -apply、-h、-)不是
|
|
137
|
+
// 本仓任何脚本的旗标形态(全局旗标一律双横线),按「疑似旗标写错」判用法错误。修复前这两种形态
|
|
138
|
+
// 都被静默忽略:exit execute -apply 既不落盘也不报错,看起来像一次成功的预演;多余的裸词同样
|
|
139
|
+
// 无人认领。判据取「节点名 + 已知旗标」的正面形态,不猜意图;--protocol 的取值是旗标的操作数、
|
|
140
|
+
// 不是位置参数(两者在同一命令里并存),故解析时随该旗标一起跳过。
|
|
141
|
+
const EXIT_SUSPECTED_FLAG_RE = /^-(?!--)/u;
|
|
142
|
+
function assertExitOperandSurface(argv) {
|
|
143
|
+
const args = argv.slice(3); // 索引 0 = 节点名(唯一允许的位置参数)
|
|
144
|
+
const suspected = [];
|
|
145
|
+
const extra = [];
|
|
146
|
+
for (let index = 0; index < args.length; index += 1) {
|
|
147
|
+
const arg = args[index];
|
|
148
|
+
if (typeof arg !== 'string' || index === 0) continue;
|
|
149
|
+
if (arg === '--protocol') {
|
|
150
|
+
index += 1; // 取值(缺失时由 resolveProtocol 报 requires a path argument,与白名单判定同口径)
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
if (arg.startsWith('--')) continue; // 已知 / 未知双横线旗标已由 assertKnownExitArgs 判过,不在此抢报
|
|
154
|
+
if (EXIT_SUSPECTED_FLAG_RE.test(arg)) suspected.push(arg);
|
|
155
|
+
else extra.push(arg);
|
|
156
|
+
}
|
|
157
|
+
if (suspected.length > 0) {
|
|
158
|
+
throw new Error('用法错误: exit 收到疑似旗标 ' + suspected.join(' ')
|
|
159
|
+
+ '——本仓旗标一律以 -- 开头;exit 只接受 --apply / --preflight / --protocol <path>'
|
|
160
|
+
+ '(用法: workflow-guard.mjs exit <node> [--apply] [--preflight])');
|
|
161
|
+
}
|
|
162
|
+
if (extra.length > 0) {
|
|
163
|
+
throw new Error('用法错误: exit 只接受一个位置参数(节点名),多余位置参数: ' + extra.join(' ')
|
|
164
|
+
+ '——其余一律用已知旗标(--apply / --preflight / --protocol <path>)'
|
|
165
|
+
+ '(用法: workflow-guard.mjs exit <node> [--apply] [--preflight])');
|
|
166
|
+
}
|
|
167
|
+
}
|
|
86
168
|
|
|
87
169
|
// WARN 计数——entry/exit 成功路径末尾输出汇总行(可观测性;追加不改变既有输出)
|
|
88
170
|
let __warnCount = 0;
|
|
@@ -115,7 +197,82 @@ async function resolveGuardProtocolPath() {
|
|
|
115
197
|
return resolveProtocolPathWithState({ packageRoot, runRoot, state });
|
|
116
198
|
}
|
|
117
199
|
|
|
200
|
+
// skill-load 声明里的 --prompt 与节点协议文件的一致性(入口侧):扫描本节点已写下的声明标记,
|
|
201
|
+
// **逐份**核对每条声明(一个标记可声明多份:protocols 数组 + protocol 单值),任何一份落在该节点
|
|
202
|
+
// 协议面之外 → BLOCK。判据单实现在 protocol-utils 的 promptDeclarationConflict;逐份取值的单源在
|
|
203
|
+
// state-skillmarkers 的 markerProtocolBasenames(出口覆盖判据读同一份)。本函数只负责读标记目录;
|
|
204
|
+
// 出口侧的「该读的每份协议是否都被声明」门落在 guard-gates——两处同源不同层(入口判「每条声明都
|
|
205
|
+
// 对」,出口判「必需项都声明了」)。只读 protocol 单值时,多 --prompt 的第二份声明在入口不被核对。
|
|
206
|
+
async function checkPromptDeclarations({ node, state }) {
|
|
207
|
+
if (!state.activeChange) return;
|
|
208
|
+
// 只认活动路径(includeArchive: false):入口核对的是**这一轮**写下的声明,而归档里的声明属于
|
|
209
|
+
// 归档前的执行者——拿它来判当前节点,会把「这一轮没声明」判成「声明过」并放过错路径。入口本就不
|
|
210
|
+
// 追溯归档(声明机制未激活时直接返回,缺失由出口声明门报),故这里不改判据、只把差异写进参数。
|
|
211
|
+
const loadsDir = await findSkillLoadsDir(runRoot, state.activeChange, { includeArchive: false });
|
|
212
|
+
if (loadsDir === null) return; // 声明机制未激活(本节点还没写过声明):缺失由出口声明门报
|
|
213
|
+
const names = await fs.readdir(loadsDir.dir).catch(() => []);
|
|
214
|
+
const prefix = node.id + '-';
|
|
215
|
+
const conflicts = [];
|
|
216
|
+
for (const name of names.filter((entry) => entry.startsWith(prefix) && entry.endsWith('.json'))) {
|
|
217
|
+
let marker;
|
|
218
|
+
try {
|
|
219
|
+
marker = JSON.parse(await fs.readFile(path.join(loadsDir.dir, name), 'utf8'));
|
|
220
|
+
} catch {
|
|
221
|
+
continue; // 损坏标记由出口声明门报,不在这里抢报(同一缺陷不写两处措辞)
|
|
222
|
+
}
|
|
223
|
+
if (marker?.auto === true) continue; // 引擎代记的标记不是执行者的声明
|
|
224
|
+
const skill = typeof marker?.skill === 'string' && marker.skill !== '' ? marker.skill : null;
|
|
225
|
+
// 逐份核对:多 --prompt 的标记里每一份声明都要过同一判据(单值读法会漏掉第二份)
|
|
226
|
+
for (const declaredProtocol of markerProtocolBasenames(marker)) {
|
|
227
|
+
const conflict = promptDeclarationConflict({ node, declaredProtocol });
|
|
228
|
+
if (conflict) conflicts.push({ name, skill, ...conflict });
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
if (conflicts.length === 0) return;
|
|
232
|
+
// 重新声明的命令由协议派生(与出口恢复段、状态命令族同一装配):旧报文写的是
|
|
233
|
+
// `skill-load <node> <skill> --prompt <上述协议文件>`——占位符落在 --prompt 的值位置(bash 下 `<`
|
|
234
|
+
// 是重定向,照抄直接语法失败),而且只补首份协议;即便换成真实路径,下一次入口仍会点名另一份。
|
|
235
|
+
// 技能取该标记自己声明的那个(重跑即覆写同一份标记,不新增);标记没有技能名时退回该节点的
|
|
236
|
+
// 必需技能集(一条技能一条命令)。
|
|
237
|
+
const derived = await nodeSkillLoadCommands({ node, state });
|
|
238
|
+
const commands = [];
|
|
239
|
+
for (const conflict of conflicts) {
|
|
240
|
+
if (conflict.skill === null) {
|
|
241
|
+
commands.push(...derived.map((entry) => entry.command));
|
|
242
|
+
continue;
|
|
243
|
+
}
|
|
244
|
+
const declared = derived.find((entry) => entry.skill === conflict.skill);
|
|
245
|
+
commands.push(declared ? declared.command : guardDeclarationCommand({ node, skill: conflict.skill }));
|
|
246
|
+
}
|
|
247
|
+
const unique = commands.filter((command, index) => commands.indexOf(command) === index);
|
|
248
|
+
console.error('BLOCKED: 节点 ' + node.id + ' 的 skill-load 声明 --prompt 与节点协议文件不符——'
|
|
249
|
+
+ conflicts.map((conflict) => conflict.name + ' 声明 ' + conflict.declared
|
|
250
|
+
+ '(应为 ' + conflict.expected.map(promptPointerPath).join(' / ') + ')').join(';')
|
|
251
|
+
+ ';重跑下面的命令重新声明后重试(同一 node-skill 重跑会覆写该标记):\n'
|
|
252
|
+
+ unique.map((command) => ' ' + command).join('\n'));
|
|
253
|
+
process.exit(1);
|
|
254
|
+
}
|
|
255
|
+
|
|
118
256
|
async function main() {
|
|
257
|
+
// 参数解析 fail-closed(先于任何语义校验):未知 `--*` 不是「忽略即可」的噪音,而是「这条命令
|
|
258
|
+
// 实际跑的不是你以为的那条」。只在 exit 上启用——entry / verify 的参数面由既有校验覆盖,本条
|
|
259
|
+
// 针对的正是预检分支所在的命令。旗标白名单之后紧接着判位置参数面(节点名唯一、单横线疑似旗标
|
|
260
|
+
// 一律用法错误),两者合起来才是「一个节点名 + 已知旗标」的完整参数面。
|
|
261
|
+
if (command === 'exit') {
|
|
262
|
+
assertKnownExitArgs(process.argv);
|
|
263
|
+
assertExitOperandSurface(process.argv);
|
|
264
|
+
}
|
|
265
|
+
// 结构化预检的参数防护(fail-closed):--preflight 只读、只与 `exit <node>` 搭配。
|
|
266
|
+
// 与 --apply 同时给没有任何合法语义(一个只读、一个落盘)→ 用法错误非零退出,不猜意图;
|
|
267
|
+
// 其它命令(entry / verify / 未知命令)同样拒绝——预检不是第二套入口门禁。
|
|
268
|
+
if (preflight && apply) {
|
|
269
|
+
throw new Error('用法错误: --preflight 只读,不能与 --apply 同时使用(一个只读、一个写盘,组合无合法语义)'
|
|
270
|
+
+ '——用法: workflow-guard.mjs exit <node> --preflight(结构预检)或 workflow-guard.mjs exit <node> [--apply](完整出口)');
|
|
271
|
+
}
|
|
272
|
+
if (preflight && command !== 'exit') {
|
|
273
|
+
throw new Error('用法错误: --preflight 只能与 exit <node> 搭配(当前命令: ' + command + ')'
|
|
274
|
+
+ '——用法: workflow-guard.mjs exit <node> --preflight');
|
|
275
|
+
}
|
|
119
276
|
// 包装 console.error 统计 WARN 输出(转发原实现,行为不变)
|
|
120
277
|
console.error = (...args) => {
|
|
121
278
|
if (/WARN/.test(args.join(' '))) __warnCount += 1;
|
|
@@ -151,11 +308,50 @@ async function main() {
|
|
|
151
308
|
state.completedNodes = Array.isArray(state.completedNodes) ? state.completedNodes : [];
|
|
152
309
|
state.evidence = state.evidence && typeof state.evidence === 'object' ? state.evidence : {};
|
|
153
310
|
if (command === 'entry') {
|
|
311
|
+
// 加载链的两条指针:先步骤权威(协议提示词),再段形权威(产出物模板)——顺序即语义:先知道
|
|
312
|
+
// 这一步怎么做,再知道产出长什么样。两者都先于门禁链输出:即使后面的入口校验拦下,执行者也先
|
|
313
|
+
// 看到该读什么。提示词路径由 protocol-utils 的 NODE_PROTOCOL_FILES 单一提供(与出口协议声明
|
|
314
|
+
// 校验同源),零提示词的自定义协议节点不打印。
|
|
315
|
+
//
|
|
316
|
+
// 条件指针(条件提示词 / 条件模板)共用一条前端判据:CHANGE.md「视觉调性」判为前端才追出。判据
|
|
317
|
+
// 归属 guard-uidesign 的 frontendCriterion(单一实现),此处只消费、不写第二份;两类条件指针取
|
|
318
|
+
// 同一个 frontend 值——同一 change 上不可能得出两种结论。任一侧登记了条件文件(模板 optional 或
|
|
319
|
+
// 节点条件提示词)就求值:缺一侧不等于非前端。
|
|
320
|
+
const declaration = nodeTemplateDeclaration(node);
|
|
321
|
+
const hasConditionalPointer = declaration.optional.length > 0
|
|
322
|
+
|| (NODE_CONDITIONAL_PROMPTS[node.id] ?? []).length > 0;
|
|
323
|
+
const frontend = hasConditionalPointer
|
|
324
|
+
? (await frontendCriterion(state.activeChange)).applicable === true
|
|
325
|
+
: false;
|
|
326
|
+
for (const line of promptPointerLines(node, { conditional: frontend })) {
|
|
327
|
+
console.log(line);
|
|
328
|
+
}
|
|
329
|
+
// 产出物模板指针(加载链的第一环):引擎推导、不依赖纪律——内置节点取 C3 映射(协议副本没写
|
|
330
|
+
// node.templates 也照样打印),自定义协议节点取协议里的 node.templates 声明,零模板节点不打印。
|
|
331
|
+
// 先于门禁链输出:即使后面的入口校验拦下,执行者也能先看到该读哪份模板。
|
|
332
|
+
if (declaration.required.length > 0 || declaration.optional.length > 0) {
|
|
333
|
+
for (const line of templatePointerLines(declaration, { label: 'READ TEMPLATE', conditional: frontend })) {
|
|
334
|
+
console.log(line);
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
// 已写下的声明必须与节点协议文件一致(错路径 fail-closed)——把「读哪份提示词」从散文要求变成
|
|
338
|
+
// 入口可核对的判据;未声明 / 自动标记不在此判,缺失仍由出口声明门负责。
|
|
339
|
+
await checkPromptDeclarations({ node, state });
|
|
154
340
|
await runEntryGates({ protocol, node, state, file });
|
|
155
341
|
return;
|
|
156
342
|
}
|
|
343
|
+
if (preflight) {
|
|
344
|
+
// 结构化预检:只跑结构门禁子集(单一清单在 guard-gates 的 runStructuralPreflight),不写 state、
|
|
345
|
+
// 不写模板提示账本——因此也**不打印 --apply 引导**(预检不推进状态,那行会误导:它只说明
|
|
346
|
+
// 「再跑一次就能落盘」,而预检的价值恰恰是在不落盘的前提下反复跑到结构干净)。
|
|
347
|
+
console.log('PREFLIGHT: 结构预检——只跑结构性门禁(含本节点声明工件存在性;不写 state、不写提示账本;完整 exit 不带 --apply 才是全链预演)');
|
|
348
|
+
await runStructuralPreflight({ protocol, node, state });
|
|
349
|
+
console.log('ALL CHECKS PASSED');
|
|
350
|
+
console.log('PREFLIGHT: structural checks only(结构预检通过;推进仍由 exit ' + node.id + ' --apply 负责)');
|
|
351
|
+
return;
|
|
352
|
+
}
|
|
157
353
|
// —— 出口校验链(顺序即语义:每条门禁命中即按既有分级 BLOCKED / WARN)——
|
|
158
|
-
const evidence = requireNodeEvidence({ node, state });
|
|
354
|
+
const evidence = await requireNodeEvidence({ node, state });
|
|
159
355
|
await runExitDriftGate({ protocol, node, state, evidence });
|
|
160
356
|
await runFixBatchExitGate({ protocol, node, state });
|
|
161
357
|
runEntryRecordGate({ node, state });
|
|
@@ -190,7 +386,6 @@ async function main() {
|
|
|
190
386
|
runReturnContractGate({ node, state });
|
|
191
387
|
await runSubagentSummaryGate({ node, state });
|
|
192
388
|
await runMultiPassCompletionGate({ node, state });
|
|
193
|
-
await runSkillLoadMarkerGate({ node, state });
|
|
194
389
|
await runSummaryTemplateFidelityGate({ node, state });
|
|
195
390
|
await runTaskSevenFieldGate({ node, state });
|
|
196
391
|
await runIntakeDocFidelityGate({ node, state });
|
|
@@ -203,6 +398,10 @@ async function main() {
|
|
|
203
398
|
emptyExitExempt: executeEmptyExitExempt,
|
|
204
399
|
});
|
|
205
400
|
runRequiredEvidenceGate({ node, evidence });
|
|
401
|
+
// 声明覆盖门排在证据族之后:同一个「缺声明」既可能表现为证据清单缺 required-skill(证据门的报文
|
|
402
|
+
// 给出该绑定的补齐命令),也可能表现为声明标记没覆盖必需项(本门的报文逐项点名缺哪个协议文件 /
|
|
403
|
+
// 哪个必需技能)。证据门先说话,本门收口——两者都说同一件事时不会各给一条互相打断的路径。
|
|
404
|
+
await runSkillLoadMarkerGate({ node, state });
|
|
206
405
|
if (apply) {
|
|
207
406
|
const completed = completedSet(state);
|
|
208
407
|
// Fix 二次完成信号:exit 的 execute 家族节点在本次 exit 之前已在 completedNodes(首轮 exit
|