flow-comet 1.6.1 → 1.6.3
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 +94 -46
- package/.flow-comet/skills/flow-comet/reference/KNOWN-ISSUES-template.md +1 -1
- package/.flow-comet/skills/flow-comet/reference/commit-discipline.md +32 -0
- package/.flow-comet/skills/flow-comet/reference/dirty-worktree.md +1 -1
- package/.flow-comet/skills/flow-comet/{GUIDANCE.md → reference/entry-detail.md} +22 -30
- package/.flow-comet/skills/flow-comet/reference/fix-loop.md +57 -0
- package/.flow-comet/skills/flow-comet/reference/platform-facts.md +58 -0
- package/.flow-comet/skills/flow-comet/reference/replan.md +23 -0
- package/.flow-comet/skills/flow-comet/reference/workflow-protocol.json +1 -1
- package/.flow-comet/skills/flow-comet/scripts/comet-check.mjs +5 -4
- package/.flow-comet/skills/flow-comet/scripts/comet-hook-guard.mjs +260 -17
- package/.flow-comet/skills/flow-comet/scripts/context-init.mjs +129 -3
- package/.flow-comet/skills/flow-comet/scripts/context-scan.mjs +396 -0
- package/.flow-comet/skills/flow-comet/scripts/evolve.mjs +778 -0
- package/.flow-comet/skills/flow-comet/scripts/guard-self-test.mjs +5432 -194
- package/.flow-comet/skills/flow-comet/scripts/health.mjs +664 -0
- package/.flow-comet/skills/flow-comet/scripts/route-node.mjs +51 -4
- package/.flow-comet/skills/flow-comet/scripts/state-schema.mjs +68 -0
- package/.flow-comet/skills/flow-comet/scripts/system-test.mjs +1479 -11
- package/.flow-comet/skills/flow-comet/scripts/time-utils.mjs +133 -0
- package/.flow-comet/skills/flow-comet/scripts/workflow-guard.mjs +197 -5
- package/.flow-comet/skills/flow-comet/scripts/workflow-handoff.mjs +115 -6
- package/.flow-comet/skills/flow-comet/scripts/workflow-state.mjs +261 -29
- package/.flow-comet/skills/flow-comet-archive/SKILL.md +10 -19
- package/.flow-comet/skills/flow-comet-change/SKILL.md +10 -1
- package/.flow-comet/skills/flow-comet-compose/SKILL.md +1 -1
- package/.flow-comet/skills/flow-comet-design/SKILL.md +8 -6
- package/.flow-comet/skills/flow-comet-evolve/SKILL.md +46 -11
- package/.flow-comet/skills/flow-comet-execute/SKILL.md +58 -16
- package/.flow-comet/skills/flow-comet-health/SKILL.md +57 -16
- package/.flow-comet/skills/flow-comet-integration/SKILL.md +8 -5
- package/.flow-comet/skills/flow-comet-open/SKILL.md +5 -1
- 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 +9 -12
- package/.flow-comet/skills/flow-comet-subagent-execute/SKILL.md +59 -16
- package/.flow-comet/skills/flow-comet-task/SKILL.md +3 -2
- package/.flow-comet/skills/flow-comet-ui-design/SKILL.md +29 -4
- package/.flow-comet/skills/flow-comet-verify/SKILL.md +8 -17
- package/README.md +5 -5
- package/package.json +1 -1
- package/scripts/dsh-bridge.mjs +59 -26
- package/scripts/prepare-env.mjs +165 -1
- package/.flow-comet/skills/flow-comet/reference/TEST-MATRIX.md +0 -116
- package/.flow-comet/skills/flow-comet/reference/composition-report.md +0 -65
- package/.flow-comet/skills/flow-comet/reference/dsh-platform.md +0 -184
- package/.flow-comet/skills/flow-comet/reference/resolved-skills.json +0 -661
- package/.flow-comet/skills/flow-comet/reference/skill-review.md +0 -13
- package/.flow-comet/skills/flow-comet/reference/subagents/script-author.md +0 -7
- package/.flow-comet/skills/flow-comet/reference/worktree-notes.md +0 -70
|
@@ -343,6 +343,8 @@ function analyzeDependencyGraph(blocks) {
|
|
|
343
343
|
// process.exit / 入参改写),findParallelWriteConflicts 只负责读文件、解析、族①②与去重键的组织。
|
|
344
344
|
// 路径解析 / 归一(parsePaths / normalizeTaskPath)为本模块单份实现,族①②③共用;依赖文本解析
|
|
345
345
|
// 复用本模块 taskDependencyEligibility(依赖解析单一权威——不再另起第二份正则)。
|
|
346
|
+
// 路径**重叠判定**(含 glob 语义 · 见 DESIGN 的路径重叠判定决策)同样是本模块单份实现:具名纯函数 collectPathOverlaps,
|
|
347
|
+
// 族①②③一律经它比较——任一族内联第二份比较逻辑即违规(L-067 / AC-5 单源判据)。
|
|
346
348
|
// 开标签属性解析与 workflow-state 路由共享 taskOpeningAttrs(属性序无关;不读块内文本)。
|
|
347
349
|
// 2026-09-28 PR 审查采纳:由 workflow-guard.mjs 抽到本模块——plan 出口与 replan 重校消费同一实现,
|
|
348
350
|
// 两侧各自决定强判(BLOCK)/弱判(WARN),判定本身只此一处(L-067 单一判据)。
|
|
@@ -398,6 +400,50 @@ function parsePaths(matchText) {
|
|
|
398
400
|
.filter((p) => p !== null && p !== '');
|
|
399
401
|
}
|
|
400
402
|
|
|
403
|
+
// 元字符判定:glob 魔法 = `*` / `?` / `[` 三类——与 workflow-handoff.mjs 的字面路径资格判定
|
|
404
|
+
// (literalRelativePosixPath 的 /[*?[]/)同口径;「什么算 glob」不另立第三套定义。
|
|
405
|
+
const GLOB_MAGIC_CHAR = /[*?[]/;
|
|
406
|
+
|
|
407
|
+
// 路径重叠判定(族①②③共用的唯一具名纯函数 · 见 DESIGN 的重叠判定与判据单源决策 · AC-5):入参为两组**已归一**路径
|
|
408
|
+
// 声明(normalizeTaskPath 产物,分隔符统一 `/`),返回重叠描述串数组(直接进冲突消息的 files 字段)
|
|
409
|
+
// 或空数组(不重叠);无 fs / console / process.exit,不改任何入参。
|
|
410
|
+
// 三形态:
|
|
411
|
+
// ① 两侧均无元字符 ⇒ 既有字面相等语义(逐字等价:相等报该路径本身——消费方消息零变化);
|
|
412
|
+
// ② 单侧含元字符 ⇒ 用该侧模式匹配另一侧字面路径:**段数必须相等**(`*` 不跨 `/`,`**` 亦非递归)、
|
|
413
|
+
// 段内 `*` 匹配段内任意字符(`[^/]*`)、其余字符字面锚定(正则元字符转义);段内无 `*` 即不命中;
|
|
414
|
+
// ③ 双侧均含 glob ⇒ **保守视为重叠**(宁可误拦不可漏检——漏检正是本判据要修的缺陷);无共同字面
|
|
415
|
+
// 路径可报,故报两侧声明。
|
|
416
|
+
// ②的语义**对齐基准** = workflow-handoff.mjs 的 matchWriteFilePattern(:94):该函数未导出、所在模块
|
|
417
|
+
// 又是 CLI 顶层脚本(import 即执行 main),物理不可复用;故在本模块内按同一形态实现并在此锚定基准
|
|
418
|
+
// 位置——基准若变,此处必须同步(漂移可见;不互指「同源」了事,L-067 修法子句)。零第三方 glob 库
|
|
419
|
+
// (ADR-007):复用本模块既有 escapeRegExp(转义集与基准内联转义一致)。
|
|
420
|
+
function collectPathOverlaps(leftPaths, rightPaths) {
|
|
421
|
+
const overlaps = [];
|
|
422
|
+
for (const left of leftPaths) {
|
|
423
|
+
for (const right of rightPaths) {
|
|
424
|
+
if (left === right) { overlaps.push(left); continue; } // ① 逐字相等(含两侧同 glob)
|
|
425
|
+
const leftGlob = GLOB_MAGIC_CHAR.test(left);
|
|
426
|
+
const rightGlob = GLOB_MAGIC_CHAR.test(right);
|
|
427
|
+
if (!leftGlob && !rightGlob) continue; // ① 两侧字面且不等 ⇒ 不重叠
|
|
428
|
+
if (leftGlob && rightGlob) { // ③ 双侧 glob:保守判重叠
|
|
429
|
+
overlaps.push(left + ' ∩ ' + right);
|
|
430
|
+
continue;
|
|
431
|
+
}
|
|
432
|
+
const patternSegments = (leftGlob ? left : right).split('/'); // ② 单侧 glob:模式 × 字面
|
|
433
|
+
const literalSegments = (leftGlob ? right : left).split('/');
|
|
434
|
+
if (patternSegments.length !== literalSegments.length) continue;
|
|
435
|
+
const matched = patternSegments.every((seg, index) => {
|
|
436
|
+
if (seg === literalSegments[index]) return true;
|
|
437
|
+
if (!seg.includes('*')) return false;
|
|
438
|
+
return new RegExp('^' + seg.split('*').map(escapeRegExp).join('[^/]*') + '$')
|
|
439
|
+
.test(literalSegments[index]);
|
|
440
|
+
});
|
|
441
|
+
if (matched) overlaps.push(left + ' ∩ ' + right);
|
|
442
|
+
}
|
|
443
|
+
}
|
|
444
|
+
return overlaps;
|
|
445
|
+
}
|
|
446
|
+
|
|
401
447
|
// 第三族(同文件跨任务且无依赖路径)计算——同模块具名纯函数:输入任务块 / 依赖图 / 既有族去重键,
|
|
402
448
|
// 输出冲突对数组({ a, b, files });无 fs / console / process.exit,不改任何入参。
|
|
403
449
|
// taskContent 与 allBlocks 须同源(taskContent = 产出 allBlocks 的 TASK.md 文本)——修复任务族
|
|
@@ -423,7 +469,7 @@ function collectCrossTaskConflicts({ taskContent = '', allBlocks = [], depsById
|
|
|
423
469
|
for (let i = 0; i < participants.length; i++) {
|
|
424
470
|
for (let j = i + 1; j < participants.length; j++) {
|
|
425
471
|
if (excludedPairKeys.has(taskPairKey(participants[i].id, participants[j].id))) continue;
|
|
426
|
-
const overlap =
|
|
472
|
+
const overlap = collectPathOverlaps(participants[i].writes, participants[j].writes);
|
|
427
473
|
if (overlap.length === 0) continue;
|
|
428
474
|
if (reachableFrom(participants[i].id).has(participants[j].id)
|
|
429
475
|
|| reachableFrom(participants[j].id).has(participants[i].id)) continue;
|
|
@@ -470,14 +516,14 @@ async function findParallelWriteConflicts(changeDir) {
|
|
|
470
516
|
const readWarnings = [];
|
|
471
517
|
for (let i = 0; i < perTask.length; i++) {
|
|
472
518
|
for (let j = i + 1; j < perTask.length; j++) {
|
|
473
|
-
const overlap =
|
|
519
|
+
const overlap = collectPathOverlaps(perTask[i].writes, perTask[j].writes);
|
|
474
520
|
if (overlap.length) writeConflicts.push({ a: perTask[i].id, b: perTask[j].id, files: overlap });
|
|
475
521
|
// 读写弱判触发面:仅无显式 depends_on 关联的并行对(有显式关联=依赖已声明,跳过)
|
|
476
522
|
const associated = perTask[i].deps.has(perTask[j].id) || perTask[j].deps.has(perTask[i].id);
|
|
477
523
|
if (associated) continue;
|
|
478
|
-
const readOverlap =
|
|
524
|
+
const readOverlap = collectPathOverlaps(perTask[i].reads, perTask[j].writes);
|
|
479
525
|
if (readOverlap.length) readWarnings.push({ a: perTask[i].id, b: perTask[j].id, files: readOverlap });
|
|
480
|
-
const readOverlap2 =
|
|
526
|
+
const readOverlap2 = collectPathOverlaps(perTask[j].reads, perTask[i].writes);
|
|
481
527
|
if (readOverlap2.length) readWarnings.push({ a: perTask[j].id, b: perTask[i].id, files: readOverlap2 });
|
|
482
528
|
}
|
|
483
529
|
}
|
|
@@ -1331,6 +1377,7 @@ export {
|
|
|
1331
1377
|
FIX_SECTION_TITLE_FALLBACK,
|
|
1332
1378
|
analyzeDependencyGraph,
|
|
1333
1379
|
findParallelWriteConflicts,
|
|
1380
|
+
collectPathOverlaps,
|
|
1334
1381
|
normalizeHeading,
|
|
1335
1382
|
classifyFixReturnCause,
|
|
1336
1383
|
resolveFixRollbackDecision,
|
|
@@ -2,8 +2,10 @@
|
|
|
2
2
|
// 内置节点常量:自 workflow-state.mjs 的内联表原样迁移,供 workflow-state / workflow-guard / workflow-handoff 三脚本共用。
|
|
3
3
|
// 语义(与迁移前的内联表完全一致):存在字段逐一校验;未知字段放行(前向兼容);缺字段放行(readState 默认补);
|
|
4
4
|
// 只校验存在字段的类型。调用方负责 BLOCKED / exit(1) 处理。
|
|
5
|
+
import { promises as fs } from 'fs';
|
|
5
6
|
import path from 'path';
|
|
6
7
|
import { resolveProtocol } from './protocol-utils.mjs';
|
|
8
|
+
import { formatLocalDate, isValidTimestamp, parseTimestamp } from './time-utils.mjs';
|
|
7
9
|
|
|
8
10
|
// ---------- 运行时路径常量(单一来源)----------
|
|
9
11
|
// 「状态文件在哪」曾是一个被独立表达在 6 处的决策(协议 state.statePath、workflow-state 默认值、
|
|
@@ -20,6 +22,43 @@ export const RUNTIME_STATE_PATH = RUNTIME_DIR + '/' + RUNTIME_STATE_FILE_NAME;
|
|
|
20
22
|
// 死 API 面(且会诱使调用方自行拼路径,重新引入第二处决策)。
|
|
21
23
|
export const LEGACY_RUNTIME_STATE_PATH = '.comet/' + RUNTIME_STATE_FILE_NAME;
|
|
22
24
|
|
|
25
|
+
// ---------- 原子写(单一来源) ----------
|
|
26
|
+
// 「同目录固定 `.tmp` + rename + 失败清理」这一写盘策略的**唯一实现**:workflow-state / workflow-handoff /
|
|
27
|
+
// evolve / context-scan 曾各写一份(一次策略修正只落一处,另几处静默漂移)。先写同目录临时文件再 rename
|
|
28
|
+
// 覆盖目标——目标要么旧内容、要么新内容,不会出现被截断的半写状态;固定临时名与目标同目录,保证 rename
|
|
29
|
+
// 不跨卷,故状态下发(单写者形态)不需要按写入者区分临时名。
|
|
30
|
+
// 写失败(磁盘满 / 权限 / 目标被占用)清理临时文件后抛出,调用方按 fail-closed 处理。
|
|
31
|
+
// mkdir recursive 前置由本函数承担:调用方不再各自补目录(旧三份实现里只有一份带 mkdir)。
|
|
32
|
+
export async function writeFileAtomic(file, text) {
|
|
33
|
+
await fs.mkdir(path.dirname(file), { recursive: true });
|
|
34
|
+
const temporary = file + '.tmp';
|
|
35
|
+
try {
|
|
36
|
+
await fs.writeFile(temporary, text, 'utf8');
|
|
37
|
+
await fs.rename(temporary, file);
|
|
38
|
+
} catch (error) {
|
|
39
|
+
try { await fs.rm(temporary, { force: true }); } catch { /* 清理失败不掩盖原始写错误 */ }
|
|
40
|
+
throw error;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
// JSON 落盘(state / 标记文件):序列化形态与收敛前逐字一致(2 空格缩进 + 末尾换行)。
|
|
45
|
+
export async function writeJsonAtomic(file, value) {
|
|
46
|
+
await writeFileAtomic(file, JSON.stringify(value, null, 2) + '\n');
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
// ---------- 改写前备份(单一来源) ----------
|
|
50
|
+
// 「改写人可见文档之前,先把改写前版本复制到目标同目录的 `<文档>.bak-<本地日期>`」这一决定曾由
|
|
51
|
+
// evolve.mjs 与 context-scan.mjs 各表达一份(同形但两份):命名族或失败处置一旦演进,只改一侧
|
|
52
|
+
// 即静默分叉——与原子写同址收敛,两个消费方只消费本导出。
|
|
53
|
+
// 语义与收敛前逐字等价:日期分量走 time-utils(本地日期的单一权威;非法时刻抛错 → fail-closed)、
|
|
54
|
+
// 同目录同名(同日重复改写覆盖当日备份,不堆积)、复制失败即抛出(调用方按 fail-closed 处理:
|
|
55
|
+
// 目标文档与 state 都保持原值)。返回值与 writeFileAtomic 同形 = 无(不造无人消费的 API 面)。
|
|
56
|
+
// 调用方负责「取值真变化才备份」——无变化就没有可备份的「改写前版本」。
|
|
57
|
+
export async function backupBeforeWrite(file, timestamp) {
|
|
58
|
+
const backup = file + '.bak-' + formatLocalDate(parseTimestamp(timestamp));
|
|
59
|
+
await fs.copyFile(file, backup);
|
|
60
|
+
}
|
|
61
|
+
|
|
23
62
|
// ---------- 协议来源解析(state 持久化绑定 · 单一权威) ----------
|
|
24
63
|
// init 解析出的协议路径持久化在 state.protocolPath:项目根内 → 根相对 POSIX 形态(随项目迁移),
|
|
25
64
|
// 项目根外 → 绝对路径原样保留。消费方按统一优先级选择协议路径:
|
|
@@ -95,6 +134,13 @@ export const STATE_FIELD_VALIDATORS = [
|
|
|
95
134
|
{ field: 'ai_context_doc', check: (v) => typeof v === 'string' || v === null },
|
|
96
135
|
// auto-init-detection: 上次全量初始化扫描时间(ISO 日期字符串或 null)
|
|
97
136
|
{ field: 'last_intel_scan', check: (v) => typeof v === 'string' || v === null },
|
|
137
|
+
// evolve 元数据: 上次架构沉淀时刻(本地时间 + 显式偏移,兼容历史 `Z` 形态)。写通道 =
|
|
138
|
+
// `config set last_evolve_at`——脚本不直写该字段。形态或日历不可自洽的值一律 fail-closed 拒绝
|
|
139
|
+
// 写入(不修补不猜测,判定单一来源 = time-utils 的 isValidTimestamp);「从未跑过 evolve」用
|
|
140
|
+
// **字段缺席**表达,故不接受 null(显式空值会让到期判定与缺席歧义)。
|
|
141
|
+
// 该字段同时是 `.specs/CONTEXT.md` 的 `## evolve 元数据` 段首字段(段侧字段名见本文件
|
|
142
|
+
// EVOLVE_METADATA_FIELDS——双落点两处取值必须一致,冲突以 state 为准)。
|
|
143
|
+
{ field: 'last_evolve_at', check: (v) => isValidTimestamp(v) },
|
|
98
144
|
// 协议来源绑定(init 持久化解析后的协议路径;旧 state 缺字段 = 未绑定,归属门禁渐进回退环境变量/默认)
|
|
99
145
|
{ field: 'protocolPath', check: (v) => typeof v === 'string' || v === null || v === undefined },
|
|
100
146
|
// 审计历史(事件追加数组):存在即必须是数组——非数组是审计历史损坏,一律 fail-closed 拒绝写入,
|
|
@@ -102,6 +148,15 @@ export const STATE_FIELD_VALIDATORS = [
|
|
|
102
148
|
{ field: 'history', check: (v) => Array.isArray(v) },
|
|
103
149
|
];
|
|
104
150
|
|
|
151
|
+
// ---------- `## evolve 元数据` 段(单一来源) ----------
|
|
152
|
+
// 该段的段名与三字段名**唯一表达处**:写方(evolve.mjs 的双落点段侧)与校验方(context-init.mjs 的
|
|
153
|
+
// CONTEXT 格式校验)都从这里取,不再各自字面量(两处表达必然漂移:校验集合 ⊃ 生产集合时,写方
|
|
154
|
+
// 从不产出的字段名会被静默容差接受)。段是**可选段**:没跑过架构沉淀的项目不补段(缺席不报)。
|
|
155
|
+
// 第三字段是「下次建议」——旧的并行协作期容差别名(「下次同步建议」)**无任何生产者**,已从取值中
|
|
156
|
+
// 移除;旧文档若带该别名会被校验方拦下并给出可见的格式提示(见 context-init.mjs)。
|
|
157
|
+
export const EVOLVE_METADATA_SECTION = 'evolve 元数据';
|
|
158
|
+
export const EVOLVE_METADATA_FIELDS = ['last_evolve_at', 'scanner', '下次建议'];
|
|
159
|
+
|
|
105
160
|
// 返回非法字段名数组(空 = 合法)。仅校验存在字段;unknown / 缺失字段一律放行。
|
|
106
161
|
export function validateStateFields(state) {
|
|
107
162
|
const bad = [];
|
|
@@ -166,3 +221,16 @@ export function setFixRoundsFor(state, value) {
|
|
|
166
221
|
}
|
|
167
222
|
state.fixRoundsByChange[state.activeChange] = value;
|
|
168
223
|
}
|
|
224
|
+
|
|
225
|
+
// ---------- 撤回留痕判据(单一来源:workflow-handoff.mjs 与 workflow-guard.mjs 共用) ----------
|
|
226
|
+
// 「已撤回」= request 记录上**同时**存在非空 withdrawnAt(时间戳;新写入走 time-utils 的 nowTimestamp
|
|
227
|
+
// ——本地时间 + 显式偏移,判据只要求非空字符串,故历史 Z 形态同样被接受)与非空 withdrawnBy(来源),
|
|
228
|
+
// 缺一不算撤回——只写其中一个字段的手改形态不构成撤回证据,守卫照旧按在飞委托处理(fail-closed:
|
|
229
|
+
// 判据不得只看单一字段,否则「带时间戳与来源」的留痕要求形同虚设)。
|
|
230
|
+
// 撤回是**终态**:记录不删除(历史留痕),只在原记录上加法式落两个字段。
|
|
231
|
+
export function handoffRequestWithdrawn(record) {
|
|
232
|
+
if (!record || typeof record !== 'object' || Array.isArray(record)) return false;
|
|
233
|
+
const at = record.withdrawnAt;
|
|
234
|
+
const by = record.withdrawnBy;
|
|
235
|
+
return typeof at === 'string' && at.trim() !== '' && typeof by === 'string' && by.trim() !== '';
|
|
236
|
+
}
|