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.
- package/.flow-comet/skills/flow-comet/INSTALLED_VERSION +1 -1
- package/.flow-comet/skills/flow-comet/SKILL.md +32 -18
- package/.flow-comet/skills/flow-comet/reference/commit-discipline.md +2 -2
- 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 +30 -11
- 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/context-init.mjs +26 -23
- package/.flow-comet/skills/flow-comet/scripts/guard-self-test.mjs +14 -94
- package/.flow-comet/skills/flow-comet/scripts/items/a.mjs +122 -11
- package/.flow-comet/skills/flow-comet/scripts/items/b.mjs +79 -40
- package/.flow-comet/skills/flow-comet/scripts/items/c.mjs +11 -9
- package/.flow-comet/skills/flow-comet/scripts/items/e.mjs +52 -10
- package/.flow-comet/skills/flow-comet/scripts/items/f.mjs +1 -1
- package/.flow-comet/skills/flow-comet/scripts/items/h.mjs +128 -56
- package/.flow-comet/skills/flow-comet/scripts/items/k.mjs +357 -3
- package/.flow-comet/skills/flow-comet/scripts/items/l.mjs +26 -1
- package/.flow-comet/skills/flow-comet/scripts/items/m.mjs +6 -2
- package/.flow-comet/skills/flow-comet/scripts/items/n.mjs +29 -21
- package/.flow-comet/skills/flow-comet/scripts/lib/ac-coverage.mjs +317 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/fix-loop-node.mjs +4 -15
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-artifact-skeleton.mjs +47 -5
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-evidence-gates.mjs +357 -219
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-gates.mjs +725 -309
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-routing.mjs +182 -54
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-state-io.mjs +8 -6
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-template-fidelity.mjs +224 -83
- package/.flow-comet/skills/flow-comet/scripts/lib/guard-uidesign.mjs +17 -28
- package/.flow-comet/skills/flow-comet/scripts/lib/lessons-hits.mjs +160 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/run-root.mjs +21 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/section-body.mjs +92 -0
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-admin.mjs +61 -33
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-flow.mjs +663 -205
- package/.flow-comet/skills/flow-comet/scripts/lib/state-commands-recovery.mjs +68 -9
- package/.flow-comet/skills/flow-comet/scripts/lib/state-determine.mjs +11 -4
- package/.flow-comet/skills/flow-comet/scripts/lib/state-explain.mjs +92 -13
- package/.flow-comet/skills/flow-comet/scripts/lib/state-io.mjs +232 -11
- package/.flow-comet/skills/flow-comet/scripts/lib/state-skillmarkers.mjs +140 -74
- package/.flow-comet/skills/flow-comet/scripts/lib/system-fixtures.mjs +8 -4
- package/.flow-comet/skills/flow-comet/scripts/lib/task-graph.mjs +84 -31
- package/.flow-comet/skills/flow-comet/scripts/lib/test-assertions.mjs +0 -3
- package/.flow-comet/skills/flow-comet/scripts/lib/test-fixtures.mjs +248 -24
- package/.flow-comet/skills/flow-comet/scripts/lib/test-helpers.mjs +63 -3
- package/.flow-comet/skills/flow-comet/scripts/lib/text-anchor-checks.mjs +181 -8
- package/.flow-comet/skills/flow-comet/scripts/lib/wave-projection.mjs +340 -0
- package/.flow-comet/skills/flow-comet/scripts/protocol-utils.mjs +132 -20
- package/.flow-comet/skills/flow-comet/scripts/route-node.mjs +12 -5
- package/.flow-comet/skills/flow-comet/scripts/scenarios/a.mjs +1564 -54
- package/.flow-comet/skills/flow-comet/scripts/scenarios/b.mjs +1489 -38
- package/.flow-comet/skills/flow-comet/scripts/scenarios/c.mjs +1466 -243
- package/.flow-comet/skills/flow-comet/scripts/scenarios/d.mjs +743 -24
- package/.flow-comet/skills/flow-comet/scripts/scenarios/e.mjs +220 -92
- package/.flow-comet/skills/flow-comet/scripts/scenarios/f.mjs +657 -21
- package/.flow-comet/skills/flow-comet/scripts/scenarios/g.mjs +41 -27
- package/.flow-comet/skills/flow-comet/scripts/scenarios/h.mjs +285 -9
- package/.flow-comet/skills/flow-comet/scripts/scenarios/i.mjs +7 -6
- package/.flow-comet/skills/flow-comet/scripts/scenarios/j.mjs +21 -15
- package/.flow-comet/skills/flow-comet/scripts/scenarios/k.mjs +8 -5
- package/.flow-comet/skills/flow-comet/scripts/scenarios/l.mjs +45 -36
- package/.flow-comet/skills/flow-comet/scripts/scenarios/m.mjs +2 -2
- package/.flow-comet/skills/flow-comet/scripts/scenarios/n.mjs +2381 -85
- package/.flow-comet/skills/flow-comet/scripts/state-schema.mjs +135 -2
- package/.flow-comet/skills/flow-comet/scripts/workflow-guard.mjs +143 -16
- package/.flow-comet/skills/flow-comet/scripts/workflow-handoff.mjs +339 -103
- package/.flow-comet/skills/flow-comet/scripts/workflow-state.mjs +5 -2
- 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 +37 -13
- 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 +13 -6
- package/.flow-comet/skills/flow-comet-review/SKILL.md +21 -12
- package/.flow-comet/skills/flow-comet-subagent-execute/GUIDANCE.md +1 -1
- package/.flow-comet/skills/flow-comet-subagent-execute/SKILL.md +43 -18
- package/.flow-comet/skills/flow-comet-task/SKILL.md +4 -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
|
@@ -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';
|
|
@@ -12,12 +12,15 @@ import { taskOpeningAttrs } from '../task-parsing.mjs';
|
|
|
12
12
|
import { resolveNextNode, normalizeHeading, FIX_SECTION_TITLE_FALLBACK } from '../route-node.mjs';
|
|
13
13
|
import { runRoot, fileExists, workflowRelativeSegments } from './guard-state-io.mjs';
|
|
14
14
|
import { SUMMARY_REQUIRED_SECTIONS, buildSkeleton } from './guard-artifact-skeleton.mjs';
|
|
15
|
-
|
|
16
|
-
//
|
|
17
|
-
//
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}
|
|
15
|
+
// 归档目录名「是不是本 change 的」判据单源在状态族的路径上下文模块(guard → state-* 是允许的
|
|
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';
|
|
21
24
|
|
|
22
25
|
// flow-kit SUMMARY 模板必填段(正则匹配,大小写不敏感 + 变体兼容)——清单唯一来源是骨架模块,
|
|
23
26
|
// 此处只取用(本模块不再自持第二份段名清单)。
|
|
@@ -193,8 +196,16 @@ export function patternToRegExp(pattern) {
|
|
|
193
196
|
return new RegExp('^' + String(pattern).split('*').map(escapeRegExp).join('.*') + '$', 'u');
|
|
194
197
|
}
|
|
195
198
|
|
|
196
|
-
|
|
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 } = {}) {
|
|
197
205
|
const parts = workflowRelativeSegments(relativePattern, 'artifact path', true);
|
|
206
|
+
const archiveChangeDirSegment = change !== null && parts[0] === 'archive' && (parts[1] ?? '').includes('*')
|
|
207
|
+
? 1
|
|
208
|
+
: -1;
|
|
198
209
|
async function walk(current, index) {
|
|
199
210
|
const inspection = await inspectWorkflowProtectedPath(
|
|
200
211
|
runRoot,
|
|
@@ -224,9 +235,9 @@ export async function pathPatternExists(root, relativePattern) {
|
|
|
224
235
|
path.join(current, entry.name),
|
|
225
236
|
);
|
|
226
237
|
}
|
|
227
|
-
if (matcher.test(entry.name)
|
|
228
|
-
|
|
229
|
-
|
|
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;
|
|
230
241
|
}
|
|
231
242
|
return false;
|
|
232
243
|
}
|
|
@@ -247,57 +258,155 @@ export async function workflowArtifactRoot(pathBase) {
|
|
|
247
258
|
throw new Error('产物根 pathBase "' + pathBase + '" 不再支持——请改用 specs-root/project + 完整路径(如 project + openspec/changes/xxx.md)');
|
|
248
259
|
}
|
|
249
260
|
|
|
250
|
-
|
|
261
|
+
// 声明工件的存在性判据——**唯一的枚举处**:本节点 outputSchemas 引用的 schema → artifacts 中
|
|
262
|
+
// required 的那些,逐条解析路径并判定在场。出口的产物门禁(missingRequiredArtifacts)与结构预检
|
|
263
|
+
// (guard-gates 的缺件报告)都只消费本函数;任何一处再自行遍历 outputSchemas 就是第二份实现,
|
|
264
|
+
// 判据演进时必然分叉(重构前就已分叉:预检只判 file 类、未声明 paths 直接跳过,出口侧两项都不是)。
|
|
265
|
+
//
|
|
266
|
+
// 返回结构数组(每条 = 一份声明的必需产物):
|
|
267
|
+
// { schemaId, artifact, resolvedPaths, present, kind, unspecifiedPaths }
|
|
268
|
+
// resolvedPaths —— 已替换 <change-id> 的声明路径;同一 artifact 的 paths 是互斥备选(任一路径
|
|
269
|
+
// 在场即在场,与节点完成判定同语义);
|
|
270
|
+
// present —— 在场判定结果(pathPatternExists 任一命中);
|
|
271
|
+
// kind —— 声明的产物类别(未声明为 undefined);
|
|
272
|
+
// unspecifiedPaths —— 声明不完整(required 但未声明 paths):没有路径可查,present 恒为 false。
|
|
273
|
+
//
|
|
274
|
+
// 两侧的差异不抹平、也不在这里偷偷归一,而是留给**调用点显式**决定(调用点各写一行并注明理由):
|
|
275
|
+
// ① kind:预检只判 kind 为 file(未声明按文件处置)的产物——其它 kind 的「在场」语义不是文件
|
|
276
|
+
// 存在性;出口不判 kind(目录类产物同样按路径存在性校验)。
|
|
277
|
+
// ② 未声明 paths:报成**声明不完整**而不是「缺件」的普通一例——没有路径就没有可判的存在性,也没有
|
|
278
|
+
// 可创建的落点,报文必须指向协议本身要修,而不是让人去做一件做不到的事。两侧都阻断、且渲染
|
|
279
|
+
// **同一句**(unspecifiedPathsNotice);区别只在编排:出口把它列进缺件清单,预检给它单列一段
|
|
280
|
+
// (不给「按上述路径创建」的指令)。
|
|
281
|
+
// ③ 归档产出(.specs/archive/ 下):只在预检侧延后报告,出口照常校验——那是归档做完后的判据。
|
|
282
|
+
// 本函数只做 ①②③ 都不涉及的那部分:枚举 + <change-id> 替换 + 在场判定。
|
|
283
|
+
|
|
284
|
+
// 「声明不完整」的同一句报文:两侧消费方都渲染这一句,措辞只此一处(不各写一份)。
|
|
285
|
+
export function unspecifiedPathsNotice(schemaId, artifactId) {
|
|
286
|
+
return '协议声明不完整:' + schemaId + '.' + artifactId
|
|
287
|
+
+ ' 标记为 required 但未声明 paths —— 修协议(给它加一条路径),或在模板里改 required=false';
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
export async function declaredRequiredArtifacts(protocol, node, change) {
|
|
251
291
|
const schemas = schemaMap(protocol);
|
|
252
|
-
const
|
|
292
|
+
const declared = [];
|
|
253
293
|
for (const schemaId of node.outputSchemas ?? []) {
|
|
254
294
|
const schema = schemas.get(schemaId);
|
|
255
295
|
for (const artifact of schema?.artifacts ?? []) {
|
|
256
296
|
if (!artifact.required) continue;
|
|
257
|
-
const
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
297
|
+
const declaredPaths = artifact.paths ?? [];
|
|
298
|
+
const unspecifiedPaths = declaredPaths.length === 0;
|
|
299
|
+
// <change-id> 替换:无活跃 change 时保留占位符原文(出口侧既有语义;预检侧在无 change 时更早
|
|
300
|
+
// 已退出,两侧因此共用这一条替换口径,不再各自写一份 replaceAll)。
|
|
301
|
+
const resolvedPaths = declaredPaths.map((declaredPath) => (change
|
|
302
|
+
? String(declaredPath).replaceAll('<change-id>', change)
|
|
303
|
+
: String(declaredPath)));
|
|
304
|
+
// 未声明路径时不解析产物根:没有路径就没有可查的存在性,「pathBase 非法」也不该由一件无路径的
|
|
305
|
+
// 产物引爆。present 保持 false——声明不完整不是「在场」,两侧据此阻断(差异②)。
|
|
306
|
+
let present = false;
|
|
307
|
+
if (!unspecifiedPaths) {
|
|
308
|
+
const artifactRoot = await workflowArtifactRoot(artifact.pathBase);
|
|
309
|
+
present = (await Promise.all(
|
|
310
|
+
resolvedPaths.map((declaredPath) => pathPatternExists(artifactRoot, declaredPath, { change })),
|
|
311
|
+
)).some(Boolean);
|
|
312
|
+
}
|
|
313
|
+
declared.push({ schemaId, artifact, resolvedPaths, present, kind: artifact.kind, unspecifiedPaths });
|
|
267
314
|
}
|
|
268
315
|
}
|
|
269
|
-
return
|
|
316
|
+
return declared;
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
// 出口侧的必需产物缺件清单(产物门禁与漂移容错的容错判据共用):取 declaredRequiredArtifacts 里
|
|
320
|
+
// 不在场者。本侧**不做**预检的 kind 过滤(①,见上式注释)——出口是完成判据:声明了却不在场就是
|
|
321
|
+
// 缺件,无论 kind 是不是 file。声明不完整者(②)同样进这份清单、同样阻断,但报的是可执行的那一句
|
|
322
|
+
// (指向协议),而不是一个空路径——与预检侧同一句、同一处措辞。
|
|
323
|
+
export async function missingRequiredArtifacts(protocol, node, change) {
|
|
324
|
+
return (await declaredRequiredArtifacts(protocol, node, change))
|
|
325
|
+
.filter((declared) => !declared.present)
|
|
326
|
+
.map((declared) => (declared.unspecifiedPaths
|
|
327
|
+
? unspecifiedPathsNotice(declared.schemaId, declared.artifact.id)
|
|
328
|
+
: declared.schemaId + '.' + declared.artifact.id));
|
|
270
329
|
}
|
|
271
330
|
|
|
272
|
-
// 历史归档 change 不强制真实跑验证命令(判断 .specs/archive/
|
|
331
|
+
// 历史归档 change 不强制真实跑验证命令(判断 .specs/archive/ 目录)。归档目录名按
|
|
332
|
+
// <日期>-<change-id> 精确形态比对(判据单源在 state-io):后缀匹配会把「名字恰好以本 change id
|
|
333
|
+
// 结尾」的别的 change 认作本 change 已归档,守卫于是**跳过真实跑验证命令的要求**——这是放行口,
|
|
334
|
+
// 不是显示问题。无日期前缀、名字逐字等于 change-id 的旧布局仍认(两处精确比对,都不做后缀)。
|
|
273
335
|
export async function isArchivedChange(changeName) {
|
|
274
336
|
if (!changeName) return false;
|
|
275
337
|
const archiveRoot = path.join(runRoot, '.specs', 'archive');
|
|
276
338
|
if (await fileExists(path.join(archiveRoot, changeName))) return true;
|
|
277
339
|
const entries = await fs.readdir(archiveRoot).catch(() => []);
|
|
278
|
-
return entries.some(
|
|
279
|
-
}
|
|
280
|
-
|
|
281
|
-
//
|
|
282
|
-
|
|
283
|
-
//
|
|
284
|
-
//
|
|
285
|
-
//
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
340
|
+
return entries.some((entry) => entry === changeName || isArchivedChangeDirName(entry, changeName));
|
|
341
|
+
}
|
|
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 [];
|
|
290
357
|
}
|
|
291
|
-
const
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
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 + ')');
|
|
299
380
|
}
|
|
300
|
-
|
|
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);
|
|
301
410
|
}
|
|
302
411
|
|
|
303
412
|
// 段名校验基准从模板自动派生——骨架计算统一委托 lib/guard-artifact-skeleton.mjs(单一实现:读
|
|
@@ -312,6 +421,32 @@ export { TEMPLATE_FALLBACK_SECTION_PATTERNS } from './guard-artifact-skeleton.mj
|
|
|
312
421
|
// 模板段名 → 宽松匹配正则:实现随段名归一移到骨架模块(单一出处),此处转出保持既有导出面。
|
|
313
422
|
export { headingPattern as templateSectionPattern } from './guard-artifact-skeleton.mjs';
|
|
314
423
|
|
|
424
|
+
// 命名段选取(唯一实现):候选集为空(模板整份缺席 / 该类段无从派生)⇒ TEMPLATE_SECTION_SKIP;
|
|
425
|
+
// 否则按关键词取首个命中的**模板段名**所派生的正则,关键词全不命中 ⇒ 调用方给的 fallback。
|
|
426
|
+
// H2 顶层段(pick)与登记表列举的结构子段(pickTemplateSection 的 level 3)共用这一条规则——
|
|
427
|
+
// 候选集来源不同,选段语义必须由同一个函数给出:同一份工件的同一段在两处被选出不同判据,就是
|
|
428
|
+
// 第二份实现(两个入口在同一候选集上给出同一判据,由套件场景逐态对账)。
|
|
429
|
+
function pickByKeywords(entries, keywords, fallback) {
|
|
430
|
+
if (entries.length === 0) return TEMPLATE_SECTION_SKIP;
|
|
431
|
+
for (const entry of entries) {
|
|
432
|
+
if (keywords.some((keyword) => entry.name.includes(keyword))) return entry.regex;
|
|
433
|
+
}
|
|
434
|
+
return fallback;
|
|
435
|
+
}
|
|
436
|
+
|
|
437
|
+
// 任意模板键 + 层级的选段入口:pick 只覆盖 change / requirement / design / summary 四个 H2 键,
|
|
438
|
+
// 而判据落在别的模板(TEST 的「第 1 轮」段与 1.1 测试矩阵一类)上时同样需要一个「段名从模板派生、
|
|
439
|
+
// 模板缺席即跳过、关键词不命中即回退」的口子——否则消费方只能自己遍历段名表,那是第二份选段实现。
|
|
440
|
+
// level 2 = 模板 H2 顶层段(骨架 sections) level 3 = 登记表列举的结构子段(structureSubsections)
|
|
441
|
+
// 返回正则或 TEMPLATE_SECTION_SKIP(调用方据此打印「未校验」而不是猜测段名)。opts.runRoot 与骨架
|
|
442
|
+
// 同一出入口(场景 / 临时夹具可指向别的项目根)。
|
|
443
|
+
export async function pickTemplateSection(key, { keywords = [], fallback, level = 2, runRoot } = {}) {
|
|
444
|
+
const skeleton = await buildSkeleton(key, runRoot === undefined ? {} : { runRoot });
|
|
445
|
+
const entries = (level === 3 ? skeleton.structureSubsections ?? [] : skeleton.sections)
|
|
446
|
+
.map((entry) => ({ name: entry.name, regex: entry.pattern }));
|
|
447
|
+
return pickByKeywords(entries, keywords, fallback);
|
|
448
|
+
}
|
|
449
|
+
|
|
315
450
|
// 读取模板全部段名生成模式列表:键形(change / requirement / design / summary)与 tpl[key] 的
|
|
316
451
|
// { name, regex } 数组形态、pick 的按关键词选段语义一律保持既有——只把数据源换成骨架模块(缓存与
|
|
317
452
|
// 模板读取归它一处负责,本模块不再自持 runRoot 键控的第二份缓存)。opts.runRoot 与骨架同一出入口
|
|
@@ -326,14 +461,7 @@ export async function templateSectionPatterns(opts = {}) {
|
|
|
326
461
|
// 模板派生判据全部跳过,fallback 只在「模板在场但某个具体段名缺失」时生效)。既有消费方里有闭包
|
|
327
462
|
// 外直接 `.test` 的调用点(「视觉调性」段读取),返回 null 会把「跳过」退化成 TypeError 崩溃——
|
|
328
463
|
// 未校验变成失败,同样不是 C9 的「跳过」,故返回可判别的跳过判据(见 TEMPLATE_SECTION_SKIP)。
|
|
329
|
-
result.pick = (key, keywords, fallback) =>
|
|
330
|
-
const sections = result[key] ?? [];
|
|
331
|
-
if (sections.length === 0) return TEMPLATE_SECTION_SKIP;
|
|
332
|
-
for (const section of sections) {
|
|
333
|
-
if (keywords.some((keyword) => section.name.includes(keyword))) return section.regex;
|
|
334
|
-
}
|
|
335
|
-
return fallback;
|
|
336
|
-
};
|
|
464
|
+
result.pick = (key, keywords, fallback) => pickByKeywords(result[key] ?? [], keywords, fallback);
|
|
337
465
|
return result;
|
|
338
466
|
}
|
|
339
467
|
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
//
|
|
1
|
+
// 受保护状态 I/O(守卫模块)+ 守卫侧运行上下文。
|
|
2
2
|
//
|
|
3
|
-
//
|
|
4
|
-
//
|
|
3
|
+
// 运行根(runRoot)的解析由 lib/run-root.mjs 单源提供:状态命令族与守卫族共用同一份事实,本模块
|
|
4
|
+
// 只取用并再导出(守卫入口的导入面因此不变)。packageRoot 与协议路径绑定仍在这里——各守卫模块
|
|
5
|
+
// 不再各自从环境变量推导同一事实,两份推导会在形态变化时静默分叉。
|
|
5
6
|
//
|
|
6
7
|
// 受保护读写通道(路径段判据 → 逐段目录校验 → 快照复核 → 唯一临时名原子落盘)在写入前与落盘前
|
|
7
8
|
// 都复核目标未被替换;任何一步不符即抛错(fail-closed),绝不退化为尽力而为的写。
|
|
@@ -12,6 +13,7 @@ import { constants as fsConstants, promises as fs } from 'fs';
|
|
|
12
13
|
import path from 'path';
|
|
13
14
|
import { fileURLToPath } from 'url';
|
|
14
15
|
import { RUNTIME_STATE_PATH, LEGACY_RUNTIME_STATE_PATH } from '../state-schema.mjs';
|
|
16
|
+
import { resolveRunRoot } from './run-root.mjs';
|
|
15
17
|
import {
|
|
16
18
|
inspectWorkflowProtectedPath,
|
|
17
19
|
readWorkflowProtectedFile,
|
|
@@ -24,9 +26,9 @@ import {
|
|
|
24
26
|
const scriptsRoot = path.dirname(fileURLToPath(import.meta.url));
|
|
25
27
|
// 技能包根:scripts/lib → scripts → skills/flow-comet(协议默认路径与包内资源以此为基准)
|
|
26
28
|
export const packageRoot = path.resolve(scriptsRoot, '..', '..');
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
29
|
+
// 运行根:唯一解析在 lib/run-root.mjs(与状态命令族同一份事实)——本模块只取用并再导出。
|
|
30
|
+
// 行内再写一次 env/cwd 推导,就是本次要消灭的那份分叉(守卫认变量、状态命令认 cwd)。
|
|
31
|
+
export const runRoot = resolveRunRoot();
|
|
30
32
|
|
|
31
33
|
// 协议路径解析:显式 --protocol 全局参数(command=argv[2] 之后的剩余参数)> state.protocolPath
|
|
32
34
|
// (init 持久化绑定)> FLOW_COMET_PROTOCOL 环境变量 > 内置默认。选择在入口 main() 内执行
|