flow-comet 1.7.0 → 1.8.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.
Files changed (78) hide show
  1. package/.flow-comet/skills/flow-comet/INSTALLED_VERSION +1 -1
  2. package/.flow-comet/skills/flow-comet/SKILL.md +16 -14
  3. package/.flow-comet/skills/flow-comet/reference/commit-discipline.md +1 -1
  4. package/.flow-comet/skills/flow-comet/reference/decision-points.md +5 -5
  5. package/.flow-comet/skills/flow-comet/reference/dirty-worktree.md +1 -1
  6. package/.flow-comet/skills/flow-comet/reference/entry-detail.md +9 -9
  7. package/.flow-comet/skills/flow-comet/reference/fix-loop.md +4 -4
  8. package/.flow-comet/skills/flow-comet/reference/init-detection.md +1 -1
  9. package/.flow-comet/skills/flow-comet/reference/platform-facts.md +2 -2
  10. package/.flow-comet/skills/flow-comet/reference/post-archive-handoff.md +264 -0
  11. package/.flow-comet/skills/flow-comet/reference/recovery.md +1 -1
  12. package/.flow-comet/skills/flow-comet/reference/replan.md +1 -1
  13. package/.flow-comet/skills/flow-comet/scripts/comet-check.mjs +1 -0
  14. package/.flow-comet/skills/flow-comet/scripts/comet-hook-guard.mjs +270 -30
  15. package/.flow-comet/skills/flow-comet/scripts/items/a.mjs +25 -8
  16. package/.flow-comet/skills/flow-comet/scripts/items/b.mjs +41 -38
  17. package/.flow-comet/skills/flow-comet/scripts/items/c.mjs +11 -9
  18. package/.flow-comet/skills/flow-comet/scripts/items/e.mjs +2 -2
  19. package/.flow-comet/skills/flow-comet/scripts/items/f.mjs +1 -1
  20. package/.flow-comet/skills/flow-comet/scripts/items/h.mjs +112 -53
  21. package/.flow-comet/skills/flow-comet/scripts/items/k.mjs +357 -3
  22. package/.flow-comet/skills/flow-comet/scripts/items/l.mjs +24 -1
  23. package/.flow-comet/skills/flow-comet/scripts/items/m.mjs +2 -2
  24. package/.flow-comet/skills/flow-comet/scripts/items/n.mjs +9 -10
  25. package/.flow-comet/skills/flow-comet/scripts/lib/ac-coverage.mjs +8 -8
  26. package/.flow-comet/skills/flow-comet/scripts/lib/fix-loop-node.mjs +4 -15
  27. package/.flow-comet/skills/flow-comet/scripts/lib/guard-evidence-gates.mjs +79 -107
  28. package/.flow-comet/skills/flow-comet/scripts/lib/guard-gates.mjs +183 -232
  29. package/.flow-comet/skills/flow-comet/scripts/lib/guard-routing.mjs +91 -14
  30. package/.flow-comet/skills/flow-comet/scripts/lib/guard-template-fidelity.mjs +20 -32
  31. package/.flow-comet/skills/flow-comet/scripts/lib/guard-uidesign.mjs +10 -19
  32. package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-admin.mjs +27 -17
  33. package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-flow.mjs +240 -87
  34. package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-recovery.mjs +15 -22
  35. package/.flow-comet/skills/flow-comet/scripts/lib/state-determine.mjs +11 -4
  36. package/.flow-comet/skills/flow-comet/scripts/lib/state-io.mjs +192 -24
  37. package/.flow-comet/skills/flow-comet/scripts/lib/state-skillmarkers.mjs +55 -44
  38. package/.flow-comet/skills/flow-comet/scripts/lib/system-fixtures.mjs +2 -4
  39. package/.flow-comet/skills/flow-comet/scripts/lib/test-assertions.mjs +0 -3
  40. package/.flow-comet/skills/flow-comet/scripts/lib/test-fixtures.mjs +191 -17
  41. package/.flow-comet/skills/flow-comet/scripts/lib/test-helpers.mjs +3 -0
  42. package/.flow-comet/skills/flow-comet/scripts/lib/text-anchor-checks.mjs +23 -5
  43. package/.flow-comet/skills/flow-comet/scripts/lib/wave-projection.mjs +10 -11
  44. package/.flow-comet/skills/flow-comet/scripts/protocol-utils.mjs +40 -3
  45. package/.flow-comet/skills/flow-comet/scripts/route-node.mjs +12 -5
  46. package/.flow-comet/skills/flow-comet/scripts/scenarios/a.mjs +193 -111
  47. package/.flow-comet/skills/flow-comet/scripts/scenarios/b.mjs +314 -57
  48. package/.flow-comet/skills/flow-comet/scripts/scenarios/c.mjs +311 -216
  49. package/.flow-comet/skills/flow-comet/scripts/scenarios/d.mjs +33 -62
  50. package/.flow-comet/skills/flow-comet/scripts/scenarios/e.mjs +188 -91
  51. package/.flow-comet/skills/flow-comet/scripts/scenarios/f.mjs +94 -37
  52. package/.flow-comet/skills/flow-comet/scripts/scenarios/g.mjs +36 -27
  53. package/.flow-comet/skills/flow-comet/scripts/scenarios/h.mjs +285 -9
  54. package/.flow-comet/skills/flow-comet/scripts/scenarios/i.mjs +2 -6
  55. package/.flow-comet/skills/flow-comet/scripts/scenarios/j.mjs +5 -15
  56. package/.flow-comet/skills/flow-comet/scripts/scenarios/k.mjs +6 -5
  57. package/.flow-comet/skills/flow-comet/scripts/scenarios/l.mjs +40 -36
  58. package/.flow-comet/skills/flow-comet/scripts/scenarios/m.mjs +2 -2
  59. package/.flow-comet/skills/flow-comet/scripts/scenarios/n.mjs +346 -25
  60. package/.flow-comet/skills/flow-comet/scripts/state-schema.mjs +0 -2
  61. package/.flow-comet/skills/flow-comet/scripts/workflow-handoff.mjs +41 -54
  62. package/.flow-comet/skills/flow-comet-archive/SKILL.md +33 -11
  63. package/.flow-comet/skills/flow-comet-change/SKILL.md +1 -1
  64. package/.flow-comet/skills/flow-comet-design/SKILL.md +5 -3
  65. package/.flow-comet/skills/flow-comet-dev/SKILL.md +2 -2
  66. package/.flow-comet/skills/flow-comet-execute/SKILL.md +11 -11
  67. package/.flow-comet/skills/flow-comet-integration/SKILL.md +10 -4
  68. package/.flow-comet/skills/flow-comet-plan/GUIDANCE.md +1 -1
  69. package/.flow-comet/skills/flow-comet-plan/SKILL.md +8 -8
  70. package/.flow-comet/skills/flow-comet-review/SKILL.md +8 -8
  71. package/.flow-comet/skills/flow-comet-subagent-execute/GUIDANCE.md +1 -1
  72. package/.flow-comet/skills/flow-comet-subagent-execute/SKILL.md +14 -14
  73. package/.flow-comet/skills/flow-comet-task/SKILL.md +3 -2
  74. package/.flow-comet/skills/flow-comet-ui-design/SKILL.md +2 -2
  75. package/.flow-comet/skills/flow-comet-verify/SKILL.md +1 -1
  76. package/README.md +2 -2
  77. package/package.json +1 -1
  78. package/scripts/dsh-bridge.mjs +238 -21
@@ -21,19 +21,21 @@ import {
21
21
  } from '../lib/test-helpers.mjs';
22
22
  import {
23
23
  CHANGE_ID,
24
- REPO_ROOT,
25
- SCRIPTS_DIR,
26
- TASK_DONE,
27
- TASK_SERIAL_PENDING,
24
+ dropNamedImport,
28
25
  engineConsumersOf,
29
26
  engineDefinitionHits,
30
27
  engineDefinitionModule,
31
28
  engineScriptTexts,
32
- dropNamedImport,
33
29
  handoffFor,
30
+ intakeRequirementText,
34
31
  makeTmp,
32
+ REPO_ROOT,
35
33
  runPlanExit,
34
+ SCRIPTS_DIR,
35
+ TASK_DONE,
36
+ TASK_SERIAL_PENDING,
36
37
  writeIntakeArtifacts,
38
+ writeNodeDeclarationMarkers,
37
39
  } from '../lib/test-fixtures.mjs';
38
40
  import {
39
41
  assertRevocationAudit,
@@ -43,6 +45,7 @@ import {
43
45
  scenarioProtocolPath,
44
46
  } from '../lib/test-assertions.mjs';
45
47
  import {
48
+ autoFillPromiseProblems,
46
49
  singleSourceImportProblems,
47
50
  skillLoadingWordingProblems,
48
51
  twoLayerEntryProblems,
@@ -86,7 +89,6 @@ export const ENTRIES = [
86
89
  run: (dir) => {
87
90
  // ① 空 write_files 既有正例(request 落库夹具;零回归锚)
88
91
  const st = baseState('subagent-execute');
89
- st.newChange = true;
90
92
  st.evidence['subagent-execute'] = { handoffRequests: { T01: { description: 'zero-commit task', writeFiles: [] } } };
91
93
  writeState(dir, st);
92
94
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', '# TASK\n\n<task id="T01" status="done"><action>only docs already tracked</action><write_files></write_files><verify>node --check src/t1.mjs</verify></task>\n');
@@ -114,7 +116,6 @@ export const ENTRIES = [
114
116
  writeFile(dir, '.specs/' + CHANGE_ID + '/.skill-loads/subagent-execute-flow-comet-dev.json',
115
117
  JSON.stringify({ node: 'subagent-execute', skill: 'flow-comet-dev', protocol: '4-dev.md', at: '2026-08-01T00:00:00.000Z' }, null, 2) + '\n');
116
118
  const st2 = baseState('subagent-execute');
117
- st2.newChange = true;
118
119
  writeState(dir, st2);
119
120
  const resReq = runHandoff(['request', 'T02', 'delegate docs-only slice'], dir);
120
121
  assertExit(resReq, 0);
@@ -163,10 +164,11 @@ export const ENTRIES = [
163
164
  assertRevocationAudit(reqBlocked, 'stale-eligibility', '157③ 新 change .gitignore 变化');
164
165
  assertOut(resRevalBlock, 'revokedAt=');
165
166
  assertOut(resRevalBlock, 'revokeReason=stale-eligibility');
166
- // ④ 旧 change 同构造:HANDOFF WARN + 照常落 result + noCommit 同样置 false(渐进兼容)
167
+ // ④ 旧状态带 newChange 字段(升级前的 init 产物):同一构造只被容忍字段、判级与 ③ 一致
168
+ // (重验失败 = HANDOFF ERROR、不落 result;字段不再分出新旧等级)
167
169
  writeFile(dir, '.gitignore', '.specs/\n'); // 恢复忽略规则 → 重新 request 取得资格
168
170
  const stReReq = JSON.parse(fs.readFileSync(statePath, 'utf8'));
169
- delete stReReq.newChange; // 旧 change = 缺省/null(validator 不接受 false)
171
+ stReReq.newChange = null; // 旧 state 的另一种历史取值(null)——字段只被忽略
170
172
  writeState(dir, stReReq);
171
173
  assertExit(runHandoff(['request', 'T02', 'delegate docs-only slice again'], dir), 0);
172
174
  const stReReqAfter = JSON.parse(fs.readFileSync(statePath, 'utf8'));
@@ -182,21 +184,22 @@ export const ENTRIES = [
182
184
  redEvidence: { command: 'node --check baseline.js', output: 'ok' },
183
185
  greenEvidence: { command: 'node --check baseline.js', output: 'ok' },
184
186
  })], dir);
185
- assertExit(resRevalWarn, 0);
186
- assertOut(resRevalWarn, 'HANDOFF WARN');
187
+ assertExit(resRevalWarn, 1);
188
+ assertOut(resRevalWarn, 'HANDOFF ERROR');
187
189
  assertOut(resRevalWarn, 'noCommit=false');
190
+ assertOut(resRevalWarn, '不落 result');
188
191
  const stRevalWarn = JSON.parse(fs.readFileSync(statePath, 'utf8'));
189
192
  if (stRevalWarn.evidence['subagent-execute'].handoffRequests.T02.noCommit !== false) {
190
- throw new Error('旧 change 重验失败同样应撤销 request.noCommit,实际 '
193
+ throw new Error('重验失败同样应撤销 request.noCommit,实际 '
191
194
  + JSON.stringify(stRevalWarn.evidence['subagent-execute'].handoffRequests.T02));
192
195
  }
193
- // F6 审计:旧 change 渐进撤销同样必须留 at/reason(与失败类别对应)
196
+ // F6 审计:撤销同样必须留 at/reason(与失败类别对应)
194
197
  assertRevocationAudit(stRevalWarn.evidence['subagent-execute'].handoffRequests.T02,
195
- 'stale-eligibility', '157④ 旧 change .gitignore 变化');
198
+ 'stale-eligibility', '157④ 旧状态 .gitignore 变化');
196
199
  assertOut(resRevalWarn, 'revokeReason=stale-eligibility');
197
200
  const legacyResult = stRevalWarn.evidence['subagent-execute'].handoffResult.T02;
198
- if (!legacyResult || legacyResult.completedAt === legacyCompletedAt || legacyResult.result.noCommit !== true) {
199
- throw new Error('旧 change 重验失败应照常落 result(渐进),实际 ' + JSON.stringify(legacyResult));
201
+ if (!legacyResult || legacyResult.completedAt !== legacyCompletedAt) {
202
+ throw new Error('重验失败不得覆盖既有 handoffResult(字段容忍 ≠ 落 result),实际 ' + JSON.stringify(legacyResult));
200
203
  }
201
204
  },
202
205
  },
@@ -210,6 +213,7 @@ export const ENTRIES = [
210
213
  {
211
214
  name: '158 零提交滥用负例:非空声称 noCommit 仍完整校验;glob/越界/非 git/非 top-level 请求不记 noCommit',
212
215
  run: (dir) => {
216
+ writeNodeDeclarationMarkers(dir, 'subagent-execute');
213
217
  const g = (args) => spawnSync('git', args, { cwd: dir, encoding: 'utf8' });
214
218
  g(['init', '-q']);
215
219
  g(['config', 'user.email', 't@t']);
@@ -220,7 +224,6 @@ export const ENTRIES = [
220
224
  g(['commit', '-qm', 'init']);
221
225
  const hash = g(['rev-parse', 'HEAD']).stdout.trim();
222
226
  const st = baseState('subagent-execute');
223
- st.newChange = true;
224
227
  st.evidence['subagent-execute'] = { handoffRequests: { T01: { description: 'normal task', writeFiles: ['allowed.js'] } } };
225
228
  writeState(dir, st);
226
229
  const res = runHandoff(['result', 'T01', JSON.stringify({
@@ -277,6 +280,7 @@ export const ENTRIES = [
277
280
  + '<write_files>.specs/' + CHANGE_ID + '/x.md</write_files>'
278
281
  + '<verify>node --check allowed.js</verify></task>\n');
279
282
  writeState(nonGit, baseState('subagent-execute'));
283
+ writeNodeDeclarationMarkers(nonGit, 'subagent-execute');
280
284
  const resNonGit = runHandoff(['request', 'T04', 'non-git slice'], nonGit);
281
285
  assertExit(resNonGit, 0);
282
286
  const stNonGit = JSON.parse(fs.readFileSync(path.join(nonGit, '.flow-comet', 'flow-comet-state.json'), 'utf8'));
@@ -294,6 +298,7 @@ export const ENTRIES = [
294
298
  + '<verify>node --check allowed.js</verify></task>\n');
295
299
  const sub = path.join(dir, 'sub');
296
300
  writeState(sub, baseState('subagent-execute'));
301
+ writeNodeDeclarationMarkers(sub, 'subagent-execute');
297
302
  const resSub = runHandoff(['request', 'T05', 'subdir slice'], sub);
298
303
  assertExit(resSub, 0);
299
304
  const stSub = JSON.parse(fs.readFileSync(path.join(sub, '.flow-comet', 'flow-comet-state.json'), 'utf8'));
@@ -337,7 +342,6 @@ export const ENTRIES = [
337
342
  writeFile(dir, '.specs/' + CHANGE_ID + '/.skill-loads/subagent-execute-flow-comet-dev.json',
338
343
  JSON.stringify({ node: 'subagent-execute', skill: 'flow-comet-dev', protocol: '4-dev.md', at: '2026-08-01T00:00:00.000Z' }, null, 2) + '\n');
339
344
  const stReqLink = baseState('subagent-execute');
340
- stReqLink.newChange = true;
341
345
  writeState(dir, stReqLink);
342
346
  const resReqLink = runHandoff(['request', 'T07', 'junction revalidate slice'], dir);
343
347
  assertExit(resReqLink, 0);
@@ -381,7 +385,6 @@ export const ENTRIES = [
381
385
  // request 的结论形态——write_files 非空(glob,无零提交资格)——本段要验证的仍是
382
386
  // 「零提交声明不能绕过真实提交检查」,不是缺 request 的拦截。
383
387
  const stIneligible = JSON.parse(fs.readFileSync(path.join(dir, '.flow-comet', 'flow-comet-state.json'), 'utf8'));
384
- stIneligible.newChange = true;
385
388
  stIneligible.evidence['subagent-execute'].handoffRequests = {
386
389
  ...stIneligible.evidence['subagent-execute'].handoffRequests,
387
390
  T02: { description: 'glob boundary slice', writeFiles: ['src/gen/*.mjs'] },
@@ -459,17 +462,17 @@ export const ENTRIES = [
459
462
  ]; // 数据库迁移排到越界检查之后(段序偏离)
460
463
  const compose = (title, order) =>
461
464
  [title, '', header, '', '---', '', order.join('\n\n')].join('\n');
462
- const setupExecute = (newChange) => {
465
+ const setupExecute = () => {
463
466
  const st = baseState('execute');
464
467
  st.evidence.execute = { summary: 'executed' };
465
468
  st.evidence['subagent-execute'] = { handoffResult: handoffFor(['T01']) };
466
- if (newChange) { st.newChange = true; st.enteredNodes = ['execute']; }
469
+ st.enteredNodes = ['execute'];
467
470
  writeState(dir, st);
468
471
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', '# TASK\n\n' + TASK_DONE);
469
472
  marker();
470
473
  };
471
474
  // ① 新 change:缺 `# SUMMARY:` 标题(段齐全)→ BLOCK
472
- setupExecute(true);
475
+ setupExecute();
473
476
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# T01-SUMMARY', fullSections));
474
477
  const res1 = runGuard(['exit', 'execute'], dir);
475
478
  assertExit(res1, 1);
@@ -496,23 +499,28 @@ export const ENTRIES = [
496
499
  assertExit(res3, 1);
497
500
  assertOut(res3, 'BLOCKED');
498
501
  // ④ 合法变体:大小写(# Summary: …)→ 通过
499
- setupExecute(true);
502
+ setupExecute();
500
503
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# Summary: T01 - 实现 T01', fullSections));
501
504
  const res4 = runGuard(['exit', 'execute'], dir);
502
505
  assertExit(res4, 0);
503
506
  assertOut(res4, 'ALL CHECKS PASSED');
504
507
  // ⑤ 合法变体:括号后缀 → 通过
505
- setupExecute(true);
508
+ setupExecute();
506
509
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# SUMMARY: T01 - 实现 T01(含说明括号)', fullSections));
507
510
  const res5 = runGuard(['exit', 'execute'], dir);
508
511
  assertExit(res5, 0);
509
512
  assertOut(res5, 'ALL CHECKS PASSED');
510
- // ⑥ 旧 change:缺标题 → WARN 渐进不阻断
511
- setupExecute(false);
513
+ // ⑥ 旧状态带 newChange 字段(升级前的 init 产物):同一缺标题构造 → 与 ① 同判(BLOCKED,
514
+ // 字段只被忽略、不改变等级——AC-2 容忍 + AC-1 单轨)
515
+ setupExecute();
516
+ const legacyExecuteState = readScenarioState(dir);
517
+ legacyExecuteState.newChange = true;
518
+ writeState(dir, legacyExecuteState);
512
519
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# T01-SUMMARY', fullSections));
513
520
  const res6 = runGuard(['exit', 'execute'], dir);
514
- assertExit(res6, 0);
515
- assertOut(res6, 'WARN');
521
+ assertExit(res6, 1);
522
+ assertOut(res6, 'BLOCKED');
523
+ assertOut(res6, '# SUMMARY:');
516
524
  // ⑦ 起:写入 SUMMARY 模板副本——M1 全骨架硬阻断只在 runRoot 内存在
517
525
  // flow-kit/templates/SUMMARY.md 时生效(模板缺失仅内置骨架提示,不新增 BLOCK)。
518
526
  // 维护者工作副本含 vendored flow-kit → 复制真实模板;CI 全新检出 flow-kit 被
@@ -547,7 +555,7 @@ export const ENTRIES = [
547
555
  ].join('\n');
548
556
  writeFile(dir, 'flow-kit/templates/SUMMARY.md', summaryTemplateFixture);
549
557
  // ⑦ 新 change 缺尾段(完成判定)→ BLOCK + 缺段 + 「补 N/A 段」恢复指引
550
- setupExecute(true);
558
+ setupExecute();
551
559
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# SUMMARY: T01 - 实现 T01', missingTailSections));
552
560
  const res7 = runGuard(['exit', 'execute'], dir);
553
561
  assertExit(res7, 1);
@@ -555,7 +563,7 @@ export const ENTRIES = [
555
563
  assertOut(res7, '完成判定');
556
564
  assertOut(res7, 'N/A');
557
565
  // ⑧ 段序偏离(数据库迁移排到越界检查之后)→ BLOCK + 段序 + 缺段点可定位
558
- setupExecute(true);
566
+ setupExecute();
559
567
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# SUMMARY: T01 - 实现 T01', outOfOrderSections));
560
568
  const res8 = runGuard(['exit', 'execute'], dir);
561
569
  assertExit(res8, 1);
@@ -563,21 +571,21 @@ export const ENTRIES = [
563
571
  assertOut(res8, '段序');
564
572
  assertOut(res8, '数据库迁移');
565
573
  // ⑨ 合法位置一:## 自检方法 位于文末 → 通过(真实模板在场)
566
- setupExecute(true);
574
+ setupExecute();
567
575
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# SUMMARY: T01 - 实现 T01', fullSections));
568
576
  const res9 = runGuard(['exit', 'execute'], dir);
569
577
  assertExit(res9, 0);
570
578
  assertOut(res9, 'ALL CHECKS PASSED');
571
579
  assertNotOut(res9, 'BLOCKED');
572
580
  // ⑩ 合法位置二:## 自检方法 紧随 ## 越界检查 之后 → 通过(真实模板在场)
573
- setupExecute(true);
581
+ setupExecute();
574
582
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# SUMMARY: T01 - 实现 T01', afterBoundsSections));
575
583
  const res10 = runGuard(['exit', 'execute'], dir);
576
584
  assertExit(res10, 0);
577
585
  assertOut(res10, 'ALL CHECKS PASSED');
578
586
  assertNotOut(res10, 'BLOCKED');
579
587
  // ⑪ 自检方法位置非法(夹在 6 维自查与数据库迁移之间)→ BLOCK
580
- setupExecute(true);
588
+ setupExecute();
581
589
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# SUMMARY: T01 - 实现 T01', illegalSelfSections));
582
590
  const res11 = runGuard(['exit', 'execute'], dir);
583
591
  assertExit(res11, 1);
@@ -596,12 +604,12 @@ export const ENTRIES = [
596
604
  sectionText.sixDim, '单变量前提不成立:Z 说明行不是与无 Z 基线的唯一差异');
597
605
  assertTrue(sixDimZFirst.indexOf(zNote) < sixDimZFirst.indexOf('brooks-review'),
598
606
  '夹具形态前提不成立:Z 说明行须早于方法声明,否则段尾截断不影响该声明(锚零判别力)');
599
- setupExecute(true);
607
+ setupExecute();
600
608
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# SUMMARY: T01 - 实现 T01', fullSections));
601
609
  const res12Base = runGuard(['exit', 'execute'], dir);
602
610
  assertExit(res12Base, 0);
603
611
  assertOut(res12Base, 'ALL CHECKS PASSED');
604
- setupExecute(true);
612
+ setupExecute();
605
613
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# SUMMARY: T01 - 实现 T01', withSixDim(sixDimZFirst)));
606
614
  const res12 = runGuard(['exit', 'execute'], dir);
607
615
  assertExit(res12, 0);
@@ -611,7 +619,7 @@ export const ENTRIES = [
611
619
  // ⇒ 6 维自查段确实未声明自检方法 ⇒ 仍须 BLOCK,且拦因须落在该判据上(而非段空 / 段缺席)。
612
620
  const sixDimNoDecl = sixDimZFirst.replace('- 功能: 通过(brooks-review 已跑)', '- 功能: 通过(内置快查)');
613
621
  assertTrue(sixDimNoDecl !== sixDimZFirst, '对照夹具前提不成立:6 维段内方法声明行未命中');
614
- setupExecute(true);
622
+ setupExecute();
615
623
  writeFile(dir, '.specs/' + CHANGE_ID + '/T01-SUMMARY.md', compose('# SUMMARY: T01 - 实现 T01', withSixDim(sixDimNoDecl)));
616
624
  const res13 = runGuard(['exit', 'execute'], dir);
617
625
  assertExit(res13, 1);
@@ -635,21 +643,21 @@ export const ENTRIES = [
635
643
  // ① 新 change:缺 write_files → BLOCK(含字段名)
636
644
  const st = baseState('plan');
637
645
  st.evidence.plan = { summary: 'plan done' };
638
- st.newChange = true;
639
646
  writeState(dir, st);
640
647
  addPlanMarker();
641
648
  const res = runPlanExit(dir, missingWrite);
642
649
  assertExit(res, 1);
643
650
  assertOut(res, 'BLOCKED');
644
651
  assertOut(res, 'write_files');
645
- // ② 旧 change:同构造 → WARN 渐进不阻断
652
+ // ② 同构造(无任何新旧标记字段):同判 BLOCKED(单轨,无渐进侧)
646
653
  const stOld = baseState('plan');
647
654
  stOld.evidence.plan = { summary: 'plan done' };
648
655
  writeState(dir, stOld);
649
656
  addPlanMarker();
650
657
  const resOld = runPlanExit(dir, missingWrite);
651
- assertExit(resOld, 0);
652
- assertOut(resOld, 'WARN');
658
+ assertExit(resOld, 1);
659
+ assertOut(resOld, 'BLOCKED');
660
+ assertOut(resOld, 'write_files');
653
661
  },
654
662
  },
655
663
 
@@ -677,7 +685,6 @@ export const ENTRIES = [
677
685
  // ① open 出口 新 change:REQUIREMENT 缺 `# REQUIREMENT:` 标题(段齐全)→ BLOCK
678
686
  const stOpen = baseState('open');
679
687
  stOpen.evidence.open = { summary: 'intake complete' };
680
- stOpen.newChange = true;
681
688
  stOpen.enteredNodes = ['open'];
682
689
  writeState(dir, stOpen);
683
690
  addOpenMarker();
@@ -690,7 +697,6 @@ export const ENTRIES = [
690
697
  // ② design 出口 新 change:DESIGN 缺 `# DESIGN:` 标题(段齐全)→ BLOCK
691
698
  const stDesign = baseState('design');
692
699
  stDesign.evidence.design = { summary: 'design done' };
693
- stDesign.newChange = true;
694
700
  stDesign.enteredNodes = ['design'];
695
701
  writeState(dir, stDesign);
696
702
  addDesignMarker();
@@ -700,7 +706,7 @@ export const ENTRIES = [
700
706
  assertExit(resDesign, 1);
701
707
  assertOut(resDesign, 'BLOCKED');
702
708
  assertOut(resDesign, 'DESIGN');
703
- // ③ 旧 change open 同构造(REQUIREMENT 缺标题)→ WARN 渐进不阻断
709
+ // ③ 同构造(无任何新旧标记字段):同判 BLOCKED(单轨,无渐进侧)
704
710
  const stOld = baseState('open');
705
711
  stOld.evidence.open = { summary: 'intake complete' };
706
712
  writeState(dir, stOld);
@@ -708,8 +714,9 @@ export const ENTRIES = [
708
714
  writeFile(dir, '.specs/' + CHANGE_ID + '/CHANGE.md', '# 变更文档\n\n## Why(为什么做)\n\n原因。\n\n## 范围(Scope)\n');
709
715
  writeFile(dir, '.specs/' + CHANGE_ID + '/REQUIREMENT.md', '# 需求文档\n\n## 用户故事\n\n- US-1 作为维护者……\n\n## 验收准则(AC)\n\n- Given X When Y Then Z\n');
710
716
  const resOld = runGuard(['exit', 'open'], dir);
711
- assertExit(resOld, 0);
712
- assertOut(resOld, 'WARN');
717
+ assertExit(resOld, 1);
718
+ assertOut(resOld, 'BLOCKED');
719
+ assertOut(resOld, 'REQUIREMENT');
713
720
  },
714
721
  },
715
722
 
@@ -722,24 +729,26 @@ export const ENTRIES = [
722
729
  const env = { FLOW_COMET_PROTOCOL: scenarioProtocolPath(dir) };
723
730
  // ① handoff request 前置门:新 change、subagent-execute 节点无声明标记 → BLOCK
724
731
  const stReq = baseState('subagent-execute');
725
- stReq.newChange = true;
726
732
  writeState(dir, stReq);
727
733
  const resReq = runHandoff(['request', 'T01', 'delegate parallel task'], dir);
728
734
  assertExit(resReq, 1);
729
735
  assertOut(resReq, '先加载技能');
736
+ // 在办 change 的目录必在场(真实链路里 init 会建 .specs/<id>/):缺目录是 running-orphan 形态,
737
+ // record 会先在位置门上 fail-closed(那是另一条判据,不是本场景要测的声明门)。
738
+ fs.mkdirSync(path.join(dir, '.specs', CHANGE_ID), { recursive: true });
730
739
  // ② record 前置门:新 change、plan 节点无声明标记、payload 不含 completedChecks → BLOCK
731
740
  const stRec = baseState('plan');
732
- stRec.newChange = true;
733
741
  writeState(dir, stRec);
734
742
  const resRec = runStateWithProtocol(dir, ['record', 'plan', '{"summary":"plan done"}']);
735
743
  assertExit(resRec, 1);
736
744
  assertOut(resRec, '先加载技能');
737
- // ③ 旧 change:record 无声明 → WARN 渐进不阻断
745
+ // ③ 同构造(无任何新旧标记字段):record 无声明 → 同判 BLOCKED(单轨,无渐进侧)
738
746
  const stOld = baseState('plan');
739
747
  writeState(dir, stOld);
740
748
  const resOld = runStateWithProtocol(dir, ['record', 'plan', '{"summary":"plan done"}']);
741
- assertExit(resOld, 0);
742
- assertOut(resOld, 'WARN');
749
+ assertExit(resOld, 1);
750
+ assertOut(resOld, 'BLOCKED');
751
+ assertOut(resOld, '缺少技能加载声明标记');
743
752
 
744
753
  // ===== M-02 request 时刻归属门禁(AC-2 不误伤面)=====
745
754
  // 正确节点成功 / 串行错配 BLOCK / 未 entry WARN / done 与显式 write-files 旁路 /
@@ -759,7 +768,6 @@ export const ENTRIES = [
759
768
  writeMarker('subagent-execute');
760
769
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', taskXml('P01', 'parallel="true" status="pending"', 'src/p01.mjs'));
761
770
  const stOk = baseState('subagent-execute');
762
- stOk.newChange = true;
763
771
  stOk.enteredNodes = ['subagent-execute'];
764
772
  writeState(dir, stOk);
765
773
  const resOk = runHandoff(['request', 'P01', 'delegate'], dir, env);
@@ -771,7 +779,6 @@ export const ENTRIES = [
771
779
  writeMarker('execute');
772
780
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', taskXml('S01', 'parallel="false" status="pending"', 'src/s01.mjs'));
773
781
  const stSerial = baseState('subagent-execute');
774
- stSerial.newChange = true;
775
782
  stSerial.enteredNodes = ['subagent-execute'];
776
783
  writeState(dir, stSerial);
777
784
  const beforeSerial = fs.readFileSync(statePath, 'utf8');
@@ -789,7 +796,7 @@ export const ENTRIES = [
789
796
  // ⑥ 正确节点但尚未 entry → 仅 WARN + 照常落库
790
797
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', taskXml('S02', 'parallel="false" status="pending"', 'src/s02.mjs'));
791
798
  const stNotEntered = baseState('execute');
792
- stNotEntered.newChange = true; // enteredNodes 缺 execute
799
+ stNotEntered.enteredNodes = []; // 显式构造「未 entry」形态
793
800
  writeState(dir, stNotEntered);
794
801
  const resNotEntered = runHandoff(['request', 'S02', 'serial slice'], dir, env);
795
802
  assertExit(resNotEntered, 0);
@@ -810,7 +817,6 @@ export const ENTRIES = [
810
817
  // ⑦ done 任务补录(非 pending)→ 归属门禁跳过,不误伤
811
818
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', taskXml('D01', 'parallel="true" status="done"', 'src/d01.mjs'));
812
819
  const stDone = baseState('execute');
813
- stDone.newChange = true;
814
820
  stDone.enteredNodes = ['execute'];
815
821
  writeState(dir, stDone);
816
822
  const resDone = runHandoff(['request', 'D01', 'backfill'], dir, env);
@@ -820,7 +826,6 @@ export const ENTRIES = [
820
826
  // ⑧ 显式 --write-files 且 TASK 无匹配任务 → 可见 WARN + 跳过归属门禁(不误伤)
821
827
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', '# TASK\n\n<!-- 无匹配任务块 -->\n');
822
828
  const stExplicit = baseState('execute');
823
- stExplicit.newChange = true;
824
829
  stExplicit.enteredNodes = ['execute'];
825
830
  writeState(dir, stExplicit);
826
831
  const resExplicit = runHandoff(['request', 'X01', 'explicit slice', '--write-files', 'src/x01.mjs'], dir, env);
@@ -836,7 +841,6 @@ export const ENTRIES = [
836
841
  writeFile(dir, 'reference/protocol-nosub.json', JSON.stringify(noSubProto, null, 2) + '\n');
837
842
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', taskXml('P02', 'parallel="true" status="pending"', 'src/p02.mjs'));
838
843
  const stNoSub = baseState('execute');
839
- stNoSub.newChange = true;
840
844
  stNoSub.enteredNodes = ['execute'];
841
845
  writeState(dir, stNoSub);
842
846
  const resNoSub = runHandoff(['request', 'P02', 'no-sub protocol'], dir,
@@ -850,7 +854,6 @@ export const ENTRIES = [
850
854
  writeFile(dir, 'reference/protocol-disabled.json', JSON.stringify(disabledProto, null, 2) + '\n');
851
855
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', taskXml('P03', 'parallel="true" status="pending"', 'src/p03.mjs'));
852
856
  const stDisabled = baseState('execute');
853
- stDisabled.newChange = true;
854
857
  stDisabled.enteredNodes = ['execute'];
855
858
  writeState(dir, stDisabled);
856
859
  const resDisabled = runHandoff(['request', 'P03', 'disabled protocol'], dir,
@@ -867,7 +870,6 @@ export const ENTRIES = [
867
870
  '<task id="P04" parallel="true" status="pending"><action>实现 P04</action><write_files>src/p04.mjs</write_files><verify>node --check src/p04.mjs</verify><depends_on>S03</depends_on></task>\n';
868
871
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', '# TASK\n\n' + unmetDepsTask);
869
872
  const stUnmet = baseState('execute');
870
- stUnmet.newChange = true;
871
873
  stUnmet.enteredNodes = ['execute'];
872
874
  stUnmet.completedNodes = ['open', 'design', 'plan'];
873
875
  stUnmet.evidence = { plan: { summary: 'plan done' } };
@@ -918,7 +920,6 @@ export const ENTRIES = [
918
920
  writeMarker('execute');
919
921
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', taskXml('P05', 'parallel="true" status="pending"', 'src/p05.mjs'));
920
922
  const stNoProtocol = baseState('execute');
921
- stNoProtocol.newChange = true;
922
923
  stNoProtocol.enteredNodes = ['execute'];
923
924
  writeState(dir, stNoProtocol);
924
925
  const resNoProtocol = runHandoff(['request', 'P05', 'no protocol'], dir, { FLOW_COMET_PROTOCOL: '' });
@@ -934,7 +935,6 @@ export const ENTRIES = [
934
935
  // ⑬ 协议文件缺失(显式指向 runRoot 内不存在的路径)→ 同类可见 WARN(原因=文件不存在)+ 放行
935
936
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', taskXml('P06', 'parallel="true" status="pending"', 'src/p06.mjs'));
936
937
  const stProtocolMissing = baseState('execute');
937
- stProtocolMissing.newChange = true;
938
938
  stProtocolMissing.enteredNodes = ['execute'];
939
939
  writeState(dir, stProtocolMissing);
940
940
  const resProtocolMissing = runHandoff(['request', 'P06', 'missing protocol'], dir,
@@ -947,7 +947,6 @@ export const ENTRIES = [
947
947
  assertNotOut(resProtocolMissing, 'BLOCKED');
948
948
  // 旧 change 同形态 → 同样仅可见 WARN + 照常落库(协议不可读不区分新旧 change 新增硬 BLOCK)
949
949
  const stProtocolMissingOld = JSON.parse(fs.readFileSync(statePath, 'utf8'));
950
- delete stProtocolMissingOld.newChange;
951
950
  writeState(dir, stProtocolMissingOld);
952
951
  const resProtocolMissingOld = runHandoff(['request', 'P06', 'missing protocol legacy'], dir,
953
952
  { FLOW_COMET_PROTOCOL: path.join(dir, 'reference', 'protocol-missing.json') });
@@ -959,7 +958,6 @@ export const ENTRIES = [
959
958
  writeFile(dir, 'reference/protocol-broken.json', '{ not-json\n');
960
959
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', taskXml('P07', 'parallel="true" status="pending"', 'src/p07.mjs'));
961
960
  const stProtocolBroken = baseState('execute');
962
- stProtocolBroken.newChange = true;
963
961
  stProtocolBroken.enteredNodes = ['execute'];
964
962
  writeState(dir, stProtocolBroken);
965
963
  const resProtocolBroken = runHandoff(['request', 'P07', 'broken protocol'], dir,
@@ -980,7 +978,7 @@ export const ENTRIES = [
980
978
  nodes: proto.nodes.filter((n) => n.id !== 'execute' && n.id !== 'subagent-execute'),
981
979
  };
982
980
  writeFile(dir, 'reference/protocol-bound.json', JSON.stringify(boundProtocol, null, 2) + '\n');
983
- assertExit(runState(['init', boundChange, '--init-skip', '--protocol', 'reference/protocol-bound.json'], dir), 0);
981
+ assertExit(runState(['init', boundChange, '--init-skip', '--replace', CHANGE_ID, '--reason', '验证 state 协议绑定', '--protocol', 'reference/protocol-bound.json'], dir), 0);
984
982
  writeFile(dir, '.specs/' + boundChange + '/TASK.md', taskXml('B01', 'parallel="false" status="pending"', 'src/b01.mjs'));
985
983
  const resBound = runHandoff(['request', 'B01', 'bound protocol serial'], dir,
986
984
  { FLOW_COMET_PROTOCOL: scenarioProtocolPath(dir) });
@@ -1157,12 +1155,17 @@ export const ENTRIES = [
1157
1155
  },
1158
1156
  },
1159
1157
 
1160
- // 167: 两层加载模型措辞——阶段层禁止在节点 SKILL 内指示用 Skill 工具加载任何节点实现技能
1158
+ // 167: 两层加载模型与归档顺序措辞——阶段层禁止在节点 SKILL 内指示用 Skill 工具加载任何节点实现技能
1161
1159
  //(本节点技能已由入口路由经 Skill 工具加载);入口层禁止 Implementation/Required 混淆句式;
1162
- // 全部 10 文件禁止无限定「record 会自动补写缺失的声明标记」表述(与新 change 技能加载前置门矛盾)。
1160
+ // 全部 10 文件禁止任何承诺自动补写的表述(record 自动补写已整体删除,唯一路径是执行者手动
1161
+ // skill-load——判据与入口层共用 autoFillPromiseProblems 单一实现,不做语义判断)。
1163
1162
  // 入口层的第二份随 `GUIDANCE.md` 改名同步为 `reference/entry-detail.md`(判据强度不变)。
1163
+ //
1164
+ // 归档顺序(证据先于不可逆):三册的步骤序是「准备 → 记录 → 搬目录 → 登记 → 通知 → 出口」——
1165
+ // 记录步骤在搬目录之前、搬目录在 exit 之前、技能加载声明先于任何动作(尤其先于搬目录);同一判据
1166
+ // 还清掉新旧分级 / 渐进 WARN / 自动补写的旧口径残留(三册内零残留)。判定与反向构造共用同一函数。
1164
1167
  {
1165
- name: '167 两层加载模型措辞:禁自加载句式/禁混淆句式/自动补分新旧',
1168
+ name: '167 两层加载与归档顺序措辞:禁自加载/禁混淆/禁自动补写承诺 + 记录先于搬目录、声明先于搬移',
1166
1169
  run: () => {
1167
1170
  const nodeDirs = ['flow-comet-open', 'flow-comet-design', 'flow-comet-plan', 'flow-comet-execute',
1168
1171
  'flow-comet-subagent-execute', 'flow-comet-review', 'flow-comet-verify', 'flow-comet-archive'];
@@ -1174,7 +1177,7 @@ export const ENTRIES = [
1174
1177
  for (const id of nodeDirs) {
1175
1178
  const text = fs.readFileSync(path.join(SCRIPTS_DIR, '..', '..', id, 'SKILL.md'), 'utf8');
1176
1179
  if (implPattern.test(text)) problems.push(id + ' 含「用 Skill 工具加载节点实现技能」句式');
1177
- if (text.includes(autoFill)) problems.push(id + ' 含无限定自动补表述');
1180
+ problems.push(...autoFillPromiseProblems(id, text));
1178
1181
  if (!text.includes(stageAnchor)) problems.push(id + ' 缺阶段层锚点句');
1179
1182
  }
1180
1183
  const entryLevelFiles = [
@@ -1196,11 +1199,102 @@ export const ENTRIES = [
1196
1199
  }
1197
1200
  const regressed = text + '\n见上方 Required Calls 表。' + autoFill + '。\n';
1198
1201
  const regressedProblems = twoLayerEntryProblems(rel, regressed);
1199
- for (const label of ['Implementation/Required 混淆句式', '无限定自动补表述']) {
1202
+ for (const label of ['Implementation/Required 混淆句式', '自动补写承诺表述']) {
1200
1203
  if (!regressedProblems.some((p) => p.includes(label))) {
1201
1204
  problems.push(rel + ' 反向构造判别力缺失(还原「' + label + '」未被判违规)');
1202
1205
  }
1203
1206
  }
1207
+ // 混合小句(否定词落在另一个小句里)不得被当成否定:判据只认「自动补」所在小句内的否定。
1208
+ const mixed = text + '\n无需手动声明,record 会自动补写缺失的声明标记。\n';
1209
+ if (!twoLayerEntryProblems(rel, mixed).some((p) => p.includes('自动补写承诺表述'))) {
1210
+ problems.push(rel + ' 反向构造判别力缺失(混合小句的自动补写承诺未被判违规)');
1211
+ }
1212
+ }
1213
+ // —— 归档顺序(证据先于不可逆)与三册口径 ——
1214
+ // 判据两半:① 步骤序——记录步骤在搬目录之前、搬目录在 exit 之前、声明硬规则先于搬目录;
1215
+ // ② 口径——三册内不得残留新旧分级 / 渐进 WARN / 自动补写承诺(后者复用 autoFillPromiseProblems)。
1216
+ // 归档完成后的交接段接在出口之后:出口先于交接段(段序),收尾句与接线句必须在场——交接的
1217
+ // 触发时机与协议页只能从这三处读到;缺任何一处、或把段位挪走,执行者就找不到入口。
1218
+ // 反向构造:把搬目录步骤提到最前(序颠倒)、抽掉声明硬规则句、注入旧分级行、注入自动补写承诺、
1219
+ // 把交接段提到 Exit Check 之前(段序颠倒)、抽掉收尾句 ⇒ 六条各必报,证明判据不是恒真的摆设。
1220
+ const archiveBooks = new Map([
1221
+ ['flow-comet-archive/SKILL.md', path.join(SCRIPTS_DIR, '..', '..', 'flow-comet-archive', 'SKILL.md')],
1222
+ ['flow-comet-integration/SKILL.md', path.join(SCRIPTS_DIR, '..', '..', 'flow-comet-integration', 'SKILL.md')],
1223
+ ['flow-comet/SKILL.md', path.join(SCRIPTS_DIR, '..', 'SKILL.md')],
1224
+ ].map(([rel, file]) => [rel, fs.readFileSync(file, 'utf8')]));
1225
+ const orderRules = [
1226
+ ['flow-comet-archive/SKILL.md', '记录步骤先于搬目录', '**Record evidence**', '**Move change to archive**'],
1227
+ ['flow-comet-archive/SKILL.md', '搬目录先于出口', '**Move change to archive**', '## Exit Check'],
1228
+ ['flow-comet-archive/SKILL.md', '声明硬规则先于搬目录', '技能加载声明必须先于任何动作', '**Move change to archive**'],
1229
+ ['flow-comet-archive/SKILL.md', '出口先于交接段', '## Exit Check', '### 归档完成后的交接'],
1230
+ ['flow-comet-integration/SKILL.md', '记录步骤先于搬目录', '**记录**', '**搬目录**'],
1231
+ ['flow-comet-integration/SKILL.md', '搬目录先于登记与出口', '**搬目录**', '**通知与出口**'],
1232
+ ['flow-comet-integration/SKILL.md', '声明硬规则先于搬目录', '技能加载声明必须先于任何动作', '**搬目录**'],
1233
+ ];
1234
+ const orderProblems = (docs) => {
1235
+ const out = [];
1236
+ for (const [rel, label, first, second] of orderRules) {
1237
+ const text = docs.get(rel);
1238
+ if (typeof text !== 'string') { out.push(rel + ' 不在判据面内(' + label + ')'); continue; }
1239
+ const firstIndex = text.indexOf(first);
1240
+ const secondIndex = text.indexOf(second);
1241
+ if (firstIndex < 0) out.push(rel + ' 缺「' + first + '」(' + label + ')');
1242
+ if (secondIndex < 0) out.push(rel + ' 缺「' + second + '」(' + label + ')');
1243
+ if (firstIndex >= 0 && secondIndex >= 0 && firstIndex > secondIndex) {
1244
+ out.push(rel + ' 步骤序颠倒:' + first + ' 在 ' + second + ' 之后(' + label + ')');
1245
+ }
1246
+ }
1247
+ for (const [rel, needle] of [
1248
+ ['flow-comet-archive/SKILL.md', '尤其先于搬目录'],
1249
+ ['flow-comet-archive/SKILL.md', '先记录、后搬目录'],
1250
+ ['flow-comet-archive/SKILL.md', 'run the 「归档完成后的交接」 section below first'],
1251
+ ['flow-comet-archive/SKILL.md', '../flow-comet/reference/post-archive-handoff.md'],
1252
+ ['flow-comet-integration/SKILL.md', '尤其先于搬目录'],
1253
+ ['flow-comet-integration/SKILL.md', '先记录、后搬目录'],
1254
+ ['flow-comet-integration/SKILL.md', 'post-archive-handoff'],
1255
+ ['flow-comet/SKILL.md', '证据先于不可逆'],
1256
+ ['flow-comet/SKILL.md', '技能加载声明必须先于任何动作'],
1257
+ ['flow-comet/SKILL.md', '记录必须早于搬目录'],
1258
+ ['flow-comet/SKILL.md', '仍是 `exit` 的前置'],
1259
+ ]) {
1260
+ const text = docs.get(rel);
1261
+ if (typeof text === 'string' && !text.includes(needle)) out.push(rel + ' 缺「' + needle + '」');
1262
+ }
1263
+ // 旧分级口径的行级判据:「旧 change」/ 机器字段名 / 「渐进」出现即残留;「新 change」只有落在
1264
+ // 判级语境(WARN / BLOCK / 严格 / 判级)才算残留——「init 一个新 change」是正常表述,不能误红。
1265
+ const legacyLine = /旧\s*change|newChange|渐进|新\s*change[^。\n]{0,24}(WARN|BLOCK|严格|判级)/;
1266
+ for (const [rel, text] of docs) {
1267
+ if (typeof text !== 'string') continue;
1268
+ for (const line of text.split('\n')) {
1269
+ if (legacyLine.test(line)) out.push(rel + ' 残留旧分级口径「' + line.trim().slice(0, 80) + '」');
1270
+ }
1271
+ out.push(...autoFillPromiseProblems(rel, text));
1272
+ }
1273
+ return out;
1274
+ };
1275
+ problems.push(...orderProblems(archiveBooks));
1276
+ for (const [label, rel, mutate, expected] of [
1277
+ ['搬目录步骤提到最前', 'flow-comet-archive/SKILL.md',
1278
+ (text) => '**Move change to archive**\n' + text, '步骤序颠倒'],
1279
+ ['抽掉声明硬规则', 'flow-comet-archive/SKILL.md',
1280
+ (text) => text.split('技能加载声明必须先于任何动作').join('(反向构造:抽掉)'),
1281
+ '缺「技能加载声明必须先于任何动作」'],
1282
+ ['注入旧分级行', 'flow-comet-integration/SKILL.md',
1283
+ (text) => text + '\n旧 change 只 WARN(渐进)\n', '残留旧分级口径'],
1284
+ ['注入自动补写承诺', 'flow-comet/SKILL.md',
1285
+ (text) => text + '\nrecord 会自动补写缺失的声明标记。\n', '含自动补写承诺表述'],
1286
+ ['把交接段提到最前', 'flow-comet-archive/SKILL.md',
1287
+ (text) => '### 归档完成后的交接\n' + text, '步骤序颠倒'],
1288
+ ['抽掉交接收尾句', 'flow-comet-archive/SKILL.md',
1289
+ (text) => text.split('run the 「归档完成后的交接」 section below first').join(''),
1290
+ '缺「run the 「归档完成后的交接」 section below first」'],
1291
+ ]) {
1292
+ const before = archiveBooks.get(rel);
1293
+ const probed = new Map(archiveBooks).set(rel, mutate(before));
1294
+ if (probed.get(rel) === before) { problems.push('反向构造前提失效(' + label + ')'); continue; }
1295
+ if (!orderProblems(probed).some((problem) => problem.includes(expected))) {
1296
+ problems.push('反向构造判别力缺失(' + label + ':未被判「' + expected + '」)');
1297
+ }
1204
1298
  }
1205
1299
  if (problems.length > 0) throw new Error('两层加载模型措辞不符: ' + problems.join('; '));
1206
1300
  },
@@ -1215,11 +1309,13 @@ export const ENTRIES = [
1215
1309
  {
1216
1310
  name: '168 verify 出口 EPERM 降级:VERIFY-DEGRADED 行 + inherit 真实重试 + exit 0',
1217
1311
  run: (dir) => {
1312
+ writeNodeDeclarationMarkers(dir, 'verify');
1218
1313
  const st = baseState('verify');
1219
1314
  st.evidence.verify = { summary: 'verified' };
1220
1315
  writeState(dir, st);
1221
1316
  // 验证命令写副作用标记文件(相对 cwd=runRoot)——文件存在即证明命令被真实执行
1222
- writeFile(dir, '.specs/' + CHANGE_ID + '/TEST.md', '# TEST\n\n## 验证命令\n\n```bash\nnode -e "require(\'fs\').writeFileSync(\'verify-marker.txt\',\'ok\')"\n```\n');
1317
+ writeFile(dir, '.specs/' + CHANGE_ID + '/REQUIREMENT.md', intakeRequirementText());
1318
+ writeFile(dir, '.specs/' + CHANGE_ID + '/TEST.md', '# TEST\n\n## 第 1 轮 · 功能测试\n\n### 1.1 测试矩阵(AC → 用例)\n\n| AC | 类型 | 用例文件 / UAT | 状态 |\n|---|---|---|---|\n| AC-1 | unit | guard-self-test.mjs | ✅ |\n\n## 验证命令\n\n```bash\nnode -e "require(\'fs\').writeFileSync(\'verify-marker.txt\',\'ok\')"\n```\n');
1223
1319
  writeFile(dir, '.specs/' + CHANGE_ID + '/UAT.md', '# UAT\n\n通过\n');
1224
1320
  const marker = path.join(dir, 'verify-marker.txt');
1225
1321
  if (fs.existsSync(marker)) fs.rmSync(marker);
@@ -1242,7 +1338,8 @@ export const ENTRIES = [
1242
1338
  const st = baseState('verify');
1243
1339
  st.evidence.verify = { summary: 'verified' };
1244
1340
  writeState(dir, st);
1245
- writeFile(dir, '.specs/' + CHANGE_ID + '/TEST.md', '# TEST\n\n## 验证命令\n\n```bash\nnode -e "process.exit(3)"\n```\n');
1341
+ writeFile(dir, '.specs/' + CHANGE_ID + '/REQUIREMENT.md', intakeRequirementText());
1342
+ writeFile(dir, '.specs/' + CHANGE_ID + '/TEST.md', '# TEST\n\n## 第 1 轮 · 功能测试\n\n### 1.1 测试矩阵(AC → 用例)\n\n| AC | 类型 | 用例文件 / UAT | 状态 |\n|---|---|---|---|\n| AC-1 | unit | guard-self-test.mjs | ✅ |\n\n## 验证命令\n\n```bash\nnode -e "process.exit(3)"\n```\n');
1246
1343
  writeFile(dir, '.specs/' + CHANGE_ID + '/UAT.md', '# UAT\n\n通过\n');
1247
1344
  const res = runGuard(['exit', 'verify'], dir);
1248
1345
  assertExit(res, 1);
@@ -1251,14 +1348,15 @@ export const ENTRIES = [
1251
1348
  },
1252
1349
  },
1253
1350
 
1254
- // 170: 零提交旁路收紧——noCommit 结果若携带 tracked 提交:新 change BLOCKED / 旧 change
1255
- // HANDOFF WARN;空提交(--allow-empty)正例通过。锚定 AC-1(防「空 write_files 声明」
1256
- // 成为携带任意提交的逃逸口)。
1351
+ // 170: 零提交旁路收紧——noCommit 结果若携带 tracked 提交一律 BLOCKED(旧状态带 newChange
1352
+ // 字段同样同判,字段只被忽略);空提交(--allow-empty)正例通过。锚定 AC-1(防「空
1353
+ // write_files 声明」成为携带任意提交的逃逸口)。
1257
1354
  // ④ F-6 请求侧补 tracked 负例:write_files 路径虽被 .gitignore 命中、但该路径已 tracked
1258
1355
  //(index-aware check-ignore 退出 1)→ 不记 noCommit(tracked 提交仍走完整子集校验)。
1259
1356
  {
1260
- name: '170 零提交旁路:携带 tracked 提交新 BLOCK / 旧 WARN / 空提交通过',
1357
+ name: '170 零提交旁路:携带 tracked 提交一律 BLOCK / 空提交通过 / 旧状态字段只被忽略',
1261
1358
  run: (dir) => {
1359
+ writeNodeDeclarationMarkers(dir, 'subagent-execute');
1262
1360
  execFileSync('git', ['init'], { cwd: dir, stdio: 'ignore' });
1263
1361
  const git = (...args) => execFileSync('git', args, { cwd: dir, stdio: 'ignore' });
1264
1362
  git('-c', 'user.name=t', '-c', 'user.email=t@t', 'add', '-A');
@@ -1266,9 +1364,8 @@ export const ENTRIES = [
1266
1364
  git('-c', 'user.name=t', '-c', 'user.email=t@t', 'add', 'src/x.js');
1267
1365
  git('-c', 'user.name=t', '-c', 'user.email=t@t', 'commit', '-q', '-m', 'tracked');
1268
1366
  const hashTracked = execFileSync('git', ['rev-parse', '--short', 'HEAD'], { cwd: dir, encoding: 'utf8' }).trim();
1269
- const mkState = (isNew) => {
1367
+ const mkState = () => {
1270
1368
  const st = baseState('subagent-execute');
1271
- if (isNew) st.newChange = true;
1272
1369
  st.evidence['subagent-execute'] = st.evidence['subagent-execute'] || {};
1273
1370
  st.evidence['subagent-execute'].handoffRequests = {
1274
1371
  T9: { description: 'zero-commit', noCommit: true },
@@ -1280,18 +1377,21 @@ export const ENTRIES = [
1280
1377
  const payload = (id, hash) => JSON.stringify({ status: 'DONE', taskId: id, commitHash: hash,
1281
1378
  completedChecks: ['required-skill:subagent-execute.flow-comet-dev'],
1282
1379
  greenEvidence: { command: 'n', output: 'n' }, redEvidence: { command: 'r', output: 'r' } });
1283
- // ① 新 change + 含 tracked 文件的提交 → BLOCKED
1284
- mkState(true);
1380
+ // ① 含 tracked 文件的提交 → BLOCKED
1381
+ mkState();
1285
1382
  const res1 = runHandoff(['result', 'T9', payload('T9', hashTracked)], dir);
1286
1383
  assertExit(res1, 1);
1287
1384
  assertOut(res1, '声明零提交但提交携带');
1288
- // ② 旧 change 同构造 → WARN 不阻断
1289
- mkState(false);
1385
+ // ② 旧状态带 newChange 字段(升级前的 init 产物)+ 同构造 → 同判 BLOCKED(无渐进放行)
1386
+ mkState();
1387
+ const legacyZeroState = JSON.parse(fs.readFileSync(path.join(dir, '.flow-comet', 'flow-comet-state.json'), 'utf8'));
1388
+ legacyZeroState.newChange = true;
1389
+ writeState(dir, legacyZeroState);
1290
1390
  const res2 = runHandoff(['result', 'T10', payload('T10', hashTracked)], dir);
1291
- assertExit(res2, 0);
1292
- assertOut(res2, 'HANDOFF WARN');
1293
- // ③ 新 change + 空提交 → 通过
1294
- mkState(true);
1391
+ assertExit(res2, 1);
1392
+ assertOut(res2, '声明零提交但提交携带');
1393
+ // ③ 空提交 → 通过
1394
+ mkState();
1295
1395
  git('-c', 'user.name=t', '-c', 'user.email=t@t', 'commit', '-q', '--allow-empty', '-m', 'empty');
1296
1396
  const hashEmpty = execFileSync('git', ['rev-parse', '--short', 'HEAD'], { cwd: dir, encoding: 'utf8' }).trim();
1297
1397
  const res3 = runHandoff(['result', 'T11', payload('T11', hashEmpty)], dir);
@@ -1331,7 +1431,6 @@ export const ENTRIES = [
1331
1431
  writeFile(dir, '.specs/' + CHANGE_ID + '/T15.md', 'tracked after request\n');
1332
1432
  git('-c', 'user.name=t', '-c', 'user.email=t@t', 'add', '-f', '.specs/' + CHANGE_ID + '/T15.md');
1333
1433
  git('-c', 'user.name=t', '-c', 'user.email=t@t', 'commit', '-q', '-m', 'track after request');
1334
- stReqT15.newChange = true;
1335
1434
  writeState(dir, stReqT15);
1336
1435
  const resRevokeTracked = runHandoff(['result', 'T15', payload('T15', '')], dir);
1337
1436
  assertExit(resRevokeTracked, 1);
@@ -1357,7 +1456,6 @@ export const ENTRIES = [
1357
1456
  git('-c', 'user.name=t', '-c', 'user.email=t@t', 'commit', '-q', '-m', 'evil merge');
1358
1457
  const mergeHash = execFileSync('git', ['rev-parse', 'HEAD'], { cwd: dir, encoding: 'utf8' }).trim();
1359
1458
  const stMerge = baseState('subagent-execute');
1360
- stMerge.newChange = true;
1361
1459
  stMerge.evidence['subagent-execute'] = { handoffRequests: { T13: { description: 'merge boundary', writeFiles: ['src/x.js'] } } };
1362
1460
  writeState(dir, stMerge);
1363
1461
  const resMerge = runHandoff(['result', 'T13', payload('T13', mergeHash)], dir);
@@ -1367,7 +1465,6 @@ export const ENTRIES = [
1367
1465
  // ⑥ invalid hash 负例:非法 commitHash 不得被静默当作合法提交——必须输出可见 HANDOFF ERROR
1368
1466
  //(记录不被拒绝是既有渐进语义;此处锚定「可见报错 + 不作为合法提交校验」的契约边界)
1369
1467
  const stInvalidHash = baseState('subagent-execute');
1370
- stInvalidHash.newChange = true;
1371
1468
  stInvalidHash.evidence['subagent-execute'] = { handoffRequests: { T14: { description: 'invalid hash', writeFiles: ['src/x.js'] } } };
1372
1469
  writeState(dir, stInvalidHash);
1373
1470
  const resInvalidHash = runHandoff(['result', 'T14', payload('T14', 'not-a-commit-hash')], dir);
@@ -1401,7 +1498,6 @@ export const ENTRIES = [
1401
1498
  // ① 新 change 缺首部字段 → BLOCK
1402
1499
  const stNew = baseState('open');
1403
1500
  stNew.evidence.open = { summary: 'intake complete' };
1404
- stNew.newChange = true;
1405
1501
  stNew.enteredNodes = ['open'];
1406
1502
  writeState(dir, stNew);
1407
1503
  addOpenMarker();
@@ -1415,15 +1511,16 @@ export const ENTRIES = [
1415
1511
  const resGood = runGuard(['exit', 'open'], dir);
1416
1512
  assertExit(resGood, 0);
1417
1513
  assertOut(resGood, 'ALL CHECKS PASSED');
1418
- // ③ 旧 change 缺首部字段 → WARN 渐进不阻断
1514
+ // ③ 同构造(无任何新旧标记字段)缺首部字段 → 同判 BLOCKED(单轨,无渐进侧)
1419
1515
  const stOld = baseState('open');
1420
1516
  stOld.evidence.open = { summary: 'intake complete' };
1421
1517
  writeState(dir, stOld);
1422
1518
  addOpenMarker();
1423
1519
  writeChange(false);
1424
1520
  const resOld = runGuard(['exit', 'open'], dir);
1425
- assertExit(resOld, 0);
1426
- assertOut(resOld, 'WARN');
1521
+ assertExit(resOld, 1);
1522
+ assertOut(resOld, 'BLOCKED');
1523
+ assertOut(resOld, '首部缺字段: Change ID');
1427
1524
  },
1428
1525
  },
1429
1526
  ];