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
|
@@ -6,8 +6,13 @@ import { runRootDir } from './state-io.mjs';
|
|
|
6
6
|
// 判定核心在共享模块 route-node.mjs——本函数保持既有签名与返回语义,仅委托 resolveNextNode
|
|
7
7
|
// (output 与抽取前一致)。route / buildNodeCompletionFlags / pathPatternExists / nodeFlagsComplete /
|
|
8
8
|
// protocolTaskFilePath / hasSubagentNode 同为该模块的单一实现(guard 与状态机共用,杜绝双实现漂移)。
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
//
|
|
10
|
+
// changeDir(可选)= 该 change 目录相对 .specs/ 的 POSIX 路径(活动 '<id>' / 归档
|
|
11
|
+
// 'archive/<日期>-<id>',由 state-io.resolveChangeDir 解析)。目录已搬进归档时产物与任务文件都在
|
|
12
|
+
// 归档目录里——不传它会让推导看不到任何产物、回退到协议首节点(移动后报 open 的成因)。缺省 null
|
|
13
|
+
// = 既有形态(按 .specs/<changeName> 解析),旧调用零变化。
|
|
14
|
+
export async function determineNode(changeName, protocol, completedNodes = [], changeDir = null) {
|
|
15
|
+
return resolveNextNode({ runRoot: runRootDir(), changeName, protocol, completedNodes, changeDir });
|
|
11
16
|
}
|
|
12
17
|
|
|
13
18
|
// 正常推进豁免判定——exit --apply 会把 currentNode 推进到下一节点(如 open exit 后
|
|
@@ -20,7 +25,7 @@ export async function determineNode(changeName, protocol, completedNodes = []) {
|
|
|
20
25
|
// NEXT 同源),静态直接后继兜底(串行推进原语义,旧态/序列流不回归)。与回退豁免独立判断
|
|
21
26
|
// (回退 = TASK.md 有 pending 回退修复任务;本豁免 = 正常推进后继)。真乱序(currentNode
|
|
22
27
|
// 既非路由后继也非静态后继)仍维持严格 BLOCK。
|
|
23
|
-
export async function normalAdvanceExempt(state, protocol, completedNodes, currentNode, changeName) {
|
|
28
|
+
export async function normalAdvanceExempt(state, protocol, completedNodes, currentNode, changeName, changeDir = null) {
|
|
24
29
|
if (completedNodes.length === 0) return false;
|
|
25
30
|
const lastNodeId = completedNodes[completedNodes.length - 1];
|
|
26
31
|
const routeIds = route(protocol).map((node) => node.id);
|
|
@@ -42,7 +47,9 @@ export async function normalAdvanceExempt(state, protocol, completedNodes, curre
|
|
|
42
47
|
// 路由后继判定(与 guard 出口同源):currentNode === resolveNextNode(completedNodes) 即
|
|
43
48
|
// 正常推进后的下一路由目标(含平行转换与趟间回流);文件推导失败(异常态)不豁免。
|
|
44
49
|
try {
|
|
45
|
-
|
|
50
|
+
// 产物根与共享视图取同一个 changeDir:两处各按自己的根推导,「路由后继」就会与 next 的 NODE
|
|
51
|
+
// 行给出两个答案(移动后尤其明显:一处读归档、一处读已不存在的活动目录)。
|
|
52
|
+
const routingNext = await determineNode(changeName, protocol, completedNodes, changeDir);
|
|
46
53
|
if (routingNext === currentNode) return true;
|
|
47
54
|
} catch {
|
|
48
55
|
return false;
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// 路径锚由入口在分派前初始化一次;运行根由唯一解析模块(run-root.mjs)给定——FLOW_COMET_RUN_ROOT
|
|
4
4
|
// 优先、否则进程 cwd。模块内不自行取 cwd:入口与模块各持一份「运行根」就是同一事实的第二处表达。
|
|
5
5
|
// 目录名与状态文件名常量来自 state-schema.mjs。
|
|
6
|
-
import { promises as fs } from 'fs';
|
|
6
|
+
import { existsSync, promises as fs, readdirSync } from 'fs';
|
|
7
7
|
import path from 'path';
|
|
8
8
|
import { validateStateFields, writeJsonAtomic, RUNTIME_DIR, RUNTIME_STATE_FILE_NAME } from '../state-schema.mjs';
|
|
9
9
|
import { inspectWorkflowPathSegments } from '../protocol-utils.mjs';
|
|
@@ -43,19 +43,37 @@ export async function fileExists(file) {
|
|
|
43
43
|
try { await fs.access(file); return true; } catch { return false; }
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
+
// 「在办」身份的唯一判据:state.activeChange 非空 ∧ status ≠ 'completed' ⇒ 在办(返回 change 名),
|
|
47
|
+
// 否则 null。目录在不在**不参与**(位置由 resolveChangeDir 回答)。抽成具名函数是为了让「同一身份
|
|
48
|
+
// 口径」有唯一表达:findActiveChange(读文件 + state 缺失时的恢复扫描)与 init 的覆盖闸门(手里
|
|
49
|
+
// 已有 prevState,不重读)消费的是同一条规则,而不是各写一遍表达式。
|
|
50
|
+
// 消费方注意:init 的闸门只认状态——state 文件缺席时「没有可被覆盖的旧状态」,恢复扫描出的目录
|
|
51
|
+
// 不构成阻断理由,也不该被当成留档对象。
|
|
52
|
+
export function inFlightChangeName(state) {
|
|
53
|
+
if (!state || typeof state !== 'object' || Array.isArray(state)) return null;
|
|
54
|
+
if (state.status === 'completed') return null;
|
|
55
|
+
return typeof state.activeChange === 'string' && state.activeChange !== '' ? state.activeChange : null;
|
|
56
|
+
}
|
|
57
|
+
|
|
46
58
|
export async function findActiveChange() {
|
|
47
|
-
// 1.
|
|
59
|
+
// 1. 身份只看状态(单一判定,判据 = inFlightChangeName):state 存在 ∧ activeChange 非空 ∧
|
|
60
|
+
// status ≠ 'completed' ⇒ 在办。目录在不在**不参与**身份判定——位置由 resolveChangeDir 回答:
|
|
61
|
+
// 归档搬移只是把目录换个位置,change 仍在办(移动后 status / next / record 照常报进行中)。
|
|
62
|
+
// 把身份绑在「活动目录存在」上会让移动后瞬时丢掉身份,命令层随即把在办 change 报成
|
|
63
|
+
// no-change / NEXT: done(假答案)。
|
|
48
64
|
if (await fileExists(stateFile())) {
|
|
49
65
|
const state = await readJson(stateFile());
|
|
50
|
-
|
|
51
|
-
|
|
66
|
+
const inFlight = inFlightChangeName(state);
|
|
67
|
+
if (inFlight) return inFlight;
|
|
68
|
+
// completed 检查优先于恢复扫描——归档完成态(无论 activeChange 是否残留)一律不识别为 active
|
|
69
|
+
//(防归档残留目录 / 残留字段误判)
|
|
52
70
|
if (state.status === 'completed') return null;
|
|
53
|
-
if (state.activeChange) {
|
|
54
|
-
const changeDir = path.join(specsDir(), state.activeChange);
|
|
55
|
-
if (await fileExists(changeDir)) return state.activeChange;
|
|
56
|
-
}
|
|
57
71
|
}
|
|
58
|
-
// 2.
|
|
72
|
+
// 2. .specs/ 扫描**只是 state 丢失时的恢复通道,不是第二身份来源**:它只在「无 state 文件」
|
|
73
|
+
// 与「state 无 activeChange」两种情形下运行,触发条件与上一步的分支互斥。读这段时不要把它当成
|
|
74
|
+
// 另一个身份来源——那会让同一事实出现两套判定(state 说 A、目录扫描说 B,命令各取一套)。
|
|
75
|
+
// 位置(活动 / 归档)由 resolveChangeDir 回答,不在本函数内。
|
|
76
|
+
// Scan .specs/ for directories with TASK.md (active flow-kit changes)
|
|
59
77
|
// 注: 曾尝试按 archive/ 对应归档跳过残留目录——但会误伤同名新 change(既有实证),已撤回。
|
|
60
78
|
// 「state 缺失 + 归档残留」为已知限制;归档后正常态由上文 completed 分支覆盖。
|
|
61
79
|
try {
|
|
@@ -164,11 +182,163 @@ export function isArchivedChangeDirName(entry, changeName) {
|
|
|
164
182
|
return archiveDate !== null && entry === archiveDate + '-' + changeName;
|
|
165
183
|
}
|
|
166
184
|
|
|
167
|
-
//
|
|
168
|
-
//
|
|
169
|
-
//
|
|
170
|
-
//
|
|
171
|
-
//
|
|
185
|
+
// ---------- change 目录定位(唯一实现) ----------
|
|
186
|
+
// 给定 change 名,回答「这个 change 的目录现在在哪」:活动目录 .specs/<id>/ 优先;不在就是归档目录
|
|
187
|
+
// .specs/archive/<YYYY-MM-DD>-<id>/(整名精确比对——判据单源 isArchivedChangeDirName,不写第二份
|
|
188
|
+
// 日期规则)。多候选按日期判:排除日期早于 state.createdAt 日期部分的候选、取日期最新的一份;
|
|
189
|
+
// 仍并列 / 无候选 → **不猜**,把候选交还调用方按 fail-closed 处理(status='ambiguous' | 'missing')。
|
|
190
|
+
//
|
|
191
|
+
// 身份与位置是两件事:身份只看 state(findActiveChange),本函数只回答位置。目录缺失不影响「这个
|
|
192
|
+
// change 在办」的判定,只影响命令能不能落地——所以运行命令在解析不到时必须 fail-closed 并点名两处
|
|
193
|
+
// 路径,而不是把在办 change 报成「没有在办 change」。
|
|
194
|
+
//
|
|
195
|
+
// 落点在本模块(.specs 路径上下文):这是一条 change 目录的路径规则,命令族 / 守卫族 / 委托脚本都
|
|
196
|
+
// 消费它,各写一份必然在「活动目录优先对不对」「多归档目录取哪个」上分叉(L-067)。运行根是显式
|
|
197
|
+
// 参数:各族注入自己的根(状态族 runRootDir()、守卫族 runRoot),规则不绑定任何一族的运行上下文。
|
|
198
|
+
//
|
|
199
|
+
// 返回形态(消费方按 status 分派,不解读 dir 的字符串形态):
|
|
200
|
+
// { status: 'active', dir, relative, display, archiveDate: null, candidates: [] }
|
|
201
|
+
// { status: 'archived', dir, relative, display, archiveDate, candidates }
|
|
202
|
+
// { status: 'missing', dir: null, relative: null, display: null, archiveDate: null, candidates }
|
|
203
|
+
// { status: 'ambiguous', dir: null, relative: null, display: null, archiveDate, candidates }
|
|
204
|
+
// relative = 相对 .specs/ 的 POSIX 路径('<id>' / 'archive/<日期>-<id>')——节点推导的产物根就按它
|
|
205
|
+
// 拼(见 route-node.resolveNextNode 的 changeDir 入参);display = 用户可见的 .specs/... 形态。
|
|
206
|
+
export async function resolveChangeDir({ root, changeName, createdAt = null } = {}) {
|
|
207
|
+
const specsRoot = path.join(root, '.specs');
|
|
208
|
+
const activeDir = path.join(specsRoot, changeName);
|
|
209
|
+
if (await fileExists(activeDir)) {
|
|
210
|
+
return {
|
|
211
|
+
status: 'active',
|
|
212
|
+
dir: activeDir,
|
|
213
|
+
relative: changeName,
|
|
214
|
+
display: '.specs/' + changeName,
|
|
215
|
+
archiveDate: null,
|
|
216
|
+
candidates: [],
|
|
217
|
+
};
|
|
218
|
+
}
|
|
219
|
+
const archiveRoot = path.join(specsRoot, 'archive');
|
|
220
|
+
const entries = await fs.readdir(archiveRoot).catch(() => []);
|
|
221
|
+
const candidates = [];
|
|
222
|
+
for (const entry of entries) {
|
|
223
|
+
if (!isArchivedChangeDirName(entry, changeName)) continue;
|
|
224
|
+
candidates.push({ name: entry, date: archiveDateFromName(entry) });
|
|
225
|
+
}
|
|
226
|
+
const lowerBound = archiveDateLowerBound(createdAt);
|
|
227
|
+
const eligible = lowerBound === null
|
|
228
|
+
? candidates.slice()
|
|
229
|
+
: candidates.filter((candidate) => candidate.date >= lowerBound);
|
|
230
|
+
if (eligible.length === 0) {
|
|
231
|
+
return { status: 'missing', dir: null, relative: null, display: null, archiveDate: null, candidates };
|
|
232
|
+
}
|
|
233
|
+
// 日期字典序 = 时间序(同一 YYYY-MM-DD 形态);同日期多份即并列,不按 readdir 顺序挑一份。
|
|
234
|
+
// 判据契约是「排不出唯一就停」:在 `<日期>-<id>` 精确名规则下同一日期不可能有两份(每个日期只
|
|
235
|
+
// 拼出一个名字),所以并列支正常不可达——保留它是因为「不猜」是解析器对调用方的承诺,不该是某条
|
|
236
|
+
// 命名规则的副产品(命名规则一放宽,是本支先接住,而不是 readdir 顺序先替人做决定)。
|
|
237
|
+
const newest = eligible.reduce((best, candidate) => (candidate.date > best.date ? candidate : best), eligible[0]);
|
|
238
|
+
const tied = eligible.filter((candidate) => candidate.date === newest.date);
|
|
239
|
+
if (tied.length > 1) {
|
|
240
|
+
return { status: 'ambiguous', dir: null, relative: null, display: null, archiveDate: newest.date, candidates };
|
|
241
|
+
}
|
|
242
|
+
return {
|
|
243
|
+
status: 'archived',
|
|
244
|
+
dir: path.join(archiveRoot, newest.name),
|
|
245
|
+
relative: 'archive/' + newest.name,
|
|
246
|
+
display: '.specs/archive/' + newest.name,
|
|
247
|
+
archiveDate: newest.date,
|
|
248
|
+
candidates,
|
|
249
|
+
};
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
// createdAt 的日期下界:取 state 时间戳的前 10 个字符,交给 time-utils 的归档日期判据校验(不写
|
|
253
|
+
// 第二份日期形态正则)。形态不可判 → null = 不设下界(判不了的日期不许当作「全都太早」把唯一
|
|
254
|
+
// 候选也排掉)。
|
|
255
|
+
function archiveDateLowerBound(createdAt) {
|
|
256
|
+
if (typeof createdAt !== 'string') return null;
|
|
257
|
+
return archiveDateFromName(createdAt.trim().slice(0, 10));
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
// 位置解析的命令面形态:可解析 → { ok: true, resolution };解析不到 → { ok: false, resolution,
|
|
261
|
+
// message }。退出码与打印归命令层(本模块不 process.exit),但**报文文本**落在这里——status /
|
|
262
|
+
// next / record / skill-load 必须说同一句话(成因只有「两处都没有」与「多候选判不出」两类,各写
|
|
263
|
+
// 一份措辞必然分叉)。
|
|
264
|
+
export async function resolveChangeLocation({ root, changeName, createdAt = null } = {}) {
|
|
265
|
+
const resolution = await resolveChangeDir({ root, changeName, createdAt });
|
|
266
|
+
if (resolution.status === 'active' || resolution.status === 'archived') {
|
|
267
|
+
return { ok: true, resolution };
|
|
268
|
+
}
|
|
269
|
+
return { ok: false, resolution, message: changeLocationFailureMessage(changeName, resolution) };
|
|
270
|
+
}
|
|
271
|
+
|
|
272
|
+
// 位置解析失败的可见报文(fail-closed 的唯一措辞):
|
|
273
|
+
// · missing:身份在办但两处目录都没有(running-orphan)——命令不得回落到「没有在办 change」;
|
|
274
|
+
// · ambiguous:同名归档多候选且日期判不出唯一一份——不许猜,列出候选请人工处置。
|
|
275
|
+
export function changeLocationFailureMessage(changeName, resolution) {
|
|
276
|
+
const activeDisplay = '.specs/' + changeName;
|
|
277
|
+
if (resolution.status === 'ambiguous') {
|
|
278
|
+
return 'BLOCKED: 归档目录多候选,无法唯一判定 ' + changeName + ' 的目录(' + resolution.archiveDate
|
|
279
|
+
+ ' 存在 ' + resolution.candidates.filter((candidate) => candidate.date === resolution.archiveDate).length
|
|
280
|
+
+ ' 份:' + resolution.candidates.map((candidate) => candidate.name).join('、')
|
|
281
|
+
+ ')——保留一份后重跑;引擎不猜';
|
|
282
|
+
}
|
|
283
|
+
const excluded = resolution.candidates.length > 0
|
|
284
|
+
? '(归档区同名候选 ' + resolution.candidates.map((candidate) => candidate.name).join('、')
|
|
285
|
+
+ ' 的日期均早于本次 change 的创建日期)'
|
|
286
|
+
: '';
|
|
287
|
+
return 'BLOCKED: change 目录缺失(' + activeDisplay + ' 与 .specs/archive/<日期>-' + changeName
|
|
288
|
+
+ ' 均不存在)' + excluded
|
|
289
|
+
+ '——身份由状态判定(该 change 仍在办),位置解析不到;恢复: 把目录移回 ' + activeDisplay
|
|
290
|
+
+ ',或按 <YYYY-MM-DD>-' + changeName + ' 命名放进 .specs/archive/ 后重跑';
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
// ---------- 恢复指引里的「目录在哪」(唯一分叉 · 状态族与门禁族共用) ----------
|
|
294
|
+
|
|
295
|
+
// 「目录已不在活动位置、而在归档里」的可见形态(恢复指引据此换一种说法):活动目录在原位 → null;
|
|
296
|
+
// 归档区里通过 isArchivedChangeDirName 的条目(同名多份取日期最新的一份)→ 该目录的 .specs/ 形态。
|
|
297
|
+
// 只回答「在不在归档、叫什么」,不参与定位写入(定位唯一实现是 resolveChangeDir,它还要套
|
|
298
|
+
// createdAt 下界与并列判定)。恢复指引只关心「活动位置空没空」,同步取值即可——出口链上有同步门禁
|
|
299
|
+
//(entry 记录门)取用同一份事实,不为一条提示改它的调用约定。
|
|
300
|
+
//
|
|
301
|
+
// 恢复动作的分叉**只有这一处实现**:活动态给 advance / select,归档态只给「把目录移回活动位置」。
|
|
302
|
+
// 四类消费方共用它——出口的转移前置 BLOCK、出口的 entry 记录门、证据门的状态漂移句、状态族的
|
|
303
|
+
// next 节点顺序门禁。此前实现落在门禁族(guard-routing),next 侧拿不到就自己拼了一句,于是同一
|
|
304
|
+
// 分叉只改了三处、漏了第四处(归档态下 next 推销走不通的 advance / select)。落点因此迁到本模块
|
|
305
|
+
// (.specs 路径上下文):状态族取用这里是允许的 state ← guard 单向边,反向 import 门禁族会把整个
|
|
306
|
+
// 守卫图拖进 workflow-state.mjs。运行根是显式参数(状态族 runRootDir()、门禁族 runRoot)——规则
|
|
307
|
+
// 不绑定任何一族的运行上下文,与 resolveChangeDir 同一形态。
|
|
308
|
+
export function archivedChangeLocationAt(root, changeName) {
|
|
309
|
+
if (!changeName) return null;
|
|
310
|
+
if (existsSync(path.join(root, '.specs', changeName))) return null;
|
|
311
|
+
let entries = [];
|
|
312
|
+
try {
|
|
313
|
+
entries = readdirSync(path.join(root, '.specs', 'archive'));
|
|
314
|
+
} catch {
|
|
315
|
+
return null;
|
|
316
|
+
}
|
|
317
|
+
// 归档日期是 YYYY-MM-DD(字典序 = 时间序),点名最新的一份(多份的真实处置是 resolveChangeDir 的
|
|
318
|
+
// 「排不出就停」,这里只给一句可执行的指引,不复制那套判定)。
|
|
319
|
+
const names = entries.filter((entry) => isArchivedChangeDirName(entry, changeName)).sort();
|
|
320
|
+
if (names.length === 0) return null;
|
|
321
|
+
return '.specs/archive/' + names[names.length - 1];
|
|
322
|
+
}
|
|
323
|
+
|
|
324
|
+
// 恢复动作那一句(与 archivedChangeLocationAt 同一分叉):活动目录在场时原样返回 activeText(调用方
|
|
325
|
+
// 给出的可行动作);目录已搬进归档时 advance / select 都走不通——select 要求活动目录在场,advance 的
|
|
326
|
+
// 产物推导读的也是活动路径,给出去就是让人去做一件做不到的事。此时只给可执行的那一步(把目录移回
|
|
327
|
+
// 活动位置),并保留「禁止手改状态机器字段」。
|
|
328
|
+
export function recoveryActionTextAt(root, changeName, activeText) {
|
|
329
|
+
const location = archivedChangeLocationAt(root, changeName);
|
|
330
|
+
if (location === null) return activeText;
|
|
331
|
+
return '本 change 的目录已移到归档位置(' + location + ')——恢复动作是把它移回活动位置 '
|
|
332
|
+
+ '.specs/' + changeName + '/ 后重跑;禁止手改 state 机器字段';
|
|
333
|
+
}
|
|
334
|
+
|
|
335
|
+
// 声明标记目录解析(活动路径 .specs/<change-id>/.skill-loads/ 优先;归档路径兜底):规范顺序是
|
|
336
|
+
// 「声明 → 记录 → 搬目录 → exit」——搬目录在 exit 前、记录之后;移动后补 record / 补声明仅作
|
|
337
|
+
// 兼容 / 恢复路径,标记因此仍须能在 .specs/archive/<日期>-<change-id>/.skill-loads/ 被读到。
|
|
338
|
+
// 只查活动路径会把「标记存在」误判成「机制未激活」。归档目录的**定位**(是哪一份、多候选
|
|
339
|
+
// 怎么办)走 resolveChangeDir 的唯一实现;本函数只把 .skill-loads/ 追加在解析到的目录之后。协议
|
|
340
|
+
// 声明的 archive/*-<change-id> 是产物 glob,目录名约定才是 <日期>-<change-id>(判据见
|
|
341
|
+
// isArchivedChangeDirName)。两者皆无 → null,调用方按「一项都没声明」处理。
|
|
172
342
|
//
|
|
173
343
|
// includeArchive 是这条规则唯一的形态开关,缺省 true(兜底归档)。入口侧(workflow-guard 的
|
|
174
344
|
// checkPromptDeclarations)传 false:入口核对的是**这一轮**写下的声明,归档里的声明属于归档前的
|
|
@@ -187,14 +357,12 @@ export async function findSkillLoadsDir(root, changeName, { includeArchive = tru
|
|
|
187
357
|
return { dir: activeDir, display: '.specs/' + changeName + '/.skill-loads/' };
|
|
188
358
|
}
|
|
189
359
|
if (!includeArchive) return null;
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
}
|
|
199
|
-
return null;
|
|
360
|
+
// 归档路径 = 位置解析的结果 + .skill-loads/ —— 目录定位只有 resolveChangeDir 一份实现:标记查找、
|
|
361
|
+
// 命令写入与节点推导必须认同一个目录(否则「标记在 A、产物在 B」)。位置解析到活动目录时本函数
|
|
362
|
+
// 已在上一步返回;解析不出(缺失 / 多候选)→ null(调用方按「一项都没声明」fail-closed,不猜)。
|
|
363
|
+
const resolution = await resolveChangeDir({ root, changeName });
|
|
364
|
+
if (resolution.status !== 'archived') return null;
|
|
365
|
+
const candidate = path.join(resolution.dir, '.skill-loads');
|
|
366
|
+
if (!(await fileExists(candidate))) return null;
|
|
367
|
+
return { dir: candidate, display: resolution.display + '/.skill-loads/' };
|
|
200
368
|
}
|
|
@@ -24,6 +24,7 @@ import {
|
|
|
24
24
|
fileExists,
|
|
25
25
|
findSkillLoadsDir as findSkillLoadsDirAtRoot,
|
|
26
26
|
readJson,
|
|
27
|
+
resolveChangeDir,
|
|
27
28
|
runRootDir,
|
|
28
29
|
specsDir,
|
|
29
30
|
} from './state-io.mjs';
|
|
@@ -61,8 +62,7 @@ export function findPromptArgs(cliArgs) {
|
|
|
61
62
|
}
|
|
62
63
|
|
|
63
64
|
// 声明标记里「已声明的协议文件」提取(唯一实现:出口覆盖判据与任何读标记的消费方共用):
|
|
64
|
-
// · protocols 数组(skill-load 多条 --prompt 的写入形态)∪ protocol
|
|
65
|
-
// 以及 record 自动补写的标记);
|
|
65
|
+
// · protocols 数组(skill-load 多条 --prompt 的写入形态)∪ protocol 单值(收紧前的写入形态);
|
|
66
66
|
// · 每个值都按 basename 归一——旧标记可能是完整绝对路径(历史缺陷期写入的形态),新标记是
|
|
67
67
|
// basename;两种形态必须比对同一口径(节点协议映射表只存 basename)。
|
|
68
68
|
// 返回去重保序的 basename 数组;null / 空串 / 非字符串一律忽略(fail-closed:覆盖判据只认
|
|
@@ -106,10 +106,10 @@ export function findRequiredSkillBinding(protocol, nodeId, skillName) {
|
|
|
106
106
|
return (node.requiredSkillCalls ?? []).find((binding) => binding.skill === skillName) ?? null;
|
|
107
107
|
}
|
|
108
108
|
|
|
109
|
-
// 标记目录解析(活动路径 .specs/<change-id>/.skill-loads/
|
|
110
|
-
//
|
|
111
|
-
//
|
|
112
|
-
//
|
|
109
|
+
// 标记目录解析(活动路径 .specs/<change-id>/.skill-loads/ 优先,归档路径兜底):规范顺序是
|
|
110
|
+
// 「声明 → 记录 → 搬目录 → exit」,搬目录在 exit 前、记录之后;移动后补 record / 补声明仅作
|
|
111
|
+
// 兼容 / 恢复路径,标记因此仍须能在归档路径被读到。路径规则与守卫族同一份实现,实现在本族的路径
|
|
112
|
+
// 上下文模块(state-io),本处只注入状态命令族的运行根。规则落状态族而不是守卫族是依赖方向决定的:状态命令族不得 import 守卫族(否则
|
|
113
113
|
// 一条路径规则就让状态 CLI 加载整个守卫图),守卫侧按允许的 guard → state-* 方向取用同一份实现。
|
|
114
114
|
// 两族各持一份扫描时,同一个标记会因「活动目录在场是否回溯归档」「多归档目录取哪个」各自得出答案。
|
|
115
115
|
// 两者皆无 → null。
|
|
@@ -123,31 +123,28 @@ export function findSkillLoadsDir(changeName) {
|
|
|
123
123
|
// 记录/委托前置门在「先加载技能(Skill 工具)并 skill-load 声明」之前拦截"先干活后补声明"。
|
|
124
124
|
export async function hasNodeSkillDeclaration(nodeId, changeName) {
|
|
125
125
|
if (!nodeId || !changeName) return false;
|
|
126
|
-
|
|
126
|
+
// 标记面 = 位置解析到的目录 + .skill-loads/(活动优先、归档兜底——两条规则都在 findSkillLoadsDir
|
|
127
|
+
// 里,本函数不另拼一份活动路径:目录定位只此一处,移动后「标记还在不在」才有唯一答案)。
|
|
128
|
+
const loadsDir = await findSkillLoadsDir(changeName);
|
|
129
|
+
if (loadsDir === null) return false;
|
|
127
130
|
const prefix = nodeId + '-';
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
}
|
|
135
|
-
};
|
|
136
|
-
if (await scan(activeDir)) return true;
|
|
137
|
-
const archived = await findSkillLoadsDir(changeName);
|
|
138
|
-
if (archived !== null && archived.dir !== activeDir) return scan(archived.dir);
|
|
139
|
-
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
|
+
}
|
|
140
137
|
}
|
|
141
138
|
|
|
142
139
|
// 模板声明核对(C11):节点的产出物模板声明落在 .skill-loads/<node>-*.json 的 templates 数组里,
|
|
143
140
|
// 集合必须与 C3 映射一致(required ⊆ declared ⊆ required ∪ optional)。同一节点可有多个 skill 标记
|
|
144
141
|
// (open 有 change / requirement),取并集——节点级一份声明被任一标记满足即可(skill-load 每次
|
|
145
|
-
//
|
|
142
|
+
// 都写全清单)。缺失 / 多写 / 漏写 / 错名 → BLOCK(单轨,无分级旁路)。
|
|
146
143
|
// 不比对的三种情形:非内置节点(C12:自定义协议按自己的声明走)、无活动 change、声明机制未激活
|
|
147
144
|
//(无 .skill-loads/ 或本节点无标记)——后者由「缺少技能加载声明标记」门负责,不重复报
|
|
148
145
|
//(与 exit 侧协议声明校验的「未激活不追溯」同一口径)。
|
|
149
146
|
// 零模板的内置节点(verify / archive)省略 --templates 即视为空集,通过。
|
|
150
|
-
export async function verifyTemplateDeclaration({ protocol, nodeId, changeName,
|
|
147
|
+
export async function verifyTemplateDeclaration({ protocol, nodeId, changeName, commandContext: context }) {
|
|
151
148
|
const declarationNode = (protocol?.nodes ?? []).find((node) => node.id === nodeId);
|
|
152
149
|
const declaration = nodeTemplateDeclaration(declarationNode);
|
|
153
150
|
if (declaration.source !== 'builtin' || !changeName) return { ok: true };
|
|
@@ -169,8 +166,8 @@ export async function verifyTemplateDeclaration({ protocol, nodeId, changeName,
|
|
|
169
166
|
} catch {
|
|
170
167
|
continue; // 损坏标记由既有声明校验报(本判据不抢报)
|
|
171
168
|
}
|
|
172
|
-
// record 自动补写的标记(auto
|
|
173
|
-
//
|
|
169
|
+
// 旧版本 record 自动补写的标记(auto:true)是引擎写的,不是执行者的声明——历史 state 容忍
|
|
170
|
+
// 读取,但它不承担模板声明义务,不拿它算缺失(自动补写已删除,本形态不再产生)
|
|
174
171
|
if (marker?.auto === true) continue;
|
|
175
172
|
explicitMarkers += 1;
|
|
176
173
|
// 技能名取**标记文件名**(<node>-<skill>.json 是这份标记的身份,扫描与覆盖判据也按它认):
|
|
@@ -201,8 +198,30 @@ export async function verifyTemplateDeclaration({ protocol, nodeId, changeName,
|
|
|
201
198
|
+ ';映射要求: ' + describeTemplateList(declaration.required) + ')——重跑下面的命令重新声明'
|
|
202
199
|
+ '(同一 node-skill 重跑会覆写该标记):\n'
|
|
203
200
|
+ declareCommands.map((command) => ' ' + command).join('\n');
|
|
204
|
-
|
|
205
|
-
|
|
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 '';
|
|
206
225
|
}
|
|
207
226
|
|
|
208
227
|
// completedChecks 真实性校验。解析 completedChecks 的 required-skill:<node>.<skill>
|
|
@@ -253,25 +272,17 @@ export async function verifySkillLoadMarkers(completedChecks, changeName, record
|
|
|
253
272
|
}
|
|
254
273
|
continue;
|
|
255
274
|
}
|
|
256
|
-
//
|
|
257
|
-
//
|
|
258
|
-
//
|
|
275
|
+
// 标记路径解析——活动路径优先,归档路径兜底(规范顺序「记录 → 搬目录」,搬目录之后补 record /
|
|
276
|
+
// 补声明仅作兼容 / 恢复路径,标记此时只在 .specs/archive/<日期>-<change-id>/.skill-loads/);
|
|
277
|
+
// 两处都找不到 → BLOCK + 指引
|
|
278
|
+
// (不静默放行)。标记路径 = 位置解析到的目录 + .skill-loads/<标记>:活动优先与归档兜底只有
|
|
279
|
+
// findSkillLoadsDir 一处实现(本处不另拼活动路径表达式)。
|
|
259
280
|
const markerName = item.node + '-' + item.skill + '.json';
|
|
260
281
|
const activeDisplay = '.specs/' + path.posix.join(changeName, '.skill-loads', markerName);
|
|
261
|
-
const
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
if (!markerPath) {
|
|
265
|
-
const loadsDir = await findSkillLoadsDir(changeName);
|
|
266
|
-
if (loadsDir !== null) {
|
|
267
|
-
const altPath = path.join(loadsDir.dir, markerName);
|
|
268
|
-
if (await fileExists(altPath)) {
|
|
269
|
-
markerPath = altPath;
|
|
270
|
-
markerDisplay = loadsDir.display + markerName;
|
|
271
|
-
}
|
|
272
|
-
}
|
|
273
|
-
}
|
|
274
|
-
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))) {
|
|
275
286
|
// 声明命令由协议派生(该条目所指节点的全部协议文件 + 模板全清单),脚本路径与协议上下文由
|
|
276
287
|
// 唯一装配补齐:只给 "skill-load <node> <skill>" 或裸脚本名的旧形态,照抄后会被模板声明门 /
|
|
277
288
|
// 出口覆盖门逐个拦下,或在 shell 里 command not found——报文给出的东西必须一次补齐。
|
|
@@ -280,8 +291,8 @@ export async function verifySkillLoadMarkers(completedChecks, changeName, record
|
|
|
280
291
|
const declaredNode = (protocol?.nodes ?? []).find((node) => node.id === item.node) ?? { id: item.node };
|
|
281
292
|
return {
|
|
282
293
|
ok: false,
|
|
283
|
-
reason: 'completedChecks 条目 ' + item.raw + ' 缺少对应声明标记 ' + activeDisplay
|
|
284
|
-
'
|
|
294
|
+
reason: 'completedChecks 条目 ' + item.raw + ' 缺少对应声明标记 ' + activeDisplay
|
|
295
|
+
+ (await markerLookupNote(changeName)) + '——先加载该 skill 并照抄下面的命令声明已加载:\n '
|
|
285
296
|
+ declarationCommand({ node: declaredNode, skill: item.skill, context }),
|
|
286
297
|
};
|
|
287
298
|
}
|
|
@@ -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
|
-
|
|
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);
|
|
@@ -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,
|