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
@@ -4,7 +4,7 @@
4
4
  // 依赖方向单向:本模块 → 既有共享模块(state-schema / protocol-utils / task-parsing /
5
5
  // route-node)+ guard-state-io;反向 import 不存在。
6
6
 
7
- import { promises as fs } from 'fs';
7
+ import { existsSync, promises as fs, readdirSync } from 'fs';
8
8
  import path from 'path';
9
9
  import { handoffRequestWithdrawn } from '../state-schema.mjs';
10
10
  import { inspectWorkflowProtectedPath } from '../protocol-utils.mjs';
@@ -13,14 +13,14 @@ import { resolveNextNode, normalizeHeading, FIX_SECTION_TITLE_FALLBACK } from '.
13
13
  import { runRoot, fileExists, workflowRelativeSegments } from './guard-state-io.mjs';
14
14
  import { SUMMARY_REQUIRED_SECTIONS, buildSkeleton } from './guard-artifact-skeleton.mjs';
15
15
  // 归档目录名「是不是本 change 的」判据单源在状态族的路径上下文模块(guard → state-* 是允许的
16
- // 单向边):本模块只消费,不在这里另写一份后缀/日期匹配。
17
- import { isArchivedChangeDirName } from './state-io.mjs';
18
-
19
- // 新旧 change 区分——init 写入的 newChange: true = 新 change(严格,不依赖 entry——防系统性
20
- // 跳 entry 绕过);缺失/非 true(旧 change)= 渐进 WARN 兼容。
21
- export function isNewChange(state) {
22
- return state.newChange === true;
23
- }
16
+ // 单向边):本模块只消费,不在这里另写一份后缀/日期匹配。恢复动作的分叉(archivedChangeLocationAt /
17
+ // recoveryActionTextAt)同样落在那里——四类消费方之一在状态命令族(next 的节点顺序门禁),而状态族
18
+ // 反向 import 门禁族会把整个守卫图拖进 workflow-state.mjs。本模块只做薄包装(注入 runRoot),既有
19
+ // 导出面与调用点因此不变。
20
+ import { isArchivedChangeDirName, archivedChangeLocationAt, recoveryActionTextAt } from './state-io.mjs';
21
+ // 归档日期判据与「今天」的形态同属时间纪律单一来源(time-utils):本模块只取用——不为一条目录名
22
+ // 诊断另写日期正则,也不自行拼当前日期。
23
+ import { archiveDateFromName, formatLocalDate } from '../time-utils.mjs';
24
24
 
25
25
  // flow-kit SUMMARY 模板必填段(正则匹配,大小写不敏感 + 变体兼容)——清单唯一来源是骨架模块,
26
26
  // 此处只取用(本模块不再自持第二份段名清单)。
@@ -196,8 +196,16 @@ export function patternToRegExp(pattern) {
196
196
  return new RegExp('^' + String(pattern).split('*').map(escapeRegExp).join('.*') + '$', 'u');
197
197
  }
198
198
 
199
- export async function pathPatternExists(root, relativePattern) {
199
+ // 在场判定(协议声明的产物路径 → 是否在场)。归档 change 目录段(`archive/<任意>-<change-id>`)的
200
+ // 通配只表达「归档位下本 change 的目录」——目录名本身另有唯一规则(<YYYY-MM-DD>-<change-id>,判据
201
+ // 单源 state-io.isArchivedChangeDirName)。带 change 调用时,名字不合规的目录**不算在场**:它由产物门
202
+ // 当场报出实际名字与改名命令(archiveDirNameNotice),而不是被当成「本 change 的归档产物」放行。
203
+ // 非归档通配段(以及未传 change 的调用)逐字保持既有语义——放宽/收紧只落在这一个位置。
204
+ export async function pathPatternExists(root, relativePattern, { change = null } = {}) {
200
205
  const parts = workflowRelativeSegments(relativePattern, 'artifact path', true);
206
+ const archiveChangeDirSegment = change !== null && parts[0] === 'archive' && (parts[1] ?? '').includes('*')
207
+ ? 1
208
+ : -1;
201
209
  async function walk(current, index) {
202
210
  const inspection = await inspectWorkflowProtectedPath(
203
211
  runRoot,
@@ -227,9 +235,9 @@ export async function pathPatternExists(root, relativePattern) {
227
235
  path.join(current, entry.name),
228
236
  );
229
237
  }
230
- if (matcher.test(entry.name) && (await walk(path.join(current, entry.name), index + 1))) {
231
- return true;
232
- }
238
+ if (!matcher.test(entry.name)) continue;
239
+ if (index === archiveChangeDirSegment && !isArchivedChangeDirName(entry.name, change)) continue;
240
+ if (await walk(path.join(current, entry.name), index + 1)) return true;
233
241
  }
234
242
  return false;
235
243
  }
@@ -299,7 +307,7 @@ export async function declaredRequiredArtifacts(protocol, node, change) {
299
307
  if (!unspecifiedPaths) {
300
308
  const artifactRoot = await workflowArtifactRoot(artifact.pathBase);
301
309
  present = (await Promise.all(
302
- resolvedPaths.map((declaredPath) => pathPatternExists(artifactRoot, declaredPath)),
310
+ resolvedPaths.map((declaredPath) => pathPatternExists(artifactRoot, declaredPath, { change })),
303
311
  )).some(Boolean);
304
312
  }
305
313
  declared.push({ schemaId, artifact, resolvedPaths, present, kind: artifact.kind, unspecifiedPaths });
@@ -332,6 +340,75 @@ export async function isArchivedChange(changeName) {
332
340
  return entries.some((entry) => entry === changeName || isArchivedChangeDirName(entry, changeName));
333
341
  }
334
342
 
343
+ // ---------- 归档目录名诊断 / 目录位置在恢复指引里的说法 ----------
344
+
345
+ // 归档区里「名字像是本 change 的、却没有日期前缀」的目录(如 foo-<id>)——运行路径不再解释它,
346
+ // 所以要当场给出期望格式与改名命令,而不是把它当「不在场」→ 报缺件(那会让人去补一件其实存在的
347
+ // 产物)。判据单源 = state-io.isArchivedChangeDirName,本函数只负责挑出这一类。
348
+ // 两个刻意排除的形态:① 合规名(<YYYY-MM-DD>-<change-id>)是正常态;② 日期前缀在场但不是本 change
349
+ // 的目录(如 2026-10-20-other-<id>)是**别人的归档**——把它当成「本 change 错名了」就是误报。
350
+ function misnamedArchiveChangeDirs(changeName) {
351
+ if (!changeName) return [];
352
+ let entries = [];
353
+ try {
354
+ entries = readdirSync(path.join(runRoot, '.specs', 'archive'));
355
+ } catch {
356
+ return [];
357
+ }
358
+ const suffix = '-' + changeName;
359
+ return entries
360
+ .filter((entry) => entry.endsWith(suffix)
361
+ && !isArchivedChangeDirName(entry, changeName)
362
+ && archiveDateFromName(entry) === null)
363
+ .sort()
364
+ .map((entry) => ({ name: entry, display: '.specs/archive/' + entry }));
365
+ }
366
+
367
+ // 错名归档目录的**同一句**报文(出口产物门与结构化预检都渲染这一句,措辞只此一处):期望格式 +
368
+ // 实际目录名 + 可整行照抄的改名命令。改名命令的路径用与其余报文一致的 .specs/ 相对形态(平台无关、
369
+ // 可直接贴进 shell),日期取本次搬移日(= 今天,与「归档日期由执行者按搬移日填写」同义)。
370
+ export function archiveDirNameNotice(changeName, nodeId) {
371
+ const problems = misnamedArchiveChangeDirs(changeName);
372
+ if (problems.length === 0) return [];
373
+ const expected = '<YYYY-MM-DD>-' + changeName;
374
+ const today = formatLocalDate(new Date());
375
+ const lines = ['BLOCKED: 归档目录名不合规(' + problems.length + ' 处)——本 change 的归档目录名必须是 '
376
+ + expected + '(日期前缀 + change 名,运行路径只认这一种):'];
377
+ const target = '.specs/archive/' + today + '-' + changeName;
378
+ for (const problem of problems) {
379
+ lines.push(' - ' + problem.display + '(实际目录名: ' + problem.name + ')');
380
+ }
381
+ let renameCommandGiven = false;
382
+ if (problems.length > 1) {
383
+ // 多份错名目录会拼出**同一个**目标名:第一条 mv 之后第二条会把源目录搬进那个目录之下,
384
+ // 而不是改名——先让人只留一份,再按命令改名。
385
+ lines.push(' 改名目标相同(' + target + ')——先只保留本 change 的那一份(删除或改名其余),重试后再改名');
386
+ } else if (existsSync(path.join(runRoot, target))) {
387
+ // 目标已在场时 mv 同样会把源目录搬进那个目录之下:先核对,不打印会改变目录结构的命令。
388
+ lines.push(' 目标目录已存在(' + target + ')——先核对哪一份是本 change 的,删除或移走后重试');
389
+ } else {
390
+ lines.push(' 改名: mv "' + problems[0].display + '" "' + target + '"');
391
+ renameCommandGiven = true;
392
+ }
393
+ // 恢复语的动词跟着有没有命令走:多份错名 / 目标已存在两形态不打印命令,说「按上面的命令」会让人找
394
+ // 一条不存在的命令(判据已满足,措辞不能自相矛盾)。
395
+ lines.push('恢复: ' + (renameCommandGiven ? '按上面的命令改名后' : '按上面的指引处理后')
396
+ + '重试 exit ' + nodeId + '——脚本不替你搬目录,也不猜目录名');
397
+ return lines;
398
+ }
399
+
400
+ // 恢复动作与归档位置的唯一实现已迁到状态族(state-io.archivedChangeLocationAt /
401
+ // recoveryActionTextAt):第四类消费方(next 的节点顺序门禁)在状态命令族,分叉必须落在两边都能
402
+ // 取用、又不会让状态族反向依赖门禁族的模块里。本模块保留既有导出面作为薄包装(注入 guard 运行根),
403
+ // guard-gates / guard-evidence-gates 的调用点因此逐字不变。
404
+ export function archivedChangeLocation(changeName) {
405
+ return archivedChangeLocationAt(runRoot, changeName);
406
+ }
407
+
408
+ export function recoveryActionText(changeName, activeText) {
409
+ return recoveryActionTextAt(runRoot, changeName, activeText);
410
+ }
411
+
335
412
  // 段名校验基准从模板自动派生——骨架计算统一委托 lib/guard-artifact-skeleton.mjs(单一实现:读
336
413
  // <runRoot>/flow-kit/templates/<DOC>.md + reference/artifact-templates.json,按 runRoot 缓存;段名
337
414
  // 归一复用 route-node 的 normalizeHeading)。本模块只把骨架投影成既有消费方要的 { name, regex } 形态
@@ -6,7 +6,7 @@
6
6
  //
7
7
  // 模板整份缺失(derived=false,含登记表缺失 registry-missing,C13)→ 模板派生判据全部跳过并输出
8
8
  // 「未校验(模板缺失)」;标题形态与首部字段来自登记表而非模板正文,照常校验(既有语义)。
9
- // 分级沿用 isNewChange:新 change → BLOCKED,旧 change → WARN(C10 无例外)。
9
+ // 段形不符一律 BLOCKED(单轨,无分级旁路)。
10
10
  //
11
11
  // 两阶段报错(AC-15):首次只给「模板路径 + 类别与数量」,不列「缺段」的段名;同一工件再次
12
12
  // 失败时读 .specs/<change>/.template-hints.json 并列段名;该工件通过后清除其键(C5)。其它类别
@@ -24,7 +24,6 @@ import {
24
24
  templateKeyOf,
25
25
  } from '../protocol-utils.mjs';
26
26
  import { runRoot, fileExists, protocolPath } from './guard-state-io.mjs';
27
- import { isNewChange } from './guard-routing.mjs';
28
27
  import { buildSkeleton, LEGACY_SUMMARY_ORDER } from './guard-artifact-skeleton.mjs';
29
28
  import { scanHeadings } from './section-body.mjs';
30
29
  import { TASK7_REQUIRED } from './task-graph.mjs';
@@ -640,17 +639,12 @@ export async function reportArtifactStructure({ changeDir, state, assessments })
640
639
  if (failing.length > 0) {
641
640
  const lines = planFailureLines(hints, failing);
642
641
  await writeHints(hintsFile, hints);
643
- if (isNewChange(state)) {
644
- for (const line of lines) console.error('BLOCKED: ' + line);
645
- const templatePaths = [...new Set(failing.map((item) => item.skeleton.file ?? '(未登记模板路径)'))];
646
- console.error('恢复: 对照 ' + templatePaths.join(' / ') + ' 修正标题 / 首部字段 / 段序,并按模板补齐缺失的 H2 与结构型 H3 标题'
647
- + '(条件段与无内容段正文可写 N/A;可选段按模板自述可整段删除)后重试 exit;同一工件再次失败时会列出具体段名'
648
- + '(已记录在 .specs/' + (state.activeChange ?? '<change>') + '/' + HINT_FILE_NAME + ')');
649
- process.exit(1);
650
- }
651
- for (const line of lines) {
652
- console.error('TEMPLATE-STRUCTURE WARN: ' + line + '(旧 change 渐进,不阻断;新 change 将强制)');
653
- }
642
+ for (const line of lines) console.error('BLOCKED: ' + line);
643
+ const templatePaths = [...new Set(failing.map((item) => item.skeleton.file ?? '(未登记模板路径)'))];
644
+ console.error('恢复: 对照 ' + templatePaths.join(' / ') + ' 修正标题 / 首部字段 / 段序,并按模板补齐缺失的 H2 与结构型 H3 标题'
645
+ + '(条件段与无内容段正文可写 N/A;可选段按模板自述可整段删除)后重试 exit;同一工件再次失败时会列出具体段名'
646
+ + '(已记录在 .specs/' + (state.activeChange ?? '<change>') + '/' + HINT_FILE_NAME + ')');
647
+ process.exit(1);
654
648
  } else if (released) {
655
649
  await writeHints(hintsFile, hints);
656
650
  }
@@ -679,7 +673,7 @@ function addLegacySummaryIssues(text, issues) {
679
673
 
680
674
  // SUMMARY 结构门禁(execute / subagent-execute):标题形态 / 首部四字段 / 全骨架(H2 + 结构型 H3,
681
675
  // 条件段允许正文 N/A)/ 段序 / 空正文 / 逐字占位 / 增量段位置(自检方法 紧随越界检查或文末;
682
- // LESSONS 扫描 紧随自检方法或在自检方法之后),新 change BLOCKED、旧 change WARN;模板缺席时
676
+ // LESSONS 扫描 紧随自检方法或在自检方法之后),违反一律 BLOCKED(单轨判级);模板缺席时
683
677
  // 只保留既有兜底段序判据并显式输出「未校验(模板缺失)」。
684
678
  export async function runSummaryTemplateFidelityGate({ node, state }) {
685
679
  if (!EXECUTE_FAMILY_NODE_IDS.has(node.id)) return;
@@ -820,19 +814,16 @@ async function legacyDesignLiteTitle(changeDir, state) {
820
814
  const firstLine = (text.replace(/^\uFEFF/u, '').split('\n').find((line) => line.trim() !== '') ?? '').trim();
821
815
  if (/^#\s*design\b/iu.test(firstLine)) return;
822
816
  const message = 'DESIGN-lite.md 标题应以 # DESIGN 开头(如 `# DESIGN: <标题>`,大小写不敏感、冒号可省)';
823
- if (isNewChange(state)) {
824
- console.error('BLOCKED: ' + message);
825
- console.error('恢复: 修正 DESIGN-lite.md 首行标题后重试 exit design');
826
- process.exit(1);
827
- }
828
- console.error('INTAKE-DOC WARN: ' + message + '(旧 change 渐进,不阻断;新 change 将强制)');
817
+ console.error('BLOCKED: ' + message);
818
+ console.error('恢复: 修正 DESIGN-lite.md 首行标题后重试 exit design');
819
+ process.exit(1);
829
820
  }
830
821
 
831
822
  // TASK 7 字段完整性门禁(plan 出口):每个 <task> 块须含
832
- // name/read_files/write_files/action/verify/done/depends_on;缺任一 → 新 BLOCK / 旧 WARN。
833
- // 开标签解析/整块提取沿用 task-parsing.mjs(属性序无关)。宽容:任务块采用旧式一字段形态
834
- // (无 <name> 标记)的 TASK 视为旧格式 → 仅渐进 WARN(不误拦既有波次/路由回归载体);采用新
835
- // 模板形态(含 <name>)则按 7 字段强校验。字段集从 `task-graph.mjs` 的单一权威常量取用(执行期
823
+ // name/read_files/write_files/action/verify/done/depends_on;缺任一 → BLOCKED / WARN,分级依据是
824
+ // **模板形态**(不是 change 新旧)。开标签解析/整块提取沿用 task-parsing.mjs(属性序无关)。宽容:
825
+ // 任务块采用旧式一字段形态(无 <name> 标记)的 TASK 视为旧格式 → 仅 WARN(不误拦既有波次/路由回
826
+ // 归载体);采用新模板形态(含 <name>)则按 7 字段强校验。字段集从 `task-graph.mjs` 的单一权威常量取用(执行期
836
827
  // `replan` 判据同源)——本模块不得再写一份字面集合,否则两侧会在规则演进时分叉。
837
828
  export async function runTaskSevenFieldGate({ node, state }) {
838
829
  if (node.id !== 'plan' || !state.activeChange) return;
@@ -850,14 +841,11 @@ export async function runTaskSevenFieldGate({ node, state }) {
850
841
  }
851
842
  if (broken.length > 0) {
852
843
  if (planNewFormat) {
853
- if (isNewChange(state)) {
854
- // 文案的集合字符串**从判据常量派生**(不得在此再写一遍字面集合——第二处同口径表达会在
855
- // 判据演进时静默落后于实现;构造方式不改变渲染结果)。
856
- console.error('BLOCKED: TASK.md 任务缺 7 字段(' + TASK7_REQUIRED.join('/') + '): ' + broken.join('; '));
857
- console.error('恢复: 对照 flow-kit/templates/TASK.md 补齐每个 <task> 的缺字段后重试 exit;新 change 强制任务块结构完整');
858
- process.exit(1);
859
- }
860
- console.error('TASK-7FIELD WARN: TASK.md ' + broken.join('; ') + '(旧 change 渐进,不阻断;新 change 将强制补齐 7 字段)');
844
+ // 文案的集合字符串**从判据常量派生**(不得在此再写一遍字面集合——第二处同口径表达会在
845
+ // 判据演进时静默落后于实现;构造方式不改变渲染结果)。
846
+ console.error('BLOCKED: TASK.md 任务缺 7 字段(' + TASK7_REQUIRED.join('/') + '): ' + broken.join('; '));
847
+ console.error('恢复: 对照 flow-kit/templates/TASK.md 补齐每个 <task> 的缺字段后重试 exit');
848
+ process.exit(1);
861
849
  } else {
862
850
  console.error('TASK-7FIELD WARN: TASK.md 任务为旧式一字段模板形态(' + broken.join('; ') +
863
851
  ')——建议按 flow-kit/templates/TASK.md 补全 7 字段(渐进不阻断)');
@@ -10,8 +10,8 @@
10
10
  // 按 `<nodeId>.<skill>` 键控,工件门与出口自动补写共用 applicabilityGatedBinding 查询。
11
11
  //
12
12
  // 判据必须结构性可判:CHANGE.md 的「视觉调性」段在场且段内不含**结构形态**的「不适用」标记 ⇒
13
- // 前端;段内以结构形态标注 ⇒ 非前端。段**缺席**只在旧 change 上沿用「判非前端」的兼容口径——
14
- // 新 change 由 open 出口按模板条件段拦(标题必须在场),此处缺席即拦,不再默认判非前端
13
+ // 前端;段内以结构形态标注 ⇒ 非前端。段**缺席**一律拦——与 open 出口的模板条件段同判(标题必须
14
+ // 在场),不再默认判非前端
15
15
  // (否则「漏写段」会被静默翻译成一个更弱的门)。
16
16
  //
17
17
  // UI-DESIGN.md 在场时,其模板结构(frontmatter 8 键 / H2 骨架 / 结构型 H3)由产出物模板结构门禁
@@ -20,7 +20,7 @@
20
20
  import { promises as fs } from 'fs';
21
21
  import path from 'path';
22
22
  import { runRoot, fileExists } from './guard-state-io.mjs';
23
- import { isNewChange, templateSectionPatterns, TEMPLATE_FALLBACK_SECTION_PATTERNS } from './guard-routing.mjs';
23
+ import { templateSectionPatterns, TEMPLATE_FALLBACK_SECTION_PATTERNS } from './guard-routing.mjs';
24
24
  import { assessArtifact, evaluateArtifact, reportArtifactStructure } from './guard-template-fidelity.mjs';
25
25
  // 段界(下一个二级标题 / 文末)取 lib/section-body.mjs 的唯一实现:围栏代码块里的 `## ` 是正文示例。
26
26
  import { sectionBody } from './section-body.mjs';
@@ -49,7 +49,7 @@ const TONE_MARKER_FIELD_VALUE = new RegExp(String.raw`(?:^|[\s|])(?:\*\*)?(?:`
49
49
 
50
50
  // 「视觉调性」段读取四态(区分「CHANGE.md 不存在」「模板整份缺失」「段缺席」「段在场」——四者判据
51
51
  // 不同:文件不存在时本门没有输入,交给其余门禁处理;模板整份缺失时段名无从派生(no-basis,按
52
- // 「未校验」显式跳过);段缺席才按 newChange 分级,C10)。
52
+ // 「未校验」显式跳过);段缺席由适用性门控按「未显式标注」拦下)。
53
53
  async function visualToneSectionState(changeName) {
54
54
  if (!changeName) return { state: 'file-missing', body: null };
55
55
  let text;
@@ -135,8 +135,7 @@ export async function frontendCriterion(changeName) {
135
135
  }
136
136
 
137
137
  // design 出口 ui-design 工件门(按协议绑定键控:登记 ∧ 等级 = guarded ∧ 判据成立)——判据成立 ⇒
138
- // 要求 UI-DESIGN.md 在场:新 change 缺件 BLOCKED + 恢复指引,旧 change WARN 渐进不阻断(不静默
139
- // 放行);判据不成立(非前端)⇒ 可见跳过行(含命中片段)后照常放行;协议删掉该绑定或等级非
138
+ // 要求 UI-DESIGN.md 在场:缺件 BLOCKED + 恢复指引(不静默放行);判据不成立(非前端)⇒ 可见跳过行(含命中片段)后照常放行;协议删掉该绑定或等级非
140
139
  // guarded ⇒ 门未启用(同样可见输出),行为回到未登记绑定的原语义——闸门开关由协议表达。
141
140
  export async function checkUiDesignArtifact(node, state) {
142
141
  if (!state.activeChange || !isRegisteredApplicabilityBinding(node, UI_DESIGN_SKILL)) return;
@@ -159,13 +158,9 @@ export async function checkUiDesignArtifact(node, state) {
159
158
  // 要求执行者显式写「不适用」(缺席与声明不适用是两件事,只有后者是决策)。
160
159
  const toneRecovery = '在 .specs/' + state.activeChange + '/CHANGE.md 的「视觉调性」段填写选定调性,'
161
160
  + '或以结构形态标注「不适用」(非前端项目),然后重试 exit design';
162
- if (isNewChange(state)) {
163
- console.error('BLOCKED: CHANGE.md 的「视觉调性」段缺席——新 change 须显式标注「不适用」或填写调性(段缺席不再默认判非前端)');
164
- console.error('恢复: ' + toneRecovery);
165
- process.exit(1);
166
- }
167
- console.error('UI-DESIGN: skipped(旧 change 兼容)——「视觉调性」段缺席,沿用旧口径判非前端');
168
- return;
161
+ console.error('BLOCKED: CHANGE.md 的「视觉调性」段缺席——须显式标注「不适用」或填写调性(段缺席不默认判非前端)');
162
+ console.error('恢复: ' + toneRecovery);
163
+ process.exit(1);
169
164
  }
170
165
  if (!frontend.applicable) {
171
166
  console.error('UI-DESIGN: skipped(非前端)——' + frontend.reason + ',不要求 UI-DESIGN.md');
@@ -192,11 +187,7 @@ export async function checkUiDesignArtifact(node, state) {
192
187
  }
193
188
  const recovery = '补 .specs/' + state.activeChange + '/UI-DESIGN.md(加载 ' + UI_DESIGN_SKILL + ' 并按其协议产出 design token / 反 AI-slop 自检),'
194
189
  + '或在 .specs/' + state.activeChange + '/CHANGE.md 的「视觉调性」段以结构形态标注「不适用」(非前端项目)后重试 exit design';
195
- if (isNewChange(state)) {
196
- console.error('BLOCKED: design 出口缺 UI-DESIGN.md——' + frontend.reason + ',前端项目须产出 UI-DESIGN.md');
197
- console.error('恢复: ' + recovery);
198
- process.exit(1);
199
- }
200
- console.error('UI-DESIGN WARN: 缺 .specs/' + state.activeChange + '/UI-DESIGN.md——' + frontend.reason + '(旧 change 渐进不阻断;新 change 将强制)');
190
+ console.error('BLOCKED: design 出口缺 UI-DESIGN.md——' + frontend.reason + ',前端项目须产出 UI-DESIGN.md');
201
191
  console.error('恢复: ' + recovery);
192
+ process.exit(1);
202
193
  }
@@ -3,7 +3,7 @@
3
3
  import path from 'path';
4
4
  import { isValidTimestamp } from '../time-utils.mjs';
5
5
  import { verifyFailuresFor, setVerifyFailuresFor, writeJsonAtomic } from '../state-schema.mjs';
6
- import { findActiveChange, readState, writeState, specsDir } from './state-io.mjs';
6
+ import { findActiveChange, readState, writeState, runRootDir, resolveChangeLocation } from './state-io.mjs';
7
7
  import {
8
8
  describeTemplateList,
9
9
  findTemplatesArg,
@@ -118,15 +118,13 @@ export async function runSkillLoad(protocol, argv) {
118
118
  }
119
119
  }
120
120
  // 产出物模板声明(C4 / C11):置入既有标记 JSON 的 templates 数组(节点级一份)。
121
- // 内置节点:声明集合必须与 C3 映射一致(required ⊆ declared ⊆ required ∪ optional)——新 change
122
- // 缺失 / 多写 / 漏写 / 错名一律 BLOCK(fail-closed),旧 change 只在「显式传了不一致的清单」时
123
- // WARN(渐进兼容:旧项目不可能一夜补齐声明,缺失由 record 侧统一给提示,不在声明处重复报)。
121
+ // 内置节点:声明集合必须与 C3 映射一致(required ⊆ declared ⊆ required ∪ optional)——
122
+ // 缺失 / 多写 / 漏写 / 错名一律 BLOCK(fail-closed)。
124
123
  // 自定义协议节点:不比对集合(ADR-002 特化层,C12:协议声明什么就记什么)。
125
124
  const templateArg = findTemplatesArg(argv.slice(3));
126
125
  const declarationNode = (protocol.nodes ?? []).find((item) => item.id === nodeId);
127
126
  const templateDeclaration = nodeTemplateDeclaration(declarationNode);
128
127
  if (templateDeclaration.source === 'builtin') {
129
- const isNewChange = (await readState()).newChange === true;
130
128
  const requiredNames = describeTemplateList(templateDeclaration.required);
131
129
  // 重新声明命令由协议派生(state-explain 的唯一装配):脚本路径 + 该节点**全部**协议文件 +
132
130
  // 模板全清单 + 协议上下文。此前的形态只带首份 --prompt,且是裸脚本名(照抄 command not found,
@@ -138,13 +136,12 @@ export async function runSkillLoad(protocol, argv) {
138
136
  });
139
137
  // 命令自成一行(与其他两处声明报文同形):整行可照抄,不会被前后措辞切碎。
140
138
  const reportUnsoundDeclaration = (reason) => {
141
- console.error((isNewChange ? 'BLOCKED: ' : 'WARN: ') + reason
142
- + '——照抄下面的命令重新声明(同一 node-skill 重跑会覆写该标记)'
143
- + (isNewChange ? '后重试' : ';旧 change 渐进不阻断') + ':\n ' + declareCommand);
144
- if (isNewChange) process.exit(1);
139
+ console.error('BLOCKED: ' + reason
140
+ + '——照抄下面的命令重新声明(同一 node-skill 重跑会覆写该标记)后重试:\n ' + declareCommand);
141
+ process.exit(1);
145
142
  };
146
143
  const problems = templateDeclarationProblems(templateDeclaration, templateArg.values);
147
- if (!templateArg.provided && templateDeclaration.required.length > 0 && isNewChange) {
144
+ if (!templateArg.provided && templateDeclaration.required.length > 0) {
148
145
  reportUnsoundDeclaration('节点 ' + nodeId + ' 的模板声明缺失(C3 映射: ' + requiredNames + ')');
149
146
  }
150
147
  if (templateArg.provided && (problems.missing.length > 0 || problems.extra.length > 0)) {
@@ -159,9 +156,20 @@ export async function runSkillLoad(protocol, argv) {
159
156
  // 同 node-skill 重复调用覆盖(记录最新声明)
160
157
  const changeName = await findActiveChange();
161
158
  if (!changeName) {
162
- // 归档后场景:change 目录已移入 .specs/archive/(无活跃 change)——skill-load 不可用,
163
- // 但 record 的声明自动化仍可写归档路径标记——消息如实引导
164
- throw new Error('skill-load requires an active change(先运行 init <change-id>;若该 change 已归档,声明标记由 record 自动补写——M5 会写入归档路径的 .skill-loads/)');
159
+ // 无活跃 change:声明标记的唯一写入通道就是本命令——不得承诺任何自动补写。
160
+ throw new Error('skill-load requires an active change(先运行 init <change-id>;声明标记必须由执行者手动 skill-load 写入,引擎不会代记)');
161
+ }
162
+ // 位置门 = state-io 的唯一解析器(活动目录优先、归档兜底)。标记写进**解析到的目录**:归档搬移之后
163
+ // 声明照常可用(此前身份绑在活动目录存在上,移动后直接抛「无活跃 change」),报告如实说出落点。
164
+ // 解析不到(目录两处都没有 / 归档多候选)→ fail-closed,报文与 status / next / record 同一句。
165
+ const located = await resolveChangeLocation({
166
+ root: runRootDir(),
167
+ changeName,
168
+ createdAt: (await readState()).createdAt,
169
+ });
170
+ if (!located.ok) {
171
+ console.error(located.message);
172
+ process.exit(1);
165
173
  }
166
174
  // 标记的协议声明两形态并存:
167
175
  // · protocols = 全部 --prompt 的 basename(保序)——出口覆盖判据按它判「该读的每份协议是否
@@ -172,10 +180,12 @@ export async function runSkillLoad(protocol, argv) {
172
180
  // 同值(真实链路 skill-load → exit 一致);写完整路径会让比对必然失败(机制实际不可用)。
173
181
  const protocols = promptArgs.map((promptArg) => path.basename(promptArg));
174
182
  const marker = { node: nodeId, skill: skillName, protocol: protocols[0] ?? null, protocols, templates: templateArg.values, at: new Date().toISOString() };
175
- // specsDir 已含 .specs/,相对路径为 <change-id>/.skill-loads/<node>-<skill>.json
176
- const markerRel = path.posix.join(changeName, '.skill-loads', nodeId + '-' + skillName + '.json');
177
- await writeJsonAtomic(path.join(specsDir(), markerRel), marker);
178
- console.log('SKILL-LOAD: ' + nodeId + ' ' + skillName + ' → .skill-loads/' + nodeId + '-' + skillName + '.json');
183
+ // 落点 = 解析到的 change 目录(活动或归档)+ .skill-loads/<node>-<skill>.json;报告与写入同源,
184
+ // 执行者据此能直接核对「标记到底进了哪个目录」。
185
+ const markerName = nodeId + '-' + skillName + '.json';
186
+ await writeJsonAtomic(path.join(located.resolution.dir, '.skill-loads', markerName), marker);
187
+ console.log('SKILL-LOAD: ' + nodeId + ' ' + skillName + ' → ' + located.resolution.display
188
+ + '/.skill-loads/' + markerName);
179
189
  return;
180
190
  }
181
191