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.
- package/.flow-comet/skills/flow-comet/INSTALLED_VERSION +1 -1
- package/.flow-comet/skills/flow-comet/SKILL.md +16 -14
- package/.flow-comet/skills/flow-comet/reference/commit-discipline.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/decision-points.md +5 -5
- package/.flow-comet/skills/flow-comet/reference/dirty-worktree.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/entry-detail.md +9 -9
- package/.flow-comet/skills/flow-comet/reference/fix-loop.md +4 -4
- package/.flow-comet/skills/flow-comet/reference/init-detection.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/platform-facts.md +2 -2
- package/.flow-comet/skills/flow-comet/reference/post-archive-handoff.md +264 -0
- package/.flow-comet/skills/flow-comet/reference/recovery.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/replan.md +1 -1
- package/.flow-comet/skills/flow-comet/scripts/comet-check.mjs +1 -0
- package/.flow-comet/skills/flow-comet/scripts/comet-hook-guard.mjs +270 -30
- package/.flow-comet/skills/flow-comet/scripts/items/a.mjs +25 -8
- package/.flow-comet/skills/flow-comet/scripts/items/b.mjs +41 -38
- package/.flow-comet/skills/flow-comet/scripts/items/c.mjs +11 -9
- package/.flow-comet/skills/flow-comet/scripts/items/e.mjs +2 -2
- package/.flow-comet/skills/flow-comet/scripts/items/f.mjs +1 -1
- package/.flow-comet/skills/flow-comet/scripts/items/h.mjs +112 -53
- package/.flow-comet/skills/flow-comet/scripts/items/k.mjs +357 -3
- package/.flow-comet/skills/flow-comet/scripts/items/l.mjs +24 -1
- package/.flow-comet/skills/flow-comet/scripts/items/m.mjs +2 -2
- package/.flow-comet/skills/flow-comet/scripts/items/n.mjs +9 -10
- package/.flow-comet/skills/flow-comet/scripts/lib/ac-coverage.mjs +8 -8
- package/.flow-comet/skills/flow-comet/scripts/lib/fix-loop-node.mjs +4 -15
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-evidence-gates.mjs +79 -107
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-gates.mjs +183 -232
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-routing.mjs +91 -14
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-template-fidelity.mjs +20 -32
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-uidesign.mjs +10 -19
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-admin.mjs +27 -17
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-flow.mjs +240 -87
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-recovery.mjs +15 -22
- package/.flow-comet/skills/flow-comet/scripts/lib/state-determine.mjs +11 -4
- package/.flow-comet/skills/flow-comet/scripts/lib/state-io.mjs +192 -24
- package/.flow-comet/skills/flow-comet/scripts/lib/state-skillmarkers.mjs +55 -44
- package/.flow-comet/skills/flow-comet/scripts/lib/system-fixtures.mjs +2 -4
- package/.flow-comet/skills/flow-comet/scripts/lib/test-assertions.mjs +0 -3
- package/.flow-comet/skills/flow-comet/scripts/lib/test-fixtures.mjs +191 -17
- package/.flow-comet/skills/flow-comet/scripts/lib/test-helpers.mjs +3 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/text-anchor-checks.mjs +23 -5
- package/.flow-comet/skills/flow-comet/scripts/lib/wave-projection.mjs +10 -11
- package/.flow-comet/skills/flow-comet/scripts/protocol-utils.mjs +40 -3
- package/.flow-comet/skills/flow-comet/scripts/route-node.mjs +12 -5
- package/.flow-comet/skills/flow-comet/scripts/scenarios/a.mjs +193 -111
- package/.flow-comet/skills/flow-comet/scripts/scenarios/b.mjs +314 -57
- package/.flow-comet/skills/flow-comet/scripts/scenarios/c.mjs +311 -216
- package/.flow-comet/skills/flow-comet/scripts/scenarios/d.mjs +33 -62
- package/.flow-comet/skills/flow-comet/scripts/scenarios/e.mjs +188 -91
- package/.flow-comet/skills/flow-comet/scripts/scenarios/f.mjs +94 -37
- package/.flow-comet/skills/flow-comet/scripts/scenarios/g.mjs +36 -27
- package/.flow-comet/skills/flow-comet/scripts/scenarios/h.mjs +285 -9
- package/.flow-comet/skills/flow-comet/scripts/scenarios/i.mjs +2 -6
- package/.flow-comet/skills/flow-comet/scripts/scenarios/j.mjs +5 -15
- package/.flow-comet/skills/flow-comet/scripts/scenarios/k.mjs +6 -5
- package/.flow-comet/skills/flow-comet/scripts/scenarios/l.mjs +40 -36
- package/.flow-comet/skills/flow-comet/scripts/scenarios/m.mjs +2 -2
- package/.flow-comet/skills/flow-comet/scripts/scenarios/n.mjs +346 -25
- package/.flow-comet/skills/flow-comet/scripts/state-schema.mjs +0 -2
- package/.flow-comet/skills/flow-comet/scripts/workflow-handoff.mjs +41 -54
- package/.flow-comet/skills/flow-comet-archive/SKILL.md +33 -11
- package/.flow-comet/skills/flow-comet-change/SKILL.md +1 -1
- package/.flow-comet/skills/flow-comet-design/SKILL.md +5 -3
- package/.flow-comet/skills/flow-comet-dev/SKILL.md +2 -2
- package/.flow-comet/skills/flow-comet-execute/SKILL.md +11 -11
- package/.flow-comet/skills/flow-comet-integration/SKILL.md +10 -4
- package/.flow-comet/skills/flow-comet-plan/GUIDANCE.md +1 -1
- package/.flow-comet/skills/flow-comet-plan/SKILL.md +8 -8
- package/.flow-comet/skills/flow-comet-review/SKILL.md +8 -8
- package/.flow-comet/skills/flow-comet-subagent-execute/GUIDANCE.md +1 -1
- package/.flow-comet/skills/flow-comet-subagent-execute/SKILL.md +14 -14
- package/.flow-comet/skills/flow-comet-task/SKILL.md +3 -2
- package/.flow-comet/skills/flow-comet-ui-design/SKILL.md +2 -2
- package/.flow-comet/skills/flow-comet-verify/SKILL.md +1 -1
- package/README.md +2 -2
- package/package.json +1 -1
- package/scripts/dsh-bridge.mjs +238 -21
|
@@ -12,22 +12,23 @@
|
|
|
12
12
|
|
|
13
13
|
import fs from 'fs';
|
|
14
14
|
import path from 'path';
|
|
15
|
-
import { spawnSync } from 'child_process';
|
|
16
15
|
import { createHash } from 'crypto';
|
|
16
|
+
import { spawnSync } from 'child_process';
|
|
17
17
|
import { fileURLToPath, pathToFileURL } from 'url';
|
|
18
18
|
import {
|
|
19
19
|
assertExit,
|
|
20
20
|
assertOut,
|
|
21
21
|
copyTreePortable,
|
|
22
|
+
makeTmp as sharedMakeTmp,
|
|
22
23
|
runGuard,
|
|
23
24
|
runState,
|
|
24
25
|
writeFile,
|
|
25
|
-
makeTmp as sharedMakeTmp,
|
|
26
26
|
} from './test-helpers.mjs';
|
|
27
27
|
import {
|
|
28
28
|
declarationSkillTargets,
|
|
29
29
|
guardedDeclarationSkills,
|
|
30
30
|
nodePromptFiles,
|
|
31
|
+
nodeTemplateDeclaration,
|
|
31
32
|
} from '../protocol-utils.mjs';
|
|
32
33
|
|
|
33
34
|
// 本模块位于 `<技能包>/scripts/lib/` ⇒ 脚本目录是它的上一级;技能树内所有兄弟脚本路径
|
|
@@ -90,12 +91,25 @@ export function writeNodeDeclarationMarkers(dir, nodeId, { changeId = CHANGE_ID,
|
|
|
90
91
|
skill,
|
|
91
92
|
protocol: files[0] ?? null,
|
|
92
93
|
protocols: files,
|
|
94
|
+
// 模板声明清单(与节点映射一致):单轨下 record/exit 的模板声明门对一切 change 生效,
|
|
95
|
+
// 夹具若只写 node/skill 会被判「模板声明缺失」——标记必须与真实 skill-load 同形。
|
|
96
|
+
templates: nodeTemplateDeclaration(node).required,
|
|
93
97
|
at: '2026-08-01T00:00:00.000Z',
|
|
94
98
|
}, null, 2) + '\n');
|
|
95
99
|
}
|
|
96
100
|
return targets;
|
|
97
101
|
}
|
|
98
102
|
|
|
103
|
+
// 全部节点的声明标记(多节点路由场景的前置):单轨下每个节点的出口都要求本节点声明,
|
|
104
|
+
// 多趟场景会逐节点 exit —— 一次性把协议里每个节点的必需标记写齐,避免夹具逐节点补漏。
|
|
105
|
+
export function writeAllNodeDeclarationMarkers(dir, { changeId = CHANGE_ID } = {}) {
|
|
106
|
+
const protocol = JSON.parse(fs.readFileSync(SKILL_PROTOCOL_FILE, 'utf8'));
|
|
107
|
+
for (const node of protocol.nodes ?? []) {
|
|
108
|
+
if (!node || typeof node.id !== 'string') continue;
|
|
109
|
+
writeNodeDeclarationMarkers(dir, node.id, { changeId });
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
|
|
99
113
|
// 组件技能树布局感知(单一来源):本 suite 恒位于 <skillsRoot>/flow-comet/scripts/,
|
|
100
114
|
// 组件技能(flow-comet-execute / flow-comet-review / flow-comet-verify 等)是 <skillsRoot>
|
|
101
115
|
// 下的同级目录。权威源 checkout → <root>/.flow-comet/skills/;安装副本 → <目标>/.claude|
|
|
@@ -446,19 +460,36 @@ export function composeState(overrides = {}) {
|
|
|
446
460
|
};
|
|
447
461
|
}
|
|
448
462
|
|
|
449
|
-
// 完整 SUMMARY
|
|
450
|
-
//
|
|
451
|
-
//
|
|
452
|
-
//
|
|
463
|
+
// 完整 SUMMARY(**模板合规形态**:标题 + 首部 4 字段 + 模板段序 + 条件段标题在场)。
|
|
464
|
+
// 单轨下模板保真对一切 change 生效,夹具必须是合规形态——否则被测门禁还没轮到,工件先被结构门
|
|
465
|
+
// 拦下(夹具自身缺陷)。options.sixDim / options.method 可替换对应段体;method='' 表示去掉
|
|
466
|
+
// ## 自检方法 段(旧格式场景,用于测「段标题必须在场」这一判据本身)。
|
|
453
467
|
export function summaryContent(options = {}) {
|
|
454
468
|
const sixDim = options.sixDim !== undefined
|
|
455
469
|
? options.sixDim
|
|
456
|
-
: '## 6
|
|
470
|
+
: '## 6 维自查(生产代码改动必填 · 来自 4-dev 步骤 4)\n\n- 功能: 通过(brooks-review 已跑)\n- 性能: 无影响\n- 安全: 无影响\n- 兼容: 通过\n- 可观测: 通过\n- 可维护: 通过\n\n### 已知接受 + 理由(🟡 Major 项不修的)\n\n- 无(夹具)。\n\n### 已知小问题(🟢 Minor 项可省的)\n\n- 无(夹具)。';
|
|
457
471
|
const method = options.method !== undefined ? options.method : '## 自检方法\n\nbrooks-review';
|
|
458
472
|
return [
|
|
459
|
-
'# T01-
|
|
473
|
+
'# SUMMARY: T01 - 实现 T01',
|
|
460
474
|
'',
|
|
461
|
-
'
|
|
475
|
+
'- **Change ID**: ' + CHANGE_ID,
|
|
476
|
+
'- **Task ID**: T01',
|
|
477
|
+
'- **完成时间**: 2026-08-01 10:00',
|
|
478
|
+
'- **AI 角色**: Dev',
|
|
479
|
+
'',
|
|
480
|
+
'---',
|
|
481
|
+
'',
|
|
482
|
+
'## 做了什么(一段话)',
|
|
483
|
+
'',
|
|
484
|
+
'实现 T01。',
|
|
485
|
+
'',
|
|
486
|
+
'## 改动文件',
|
|
487
|
+
'',
|
|
488
|
+
'| 文件 | 性质 | 说明 |',
|
|
489
|
+
'|---|---|---|',
|
|
490
|
+
'| src/t1.mjs | 修改 | 实现 T01 |',
|
|
491
|
+
'',
|
|
492
|
+
'## verify 输出(必填)',
|
|
462
493
|
'',
|
|
463
494
|
'```',
|
|
464
495
|
'node --check src/t1.mjs',
|
|
@@ -466,17 +497,29 @@ export function summaryContent(options = {}) {
|
|
|
466
497
|
'',
|
|
467
498
|
sixDim,
|
|
468
499
|
'',
|
|
469
|
-
'##
|
|
500
|
+
'## 数据库迁移(涉及 schema 变更必填 · 来自 4-dev 步骤 1.7 / R4.5)',
|
|
501
|
+
'',
|
|
502
|
+
'N/A:本任务无 schema 变更。',
|
|
503
|
+
'',
|
|
504
|
+
'## 越界检查(必填 · 来自 4-dev 步骤 5 / R6.5 / B3 老项目护栏)',
|
|
470
505
|
'',
|
|
471
506
|
'仅修改 src/t1.mjs,无越界。',
|
|
472
507
|
'',
|
|
473
|
-
'##
|
|
508
|
+
'## 破坏性变更(涉及破坏性改动必填 · 来自 4-dev 步骤 1.8 / R4.6 / B4 老项目护栏)',
|
|
474
509
|
'',
|
|
475
|
-
'
|
|
510
|
+
'N/A:本任务不涉及破坏性变更。',
|
|
476
511
|
'',
|
|
477
|
-
'##
|
|
512
|
+
'## 决策与偏离(如有)',
|
|
513
|
+
'',
|
|
514
|
+
'无。',
|
|
515
|
+
'',
|
|
516
|
+
'## 是否触发新工作',
|
|
517
|
+
'',
|
|
518
|
+
'无。',
|
|
519
|
+
'',
|
|
520
|
+
'## 完成判定',
|
|
478
521
|
'',
|
|
479
|
-
'-
|
|
522
|
+
'- TASK.md 中对应任务已勾选:是',
|
|
480
523
|
'',
|
|
481
524
|
method,
|
|
482
525
|
'',
|
|
@@ -658,6 +701,7 @@ export const TASK_VALID_ALL_PARALLEL =
|
|
|
658
701
|
// ---------- 多趟路由场景任务集(多趟语义批次:依赖环拦截与缺失依赖拦截场景原位重写 + 尾部新增场景族) ----------
|
|
659
702
|
// 依赖环:P01↔P02 互为 depends_on(依赖图有环 → plan 出口 BLOCKED 含「依赖环」+ depends_on 恢复指引)
|
|
660
703
|
export const TASK_DEP_CYCLE =
|
|
704
|
+
'## 波次划分\n\nWave 1: P01, P02\n\n## 任务清单\n\n' +
|
|
661
705
|
'<task id="P01" parallel="true" status="pending"><action>实现 P01</action><write_files>src/p1.mjs</write_files><verify>node --check src/p1.mjs</verify><depends_on>P02</depends_on></task>\n' +
|
|
662
706
|
'<task id="P02" parallel="true" status="pending"><action>实现 P02</action><write_files>src/p2.mjs</write_files><verify>node --check src/p2.mjs</verify><depends_on>P01</depends_on></task>\n';
|
|
663
707
|
// 依赖缺失:P01 依赖不存在的 T99(依赖链不可满足 → plan 出口 BLOCKED 含恢复指引)
|
|
@@ -744,11 +788,141 @@ export function renderMultiWaveTasks(doneIds = []) {
|
|
|
744
788
|
'</task>\n').join('');
|
|
745
789
|
}
|
|
746
790
|
|
|
791
|
+
// 前序产物的**模板合规**文本(单一构造点):标题形态 + 首部字段 + 各段非空正文。
|
|
792
|
+
// 单轨下模板保真对一切 change 生效(段标题必须在场、正文不得为空),夹具必须给出合规形态——
|
|
793
|
+
// 否则被测门禁还没轮到,工件先被结构门拦下(夹具自身缺陷)。
|
|
794
|
+
export function intakeChangeText() {
|
|
795
|
+
return [
|
|
796
|
+
'# CHANGE: 夹具 change',
|
|
797
|
+
'',
|
|
798
|
+
'- **Change ID**: ' + CHANGE_ID,
|
|
799
|
+
'- **创建日期**: 2026-08-01',
|
|
800
|
+
'- **路径建议**: 中等',
|
|
801
|
+
'- **状态**: active',
|
|
802
|
+
'',
|
|
803
|
+
'---',
|
|
804
|
+
'',
|
|
805
|
+
'## Why(为什么做)',
|
|
806
|
+
'',
|
|
807
|
+
'夹具:说明为什么做。',
|
|
808
|
+
'',
|
|
809
|
+
'## What(做什么)',
|
|
810
|
+
'',
|
|
811
|
+
'夹具:说明做什么。',
|
|
812
|
+
'',
|
|
813
|
+
'## 影响面',
|
|
814
|
+
'',
|
|
815
|
+
'- [x] 仅修复 bug,无范围变化',
|
|
816
|
+
'',
|
|
817
|
+
'## 范围排除(这次不做)',
|
|
818
|
+
'',
|
|
819
|
+
'- 夹具不做的项。',
|
|
820
|
+
'',
|
|
821
|
+
'## 验收线(粗粒度,不是 AC)',
|
|
822
|
+
'',
|
|
823
|
+
'- 夹具验收线。',
|
|
824
|
+
'',
|
|
825
|
+
'## 风险与未知',
|
|
826
|
+
'',
|
|
827
|
+
'- 无',
|
|
828
|
+
'',
|
|
829
|
+
].join('\n');
|
|
830
|
+
}
|
|
831
|
+
|
|
832
|
+
export function intakeRequirementText() {
|
|
833
|
+
return [
|
|
834
|
+
'# REQUIREMENT: 夹具 change',
|
|
835
|
+
'',
|
|
836
|
+
'- **Change ID**: ' + CHANGE_ID,
|
|
837
|
+
'- **关联**: `@.specs/' + CHANGE_ID + '/CHANGE.md`',
|
|
838
|
+
'',
|
|
839
|
+
'---',
|
|
840
|
+
'',
|
|
841
|
+
'## 用户故事',
|
|
842
|
+
'',
|
|
843
|
+
'- **US-1**:作为执行者,我想让夹具成立,以便门禁可判。',
|
|
844
|
+
'',
|
|
845
|
+
'## 验收准则(AC)',
|
|
846
|
+
'',
|
|
847
|
+
'### AC-1 · 夹具准则',
|
|
848
|
+
'',
|
|
849
|
+
'- **Given** 前置',
|
|
850
|
+
'- **When** 动作',
|
|
851
|
+
'- **Then** 结果',
|
|
852
|
+
'- **验证方式**: 夹具',
|
|
853
|
+
'',
|
|
854
|
+
'---',
|
|
855
|
+
'',
|
|
856
|
+
'## 范围切分',
|
|
857
|
+
'',
|
|
858
|
+
'### v1(本次必做)',
|
|
859
|
+
'',
|
|
860
|
+
'- 夹具。',
|
|
861
|
+
'',
|
|
862
|
+
'### v2(下一轮考虑,不本次)',
|
|
863
|
+
'',
|
|
864
|
+
'- 无',
|
|
865
|
+
'',
|
|
866
|
+
'### out(永远不做)',
|
|
867
|
+
'',
|
|
868
|
+
'- 无',
|
|
869
|
+
'',
|
|
870
|
+
'---',
|
|
871
|
+
'',
|
|
872
|
+
'## 非功能性需求',
|
|
873
|
+
'',
|
|
874
|
+
'- **性能**: 无',
|
|
875
|
+
'- **安全**: 无',
|
|
876
|
+
'- **兼容性**: 无',
|
|
877
|
+
'- **可观测性**: 无',
|
|
878
|
+
'',
|
|
879
|
+
'## 依赖与假设',
|
|
880
|
+
'',
|
|
881
|
+
'- 无',
|
|
882
|
+
'',
|
|
883
|
+
].join('\n');
|
|
884
|
+
}
|
|
885
|
+
|
|
886
|
+
export function intakeDesignText() {
|
|
887
|
+
return [
|
|
888
|
+
'# DESIGN: 夹具 change',
|
|
889
|
+
'',
|
|
890
|
+
'- **Change ID**: ' + CHANGE_ID,
|
|
891
|
+
'- **关联**: `@.specs/' + CHANGE_ID + '/REQUIREMENT.md`',
|
|
892
|
+
'- **作者**: 夹具',
|
|
893
|
+
'',
|
|
894
|
+
'---',
|
|
895
|
+
'',
|
|
896
|
+
'## 0. 技术栈选定',
|
|
897
|
+
'',
|
|
898
|
+
'- **选定**:Node.js(ESM)',
|
|
899
|
+
'',
|
|
900
|
+
'## 1. 决策清单',
|
|
901
|
+
'',
|
|
902
|
+
'| # | 决策 | 备选 | 理由 | 代价 |',
|
|
903
|
+
'|---|---|---|---|---|',
|
|
904
|
+
'| D1 | 夹具决策 | 无 | 夹具 | 无 |',
|
|
905
|
+
'',
|
|
906
|
+
'## 2. 数据流 / 架构图',
|
|
907
|
+
'',
|
|
908
|
+
'夹具:无数据流。',
|
|
909
|
+
'',
|
|
910
|
+
'## 5. 风险',
|
|
911
|
+
'',
|
|
912
|
+
'- 无',
|
|
913
|
+
'',
|
|
914
|
+
'## 6. 不在范围',
|
|
915
|
+
'',
|
|
916
|
+
'- 无',
|
|
917
|
+
'',
|
|
918
|
+
].join('\n');
|
|
919
|
+
}
|
|
920
|
+
|
|
747
921
|
// 多波 next 断言公共材料:前序产物文件(open/design/plan 的产物门控按文件推导)
|
|
748
922
|
export function writeIntakeArtifacts(dir) {
|
|
749
|
-
writeFile(dir, '.specs/' + CHANGE_ID + '/CHANGE.md',
|
|
750
|
-
writeFile(dir, '.specs/' + CHANGE_ID + '/REQUIREMENT.md',
|
|
751
|
-
writeFile(dir, '.specs/' + CHANGE_ID + '/DESIGN.md',
|
|
923
|
+
writeFile(dir, '.specs/' + CHANGE_ID + '/CHANGE.md', intakeChangeText());
|
|
924
|
+
writeFile(dir, '.specs/' + CHANGE_ID + '/REQUIREMENT.md', intakeRequirementText());
|
|
925
|
+
writeFile(dir, '.specs/' + CHANGE_ID + '/DESIGN.md', intakeDesignText());
|
|
752
926
|
}
|
|
753
927
|
|
|
754
928
|
// ---------- 位置迁移 / 备份 / 感知层剥离场景材料 ----------
|
|
@@ -281,6 +281,8 @@ export function runPrintedCommand(command, root, envOverrides = {}) {
|
|
|
281
281
|
}
|
|
282
282
|
|
|
283
283
|
// 最小合法 state(夹具起点):字段与状态校验器的类型要求同形;node 为当前节点。
|
|
284
|
+
// enteredNodes 默认含当前节点:这是「已 entry」的正常在途形态(未 entry 即 exit 一律 BLOCKED)。
|
|
285
|
+
// 专门测 entry 门的场景自行构造不含该节点的 state(显式覆盖或 delete)。
|
|
284
286
|
export function baseState(node) {
|
|
285
287
|
return {
|
|
286
288
|
activeChange: CHANGE_ID,
|
|
@@ -290,5 +292,6 @@ export function baseState(node) {
|
|
|
290
292
|
verifyFailures: 0,
|
|
291
293
|
executionMode: 'subagent',
|
|
292
294
|
directOverride: false,
|
|
295
|
+
enteredNodes: [node],
|
|
293
296
|
};
|
|
294
297
|
}
|
|
@@ -966,10 +966,29 @@ export function vocabularyMirrorProblems(root = REPO_ROOT) {
|
|
|
966
966
|
return problems;
|
|
967
967
|
}
|
|
968
968
|
|
|
969
|
+
// 「自动补写」表述判据(新口径):技能文本不得承诺自动补写(record 自动补写已整体删除,
|
|
970
|
+
// 唯一路径是执行者手动 skill-load)。判据是声明级、不做语义判断:任何一行出现「自动补」
|
|
971
|
+
// 却没有任何否定词(不 / 未 / 禁 / 无)→ 视为承诺自动补写;明确否定(「不再自动补写」
|
|
972
|
+
// 「不覆盖 handoff scope」)与说明其不存在的写法放行。判别力由场景 167 的反向构造常驻证明
|
|
973
|
+
// (追加一行无条件承诺必被判违规)。
|
|
974
|
+
// 否定判定**限定在「自动补」所在的小句内**:整行任意位置出现「无 / 不」就放行,会被
|
|
975
|
+
// 「无需手动声明,record 会自动补写…」这类混合句绕过(否定词落在另一个小句)。句读(。;,)
|
|
976
|
+
// 是边界,跨过边界的否定不算否定这条承诺。
|
|
977
|
+
const AUTO_FILL_NEGATED = /(?:不|未|禁|无|别)[^。;;,,\n]{0,12}自动补|自动补[^。;;,,\n]{0,12}(?:已删|删除|不再|不写|不存在)/;
|
|
978
|
+
export function autoFillPromiseProblems(rel, text) {
|
|
979
|
+
const out = [];
|
|
980
|
+
for (const line of text.split('\n')) {
|
|
981
|
+
if (!line.includes('自动补')) continue;
|
|
982
|
+
if (AUTO_FILL_NEGATED.test(line)) continue;
|
|
983
|
+
out.push(rel + ' 含自动补写承诺表述: ' + line.trim().slice(0, 80));
|
|
984
|
+
}
|
|
985
|
+
return out;
|
|
986
|
+
}
|
|
987
|
+
|
|
969
988
|
export function twoLayerEntryProblems(rel, text) {
|
|
970
989
|
const out = [];
|
|
971
990
|
if (text.includes('见上方 Required Calls 表')) out.push(rel + ' 含 Implementation/Required 混淆句式');
|
|
972
|
-
|
|
991
|
+
out.push(...autoFillPromiseProblems(rel, text));
|
|
973
992
|
if (!text.includes('Skill 工具加载该节点的 Implementation 技能')) out.push(rel + ' 缺入口层锚点句');
|
|
974
993
|
if (!text.includes('前置门')) out.push(rel + ' 缺前置门表述');
|
|
975
994
|
return out;
|
|
@@ -1024,14 +1043,14 @@ export const COMMIT_DISCIPLINE_AUTHORITY_PHRASES = [
|
|
|
1024
1043
|
'2. **顺序(确定性规则)**:先按 `depends_on` 的**拓扑序**集成(被依赖者先入);同一拓扑层内按 **task id 升序**(计划期固定的稳定键,与完成先后无关)。**不得依赖书写顺序** / 提交到达顺序 / 完成先后等运行期不确定量。',
|
|
1025
1044
|
'3. **审计留痕**:每次集成输出一行审计行 `INTEGRATE: <task-id> <commitHash> → <集成提交>`;降级路径为 `INTEGRATE: <task-id> <commitHash> via cherry-pick -- 降级原因:<原因>`。映射(task-id → commitHash → 集成提交)记入该趟流程记录(`<task-id>-SUMMARY.md` / handoff evidence 文本字段)。**判级**:审计行是**执行纪律**(review 把关),本节点不声称存在机械门禁校验它。',
|
|
1026
1045
|
' - **机械冲突**(不改用户可见行为:同一文件不同区域 / 相邻行 / 纯格式):执行者**可自行解决**——解决后必须跑**合并后验证**(该任务 `verify` + 受影响任务的判据),并在审计行记录冲突与解决方式。',
|
|
1027
|
-
' - **语义冲突**(两侧对同一行为 / 契约 / 接口给出不同语义:同一函数语义分叉、同一 AC 的两种实现、公共 API 形状不一致):**必须中止集成并上抛**(记 BLOCKED + 恢复指引),**不得**由执行者自行拍板;由协调者 / 用户裁决(补 `depends_on
|
|
1046
|
+
' - **语义冲突**(两侧对同一行为 / 契约 / 接口给出不同语义:同一函数语义分叉、同一 AC 的两种实现、公共 API 形状不一致):**必须中止集成并上抛**(记 BLOCKED + 恢复指引),**不得**由执行者自行拍板;由协调者 / 用户裁决(补 `depends_on`、拆任务或另开 change)。',
|
|
1028
1047
|
];
|
|
1029
1048
|
// 四属性契约(能力契约锚 · ADR-016 明示「该怎么干」类 ⇒ 留两册正文;两册不再要求逐字相同)。
|
|
1030
1049
|
export const PARALLEL_CONTRACT_BOOK_PHRASES = [
|
|
1031
1050
|
'> **并行安全四属性契约**:契约对象是**四属性**,不是 worktree',
|
|
1032
1051
|
'| ① | **写权限** | 每个写者必须有一条被守卫认可的写入通道 |',
|
|
1033
1052
|
'| ③ | **验证隔离** | 同一时刻只有一个写者:全量判据不得与在飞写者并行 |',
|
|
1034
|
-
'出口校验锚 = `handoffRequests` 有 request 无对应 `handoffResult` ⇒
|
|
1053
|
+
'出口校验锚 = `handoffRequests` 有 request 无对应 `handoffResult` ⇒ 一律 BLOCKED(同一形态一个判级);全部有 result ⇒ 放行;无证据 ⇒ 零输出',
|
|
1035
1054
|
'**已撤回的 request 不构成在飞委托**',
|
|
1036
1055
|
'`workflow-handoff.mjs withdraw <task-id> --by <来源>` 在原记录上留痕 `withdrawnAt` + `withdrawnBy`,已撤回 = 终态、历史不删',
|
|
1037
1056
|
'**并同时注入桥接通道标记 `FLOW_COMET_AGENT_DEPTH_SOURCE`——守卫要求标记与深度同时在场才接受该通道**',
|
|
@@ -2427,7 +2446,7 @@ export function writeUiDesignBindingVariant(dir, variant) {
|
|
|
2427
2446
|
}
|
|
2428
2447
|
|
|
2429
2448
|
export function writeDesignExitFixture(dir, {
|
|
2430
|
-
|
|
2449
|
+
visualTone, uiDesign, declareUiDesign, changeName = CHANGE_ID, changeTail = '', declareDesign = true,
|
|
2431
2450
|
}) {
|
|
2432
2451
|
writeFile(dir, 'flow-kit/templates/DESIGN.md', '# DESIGN 模板\n\n## 0. 技术栈选型\n## 1. 技术决策清单\n');
|
|
2433
2452
|
// CHANGE 模板同样在场:design 出口的前端判据用 `pick('change', ['视觉调性'])` 在**模板派生**的段名表里
|
|
@@ -2435,7 +2454,6 @@ export function writeDesignExitFixture(dir, {
|
|
|
2435
2454
|
// (模板缺席下的跳过另由 TA-21 覆盖)。
|
|
2436
2455
|
writeFile(dir, 'flow-kit/templates/CHANGE.md', '# CHANGE 模板\n\n## Why(为什么做)\n\n## 视觉调性(前端项目必填)\n');
|
|
2437
2456
|
const state = baseState('design');
|
|
2438
|
-
state.newChange = newChange === true;
|
|
2439
2457
|
state.enteredNodes = ['design'];
|
|
2440
2458
|
const checks = [];
|
|
2441
2459
|
if (declareDesign) checks.push('required-skill:design.flow-comet-design');
|
|
@@ -5,11 +5,10 @@
|
|
|
5
5
|
// level(task) = 1 + max(level(dep))(无依赖 = 第 1 波,见 task-graph.mjs 的 taskWaveLevels)。
|
|
6
6
|
// 声明波次 ≠ 层级即不一致:同波依赖(依赖方与被依赖方写在同一波)、排在依赖之前、以及明明只需
|
|
7
7
|
// 更早波次却排到更后面的保守排法,都会在明细里被逐条点名为「当前波 → 应到波」。
|
|
8
|
-
// 分级不在这里判:本模块产出「判不了」的分类与载荷、明细与报文行;BLOCK / WARN
|
|
9
|
-
//
|
|
10
|
-
//
|
|
11
|
-
//
|
|
12
|
-
// (ADR-013 的前提正是「两处同判」:replan 不豁免)。
|
|
8
|
+
// 分级不在这里判:本模块产出「判不了」的分类与载荷、明细与报文行;BLOCK / WARN 由调用方给出
|
|
9
|
+
// blocking(单轨下内容不可判一律 blocking)。**分级 → 输出只有一处**(waveReviewOutcome):plan
|
|
10
|
+
// 出口门禁与 replan 重校段共用同一份。调用方不得自写「不可判 → 选级别 → 打印 → exit」的同构分支
|
|
11
|
+
// ——同一分级有两份实现时,改一处只会在另一处静默落后(ADR-013 的前提正是「两处同判」:replan 不豁免)。
|
|
13
12
|
//
|
|
14
13
|
// 判定面覆盖两侧:① 已声明任务的波次必须等于依赖层级;② 任务集里存在、Wave 行一次都没提到的
|
|
15
14
|
// 任务同样不一致(明细取值 = 「未声明」)——只沿「已声明」一侧求差集,未写进 Wave 行的任务会整个
|
|
@@ -27,8 +26,8 @@
|
|
|
27
26
|
// · 载体缺席(无 `## 波次划分` 段 / 段名无从派生)→ unverified 非空:调用方打印 notice
|
|
28
27
|
// (「未校验」)并放行——判据没有可判对象,不改退出码;
|
|
29
28
|
// · 工件内容不可判(段在场,但一行 Wave 行都解析不出可对应任务:正文只写 N/A、点的是不存在的
|
|
30
|
-
// 任务 id、行首强调记号让 Wave 行不成立)→ unjudgeable
|
|
31
|
-
//
|
|
29
|
+
// 任务 id、行首强调记号让 Wave 行不成立)→ unjudgeable 非空:一律 BLOCKED(单轨判级——「该写的
|
|
30
|
+
// 没写」不再静默;恢复出路在载荷里)。
|
|
32
31
|
// 收敛到这一形态(而不是 { judgeable, reason })的理由:① 载荷跟着分类走——notice /
|
|
33
32
|
// explanation + recovery 直接可用于打印,调用方不必再按 reason 反查第二张表(同一组取值只许有一张
|
|
34
33
|
// 表:按 key 反查的第二张表与判定表必然分叉);② 「能否判定」由字段出现与否表达,reason 只留人读
|
|
@@ -185,8 +184,8 @@ export function waveProjectionReview({ taskContent, blocks = [] } = {}) {
|
|
|
185
184
|
|
|
186
185
|
// 「工件内容不可判」的报文构造(plan 出口与 replan 重校共用同一份,只换分级前缀):首行点名哪一环
|
|
187
186
|
// 读不出来并给出分级,第二行给能照做的恢复出路——与 ac-coverage 的 acCoverageUnjudgeableLines 同形
|
|
188
|
-
//
|
|
189
|
-
//
|
|
187
|
+
// (同一件事两处措辞必然先漂移)。判不了即由调用方拒绝通过(不再有渐进档);载荷来自判定结果,
|
|
188
|
+
// 本函数只做渲染。
|
|
190
189
|
function waveContentUnjudgeableLines(unjudgeable, level) {
|
|
191
190
|
const blocking = level === 'BLOCKED';
|
|
192
191
|
return [
|
|
@@ -249,7 +248,7 @@ export function waveReviewOutcome(review, { blocking = false } = {}) {
|
|
|
249
248
|
// · 波次分组 / 层级:分组取 waveProjectionReview 的 waves(同一次解析,见该函数),层级取
|
|
250
249
|
// task-graph 的 taskWaveLevels。**同层 ⇒ 彼此无依赖路径**(依赖边严格抬高层级:
|
|
251
250
|
// level(依赖方) ≥ level(被依赖方) + 1),故「同波 ∧ 同层」即「同一波次内且彼此无依赖路径」——
|
|
252
|
-
//
|
|
251
|
+
// 波次投影一致时两者本就等价,投影不一致时取交集使判据保守。
|
|
253
252
|
// · 写面重叠:**唯一入口是 task-graph 的 collectCrossTaskConflicts**。任务书写的是
|
|
254
253
|
// collectPathOverlaps(重叠判定的底层唯一实现),落地走它的上层入口——后者才带着「已归一路径」
|
|
255
254
|
// 的解析、glob 语义与参与者规则(未完成、非修复族),且这些都收在 task-graph 一处;为直接调底层
|
|
@@ -309,7 +308,7 @@ export function parallelGapReview({ taskContent = '', blocks = [], waves = null
|
|
|
309
308
|
return { gaps };
|
|
310
309
|
}
|
|
311
310
|
|
|
312
|
-
// 报文(plan 出口 BLOCKED
|
|
311
|
+
// 报文(plan 出口 BLOCKED):逐对点名哪两个任务同波、谁没标,
|
|
313
312
|
// 恢复句给两条出路(都标 [P],或补 depends_on 换波次)——只有一条出路时执行者会以为「标 [P] 是唯一
|
|
314
313
|
// 正确答案」,而真实计划里「这两个任务其实有先后」是同样常见的形态。
|
|
315
314
|
function parallelGapLines(gaps, level = 'BLOCKED') {
|
|
@@ -45,7 +45,10 @@ export async function inspectWorkflowPathSegments(
|
|
|
45
45
|
target,
|
|
46
46
|
label,
|
|
47
47
|
expected = 'any',
|
|
48
|
+
options = {},
|
|
48
49
|
) {
|
|
50
|
+
const followLinks = options.followLinks === true;
|
|
51
|
+
const wantPhysical = options.physicalRel === true;
|
|
49
52
|
const lexicalRoot = path.resolve(projectRoot);
|
|
50
53
|
const lexicalTarget = path.resolve(target);
|
|
51
54
|
if (!workflowPathInside(lexicalRoot, lexicalTarget)) {
|
|
@@ -56,9 +59,14 @@ export async function inspectWorkflowPathSegments(
|
|
|
56
59
|
throw new Error(label + ' project root must be a real directory');
|
|
57
60
|
}
|
|
58
61
|
const realRoot = await fs.realpath(lexicalRoot);
|
|
62
|
+
const toRel = (absolute) => {
|
|
63
|
+
const relativeToRoot = path.relative(realRoot, absolute);
|
|
64
|
+
return relativeToRoot === '' ? '.' : relativeToRoot.replaceAll('\\', '/');
|
|
65
|
+
};
|
|
59
66
|
const relative = path.relative(lexicalRoot, lexicalTarget);
|
|
60
67
|
const segments = relative === '' ? [] : relative.split(path.sep);
|
|
61
68
|
let cursor = lexicalRoot;
|
|
69
|
+
let physicalCursor = realRoot;
|
|
62
70
|
for (let index = 0; index < segments.length; index++) {
|
|
63
71
|
cursor = path.join(cursor, segments[index]);
|
|
64
72
|
let stat;
|
|
@@ -70,13 +78,37 @@ export async function inspectWorkflowPathSegments(
|
|
|
70
78
|
typeof error === 'object' &&
|
|
71
79
|
(error.code === 'ENOENT' || error.code === 'ENOTDIR')
|
|
72
80
|
) {
|
|
73
|
-
|
|
81
|
+
const remainder = segments.slice(index).join(path.sep);
|
|
82
|
+
return {
|
|
83
|
+
target: lexicalTarget,
|
|
84
|
+
exists: false,
|
|
85
|
+
physicalRel: wantPhysical
|
|
86
|
+
? toRel(remainder ? path.join(physicalCursor, remainder) : physicalCursor)
|
|
87
|
+
: null,
|
|
88
|
+
};
|
|
74
89
|
}
|
|
75
90
|
throw error;
|
|
76
91
|
}
|
|
77
92
|
const display = path.relative(lexicalRoot, cursor).replaceAll('\\', '/');
|
|
78
93
|
if (stat.isSymbolicLink()) {
|
|
79
|
-
|
|
94
|
+
if (!followLinks) {
|
|
95
|
+
throw new Error(label + ' crosses a symbolic link or junction at ' + display);
|
|
96
|
+
}
|
|
97
|
+
const physical = await fs.realpath(cursor);
|
|
98
|
+
if (!workflowPathInside(realRoot, physical)) {
|
|
99
|
+
throw new Error(label + ' resolves outside the project root at ' + display);
|
|
100
|
+
}
|
|
101
|
+
physicalCursor = physical;
|
|
102
|
+
if (index === segments.length - 1 && expected !== 'any') {
|
|
103
|
+
const resolved = await fs.stat(physical);
|
|
104
|
+
if (
|
|
105
|
+
(expected === 'file' && !resolved.isFile()) ||
|
|
106
|
+
(expected === 'directory' && !resolved.isDirectory())
|
|
107
|
+
) {
|
|
108
|
+
throw new Error(label + ' must be a real ' + expected);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
continue;
|
|
80
112
|
}
|
|
81
113
|
const final = index === segments.length - 1;
|
|
82
114
|
if (!final && !stat.isDirectory()) {
|
|
@@ -94,8 +126,13 @@ export async function inspectWorkflowPathSegments(
|
|
|
94
126
|
if (!workflowPathInside(realRoot, physical)) {
|
|
95
127
|
throw new Error(label + ' resolves outside the project root');
|
|
96
128
|
}
|
|
129
|
+
physicalCursor = physical;
|
|
97
130
|
}
|
|
98
|
-
return {
|
|
131
|
+
return {
|
|
132
|
+
target: lexicalTarget,
|
|
133
|
+
exists: true,
|
|
134
|
+
physicalRel: wantPhysical ? toRel(physicalCursor) : null,
|
|
135
|
+
};
|
|
99
136
|
}
|
|
100
137
|
|
|
101
138
|
// 兼容既有消费方(readWorkflowProtectedFile / comet-hook-guard):受保护读取使用同一段
|
|
@@ -150,11 +150,13 @@ export function resolveDelegationTarget({
|
|
|
150
150
|
}
|
|
151
151
|
|
|
152
152
|
// 判定核心(行为逐字等价——重构保持锚):
|
|
153
|
-
// 输入 { runRoot, changeName, protocol, completedNodes = [] } → 输出节点 id 或
|
|
153
|
+
// 输入 { runRoot, changeName, protocol, completedNodes = [], changeDir = null } → 输出节点 id 或
|
|
154
|
+
// null(完成态)。changeDir 是**可选**的产物根替换值:该 change 目录相对 .specs/ 的 POSIX 路径
|
|
155
|
+
// ('<id>' / 'archive/<日期>-<id>',由 state-io.resolveChangeDir 的 relative 给出)。
|
|
154
156
|
// 判定顺序:① completedNodes 全齐 → null;② execute 家族之前的节点产物门控;③ 无 execute 家族 →
|
|
155
157
|
// 最后节点;④ 任务状态特判(pending 且依赖满足的 parallel → subagent-execute / 串行 pending →
|
|
156
158
|
// execute / 全 done 但缺 SUMMARY → execute / 后置节点产物门控 / 全部通过 → 最后节点);⑤ 解析失败兜底 execute。
|
|
157
|
-
export async function resolveNextNode({ runRoot, changeName, protocol, completedNodes = [] }) {
|
|
159
|
+
export async function resolveNextNode({ runRoot, changeName, protocol, completedNodes = [], changeDir = null }) {
|
|
158
160
|
const specsRoot = path.join(runRoot, '.specs');
|
|
159
161
|
// 全部节点已完成 → 完成态,不产出最后节点。自定义协议无 archive 节点时,completedNodes 全齐后
|
|
160
162
|
// next 仍会输出 NODE: <最后节点>(产物推导只返回最后节点 id)——此处(产物推导之前)判定:
|
|
@@ -166,12 +168,17 @@ export async function resolveNextNode({ runRoot, changeName, protocol, completed
|
|
|
166
168
|
if (protocolNodeIds.length > 0 && protocolNodeIds.every((id) => completedNodes.includes(id))) {
|
|
167
169
|
return null;
|
|
168
170
|
}
|
|
169
|
-
|
|
171
|
+
// 产物根替换值:目录已搬进归档时用归档目录(移动后产物仍在归档目录里,file-as-truth 认产物不认
|
|
172
|
+
// 位置)。只换 `<change-id>` 的替换值——nodeFlagsComplete 的根推导(specs-root / project)不动,
|
|
173
|
+
// 那条判据与守卫侧同源,改根会让两侧对「产物在哪」有两种说法。取值形态由生产侧唯一决定
|
|
174
|
+
// (state-io.resolveChangeDir 的 relative:POSIX,'<id>' / 'archive/<日期>-<id>'),本模块不做
|
|
175
|
+
// 二次归一——多一处形态转换就多一处「与解析结果不一致」的机会。
|
|
176
|
+
const changeRef = typeof changeDir === 'string' && changeDir !== '' ? changeDir : changeName;
|
|
170
177
|
// 节点完成判定: 节点完成标志从协议 outputSchemas 推导(内置协议缺省行为与现硬编码逐字节一致)
|
|
171
|
-
const nodeFlags = buildNodeCompletionFlags(protocol,
|
|
178
|
+
const nodeFlags = buildNodeCompletionFlags(protocol, changeRef);
|
|
172
179
|
// 任务文件路径:协议可选 taskFile 字段(相对 changeDir),无声明时缺省 TASK.md。
|
|
173
180
|
// 自定义协议无 taskFile 时 parallel 检测自然降级为串行(任务文件缺失 → 不路由 subagent-execute)。
|
|
174
|
-
const taskPath = protocolTaskFilePath(protocol,
|
|
181
|
+
const taskPath = protocolTaskFilePath(protocol, changeRef, specsRoot);
|
|
175
182
|
|
|
176
183
|
// 节点顺序 = 协议 nodes 顺序(disabled 过滤,见 task-graph 的 route);execute/subagent-execute 由
|
|
177
184
|
// 任务状态特判。按协议顺序拆分:execute/subagent-execute 之前的节点走产物门控(内置 = open →
|