flow-comet 1.6.5 → 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 (89) hide show
  1. package/.flow-comet/skills/flow-comet/INSTALLED_VERSION +1 -1
  2. package/.flow-comet/skills/flow-comet/SKILL.md +32 -18
  3. package/.flow-comet/skills/flow-comet/reference/commit-discipline.md +2 -2
  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 +30 -11
  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/context-init.mjs +26 -23
  16. package/.flow-comet/skills/flow-comet/scripts/guard-self-test.mjs +14 -94
  17. package/.flow-comet/skills/flow-comet/scripts/items/a.mjs +122 -11
  18. package/.flow-comet/skills/flow-comet/scripts/items/b.mjs +79 -40
  19. package/.flow-comet/skills/flow-comet/scripts/items/c.mjs +11 -9
  20. package/.flow-comet/skills/flow-comet/scripts/items/e.mjs +52 -10
  21. package/.flow-comet/skills/flow-comet/scripts/items/f.mjs +1 -1
  22. package/.flow-comet/skills/flow-comet/scripts/items/h.mjs +128 -56
  23. package/.flow-comet/skills/flow-comet/scripts/items/k.mjs +357 -3
  24. package/.flow-comet/skills/flow-comet/scripts/items/l.mjs +26 -1
  25. package/.flow-comet/skills/flow-comet/scripts/items/m.mjs +6 -2
  26. package/.flow-comet/skills/flow-comet/scripts/items/n.mjs +29 -21
  27. package/.flow-comet/skills/flow-comet/scripts/lib/ac-coverage.mjs +317 -0
  28. package/.flow-comet/skills/flow-comet/scripts/lib/fix-loop-node.mjs +4 -15
  29. package/.flow-comet/skills/flow-comet/scripts/lib/guard-artifact-skeleton.mjs +47 -5
  30. package/.flow-comet/skills/flow-comet/scripts/lib/guard-evidence-gates.mjs +357 -219
  31. package/.flow-comet/skills/flow-comet/scripts/lib/guard-gates.mjs +725 -309
  32. package/.flow-comet/skills/flow-comet/scripts/lib/guard-routing.mjs +182 -54
  33. package/.flow-comet/skills/flow-comet/scripts/lib/guard-state-io.mjs +8 -6
  34. package/.flow-comet/skills/flow-comet/scripts/lib/guard-template-fidelity.mjs +224 -83
  35. package/.flow-comet/skills/flow-comet/scripts/lib/guard-uidesign.mjs +17 -28
  36. package/.flow-comet/skills/flow-comet/scripts/lib/lessons-hits.mjs +160 -0
  37. package/.flow-comet/skills/flow-comet/scripts/lib/run-root.mjs +21 -0
  38. package/.flow-comet/skills/flow-comet/scripts/lib/section-body.mjs +92 -0
  39. package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-admin.mjs +61 -33
  40. package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-flow.mjs +663 -205
  41. package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-recovery.mjs +68 -9
  42. package/.flow-comet/skills/flow-comet/scripts/lib/state-determine.mjs +11 -4
  43. package/.flow-comet/skills/flow-comet/scripts/lib/state-explain.mjs +92 -13
  44. package/.flow-comet/skills/flow-comet/scripts/lib/state-io.mjs +232 -11
  45. package/.flow-comet/skills/flow-comet/scripts/lib/state-skillmarkers.mjs +140 -74
  46. package/.flow-comet/skills/flow-comet/scripts/lib/system-fixtures.mjs +8 -4
  47. package/.flow-comet/skills/flow-comet/scripts/lib/task-graph.mjs +84 -31
  48. package/.flow-comet/skills/flow-comet/scripts/lib/test-assertions.mjs +0 -3
  49. package/.flow-comet/skills/flow-comet/scripts/lib/test-fixtures.mjs +248 -24
  50. package/.flow-comet/skills/flow-comet/scripts/lib/test-helpers.mjs +63 -3
  51. package/.flow-comet/skills/flow-comet/scripts/lib/text-anchor-checks.mjs +181 -8
  52. package/.flow-comet/skills/flow-comet/scripts/lib/wave-projection.mjs +340 -0
  53. package/.flow-comet/skills/flow-comet/scripts/protocol-utils.mjs +132 -20
  54. package/.flow-comet/skills/flow-comet/scripts/route-node.mjs +12 -5
  55. package/.flow-comet/skills/flow-comet/scripts/scenarios/a.mjs +1564 -54
  56. package/.flow-comet/skills/flow-comet/scripts/scenarios/b.mjs +1489 -38
  57. package/.flow-comet/skills/flow-comet/scripts/scenarios/c.mjs +1466 -243
  58. package/.flow-comet/skills/flow-comet/scripts/scenarios/d.mjs +743 -24
  59. package/.flow-comet/skills/flow-comet/scripts/scenarios/e.mjs +220 -92
  60. package/.flow-comet/skills/flow-comet/scripts/scenarios/f.mjs +657 -21
  61. package/.flow-comet/skills/flow-comet/scripts/scenarios/g.mjs +41 -27
  62. package/.flow-comet/skills/flow-comet/scripts/scenarios/h.mjs +285 -9
  63. package/.flow-comet/skills/flow-comet/scripts/scenarios/i.mjs +7 -6
  64. package/.flow-comet/skills/flow-comet/scripts/scenarios/j.mjs +21 -15
  65. package/.flow-comet/skills/flow-comet/scripts/scenarios/k.mjs +8 -5
  66. package/.flow-comet/skills/flow-comet/scripts/scenarios/l.mjs +45 -36
  67. package/.flow-comet/skills/flow-comet/scripts/scenarios/m.mjs +2 -2
  68. package/.flow-comet/skills/flow-comet/scripts/scenarios/n.mjs +2381 -85
  69. package/.flow-comet/skills/flow-comet/scripts/state-schema.mjs +135 -2
  70. package/.flow-comet/skills/flow-comet/scripts/workflow-guard.mjs +143 -16
  71. package/.flow-comet/skills/flow-comet/scripts/workflow-handoff.mjs +339 -103
  72. package/.flow-comet/skills/flow-comet/scripts/workflow-state.mjs +5 -2
  73. package/.flow-comet/skills/flow-comet-archive/SKILL.md +33 -11
  74. package/.flow-comet/skills/flow-comet-change/SKILL.md +1 -1
  75. package/.flow-comet/skills/flow-comet-design/SKILL.md +5 -3
  76. package/.flow-comet/skills/flow-comet-dev/SKILL.md +2 -2
  77. package/.flow-comet/skills/flow-comet-execute/SKILL.md +37 -13
  78. package/.flow-comet/skills/flow-comet-integration/SKILL.md +10 -4
  79. package/.flow-comet/skills/flow-comet-plan/GUIDANCE.md +1 -1
  80. package/.flow-comet/skills/flow-comet-plan/SKILL.md +13 -6
  81. package/.flow-comet/skills/flow-comet-review/SKILL.md +21 -12
  82. package/.flow-comet/skills/flow-comet-subagent-execute/GUIDANCE.md +1 -1
  83. package/.flow-comet/skills/flow-comet-subagent-execute/SKILL.md +43 -18
  84. package/.flow-comet/skills/flow-comet-task/SKILL.md +4 -2
  85. package/.flow-comet/skills/flow-comet-ui-design/SKILL.md +2 -2
  86. package/.flow-comet/skills/flow-comet-verify/SKILL.md +1 -1
  87. package/README.md +2 -2
  88. package/package.json +1 -1
  89. package/scripts/dsh-bridge.mjs +238 -21
@@ -1,5 +1,5 @@
1
1
  // skill-load 声明标记族(单一归属):--prompt 参数提取与归属校验、协议 scope 绑定查询、
2
- // 标记目录解析、节点声明存在性,以及 completedChecks 的真实性校验。
2
+ // 标记目录解析(路径规则取自 state-io)、节点声明存在性,以及 completedChecks 的真实性校验。
3
3
  // 诚实边界:标记是「声明」而非物理证明——运行时没有 Skill 调用观察点,脚本无法确认执行者
4
4
  // 真实加载过该 skill;标记仅证明「执行者主动声明已加载」,由流程纪律兜底。handoff 条目的证据
5
5
  // 同样不是物理证明——它是子代理回传的 Return Contract 委托声明(子代理自称已加载并执行),
@@ -11,30 +11,74 @@ import {
11
11
  nodeTemplateDeclaration,
12
12
  normalizeTemplateName,
13
13
  templateDeclarationProblems,
14
- templateDeclareCommand,
15
14
  templateKeyOf,
16
15
  } from '../protocol-utils.mjs';
17
- import { fileExists, readJson, specsDir } from './state-io.mjs';
16
+ // 声明命令的唯一装配(脚本路径 + 全部 --prompt + 模板全清单 + 协议上下文)落在中立的命令文本模块:
17
+ // 守卫族取同一份(它有自己的运行上下文),本族按状态命令族的运行上下文取用——两族各拼一份时
18
+ // 只有一种文本能执行。
19
+ import { declarationCommand } from './state-explain.mjs';
20
+ // 声明标记目录的路径规则(活动路径优先、归档路径兜底)由本族的路径上下文模块持有:同一条规则被
21
+ // 状态命令族与守卫族消费,本模块只把状态命令族的运行上下文作为根注入(守卫侧按自己的运行根取用
22
+ // 同一份实现)——两族各写一份扫描,会在「活动目录在不在场」「多归档目录取哪个」上给出不同答案。
23
+ import {
24
+ fileExists,
25
+ findSkillLoadsDir as findSkillLoadsDirAtRoot,
26
+ readJson,
27
+ resolveChangeDir,
28
+ runRootDir,
29
+ specsDir,
30
+ } from './state-io.mjs';
18
31
 
19
- // --prompt 原始参数提取(skill-load 专用参数):--protocol 由 resolveProtocol 全局解析
32
+ // --prompt 原始参数收集(skill-load 专用参数):--protocol 由 resolveProtocol 全局解析
20
33
  // (CLI > env > 默认)为工作流协议 JSON——skill-load 曾用 --protocol 传 prompt 路径,主仓真实链路
21
34
  // 必现撞车(markdown 被当协议 JSON 解析 → 启动报错「workflow protocol file is not valid JSON」)。
22
- // 改名 --prompt 后与全局协议解析彻底解耦;此处仅取用户显式传入的原始值,供 skill-load
35
+ // 改名 --prompt 后与全局协议解析彻底解耦;此处取用户显式传入的**全部**原始值,供 skill-load
23
36
  // 的 flow-kit/prompts/ 归属校验与标记记录。
24
- export function findPromptArg(cliArgs) {
25
- for (let index = 0; index < cliArgs.length; index++) {
37
+ //
38
+ // 支持 `--prompt a --prompt b` 与 `--prompt=a`,可重复出现(累加保序、去重)。一个节点该读的
39
+ // 协议常常不止一份(open 两份、review 两份),而「读了几份协议」正是出口覆盖判据要核对的事实——
40
+ // 只取第一个会让第二个声明被静默丢弃,声明面永远凑不齐(覆盖判据据此报「未声明」,而执行者
41
+ // 明明写下了那条命令)。后随参数是另一个选项(以 -- 开头)时不当成路径;空值忽略。
42
+ export function findPromptArgs(cliArgs) {
43
+ const values = [];
44
+ const collect = (raw) => {
45
+ if (typeof raw !== 'string' || raw === '') return;
46
+ if (!values.includes(raw)) values.push(raw);
47
+ };
48
+ for (let index = 0; index < (cliArgs ?? []).length; index++) {
26
49
  const arg = cliArgs[index];
27
50
  if (arg === '--prompt') {
28
- const value = cliArgs[index + 1];
29
- if (typeof value !== 'string' || value === '') return null;
30
- return value;
51
+ const next = cliArgs[index + 1];
52
+ const hasValue = typeof next === 'string' && !next.startsWith('--');
53
+ collect(hasValue ? next : '');
54
+ if (hasValue) index += 1;
55
+ continue;
31
56
  }
32
57
  if (typeof arg === 'string' && arg.startsWith('--prompt=')) {
33
- const value = arg.slice('--prompt='.length);
34
- return value === '' ? null : value;
58
+ collect(arg.slice('--prompt='.length));
35
59
  }
36
60
  }
37
- return null;
61
+ return values;
62
+ }
63
+
64
+ // 声明标记里「已声明的协议文件」提取(唯一实现:出口覆盖判据与任何读标记的消费方共用):
65
+ // · protocols 数组(skill-load 多条 --prompt 的写入形态)∪ protocol 单值(收紧前的写入形态);
66
+ // · 每个值都按 basename 归一——旧标记可能是完整绝对路径(历史缺陷期写入的形态),新标记是
67
+ // basename;两种形态必须比对同一口径(节点协议映射表只存 basename)。
68
+ // 返回去重保序的 basename 数组;null / 空串 / 非字符串一律忽略(fail-closed:覆盖判据只认
69
+ // 真正声明了的值,损坏值不会冒充任何一份协议文件)。
70
+ export function markerProtocolBasenames(marker) {
71
+ const raw = [];
72
+ if (Array.isArray(marker?.protocols)) raw.push(...marker.protocols);
73
+ raw.push(marker?.protocol);
74
+ const basenames = [];
75
+ for (const value of raw) {
76
+ if (typeof value !== 'string' || value === '') continue;
77
+ const base = String(value).replaceAll('\\', '/').split('/').pop();
78
+ if (!base) continue;
79
+ if (!basenames.includes(base)) basenames.push(base);
80
+ }
81
+ return basenames;
38
82
  }
39
83
 
40
84
  // flow-kit/prompts/ 归属校验(相对或绝对路径,前缀校验)——flow-kit 为 vendored 上游,
@@ -62,25 +106,15 @@ export function findRequiredSkillBinding(protocol, nodeId, skillName) {
62
106
  return (node.requiredSkillCalls ?? []).find((binding) => binding.skill === skillName) ?? null;
63
107
  }
64
108
 
65
- // 标记目录解析——活动路径 .specs/<change-id>/.skill-loads/ 优先;归档路径兜底
66
- // (archive 节点「先移目录后 record/exit」顺序下 change 目录已在 .specs/archive/<前缀>-<change-id>/,
67
- // 标记只随目录移动——只查活动路径会误报缺失)。归档扫描匹配后缀 -<change-id>(前缀可含日期等,
68
- // 与协议 flowkit.archive.v1 的 archive/*-<change-id> artifact 路径同构)。两者皆无 → null。
69
- export async function findSkillLoadsDir(changeName) {
70
- const activeDir = path.join(specsDir(), changeName, '.skill-loads');
71
- if (await fileExists(activeDir)) {
72
- return { dir: activeDir, display: '.specs/' + changeName + '/.skill-loads/' };
73
- }
74
- const archiveRoot = path.join(specsDir(), 'archive');
75
- const entries = await fs.readdir(archiveRoot).catch(() => []);
76
- for (const entry of entries) {
77
- if (!entry.endsWith('-' + changeName)) continue;
78
- const candidate = path.join(archiveRoot, entry, '.skill-loads');
79
- if (await fileExists(candidate)) {
80
- return { dir: candidate, display: '.specs/archive/' + entry + '/.skill-loads/' };
81
- }
82
- }
83
- return null;
109
+ // 标记目录解析(活动路径 .specs/<change-id>/.skill-loads/ 优先,归档路径兜底):规范顺序是
110
+ // 「声明 → 记录 → 搬目录 → exit」,搬目录在 exit 前、记录之后;移动后补 record / 补声明仅作
111
+ // 兼容 / 恢复路径,标记因此仍须能在归档路径被读到。路径规则与守卫族同一份实现,实现在本族的路径
112
+ // 上下文模块(state-io),本处只注入状态命令族的运行根。规则落状态族而不是守卫族是依赖方向决定的:状态命令族不得 import 守卫族(否则
113
+ // 一条路径规则就让状态 CLI 加载整个守卫图),守卫侧按允许的 guard → state-* 方向取用同一份实现。
114
+ // 两族各持一份扫描时,同一个标记会因「活动目录在场是否回溯归档」「多归档目录取哪个」各自得出答案。
115
+ // 两者皆无 → null。
116
+ export function findSkillLoadsDir(changeName) {
117
+ return findSkillLoadsDirAtRoot(runRootDir(), changeName);
84
118
  }
85
119
 
86
120
  // 节点技能加载声明标记存在性(技能加载前置门·方案 A):校验 .skill-loads/ 下
@@ -89,32 +123,30 @@ export async function findSkillLoadsDir(changeName) {
89
123
  // 记录/委托前置门在「先加载技能(Skill 工具)并 skill-load 声明」之前拦截"先干活后补声明"。
90
124
  export async function hasNodeSkillDeclaration(nodeId, changeName) {
91
125
  if (!nodeId || !changeName) return false;
92
- const activeDir = path.join(specsDir(), changeName, '.skill-loads');
126
+ // 标记面 = 位置解析到的目录 + .skill-loads/(活动优先、归档兜底——两条规则都在 findSkillLoadsDir
127
+ // 里,本函数不另拼一份活动路径:目录定位只此一处,移动后「标记还在不在」才有唯一答案)。
128
+ const loadsDir = await findSkillLoadsDir(changeName);
129
+ if (loadsDir === null) return false;
93
130
  const prefix = nodeId + '-';
94
- const scan = async (dir) => {
95
- try {
96
- const entries = await fs.readdir(dir);
97
- return entries.some((f) => f.startsWith(prefix) && f.endsWith('.json'));
98
- } catch {
99
- return false;
100
- }
101
- };
102
- if (await scan(activeDir)) return true;
103
- const archived = await findSkillLoadsDir(changeName);
104
- if (archived !== null && archived.dir !== activeDir) return scan(archived.dir);
105
- return false;
131
+ try {
132
+ const entries = await fs.readdir(loadsDir.dir);
133
+ return entries.some((f) => f.startsWith(prefix) && f.endsWith('.json'));
134
+ } catch {
135
+ return false;
136
+ }
106
137
  }
107
138
 
108
139
  // 模板声明核对(C11):节点的产出物模板声明落在 .skill-loads/<node>-*.json 的 templates 数组里,
109
140
  // 集合必须与 C3 映射一致(required ⊆ declared ⊆ required ∪ optional)。同一节点可有多个 skill 标记
110
141
  // (open 有 change / requirement),取并集——节点级一份声明被任一标记满足即可(skill-load 每次
111
- // 都写全清单)。新 change 缺失 / 多写 / 漏写 / 错名 → BLOCK;旧 change → WARN(渐进兼容,C10)。
142
+ // 都写全清单)。缺失 / 多写 / 漏写 / 错名 → BLOCK(单轨,无分级旁路)。
112
143
  // 不比对的三种情形:非内置节点(C12:自定义协议按自己的声明走)、无活动 change、声明机制未激活
113
144
  //(无 .skill-loads/ 或本节点无标记)——后者由「缺少技能加载声明标记」门负责,不重复报
114
145
  //(与 exit 侧协议声明校验的「未激活不追溯」同一口径)。
115
146
  // 零模板的内置节点(verify / archive)省略 --templates 即视为空集,通过。
116
- export async function verifyTemplateDeclaration({ protocol, nodeId, changeName, newChange }) {
117
- const declaration = nodeTemplateDeclaration((protocol?.nodes ?? []).find((node) => node.id === nodeId));
147
+ export async function verifyTemplateDeclaration({ protocol, nodeId, changeName, commandContext: context }) {
148
+ const declarationNode = (protocol?.nodes ?? []).find((node) => node.id === nodeId);
149
+ const declaration = nodeTemplateDeclaration(declarationNode);
118
150
  if (declaration.source !== 'builtin' || !changeName) return { ok: true };
119
151
  const loadsDir = await findSkillLoadsDir(changeName);
120
152
  if (loadsDir === null) return { ok: true };
@@ -123,6 +155,9 @@ export async function verifyTemplateDeclaration({ protocol, nodeId, changeName,
123
155
  .filter((name) => name.startsWith(prefix) && name.endsWith('.json'));
124
156
  if (markers.length === 0) return { ok: true };
125
157
  const declared = [];
158
+ // 执行者写过声明的技能(按技能去重保序——一个 node-skill 只有一个标记文件):重新声明命令按
159
+ // **同一批技能**派发——拿节点级目标集重发会顺手覆写别人没提的那几条,只给一个占位符又等于没给命令。
160
+ const declaredSkills = [];
126
161
  let explicitMarkers = 0;
127
162
  for (const markerName of markers) {
128
163
  let marker;
@@ -131,10 +166,14 @@ export async function verifyTemplateDeclaration({ protocol, nodeId, changeName,
131
166
  } catch {
132
167
  continue; // 损坏标记由既有声明校验报(本判据不抢报)
133
168
  }
134
- // record 自动补写的标记(auto)是引擎写的,不是执行者的声明——它不承担模板声明义务
135
- // (exit 侧已有「建议手动 skill-load」提示),不拿它算缺失
169
+ // 旧版本 record 自动补写的标记(auto:true)是引擎写的,不是执行者的声明——历史 state 容忍
170
+ // 读取,但它不承担模板声明义务,不拿它算缺失(自动补写已删除,本形态不再产生)
136
171
  if (marker?.auto === true) continue;
137
172
  explicitMarkers += 1;
173
+ // 技能名取**标记文件名**(<node>-<skill>.json 是这份标记的身份,扫描与覆盖判据也按它认):
174
+ // marker.skill 可能被手改成别的值,文件名才是这条命令要覆写的那一份。
175
+ const markerSkill = markerName.slice(prefix.length, markerName.length - '.json'.length);
176
+ if (markerSkill !== '' && !declaredSkills.includes(markerSkill)) declaredSkills.push(markerSkill);
138
177
  if (!Array.isArray(marker?.templates)) continue; // 旧标记无该字段 = 未声明
139
178
  for (const name of marker.templates) {
140
179
  if (typeof name !== 'string' || name.trim() === '') continue;
@@ -150,11 +189,39 @@ export async function verifyTemplateDeclaration({ protocol, nodeId, changeName,
150
189
  const detail = [];
151
190
  if (problems.missing.length > 0) detail.push('漏写: ' + problems.missing.join('、'));
152
191
  if (problems.extra.length > 0) detail.push('多写/错名: ' + problems.extra.join('、'));
153
- const declareCommand = templateDeclareCommand(declaration, { nodeId });
192
+ // 重新声明命令与恢复段同一装配(脚本路径 + 该节点全部协议文件 + 模板全清单 + 协议上下文):
193
+ // 只补 --templates 的旧形态会把 protocol 写成 null,下一次 exit 反被判「缺协议声明标记」;
194
+ // 裸脚本名的旧形态照抄是 command not found(恢复步骤自己走不通)。
195
+ const declareCommands = declaredSkills
196
+ .map((skill) => declarationCommand({ node: declarationNode, skill, context }));
154
197
  const reason = '节点 ' + nodeId + ' 的模板声明与节点映射不一致(' + detail.join(';')
155
- + ';映射要求: ' + describeTemplateList(declaration.required) + ')——重跑 ' + declareCommand + ' 重新声明';
156
- if (newChange === true) return { ok: false, reason };
157
- return { ok: true, warn: reason };
198
+ + ';映射要求: ' + describeTemplateList(declaration.required) + ')——重跑下面的命令重新声明'
199
+ + '(同一 node-skill 重跑会覆写该标记):\n'
200
+ + declareCommands.map((command) => ' ' + command).join('\n');
201
+ return { ok: false, reason };
202
+ }
203
+
204
+ // 「该标记到底在哪儿找过」的说明(缺声明报文的尾句,唯一实现)。活动路径找不到时按目录**实际**所在的
205
+ // 位置说真话:
206
+ // · 目录已归档(<日期>-<change-id>)→ 点名归档路径:那里也没有该标记;
207
+ // · 归档多候选 / 两处都没有 → 才说「判不出」/「两处都没有」(成因措辞逐字沿用状态族的位置失败报文
208
+ // 口径,不另写一套「未找到」说法);
209
+ // · 活动目录在场 → 不给尾句:归档本来就不是这次该找的位置,对归档下任何结论都是假话。
210
+ // 旧形态无条件打印「(归档路径也未找到)」——归档目录明明在场时那句话是假话,还把「找过哪里」这个
211
+ // 可核对的事实糊掉了(L-079 同族:不可判 / 未发生的事不许写成已发生的结论)。
212
+ async function markerLookupNote(changeName) {
213
+ const resolution = await resolveChangeDir({ root: runRootDir(), changeName });
214
+ if (resolution.status === 'archived') {
215
+ return '(该 change 已归档到 ' + resolution.display + ',那里也没有该标记)';
216
+ }
217
+ if (resolution.status === 'ambiguous') {
218
+ return '(归档目录多候选:' + resolution.candidates.map((candidate) => candidate.name).join('、')
219
+ + '——无法唯一判定该找哪一份)';
220
+ }
221
+ if (resolution.status === 'missing') {
222
+ return '(活动目录与 .specs/archive/<日期>-' + changeName + ' 两处都没有该目录)';
223
+ }
224
+ return '';
158
225
  }
159
226
 
160
227
  // completedChecks 真实性校验。解析 completedChecks 的 required-skill:<node>.<skill>
@@ -166,7 +233,7 @@ export async function verifyTemplateDeclaration({ protocol, nodeId, changeName,
166
233
  // 如 subagent-execute 节点的 flow-comet-dev)豁免标记,以共用证据库 evidence['subagent-execute']
167
234
  // 的 handoffResult(有委托记录即满足)为证据;main scope / 协议外条目仍要求标记(fail-closed)。
168
235
  // 返回 { ok: true } 或 { ok: false, reason }(fail-closed:无 active change / 标记损坏同样 BLOCK)。
169
- export async function verifySkillLoadMarkers(completedChecks, changeName, recordTime, protocol, state) {
236
+ export async function verifySkillLoadMarkers(completedChecks, changeName, recordTime, protocol, state, context) {
170
237
  if (!Array.isArray(completedChecks)) return { ok: true };
171
238
  const required = [];
172
239
  for (const check of completedChecks) {
@@ -205,29 +272,28 @@ export async function verifySkillLoadMarkers(completedChecks, changeName, record
205
272
  }
206
273
  continue;
207
274
  }
208
- // 标记路径解析——活动路径优先,归档路径兜底(archive 节点「先移目录后 record」
209
- // 顺序下标记只在 .specs/archive/*-<change-id>/.skill-loads/);两处都找不到 → BLOCK + 指引
210
- // (不静默放行)。展示路径补 .specs/ 前缀便于用户定位。
275
+ // 标记路径解析——活动路径优先,归档路径兜底(规范顺序「记录 → 搬目录」,搬目录之后补 record /
276
+ // 补声明仅作兼容 / 恢复路径,标记此时只在 .specs/archive/<日期>-<change-id>/.skill-loads/);
277
+ // 两处都找不到 → BLOCK + 指引
278
+ // (不静默放行)。标记路径 = 位置解析到的目录 + .skill-loads/<标记>:活动优先与归档兜底只有
279
+ // findSkillLoadsDir 一处实现(本处不另拼活动路径表达式)。
211
280
  const markerName = item.node + '-' + item.skill + '.json';
212
281
  const activeDisplay = '.specs/' + path.posix.join(changeName, '.skill-loads', markerName);
213
- const activePath = path.join(specsDir(), changeName, '.skill-loads', markerName);
214
- let markerPath = await fileExists(activePath) ? activePath : null;
215
- let markerDisplay = activeDisplay;
216
- if (!markerPath) {
217
- const loadsDir = await findSkillLoadsDir(changeName);
218
- if (loadsDir !== null) {
219
- const altPath = path.join(loadsDir.dir, markerName);
220
- if (await fileExists(altPath)) {
221
- markerPath = altPath;
222
- markerDisplay = loadsDir.display + markerName;
223
- }
224
- }
225
- }
226
- if (!markerPath) {
282
+ const loadsDir = await findSkillLoadsDir(changeName);
283
+ const markerPath = loadsDir === null ? null : path.join(loadsDir.dir, markerName);
284
+ const markerDisplay = loadsDir === null ? activeDisplay : loadsDir.display + markerName;
285
+ if (markerPath === null || !(await fileExists(markerPath))) {
286
+ // 声明命令由协议派生(该条目所指节点的全部协议文件 + 模板全清单),脚本路径与协议上下文由
287
+ // 唯一装配补齐:只给 "skill-load <node> <skill>" 或裸脚本名的旧形态,照抄后会被模板声明门 /
288
+ // 出口覆盖门逐个拦下,或在 shell 里 command not found——报文给出的东西必须一次补齐。
289
+ // 协议外节点(旧证据里出现过、当前协议已删)取不到节点声明:仍按条目里的节点名给命令,
290
+ // 不拼引擎映射(没有映射就没有 --prompt / --templates 可拼——不编造)。
291
+ const declaredNode = (protocol?.nodes ?? []).find((node) => node.id === item.node) ?? { id: item.node };
227
292
  return {
228
293
  ok: false,
229
- reason: 'completedChecks 条目 ' + item.raw + ' 缺少对应声明标记 ' + activeDisplay +
230
- '(归档路径也未找到)——先加载该 skill 并运行 workflow-state.mjs skill-load ' + item.node + ' ' + item.skill,
294
+ reason: 'completedChecks 条目 ' + item.raw + ' 缺少对应声明标记 ' + activeDisplay
295
+ + (await markerLookupNote(changeName)) + '——先加载该 skill 并照抄下面的命令声明已加载:\n '
296
+ + declarationCommand({ node: declaredNode, skill: item.skill, context }),
231
297
  };
232
298
  }
233
299
  let marker;
@@ -202,9 +202,8 @@ export function fixBatchHistoryWithStaleExecuteExit() {
202
202
  }
203
203
 
204
204
  // Fix 批次夹具写入:state + TASK + 既有任务 SUMMARY + REVIEW.md(verify 源另备 TEST/UAT)。
205
- // kind='review'(审查驻留,execute 已首次完成)/ 'verify'(验证驻留,review 已完成);
206
- // newChange=false 时 state 不带新 change 标记(旧 change 渐进形态)。
207
- export function writeFixBatchFixture(dir, { kind, fixStatus, newChange = true, parallelFix = false }) {
205
+ // kind='review'(审查驻留,execute 已首次完成)/ 'verify'(验证驻留,review 已完成)。
206
+ export function writeFixBatchFixture(dir, { kind, fixStatus, parallelFix = false }) {
208
207
  const completed = kind === 'verify'
209
208
  ? ['open', 'design', 'plan', 'execute', 'subagent-execute', 'review']
210
209
  : ['open', 'design', 'plan', 'execute', 'subagent-execute'];
@@ -222,7 +221,6 @@ export function writeFixBatchFixture(dir, { kind, fixStatus, newChange = true, p
222
221
  directOverride: false,
223
222
  };
224
223
  if (kind === 'verify') state.evidence.verify = { summary: 'verify in progress' };
225
- if (newChange) state.newChange = true;
226
224
  writeState(dir, state);
227
225
  // 前置节点产物齐备(open/design/plan)——共享路由在任务特判前先过前置产物门控
228
226
  writeIntakeArtifacts(dir);
@@ -246,6 +244,9 @@ export function completeFixTaskAndRecord(dir, env) {
246
244
  writeFile(dir, '.specs/' + CHANGE_ID + '/TASK.md', fixBatchTaskText('done'));
247
245
  writeFile(dir, '.specs/' + CHANGE_ID + '/T-FIX-01-SUMMARY.md', execSummaryFixture('T-FIX-01'));
248
246
  assertExit(runState(['skill-load', 'execute', 'flow-comet-execute', '--prompt', 'flow-kit/prompts/4-dev.md', '--templates', 'SUMMARY.md'], dir, env), 0);
247
+ // 协议 execute.requiredSkillCalls = flow-comet-dev(guarded):出口覆盖判据要求该技能也有标记——
248
+ // 只声明实现技能 flow-comet-execute 时覆盖缺口会被拦下(节点实现技能与必需技能是两个声明面)。
249
+ assertExit(runState(['skill-load', 'execute', 'flow-comet-dev', '--prompt', 'flow-kit/prompts/4-dev.md', '--templates', 'SUMMARY.md'], dir, env), 0);
249
250
  const rec = runState(['record', 'execute', '{"summary":"fix batch executed","parallelTakeoverApproved":true}'], dir, env);
250
251
  assertExit(rec, 0);
251
252
  assertOut(rec, 'EVIDENCE: execute');
@@ -635,6 +636,9 @@ export function multiWaveTaskContent(statusMap) {
635
636
  export function driveThroughDesign(dir) {
636
637
  assertExit(runState(['init', CHANGE_ID], dir), 0);
637
638
  assertExit(runState(['skill-load', 'open', 'flow-comet-change', '--prompt', 'flow-kit/prompts/0-change.md', '--templates', 'CHANGE.md,REQUIREMENT.md'], dir), 0);
639
+ // open 该读两份协议、协议声明两个必需技能(flow-comet-change / flow-comet-requirement):出口的
640
+ // 覆盖判据要求全部声明——只声明一份时连 design 都推进不到(声明门先拦),前奏形同虚设。
641
+ assertExit(runState(['skill-load', 'open', 'flow-comet-requirement', '--prompt', 'flow-kit/prompts/1-requirement.md', '--templates', 'CHANGE.md,REQUIREMENT.md'], dir), 0);
638
642
  writeIntakeArtifacts(dir);
639
643
  assertExit(runState(['record', 'open', '{"summary":"intake complete"}'], dir), 0);
640
644
  assertExit(runGuard(['entry', 'open'], dir), 0);
@@ -1,14 +1,23 @@
1
1
  // task-graph.mjs — 任务与协议图的底层共享判定(单一权威实现)
2
2
  // 承载:① 协议节点顺序 / 启用 / 任务文件路径(route · protocolNodeEnabled · protocolTaskFilePath ·
3
- // EXECUTE_FAMILY_NODE_IDS);② 任务依赖解析与依赖图(taskDependencyEligibility · analyzeDependencyGraph);
3
+ // EXECUTE_FAMILY_NODE_IDS);② 任务依赖解析与依赖图(taskDependencyEligibility · analyzeDependencyGraph ·
4
+ // taskWaveLevels 依赖层级);
4
5
  // ③ 并行写冲突检测三族(findParallelWriteConflicts 及其构件);④ 任务集签名与版本语义 ·
5
6
  // history 事件归属 · change 名形态 · 修复任务族文本谓词;⑤ 任务块 7 字段集合(TASK7_REQUIRED)。
6
7
  // 纯判定:只读 TASK.md 文本、协议对象与 state.history,无 console 输出、无 process.exit、无 state 写入。
7
- // 依赖方向:本模块不 import 其他 lib 模块(lib 层最底层)——入口与兄弟模块单向依赖本模块。
8
+ // 依赖方向:只依赖叶子模块(lessons-hits 的条目边界、section-body 的段界)——入口与兄弟模块单向
9
+ // 依赖本模块,不出现反向边。
8
10
  import { promises as fs } from 'fs';
9
11
  import path from 'path';
10
12
  import { createHash } from 'crypto';
11
13
  import { taskBlocks, taskOpeningAttrs } from '../task-parsing.mjs';
14
+ // 写面元素(`<write_files>`…`</write_files>`,元素名大小写无关)与条目边界(剥注释 → 行切 → 分号
15
+ // 容错切 → trim → 滤空)都取 lib/lessons-hits.mjs 的唯一实现:本模块只剩「路径归一」这一层自己的
16
+ // 语义(见 normalizeTaskPath),不自带第二份元素提取或切分。
17
+ import { taskWriteFilesById, writeFilesEntries } from './lessons-hits.mjs';
18
+ // 段界(同级标题 / 围栏 / 分隔线 / 文末)取 lib/section-body.mjs 的唯一实现:修复段的段体此前自带一份
19
+ // 「按行找下一个 `## `」的扫描,围栏代码块里的 `## ` 会把段体截断。
20
+ import { sectionBody } from './section-body.mjs';
12
21
 
13
22
  // 任务块 7 字段集合(单一权威):plan 出口的 TASK 完整性门禁与执行期 `replan` 的重签判据共用本常量。
14
23
  // `replan` 是执行期唯一允许修订任务集的通道,两侧判据必须同源——任何一侧另写一份字面集合,都会在
@@ -162,24 +171,22 @@ export function normalizeHeading(raw) {
162
171
  }
163
172
 
164
173
  // 修复段正文切片:首个同级(##)标题命中 → 返回标题行之后、下一个同级标题(或 EOF)之前的正文;
165
- // 无命中标题 → null。只认二级标题(### 不闭合本段);CRLF / LF 归一后按行定位。
174
+ // 无命中标题 → null。只认二级标题(### 不闭合本段)。段界(含围栏同步)由 lib/section-body.mjs
175
+ // 单点决定,这里只表达自己的差异——标题按共享归一后比较(「Fix 任务(来自 REVIEW / INTEGRATION)」
176
+ // 「## Fix 任务 ##」等写法命中同一段),且**不以分隔线结束**(修复段内允许 `---` 分节,历史语义)。
166
177
  function fixSectionBody(taskContent, fixSectionTitle) {
167
- const lines = String(taskContent ?? '').replace(/\r\n?/g, '\n').split('\n');
168
178
  const wanted = normalizeHeading(fixSectionTitle);
169
179
  if (wanted === '') return null;
170
- let start = -1;
171
- for (let i = 0; i < lines.length; i += 1) {
172
- const m = lines[i].match(/^##\s+(.+?)\s*$/);
173
- if (!m) continue;
174
- const heading = normalizeHeading(m[1]);
175
- if (heading === wanted || heading.startsWith(wanted)) { start = i; break; }
176
- }
177
- if (start < 0) return null;
178
- let end = lines.length;
179
- for (let i = start + 1; i < lines.length; i += 1) {
180
- if (/^##\s/.test(lines[i])) { end = i; break; }
181
- }
182
- return lines.slice(start + 1, end).join('\n');
180
+ return sectionBody(
181
+ taskContent,
182
+ (heading) => {
183
+ // 只认二级标题起段(### 不闭合本段,也不在这里起段——历史语义)
184
+ if (heading.level !== 2) return false;
185
+ const normalized = normalizeHeading(heading.text);
186
+ return normalized === wanted || normalized.startsWith(wanted);
187
+ },
188
+ { level: 2, endOnSeparator: false },
189
+ );
183
190
  }
184
191
 
185
192
  // 修复任务族 id 前缀(唯一谓词的 id 边界,全模块只此一处定义):含尾连字符——形似编号(前缀
@@ -260,6 +267,40 @@ export function analyzeDependencyGraph(blocks) {
260
267
  return { ids, depsById, missing, cyclic, cycleIds };
261
268
  }
262
269
 
270
+ // ---------- 依赖层级(波次投影的层级求值 · 单一权威) ----------
271
+ // 层级定义:level(task) = 1 + max(level(dep)),无依赖 = 1(依赖链的最大深度)。「波次 = 依赖层级
272
+ // 的投影」这一判据(plan 出口 / replan 重校,两处同源调用)消费本函数,不在判据侧自算——层级是
273
+ // 同一份依赖数据的第二次求值,两处各算一遍必然分叉。
274
+ // 输入 = <task> 块数组(与 analyzeDependencyGraph 同源解析),输出 Map<id, level>。
275
+ // 依赖解析复用 analyzeDependencyGraph 的 depsById(依赖文本解析单一权威,不另起第二份正则);
276
+ // 引用不存在的依赖不计入层级(其合法性由依赖图判据负责),环上的任务不产出层级(本函数只求层级,
277
+ // 不承担合法性判定——依赖环 / 缺失依赖由 analyzeDependencyGraph 的消费方先行拦截)。
278
+ export function taskWaveLevels(blocks) {
279
+ const { ids, depsById } = analyzeDependencyGraph(blocks);
280
+ const levels = new Map();
281
+ const resolving = new Set();
282
+ const resolveLevel = (id) => {
283
+ const known = levels.get(id);
284
+ if (known !== undefined) return known;
285
+ if (resolving.has(id)) return null; // 环:该链无解,本 id 不产出层级
286
+ resolving.add(id);
287
+ let deepest = 0;
288
+ let solvable = true;
289
+ for (const dep of depsById.get(id) ?? []) {
290
+ if (!ids.has(dep)) continue;
291
+ const depLevel = resolveLevel(dep);
292
+ if (depLevel === null) { solvable = false; break; }
293
+ if (depLevel > deepest) deepest = depLevel;
294
+ }
295
+ resolving.delete(id);
296
+ if (!solvable) return null;
297
+ levels.set(id, deepest + 1);
298
+ return deepest + 1;
299
+ };
300
+ for (const id of ids) resolveLevel(id);
301
+ return levels;
302
+ }
303
+
263
304
  // ---------- 并行文件依赖检测(单源:plan 出口门禁与 replan 重校共用) ----------
264
305
  // 解析 TASK.md 的任务 read/write_files 声明,分三族返回:
265
306
  // ① writeConflicts(写写强判):本趟可运行的 parallel=pending 任务间 write∩write 非空——同波次
@@ -317,14 +358,14 @@ function normalizeTaskPath(raw) {
317
358
  return out.join('/');
318
359
  }
319
360
 
320
- // 路径解析与既有自动解析同源:剥 HTML 注释 → 换行切分 → 分号二次切分 → trim → 滤空 → 归一。
361
+ // 路径解析:入参是**已提取的**写面元素原文(元素提取与条目边界都取 lib/lessons-hits.mjs 的唯一实现
362
+ // ——taskWriteFilesById + writeFilesEntries;与 handoff 的提交子集校验、plan 出口的伪并行启发式
363
+ // 同一份:同一份写面在三处被切成不同条目集、或在元素名的大小写上分叉时,「谁越界」「哪一对并行
364
+ // 任务重叠」会互相矛盾)。本函数只在条目之上叠加本模块自己的归一(normalizeTaskPath)。
321
365
  // 按声明实际内容解析,不做扩展名白名单过滤——txt/log/无扩展名路径同等检出(链式重命名的 .txt
322
366
  // 事故面闭合)。族①②③共用本实现,不另起第二份。
323
367
  function parsePaths(matchText) {
324
- return String(matchText ?? '')
325
- .replace(/<!--[\s\S]*?-->/g, '')
326
- .trim().split(/\s*\n\s*/).map((l) => l.trim()).filter(Boolean)
327
- .flatMap((l) => l.split(';')).map((l) => l.trim()).filter(Boolean)
368
+ return writeFilesEntries(matchText)
328
369
  .map(normalizeTaskPath)
329
370
  .filter((p) => p !== null && p !== '');
330
371
  }
@@ -374,11 +415,18 @@ export function collectPathOverlaps(leftPaths, rightPaths) {
374
415
  }
375
416
 
376
417
  // 第三族(同文件跨任务且无依赖路径)计算——本模块具名纯函数:输入任务块 / 依赖图 / 既有族去重键,
377
- // 输出冲突对数组({ a, b, files });无 fs / console / process.exit,不改任何入参。
418
+ // 输出 { conflicts, isOverlappingPair }——conflicts 是冲突对明细({ a, b, files },报告面用),
419
+ // isOverlappingPair 是**任务对键集合上的成员判定**(谓词)。任务对键的形态只在 taskPairKey 表达一次:
420
+ // 消费方(wave-projection 的 [P] 判据)要的是「这一对是否写面重叠」,拿到的因此是判定而不是键形态——
421
+ // 两端各算一次键时,形态一旦漂移(换分隔符 / 换定序)键就不相等,补集会静默失效(写面重叠的一对被
422
+ // 当成「本可并行」)。无 fs / console / process.exit,不改任何入参。
378
423
  // taskContent 与 allBlocks 须同源(taskContent = 产出 allBlocks 的 TASK.md 文本)——修复任务族
379
424
  // 谓词需要全文以定位修复段(段标题取该谓词的缺省回退常量,与 fixTaskClassifier 的缺省一致)。
380
425
  export function collectCrossTaskConflicts({ taskContent = '', allBlocks = [], depsById = new Map(), excludedPairKeys = new Set() } = {}) {
381
426
  const isFixTask = fixTaskClassifier(taskContent);
427
+ // 写面元素(键 = 任务 id)取 lib/lessons-hits.mjs 的唯一提取:元素名大小写无关与 7 字段门的在场
428
+ // 判定同口径——大小写敏感的副本会让混合写法的任务在这里判「没有写面」,从而整对掉出本族。
429
+ const writeFaces = taskWriteFilesById(taskContent);
382
430
  const reachCache = new Map();
383
431
  const reachableFrom = (id) => {
384
432
  if (!reachCache.has(id)) reachCache.set(id, reachableTaskIds(depsById, id));
@@ -388,9 +436,9 @@ export function collectCrossTaskConflicts({ taskContent = '', allBlocks = [], de
388
436
  for (const block of allBlocks) {
389
437
  const attrs = taskOpeningAttrs(block);
390
438
  if (!attrs || !attrs.id || attrs.status === 'done' || isFixTask(block)) continue;
391
- const wf = block.match(/<write_files>([\s\S]*?)<\/write_files>/);
392
- if (!wf) continue;
393
- const writes = new Set(parsePaths(wf[1]));
439
+ const element = writeFaces.get(attrs.id);
440
+ if (element === undefined) continue;
441
+ const writes = new Set(parsePaths(element));
394
442
  if (writes.size === 0) continue;
395
443
  participants.push({ id: attrs.id, writes });
396
444
  }
@@ -405,7 +453,8 @@ export function collectCrossTaskConflicts({ taskContent = '', allBlocks = [], de
405
453
  conflicts.push({ a: participants[i].id, b: participants[j].id, files: overlap });
406
454
  }
407
455
  }
408
- return conflicts;
456
+ const pairKeys = new Set(conflicts.map((conflict) => taskPairKey(conflict.a, conflict.b)));
457
+ return { conflicts, isOverlappingPair: (a, b) => pairKeys.has(taskPairKey(a, b)) };
409
458
  }
410
459
 
411
460
  export async function findParallelWriteConflicts(changeDir) {
@@ -413,6 +462,9 @@ export async function findParallelWriteConflicts(changeDir) {
413
462
  let text;
414
463
  try { text = await fs.readFile(taskFile, 'utf8'); } catch { return { writeConflicts: [], readWarnings: [], crossTaskConflicts: [] }; }
415
464
  const allBlocks = taskBlocks(text);
465
+ // 写面元素(键 = 任务 id)取 lib/lessons-hits.mjs 的唯一提取(元素名大小写无关):大小写敏感的副本
466
+ // 会让混合写法的任务在这里判「没有写面」,同波并行写同一路径的竞态因此漏拦。
467
+ const writeFaces = taskWriteFilesById(text);
416
468
  // 依赖资格收窄:仅统计「本趟可运行」的并行任务——deps ⊆ doneIds;等待后续趟次的并行任务
417
469
  // (依赖未满足)与已交付任务不参与同趟冲突判定,使 A→B 同写路径的跨趟合法计划不再被首趟误拦
418
470
  // (与路由谓词同一口径)。依赖文本解析与资格判定一律走 taskDependencyEligibility——本函数不再
@@ -430,13 +482,13 @@ export async function findParallelWriteConflicts(changeDir) {
430
482
  for (const b of blocks) {
431
483
  const a = taskOpeningAttrs(b);
432
484
  if (!a || !a.id) continue;
433
- const wf = b.match(/<write_files>([\s\S]*?)<\/write_files>/);
485
+ const element = writeFaces.get(a.id);
434
486
  const rf = b.match(/<read_files>([\s\S]*?)<\/read_files>/);
435
- if (!wf && !rf) continue;
487
+ if (element === undefined && !rf) continue;
436
488
  perTask.push({
437
489
  id: a.id,
438
490
  deps: new Set(taskDependencyEligibility(b).deps),
439
- writes: new Set(parsePaths(wf && wf[1])),
491
+ writes: new Set(parsePaths(element)),
440
492
  reads: new Set(parsePaths(rf && rf[1])),
441
493
  });
442
494
  }
@@ -461,11 +513,12 @@ export async function findParallelWriteConflicts(changeDir) {
461
513
  // 全在该纯函数内,此处不内联第二份。
462
514
  const writePairKeys = new Set(writeConflicts.map((c) => taskPairKey(c.a, c.b)));
463
515
  const { depsById } = analyzeDependencyGraph(allBlocks);
516
+ // 只取说明面(明细):键集合与判定留在纯函数里,本函数不另算一份键。
464
517
  const crossTaskConflicts = collectCrossTaskConflicts({
465
518
  taskContent: text,
466
519
  allBlocks,
467
520
  depsById,
468
521
  excludedPairKeys: writePairKeys,
469
- });
522
+ }).conflicts;
470
523
  return { writeConflicts, readWarnings, crossTaskConflicts };
471
524
  }
@@ -194,7 +194,6 @@ export function fixReturnBaseState(overrides = {}) {
194
194
  verifyFailures: 0,
195
195
  executionMode: 'subagent',
196
196
  directOverride: false,
197
- newChange: true,
198
197
  ...overrides,
199
198
  };
200
199
  }
@@ -271,7 +270,6 @@ export function reentryArchiveState(overrides = {}) {
271
270
  verifyFailures: 0,
272
271
  executionMode: 'subagent',
273
272
  directOverride: false,
274
- newChange: true,
275
273
  status: 'running',
276
274
  branchMode: true,
277
275
  enablePrReview: false,
@@ -407,7 +405,6 @@ export function replanExecuteState(overrides = {}) {
407
405
  verifyFailures: 0,
408
406
  executionMode: 'subagent',
409
407
  directOverride: false,
410
- newChange: true,
411
408
  status: 'running',
412
409
  branchMode: false,
413
410
  enablePrReview: false,