@pmelab/gtd 38.2.0 → 40.0.0

package/dist/workflows/feature.mjs

@@ -1,7 +1,7 @@
 import { agent, answered, applyScript, changes, changesSince, check, codeChanges, env, hasThreadFor, head, human, judge, judgeDiffShape, kept, mark, matches, numeric, quote, read, refuse, removeScript, requireAnswers, requireProgress, requireReplies, requireRevert, requireThreadsClosed, restoreScript, revertScript, run, scope, slice, start, vars, wrote } from "../flows.mjs";
 import { lensEntriesOf, review as review$1 } from "../workflow-kit.mjs";
-import { $ as naiveApplyFailure, A as agentWithSkills, B as coverageQuestion, C as fixCheck, Ct as testFileGlobs, D as reviewMissing, E as planner, F as buildReviewTriageMessage, G as designSystem, H as criterionLine, I as builderSystem, K as designTriagePrompt, L as clearCriteriaMessage, M as buildReviewAwaitAfterDeferMessage, N as buildReviewCollectingPrompt, P as buildReviewFixNitsPrompt, Q as implementFixPrompt, R as clearCriteriaQuestion, S as coder, St as envDefaults, T as fixRisks, U as deferNotesScript, V as coveringPrompt, W as designGateAnswerMessage, X as idleMessage, Z as implementBuildingPrompt, _ as REFACTOR_NOTE, _t as startGateBlockedMessage, a as flagModeOn, at as refactorDroppedRefusal, b as SLICES, bt as unwindFailure, ct as refactorRules, d as guarded, et as naivePassPrompt, f as healthy, ft as reviewNotesCapture, g as REFACTOR, gt as slicingPrompt, h as QUALITY, ht as seamSteerMessage, i as skills, it as refactorBuildingPrompt, j as buildReviewAnswerQuestionsPrompt, k as reviewing, lt as reviewEditNotesCapture, m as HANDOFF, mt as seamByHandMessage, n as summary, nt as oversizedMessage, ot as refactorFixPrompt, p as FEEDBACK, pt as reviewerSystem, r as access, rt as qualityUnresolvedMessage, s as shipped, st as refactorNotePrompt, t as steering, tt as normaliseCriteriaScript, u as gate, ut as reviewEditsCapture, v as REQUIREMENTS, vt as uncoveredMessage, x as awaitReview, xt as defaults, y as REVIEW, yt as unwindFailedMessage, z as coverageMessage } from "../chunks/reserved-C3PgP7XB.mjs";
-import { a as refusePendingHandOff, i as isOptionalObject, n as closeReview, o as tail } from "../chunks/tail-Bkxki2nK.mjs";
+import { $ as naiveApplyFailure, A as agentWithSkills, B as coverageQuestion, C as fixCheck, Ct as testFileGlobs, D as reviewMissing, E as planner, F as buildReviewTriageMessage, G as designSystem, H as criterionLine, I as builderSystem, K as designTriagePrompt, L as clearCriteriaMessage, M as buildReviewAwaitAfterDeferMessage, N as buildReviewCollectingPrompt, P as buildReviewFixNitsPrompt, Q as implementFixPrompt, R as clearCriteriaQuestion, S as coder, St as envDefaults, T as fixRisks, U as deferNotesScript, V as coveringPrompt, W as designGateAnswerMessage, X as idleMessage, Z as implementBuildingPrompt, _ as REFACTOR_NOTE, _t as startGateBlockedMessage, a as flagModeOn, at as refactorDroppedRefusal, b as SLICES, bt as unwindFailure, ct as refactorRules, d as guarded, et as naivePassPrompt, f as healthy, ft as reviewNotesCapture, g as REFACTOR, gt as slicingPrompt, h as QUALITY, ht as seamSteerMessage, i as skills, it as refactorBuildingPrompt, j as buildReviewAnswerQuestionsPrompt, k as reviewing, lt as reviewEditNotesCapture, m as HANDOFF, mt as seamByHandMessage, n as summary, nt as oversizedMessage, ot as refactorFixPrompt, p as FEEDBACK, pt as reviewerSystem, r as access, rt as qualityUnresolvedMessage, s as shipped, st as refactorNotePrompt, t as steering, tt as normaliseCriteriaScript, u as gate, ut as reviewEditsCapture, v as REQUIREMENTS, vt as uncoveredMessage, x as awaitReview, xt as defaults, y as REVIEW, yt as unwindFailedMessage, z as coverageMessage } from "../chunks/reserved-Qt5FM6Ia.mjs";
+import { a as refusePendingHandOff, i as isOptionalObject, n as closeReview, o as tail } from "../chunks/tail-tAHx_AHe.mjs";
 import { posix } from "node:path";
 //#region src/workflows/shared/fences.ts
 const markFenced = (text) => {
@@ -112,6 +112,19 @@ const requireCriteria = (file) => {
 	if (criteria.length > 0 && unnamed.length === 0 && twice.length === 0) return;
 	refuse(`gtd land: acceptance-criteria: ${file} has ${criteria.length === 0 ? `no "## Acceptance Criteria" list` : unnamed.length > 0 ? `${unnamed.length} criterion without an ID:\n${unnamed.map((c) => `  - ${c.text}`).join("\n")}` : `duplicate IDs: ${[...new Set(twice)].join(", ")}`} — list every criterion under "## Acceptance Criteria" as "- AC-<n>: <checkable criterion>", each ID unique and never reused`);
 };
+const idNumber = (id) => Number(id.slice(3));
+/** Why `listed` renumbers or reuses an earlier ID; `undefined` when it does neither. */
+const unstableIds = (listed, ids) => {
+	const top = Math.max(0, ...ids.used.map(idNumber));
+	const reused = listed.filter((id) => !ids.closed.includes(id) && idNumber(id) <= top);
+	if (reused.length === 0) return void 0;
+	return `numbers ${reused.join(", ")} at or below AC-${top}, an ID already handed out — keep a built criterion's ID (reword it in place when the review changes it), and number new ones from AC-${top + 1}`;
+};
+/** Refuse criteria in `file` that renumber or reuse an earlier ID. */
+const requireStableIds = (file, ids) => {
+	const why = unstableIds(criterionIds(read(file) ?? ""), ids);
+	if (why !== void 0) refuse(`gtd land: criteria-ids: ${file} ${why}`);
+};
 /** Refuse a turn that changed the acceptance criteria in `file`: after the design gate only another design lap may. */
 const requireCriteriaFrozen = (file) => {
 	const change = changes().get(file);
@@ -267,13 +280,14 @@ const noteGate = async (file, answer) => {
 	if (!hasThreadFor("agent", file)) requireAnswers(file);
 	return true;
 };
-/** Triage the sketch since `base` into requirements, until no product question is open. */
-const design = (base) => scope("design", async () => {
+/** Triage the sketch since `base` into requirements, until no product question is open; `guard` holds every round's criteria. */
+const design = (base, guard) => scope("design", async () => {
 	do {
 		await triage(base);
 		requireProgress(REQUIREMENTS);
 		requireReplies(REQUIREMENTS);
 		requireCriteria(REQUIREMENTS);
+		guard?.();
 	} while (await noteGate(REQUIREMENTS, answerProductQuestions));
 });
 //#endregion
@@ -1085,27 +1099,31 @@ const build = (options) => continuing(phase("build", requireCriteriaIfEdited), a
 		}
 	};
 });
-function implement(first, tier, amend) {
-	const options = typeof first === "object" && first !== null ? first : {
+async function implement(first, tier, amend) {
+	await implementing(typeof first === "object" && first !== null ? first : {
 		reference: first,
 		tier,
 		amend
-	};
-	return scope("implement", async () => {
-		const since = head();
-		const acceptance = options.rebuild?.acceptance;
-		const built = options.naive === void 0 || !await applied(options.naive);
-		if (built) await build(options);
-		else requireCriteriaFrozen(REQUIREMENTS);
-		if (built && acceptance !== void 0) requireAcceptance({
-			...acceptance,
-			ids: settled(acceptance.ids, options.slice)
-		}, since);
-		await green(built && acceptance !== void 0 ? () => requireAcceptanceKept(acceptance) : void 0);
-		await requireCoverage(options.base, options.slice);
-		await closing(options.more === true);
 	});
 }
+/** `implement`, resolving with the criterion IDs the requirements listed when it closed. */
+const implementing = (options) => scope("implement", async () => {
+	const since = head();
+	const acceptance = options.rebuild?.acceptance;
+	const built = options.naive === void 0 || !await applied(options.naive);
+	if (built) await build(options);
+	else requireCriteriaFrozen(REQUIREMENTS);
+	if (built && acceptance !== void 0) requireAcceptance({
+		...acceptance,
+		ids: settled(acceptance.ids, options.slice)
+	}, since);
+	await green(built && acceptance !== void 0 ? () => requireAcceptanceKept(acceptance) : void 0);
+	await requireCoverage(options.base, options.slice);
+	const ids = criterionIds(read(".gtd/REQUIREMENTS.md") ?? "");
+	await closing(moreToBuild(options.more));
+	return ids;
+});
+const moreToBuild = (more) => typeof more === "function" ? more() : more === true;
 /** The last slice's closing, for a last slice a steer left with no criterion to build. */
 const closeOut = () => scope("implement", () => closing(false));
 /** A slice with `more` after it keeps the criteria and the slicing for the next one. */
@@ -1340,32 +1358,37 @@ const unwind = () => {
 const buildFeature = async (firstBase) => {
 	const tier = riskTierOn() ? recordRisk() : void 0;
 	const slices = await slicing();
+	const handedOut = new Set(listedIds());
 	const one = slices.length === 1;
+	const built = (i) => sliceIds(sliceCriteria(slices, i))?.length !== 0;
 	for (const i of slices.keys()) {
-		const more = i < slices.length - 1;
-		const criteria = sliceCriteria(slices, i);
-		if (sliceIds(criteria)?.length === 0) {
-			if (!more) await closeOut();
-			continue;
-		}
+		if (!built(i)) continue;
 		const n = one ? "" : `-${i + 1}`;
 		await buildSlice(i === 0 ? firstBase : head(), {
 			tier,
-			criteria,
+			criteria: sliceCriteria(slices, i),
 			refactor: `refactor${n}`,
 			feature: `feature${n}`,
-			more
+			more: () => slices.some((_, j) => j > i && built(j)),
+			reviewBase: one ? void 0 : firstBase,
+			handedOut
 		});
 	}
 };
-/** A naive pass (judged only with `flagMode` on), then implement and the quality lap. */
+const listedIds = () => criterionIds(read(".gtd/REQUIREMENTS.md") ?? "");
+const gather = (handedOut) => {
+	for (const id of listedIds()) handedOut.add(id);
+	return [...handedOut];
+};
+/** A naive pass (judged only with `flagMode` on), then implement and the quality lap; after the last slice, the review. */
 const buildSlice = async (sliceBase, build) => {
 	const seam = await seamBuild(sliceBase, {
 		criteria: build.criteria,
 		refactor: build.refactor
 	});
+	const used = gather(build.handedOut);
 	await slice(build.feature, async () => {
-		await implement({
+		const closed = await implementing({
 			reference: seam.reference,
 			tier: build.tier,
 			afterRefactor: seam.refactored,
@@ -1375,14 +1398,23 @@ const buildSlice = async (sliceBase, build) => {
 			base: build.criteria === void 0 ? void 0 : sliceBase,
 			more: build.more
 		});
+		const more = build.more();
 		const carried = seam.rebuild?.acceptance?.tests ?? [];
 		const base = seam.refactored === true && !changesSince(seam.base).some((c) => isCode$1(c.path) && !carried.includes(c.path)) ? sliceBase : seam.base;
-		const guard = build.more ? () => requireCriteriaFrozen(REQUIREMENTS) : void 0;
-		await tail(settleQuality, {
-			green: true,
-			lensBase: base,
-			guard,
-			guardRests: false
+		if (more) {
+			const guard = () => requireCriteriaFrozen(REQUIREMENTS);
+			await tail(settleQuality, {
+				green: true,
+				lensBase: base,
+				guard,
+				guardRests: false
+			});
+			return;
+		}
+		const reviewBase = build.reviewBase ?? base;
+		await featureFeedback(await reviewedTail(reviewBase, base), base, {
+			closed,
+			used
 		});
 	});
 };
@@ -1398,6 +1430,35 @@ const settleQuality = async () => {
 	}
 	if (rested) await healthy(() => fixCheck());
 };
+/** The quality lap, then the human review since `base`. */
+const reviewedTail = (base, lensBase, lap) => tail(async (escalations) => {
+	await settleQuality();
+	return review(base, escalations, { lap });
+}, {
+	green: true,
+	lensBase
+});
+const featureFeedback = async (first, lensBase, ids) => {
+	let outcome = first;
+	let closed = ids.closed;
+	const handedOut = /* @__PURE__ */ new Set([...ids.used, ...ids.closed]);
+	while (outcome.verdict === "feedback") {
+		await reUnwind(outcome);
+		const lap = {
+			closed,
+			used: [...handedOut]
+		};
+		await design(outcome.base, () => {
+			requireStableIds(REQUIREMENTS, lap);
+			gather(handedOut);
+		});
+		closed = await implementing({
+			tier: riskTierOn() ? recordRisk() : void 0,
+			amend: true
+		});
+		outcome = await reviewedTail(outcome.base, lensBase, "feedback");
+	}
+};
 /** Design — skipped when the sketch's own criteria are judged clear — then `buildFeature`. */
 const planAndBuild = async (firstBase, stated) => {
 	if (!await skipDesign(riskTierOn() ? void 0 : stated)) await design(firstBase);
@@ -1444,4 +1505,4 @@ const feature = shipped(ordinaryStart);
 //#region src/workflows/feature/index.ts
 var feature_default = feature;
 //#endregion
-export { COMMENT, REFACTOR_PACKAGE, acceptanceFault, access, afterTail, answerProductQuestions, answerReviewQuestions, buildFeature, buildTail, closeOut, collecting, criteriaOf, criterionIds, feature_default as default, defaults, deferNotes, design, envDefaults, feature, fixNits, holdsCallSites, implement, isTestFile, judgeSeam, naiveAcceptance, naivePass, ordinaryStart, planAndBuild, reUnwind, refactorCollecting, refactorFirst, refactorNote, refactorStrays, requireAcceptance, requireAcceptanceKept, requireCriteria, requireCriteriaFrozen, requireCriteriaIfEdited, requireNoNewFlags, requireNoTestFiles, requireSlices, requireTestCallSitesOnly, requireWithin, reviewedRefactor, seamBuild, skills, skipDesign, sliceCap, sliceCriteria, sliceIds, slicesOf, slicing, statedCriteria, steering, summary, triage, unwind };
+export { COMMENT, REFACTOR_PACKAGE, acceptanceFault, access, afterTail, answerProductQuestions, answerReviewQuestions, buildFeature, buildTail, closeOut, collecting, criteriaOf, criterionIds, feature_default as default, defaults, deferNotes, design, envDefaults, feature, fixNits, holdsCallSites, implement, implementing, isTestFile, judgeSeam, naiveAcceptance, naivePass, ordinaryStart, planAndBuild, reUnwind, refactorCollecting, refactorFirst, refactorNote, refactorStrays, requireAcceptance, requireAcceptanceKept, requireCriteria, requireCriteriaFrozen, requireCriteriaIfEdited, requireNoNewFlags, requireNoTestFiles, requireSlices, requireStableIds, requireTestCallSitesOnly, requireWithin, reviewedRefactor, seamBuild, skills, skipDesign, sliceCap, sliceCriteria, sliceIds, slicesOf, slicing, statedCriteria, steering, summary, triage, unstableIds, unwind };

package/dist/workflows/fix.mjs

@@ -1,7 +1,7 @@
 import { read, refuse, removeScript, run, scope, start } from "../flows.mjs";
 import { d as reviewNotes, f as reviewRisks } from "../chunks/steering-DVILanVf.mjs";
-import { A as agentWithSkills, J as fixReviewNotesPrompt, S as coder, St as envDefaults, c as baseline, i as skills, n as summary, q as finisherSystem, r as access, s as shipped, t as steering, xt as defaults, y as REVIEW } from "../chunks/reserved-C3PgP7XB.mjs";
-import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-Bkxki2nK.mjs";
+import { A as agentWithSkills, J as fixReviewNotesPrompt, S as coder, St as envDefaults, c as baseline, i as skills, n as summary, q as finisherSystem, r as access, s as shipped, t as steering, xt as defaults, y as REVIEW } from "../chunks/reserved-Qt5FM6Ia.mjs";
+import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-tAHx_AHe.mjs";
 //#region src/workflows/fix/fix.ts
 /**
 * Fix every note a human left in a handed-off `.gtd/REVIEW.md` and every

package/dist/workflows/review.mjs

@@ -1,6 +1,6 @@
 import { start } from "../flows.mjs";
-import { St as envDefaults, dt as reviewGateBlockedMessage, i as skills, n as summary, r as access, s as shipped, t as steering, u as gate, xt as defaults } from "../chunks/reserved-C3PgP7XB.mjs";
-import { a as refusePendingHandOff, r as handOffTail } from "../chunks/tail-Bkxki2nK.mjs";
+import { St as envDefaults, dt as reviewGateBlockedMessage, i as skills, n as summary, r as access, s as shipped, t as steering, u as gate, xt as defaults } from "../chunks/reserved-Qt5FM6Ia.mjs";
+import { a as refusePendingHandOff, r as handOffTail } from "../chunks/tail-tAHx_AHe.mjs";
 //#region src/workflows/review/review.ts
 /**
 * Pure review of everything since `reviewBase`: a green gate, the quality

package/dist/workflows/rollout.mjs

@@ -1,5 +1,5 @@
 import { agent, changesSince, glob, head, mark, read, refuse, removeScript, run, scope, vars } from "../flows.mjs";
-import { Et as flipProblems, Ot as requireFlag, S as coder, St as envDefaults, i as skills, n as summary, o as flagShipped, p as FEEDBACK, r as access, t as steering, u as gate, wt as flagMentions, xt as defaults } from "../chunks/reserved-C3PgP7XB.mjs";
+import { Et as flipProblems, Ot as requireFlag, S as coder, St as envDefaults, i as skills, n as summary, o as flagShipped, p as FEEDBACK, r as access, t as steering, u as gate, wt as flagMentions, xt as defaults } from "../chunks/reserved-Qt5FM6Ia.mjs";
 //#region src/workflows/rollout/rollout.ts
 const flippingPrompt = (name, registry) => `Roll out the release flag "${name}": in ${registry}, set \`defaultOn: true\` on its entry. Change nothing else — no other entry, no other field, no other file, no comments.`;
 const suiteBlockedMessage = () => "The suite is red after the rollout. Fix it by hand — a rollout may only touch the flag's registry entry — then land.";

package/dist/workflows.mjs

@@ -451,10 +451,15 @@ const escalation$1 = async (count, steps) => {
 };
 const STAMP = /\n<!-- gtd check [0-9a-f]+ -->\n?$/;
 const stripStamp = (text) => text.replace(STAMP, "\n");
+/** `true` when the re-check passed, else the red re-check's report — the one the escalation describes. */
+const recheckReport = async (health) => {
+	if (health.recheck === void 0) return void 0;
+	return await health.recheck() || stripStamp(read(health.report) ?? "");
+};
 /**
 * Loop until the suite is green: check, and on red run `fix` — escalating
 * first once `fixCap` fixes are spent, or `sameFailure` calls the failure
-* identical to the previous round's.
+* identical to the previous round's, unless `recheck` passes.
 */
 const healthy$1 = async (fix, health) => {
 	let fixes = health.fixesSoFar ?? 0;
@@ -468,6 +473,12 @@ const healthy$1 = async (fix, health) => {
 		const stuck = previous !== void 0 && await health.sameFailure(previous, current);
 		previous = current;
 		if (stuck || fixes >= health.fixCap) {
+			const rechecked = await recheckReport(health);
+			if (rechecked === true) {
+				health.escalations.rounds = 0;
+				return;
+			}
+			previous = rechecked ?? previous;
 			await escalation$1(health.escalations, health.escalation);
 			fixes = 0;
 		}
@@ -17222,14 +17233,14 @@ What each change does next (then run \`gtd land\`):
 - **Continue** — having undone the sketch by hand, check the test baseline is green and start triage (**start-gate.check**).
 `;
 const qualityUnresolvedMessage = () => `The quality lap's fix turns hit their cap and \`.gtd/QUALITY.md\` still
-holds findings. Nothing reviews the change after this, so the process
-will not end with them open.
+holds findings. Nothing after this fixes them, so the process will not
+go on with them open.
 
 Fix what matters by hand, then delete or empty \`.gtd/QUALITY.md\` —
 dropping a finding is your call to make.
 
 What each change does next (then run \`gtd land\`):
-- **Delete or empty \`.gtd/QUALITY.md\`** — the suite runs on your edits, then the process ends (**idle**).
+- **Delete or empty \`.gtd/QUALITY.md\`** — the suite runs on your edits, then the next slice is built, or after the last one you review the change (**build.review.reviewing**).
 - **Anything else** — rests here again.
 `;
 const startGateBlockedMessage = () => `The test baseline is red — gtd will not start new work on a broken suite.
@@ -17267,8 +17278,10 @@ reword a criterion in place, append a new one with the next unused
 number, delete a dropped one — never renumber, never reuse an ID. When
 the file holds no list (a review loop-back rewrites it), recover the
 last settled one from history (\`git log -p -- .gtd/REQUIREMENTS.md\`)
-and carry its IDs over. Landing is refused while a criterion has no ID or
-two share one.
+and carry its IDs over: after a review a built criterion keeps its ID,
+reworded in place when the review changes its behaviour, and new
+behaviour gets a new ID. Landing is refused while a criterion has no ID
+or two share one.
 `;
 const riskTierBlock = `
 ## Risk tier and production signals
@@ -18385,6 +18398,19 @@ const baseline = (name, label = "Checking the baseline") => check(name, env.test
 	report: FEEDBACK,
 	label
 });
+/**
+* Re-run a red check as step `name` before a person sees it. Green records
+* `Gtd-Mark: flaky=<red>` on the re-check's landing and resolves `true`.
+*/
+const recheck = async (name, red, options = {}) => {
+	const green = await check(name, env.testCommand ?? "", {
+		...options,
+		report: FEEDBACK,
+		label: "Re-running checks"
+	});
+	if (green) mark("flaky", red);
+	return green;
+};
 const escalationSteps = (rules) => ({
 	limit: 2,
 	describe: () => describeEscalation(rules),
@@ -18435,15 +18461,17 @@ const sameFailure = async (previous, current) => {
 	});
 	return comparable && truncated.length === 0 && answered(answers.verdict, "identical", numeric(vars.judgeIdenticalMinP, Infinity));
 };
+const healthSweep = (options) => [ESCALATION, ...options.sweepOnGreen ?? []];
 const runSuite = (options) => check("health.check", env.testCommand ?? "", {
 	report: FEEDBACK,
 	label: "Running checks",
-	sweepOnGreen: [ESCALATION, ...options.sweepOnGreen ?? []]
+	sweepOnGreen: healthSweep(options)
 });
 /**
 * Loop until the suite is green: check, and on red run `fix` — escalating
 * first once `FIX_CAP` fixes are spent, or a judge calls the failure
-* identical to the previous round's.
+* identical to the previous round's. An escalation re-runs the suite once
+* first; a green re-run ends the loop.
 */
 const healthy = (fix, options = {}) => healthy$1(guarded(fix, options.guard), {
 	check: () => runSuite(options),
@@ -18452,14 +18480,16 @@ const healthy = (fix, options = {}) => healthy$1(guarded(fix, options.guard), {
 	fixesSoFar: options.fixesSoFar ?? 0,
 	sameFailure,
 	escalations: options.escalations ?? { rounds: 0 },
+	recheck: () => recheck("health.recheck", "health.check", { sweepOnGreen: healthSweep(options) }),
 	escalation: guardedSteps(options.guard, options.describeGuard, options.guardRests, options.rules)
 });
 /**
-* Hold the process at `<name>.blocked` until the suite is green. `guard` runs
+* Hold the process at `<name>.blocked` until the suite is green, re-running a
+* red check once as `<name>.recheck` before resting. `guard` runs
 * after each `blocked` landing only — never after a check, whose refusal would
 * re-run the same script forever.
 */
-const gate = (name, message, guard) => gate$1(name, () => baseline("check"), guarded(() => human("blocked", {
+const gate = (name, message, guard) => gate$1(name, async () => await baseline("check") || recheck("recheck", `${name}.check`), guarded(() => human("blocked", {
 	message,
 	label: "Baseline is red",
 	file: FEEDBACK
@@ -38067,6 +38097,19 @@ const requireCriteria = (file) => {
 	if (criteria.length > 0 && unnamed.length === 0 && twice.length === 0) return;
 	refuse(`gtd land: acceptance-criteria: ${file} has ${criteria.length === 0 ? `no "## Acceptance Criteria" list` : unnamed.length > 0 ? `${unnamed.length} criterion without an ID:\n${unnamed.map((c) => `  - ${c.text}`).join("\n")}` : `duplicate IDs: ${[...new Set(twice)].join(", ")}`} — list every criterion under "## Acceptance Criteria" as "- AC-<n>: <checkable criterion>", each ID unique and never reused`);
 };
+const idNumber = (id) => Number(id.slice(3));
+/** Why `listed` renumbers or reuses an earlier ID; `undefined` when it does neither. */
+const unstableIds = (listed, ids) => {
+	const top = Math.max(0, ...ids.used.map(idNumber));
+	const reused = listed.filter((id) => !ids.closed.includes(id) && idNumber(id) <= top);
+	if (reused.length === 0) return void 0;
+	return `numbers ${reused.join(", ")} at or below AC-${top}, an ID already handed out — keep a built criterion's ID (reword it in place when the review changes it), and number new ones from AC-${top + 1}`;
+};
+/** Refuse criteria in `file` that renumber or reuse an earlier ID. */
+const requireStableIds = (file, ids) => {
+	const why = unstableIds(criterionIds(read(file) ?? ""), ids);
+	if (why !== void 0) refuse(`gtd land: criteria-ids: ${file} ${why}`);
+};
 /** Refuse a turn that changed the acceptance criteria in `file`: after the design gate only another design lap may. */
 const requireCriteriaFrozen = (file) => {
 	const change = changes().get(file);
@@ -38222,13 +38265,14 @@ const noteGate = async (file, answer) => {
 	if (!hasThreadFor("agent", file)) requireAnswers(file);
 	return true;
 };
-/** Triage the sketch since `base` into requirements, until no product question is open. */
-const design = (base) => scope("design", async () => {
+/** Triage the sketch since `base` into requirements, until no product question is open; `guard` holds every round's criteria. */
+const design = (base, guard) => scope("design", async () => {
 	do {
 		await triage(base);
 		requireProgress(REQUIREMENTS);
 		requireReplies(REQUIREMENTS);
 		requireCriteria(REQUIREMENTS);
+		guard?.();
 	} while (await noteGate(REQUIREMENTS, answerProductQuestions));
 });
 //#endregion
@@ -39040,27 +39084,31 @@ const build = (options) => continuing(phase("build", requireCriteriaIfEdited), a
 		}
 	};
 });
-function implement(first, tier, amend) {
-	const options = typeof first === "object" && first !== null ? first : {
+async function implement(first, tier, amend) {
+	await implementing(typeof first === "object" && first !== null ? first : {
 		reference: first,
 		tier,
 		amend
-	};
-	return scope("implement", async () => {
-		const since = head$1();
-		const acceptance = options.rebuild?.acceptance;
-		const built = options.naive === void 0 || !await applied(options.naive);
-		if (built) await build(options);
-		else requireCriteriaFrozen(REQUIREMENTS);
-		if (built && acceptance !== void 0) requireAcceptance({
-			...acceptance,
-			ids: settled(acceptance.ids, options.slice)
-		}, since);
-		await green(built && acceptance !== void 0 ? () => requireAcceptanceKept(acceptance) : void 0);
-		await requireCoverage(options.base, options.slice);
-		await closing(options.more === true);
 	});
 }
+/** `implement`, resolving with the criterion IDs the requirements listed when it closed. */
+const implementing = (options) => scope("implement", async () => {
+	const since = head$1();
+	const acceptance = options.rebuild?.acceptance;
+	const built = options.naive === void 0 || !await applied(options.naive);
+	if (built) await build(options);
+	else requireCriteriaFrozen(REQUIREMENTS);
+	if (built && acceptance !== void 0) requireAcceptance({
+		...acceptance,
+		ids: settled(acceptance.ids, options.slice)
+	}, since);
+	await green(built && acceptance !== void 0 ? () => requireAcceptanceKept(acceptance) : void 0);
+	await requireCoverage(options.base, options.slice);
+	const ids = criterionIds(read(".gtd/REQUIREMENTS.md") ?? "");
+	await closing(moreToBuild(options.more));
+	return ids;
+});
+const moreToBuild = (more) => typeof more === "function" ? more() : more === true;
 /** The last slice's closing, for a last slice a steer left with no criterion to build. */
 const closeOut = () => scope("implement", () => closing(false));
 /** A slice with `more` after it keeps the criteria and the slicing for the next one. */
@@ -39295,32 +39343,37 @@ const unwind = () => {
 const buildFeature = async (firstBase) => {
 	const tier = riskTierOn() ? recordRisk() : void 0;
 	const slices = await slicing();
+	const handedOut = new Set(listedIds());
 	const one = slices.length === 1;
+	const built = (i) => sliceIds(sliceCriteria(slices, i))?.length !== 0;
 	for (const i of slices.keys()) {
-		const more = i < slices.length - 1;
-		const criteria = sliceCriteria(slices, i);
-		if (sliceIds(criteria)?.length === 0) {
-			if (!more) await closeOut();
-			continue;
-		}
+		if (!built(i)) continue;
 		const n = one ? "" : `-${i + 1}`;
 		await buildSlice(i === 0 ? firstBase : head$1(), {
 			tier,
-			criteria,
+			criteria: sliceCriteria(slices, i),
 			refactor: `refactor${n}`,
 			feature: `feature${n}`,
-			more
+			more: () => slices.some((_, j) => j > i && built(j)),
+			reviewBase: one ? void 0 : firstBase,
+			handedOut
 		});
 	}
 };
-/** A naive pass (judged only with `flagMode` on), then implement and the quality lap. */
+const listedIds = () => criterionIds(read(".gtd/REQUIREMENTS.md") ?? "");
+const gather = (handedOut) => {
+	for (const id of listedIds()) handedOut.add(id);
+	return [...handedOut];
+};
+/** A naive pass (judged only with `flagMode` on), then implement and the quality lap; after the last slice, the review. */
 const buildSlice = async (sliceBase, build) => {
 	const seam = await seamBuild(sliceBase, {
 		criteria: build.criteria,
 		refactor: build.refactor
 	});
+	const used = gather(build.handedOut);
 	await slice(build.feature, async () => {
-		await implement({
+		const closed = await implementing({
 			reference: seam.reference,
 			tier: build.tier,
 			afterRefactor: seam.refactored,
@@ -39330,14 +39383,23 @@ const buildSlice = async (sliceBase, build) => {
 			base: build.criteria === void 0 ? void 0 : sliceBase,
 			more: build.more
 		});
+		const more = build.more();
 		const carried = seam.rebuild?.acceptance?.tests ?? [];
 		const base = seam.refactored === true && !changesSince(seam.base).some((c) => isCode$1(c.path) && !carried.includes(c.path)) ? sliceBase : seam.base;
-		const guard = build.more ? () => requireCriteriaFrozen(REQUIREMENTS) : void 0;
-		await tail(settleQuality, {
-			green: true,
-			lensBase: base,
-			guard,
-			guardRests: false
+		if (more) {
+			const guard = () => requireCriteriaFrozen(REQUIREMENTS);
+			await tail(settleQuality, {
+				green: true,
+				lensBase: base,
+				guard,
+				guardRests: false
+			});
+			return;
+		}
+		const reviewBase = build.reviewBase ?? base;
+		await featureFeedback(await reviewedTail(reviewBase, base), base, {
+			closed,
+			used
 		});
 	});
 };
@@ -39353,6 +39415,35 @@ const settleQuality = async () => {
 	}
 	if (rested) await healthy(() => fixCheck());
 };
+/** The quality lap, then the human review since `base`. */
+const reviewedTail = (base, lensBase, lap) => tail(async (escalations) => {
+	await settleQuality();
+	return review$1(base, escalations, { lap });
+}, {
+	green: true,
+	lensBase
+});
+const featureFeedback = async (first, lensBase, ids) => {
+	let outcome = first;
+	let closed = ids.closed;
+	const handedOut = /* @__PURE__ */ new Set([...ids.used, ...ids.closed]);
+	while (outcome.verdict === "feedback") {
+		await reUnwind(outcome);
+		const lap = {
+			closed,
+			used: [...handedOut]
+		};
+		await design(outcome.base, () => {
+			requireStableIds(REQUIREMENTS, lap);
+			gather(handedOut);
+		});
+		closed = await implementing({
+			tier: riskTierOn() ? recordRisk() : void 0,
+			amend: true
+		});
+		outcome = await reviewedTail(outcome.base, lensBase, "feedback");
+	}
+};
 /** Design — skipped when the sketch's own criteria are judged clear — then `buildFeature`. */
 const planAndBuild = async (firstBase, stated) => {
 	if (!await skipDesign(riskTierOn() ? void 0 : stated)) await design(firstBase);
@@ -39578,4 +39669,4 @@ var workflows_default = feature;
 */
 const doors = {};
 //#endregion
-export { COMMENT, ESCALATION, FEEDBACK, FIX_CAP, FlagOptions, HANDOFF, QUALITY, REFACTOR, REFACTOR_NOTE, REFACTOR_PACKAGE, REQUIREMENTS, REVIEW, REVIEW_ORIG, SLICES, ShippedOptions, acceptanceFault, access, afterTail, agentWithSkills, answerProductQuestions, answerReviewQuestions, awaitReview, base, baseline, buildFeature, buildTail, builtInLenses, cleanup, cleanupFlow, closeOut, closeReview, coder, collecting, criteriaOf, criterionIds, workflows_default as default, defaults, deferNotes, describeEscalation, design, doors, envDefaults, escalate, escalation, escalationExhausted, feature, fix, fixCheck, fixFlow, fixNits, fixQuality, fixQualityFindings, fixReviewNotes, fixRisks, gate, guarded, handOffReview, handOffTail, healthy, holdsCallSites, implement, isTestFile, judgeSeam, lensEntriesOf, lensOf, lensesOf, naiveAcceptance, naivePass, ordinaryStart, planAndBuild, planner, qualityLap, reUnwind, refactorCollecting, refactorFirst, refactorNote, refactorStrays, requireAcceptance, requireAcceptanceKept, requireCriteria, requireCriteriaFrozen, requireCriteriaIfEdited, requireNoNewFlags, requireNoTestFiles, requireSlices, requireTestCallSitesOnly, requireWithin, retryQuestion, review, reviewFlow, reviewMissing, reviewQuality, reviewedRefactor, reviewing, rollout, rolloutFlow, seamBuild, skills, skipDesign, sliceCap, sliceCriteria, sliceIds, slicesOf, slicing, statedCriteria, steering, summary, tail, threads, triage, unwind };
+export { COMMENT, ESCALATION, FEEDBACK, FIX_CAP, FlagOptions, HANDOFF, QUALITY, REFACTOR, REFACTOR_NOTE, REFACTOR_PACKAGE, REQUIREMENTS, REVIEW, REVIEW_ORIG, SLICES, ShippedOptions, acceptanceFault, access, afterTail, agentWithSkills, answerProductQuestions, answerReviewQuestions, awaitReview, base, baseline, buildFeature, buildTail, builtInLenses, cleanup, cleanupFlow, closeOut, closeReview, coder, collecting, criteriaOf, criterionIds, workflows_default as default, defaults, deferNotes, describeEscalation, design, doors, envDefaults, escalate, escalation, escalationExhausted, feature, fix, fixCheck, fixFlow, fixNits, fixQuality, fixQualityFindings, fixReviewNotes, fixRisks, gate, guarded, handOffReview, handOffTail, healthy, holdsCallSites, implement, implementing, isTestFile, judgeSeam, lensEntriesOf, lensOf, lensesOf, naiveAcceptance, naivePass, ordinaryStart, planAndBuild, planner, qualityLap, reUnwind, recheck, refactorCollecting, refactorFirst, refactorNote, refactorStrays, requireAcceptance, requireAcceptanceKept, requireCriteria, requireCriteriaFrozen, requireCriteriaIfEdited, requireNoNewFlags, requireNoTestFiles, requireSlices, requireStableIds, requireTestCallSitesOnly, requireWithin, retryQuestion, review, reviewFlow, reviewMissing, reviewQuality, reviewedRefactor, reviewing, rollout, rolloutFlow, seamBuild, skills, skipDesign, sliceCap, sliceCriteria, sliceIds, slicesOf, slicing, statedCriteria, steering, summary, tail, threads, triage, unstableIds, unwind };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmelab/gtd",
-  "version": "38.2.0",
+  "version": "40.0.0",
   "private": false,
   "description": "Git-aware CLI that emits the next prompt for an autonomous coding agent based on the current repository state",
   "bin": {

package/skills/authoring/SKILL.md

@@ -224,8 +224,9 @@ workflow.
 
 In the bundled default, `planAndBuild` runs the design phase, then
 `buildFeature`: the naive pass and its seam judge, then the implementation (the
-pass itself on `land`) and the quality lap, ending with no human review. Add a
-human sign-off before the build:
+pass itself on `land`), the quality lap and the human review (a review feedback
+lap re-runs design inside `buildFeature` and does not pass it again). Add a
+human sign-off before the first build:
 
 ```ts
 const planAndBuild = async (firstBase: string): Promise<void> => {

package/src/cli/Cli.ts

@@ -838,9 +838,10 @@ const COMMAND_ROWS: readonly CommandRow[] = [
       "Report how the kept processes went: slices whose naive pass",
       "landed or was rebuilt (the refactor-first rate), continuations",
       "per phase, Gtd-Cost by model and phase with the double work of",
-      "a rebuild, and quality-lap findings per lens — per process and",
-      "in total. Each <ref> is read as by history show, but a branch",
-      "name means every process kept from it; none means every ref.",
+      "a rebuild, quality-lap findings per lens, and red checks that",
+      "passed on their re-check — per process and in total. Each <ref>",
+      "is read as by history show, but a branch name means every",
+      "process kept from it; none means every ref.",
       "Reads commit subjects and trailers, never replays, so a",
       "changed config is no refusal. --json prints { processes, total",
       "} as one document; writes nothing",

package/src/cli/Metrics.test.ts

@@ -163,6 +163,37 @@ describe("processMetrics", () => {
   })
 })
 
+describe("flaky re-checks", () => {
+  it("counts each flaky re-check under its own full step name", () => {
+    const m = processMetrics([
+      {
+        message:
+          "gtd(check): start-gate.recheck → design.triage\n\nGtd-Mark: flaky=start-gate.check",
+        findings: 0,
+      },
+      {
+        message: "gtd(check): build.health.recheck → idle\n\nGtd-Mark: flaky=health.check",
+        findings: 0,
+      },
+      {
+        message:
+          "gtd(check): implement.health.recheck → implement.closing\n\nGtd-Mark: flaky=health.check",
+        findings: 0,
+      },
+      { message: "gtd(agent): seam.naive → seam.check\n\nGtd-Mark: covers=AC-1", findings: 0 },
+      { message: "fix: hand-made\n\nGtd-Mark: flaky=x.check", findings: 0 },
+    ])
+    expect(m.flaky).toEqual({
+      total: 3,
+      byStep: { "start-gate.recheck": 1, "build.health.recheck": 1, "implement.health.recheck": 1 },
+    })
+    expect(totalMetrics([m, m]).flaky).toEqual({
+      total: 6,
+      byStep: { "start-gate.recheck": 2, "build.health.recheck": 2, "implement.health.recheck": 2 },
+    })
+  })
+})
+
 describe("totalMetrics", () => {
   it("adds processes and recomputes the rate over every decision", () => {
     const a = processMetrics([