@pmelab/gtd 43.0.0 → 44.0.0

package/dist/workflows/feature.mjs

@@ -1,7 +1,8 @@
-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, showScript, slice, start, vars, writeScript, wrote } from "../flows.mjs";
-import { lensEntriesOf, removedAssertions, review as review$1 } from "../workflow-kit.mjs";
-import { $ as naivePassPrompt, A as agentWithSkills, B as coverageQuestion, C as fixCheck, Ct as envDefaults, D as reviewMissing, E as planner, F as builderSystem, G as designTriagePrompt, H as criterionLine, I as clearCriteriaMessage, L as clearCriteriaQuestion, M as buildReviewCollectingPrompt, N as buildReviewFixNitsPrompt, P as buildReviewTriageMessage, Q as naiveApplyFailure, R as composedReview, S as coder, St as defaults, T as fixRisks, U as designGateAnswerMessage, V as coveringPrompt, W as designSystem, X as implementBuildingPrompt, Y as idleMessage, Z as implementFixPrompt, _ as REFACTOR_NOTE, _t as slicingPrompt, a as flagModeOn, at as refactorBuildingPrompt, b as SLICES, bt as unwindFailedMessage, ct as refactorNotePrompt, d as guarded, dt as reviewEditsCapture, et as normaliseCriteriaScript, f as healthy, g as REFACTOR, gt as seamSteerMessage, h as QUALITY, ht as seamByHandMessage, i as skills, it as qualityUnresolvedMessage, j as buildReviewAnswerQuestionsPrompt, lt as refactorRules, m as HANDOFF, mt as reviewerSystem, n as summary, ot as refactorDroppedRefusal, p as FEEDBACK, pt as reviewNotesCapture, r as access, s as shipped, st as refactorFixPrompt, t as steering, tt as oversizedMessage, u as gate, ut as reviewEditNotesCapture, v as REQUIREMENTS, vt as startGateBlockedMessage, wt as testFileGlobs, x as awaitReview, xt as unwindFailure, y as REVIEW, yt as uncoveredMessage, z as coverageMessage } from "../chunks/reserved-COEMFEpy.mjs";
-import { a as refusePendingHandOff, i as isOptionalObject, n as closeReview, o as tail, s as NO_FINDINGS } from "../chunks/tail-C_xn8U7U.mjs";
+import { agent, answered, applyScript, changes, changesSince, check, codeChanges, env, hasThreadFor, head, human, judge, judgeDiffShape, kept, mark, matches, quote, read, refuse, removeScript, requireAnswers, requireProgress, requireReplies, requireThreadsClosed, revertScript, run, scope, slice, start, vars, wrote } from "../flows.mjs";
+import { lensEntriesOf } from "../workflow-kit.mjs";
+import { $ as naiveApplyFailure, B as coverageMessage, C as coder, Ct as unwindFailure, E as fixNits, Et as testFileGlobs, G as designSystem, H as coveringPrompt, I as builderSystem, K as designTriagePrompt, L as clearCriteriaMessage, N as agentWithSkills, P as buildReviewCollectingPrompt, Q as implementFixPrompt, R as clearCriteriaQuestion, St as unwindFailedMessage, T as fixCheck, Tt as envDefaults, U as criterionLine, V as coverageQuestion, W as designGateAnswerMessage, X as idleMessage, Z as implementBuildingPrompt, _ as REFACTOR_NOTE, _t as seamByHandMessage, a as flagModeOn, at as qualityUnresolvedMessage, b as SLICES, bt as startGateBlockedMessage, ct as refactorFixPrompt, et as naivePassPrompt, f as healthy, g as REFACTOR, gt as reviewerSystem, h as QUALITY, i as skills, k as planner, lt as refactorNotePrompt, m as HANDOFF, n as summary, nt as oversizedMessage, ot as refactorBuildingPrompt, p as FEEDBACK, r as access, s as shipped, st as refactorDroppedRefusal, t as steering, tt as normaliseCriteriaScript, u as gate, ut as refactorRules, v as REQUIREMENTS, vt as seamSteerMessage, w as collecting, wt as defaults, x as answerReviewQuestions, xt as uncoveredMessage, yt as slicingPrompt } from "../chunks/reserved-DJk_6-ju.mjs";
+import { a as refusePendingHandOff, o as tail } from "../chunks/tail-5w5mxGTq.mjs";
+import { i as reUnwind, n as humanReview, r as isCode$1, t as buildTail } from "../chunks/review-X7Jfz0dY.mjs";
 import { posix } from "node:path";
 //#region src/workflows/shared/fences.ts
 const markFenced = (text) => {
@@ -219,36 +220,6 @@ const answerProductQuestions = () => human("gate.answer", {
 	mode: "qa",
 	acceptClean: true
 });
-/** Answer every `question` note inline in `.gtd/REVIEW.md`. */
-const answerReviewQuestions = (notes) => agentWithSkills("review.answer-review-questions", buildReviewAnswerQuestionsPrompt(notes), {
-	label: "Answering your questions",
-	file: REVIEW,
-	mode: "review",
-	model: planner(),
-	system: reviewerSystem()
-});
-/** Fix every `nit` note in one turn. */
-const fixNits = (notes, access, rules) => {
-	const fixing = (name) => agentWithSkills(name, buildReviewFixNitsPrompt(notes, rules), {
-		label: "Fixing your nits",
-		file: REVIEW,
-		model: planner(),
-		system: reviewerSystem()
-	});
-	return access === void 0 ? fixing("review.fix.nits.fixing") : scope({
-		name: "review.fix.nits",
-		access
-	}, () => fixing("fixing"));
-};
-/** Turn the review round `capture` describes into `.gtd/REQUIREMENTS.md`, or change nothing. */
-const collecting = (capture, round) => agentWithSkills("review.collecting", buildReviewCollectingPrompt(capture, void 0, round), {
-	label: "Collecting your feedback",
-	file: REQUIREMENTS,
-	mode: "qa",
-	model: planner(),
-	system: reviewerSystem(),
-	allowEmpty: true
-});
 /** Turn the refactor review round `capture` describes into `.gtd/REFACTOR.md`, or change nothing. */
 const refactorCollecting = (capture, round, strays) => agentWithSkills("review.collecting", buildReviewCollectingPrompt(capture, {
 	strays,
@@ -286,249 +257,6 @@ const design = (base, guard) => scope("design", async () => {
 	} while (await noteGate(REQUIREMENTS, answerProductQuestions));
 });
 //#endregion
-//#region src/workflows/feature/review.ts
-const VERDICTS = [
-	"edit",
-	"question",
-	"nit",
-	"praise"
-];
-/** One four-way choice per note the human added to `.gtd/REVIEW.md`. */
-const verdictQuestion = (note) => ({
-	id: note.id,
-	primitive: "choice",
-	instructions: `Classify the human's note on review item "${note.anchor}" (in .gtd/REVIEW.md). Its evidence holds the anchor, the reviewer's text and the human's text.`,
-	criteria: "edit: a request to change behaviour, design or scope — anything needing a plan, or any note you are unsure about. question: asks something and wants an answer, with no change requested. nit: a small, local, unambiguous fix (naming, typo, formatting, comment wording) needing no re-plan. praise: an approving remark with nothing to do."
-});
-const TIER_ORDER = {
-	critical: 0,
-	should: 1,
-	could: 2
-};
-/** Capture order: critical, should, could; within a tier one-way doors, then new concepts. */
-const captureKey = (s) => s === void 0 ? 2 : TIER_ORDER[s.tier] * 3 + s.rank;
-const SEVERITY_ANSWERS = {
-	security: ["yes", "no"],
-	reversibility: ["one-way", "two-way"],
-	blastRadius: [
-		"local",
-		"module",
-		"contract"
-	],
-	newConcept: ["yes", "no"]
-};
-/** Anything unanswered, unrecognised, cut or below `minP` is `critical`, never `could`. */
-const severityOf = (note, judgment, minP) => {
-	const ans = (q) => judgment.answers[`${note.id}.${q}`];
-	const a = (q) => ans(q)?.answer;
-	const rank = () => a("reversibility") === "one-way" ? 0 : a("newConcept") === "yes" ? 1 : 2;
-	if (note.forced) return {
-		tier: "critical",
-		reason: "critical: forced by `!`",
-		rank: 2
-	};
-	if (judgment.truncated.includes(note.id) || Object.entries(SEVERITY_ANSWERS).some(([q, allowed]) => !allowed.includes(a(q) ?? "") || !((ans(q)?.p ?? NaN) >= minP))) return {
-		tier: "critical",
-		reason: "critical: judge unsure",
-		rank: 2
-	};
-	const critical = [...a("security") === "yes" ? ["security"] : [], ...a("reversibility") === "one-way" ? ["one-way door"] : []];
-	if (critical.length > 0) return {
-		tier: "critical",
-		reason: `critical: ${critical.join(", ")}`,
-		rank: rank()
-	};
-	const should = [...a("blastRadius") === "contract" ? ["contract"] : [], ...a("newConcept") === "yes" ? ["new concept"] : []];
-	if (should.length > 0) return {
-		tier: "should",
-		reason: `should: ${should.join(", ")}`,
-		rank: rank()
-	};
-	return {
-		tier: "could",
-		reason: "could",
-		rank: 2
-	};
-};
-const severityQuestions = (note) => [
-	{
-		id: `${note.id}.security`,
-		primitive: "noul",
-		instructions: `Does the change the human asks for in note "${note.id}" (on "${note.anchor}") touch security — authentication, authorisation, secrets, untrusted input or data exposure?`,
-		criteria: "yes: it changes or could weaken a security property. no: it does not."
-	},
-	{
-		id: `${note.id}.reversibility`,
-		primitive: "choice",
-		instructions: `Once the change in note "${note.id}" ships, can it be undone without breaking anyone who already depends on it?`,
-		criteria: "one-way: a published API, file format, persisted data, protocol or other contract that cannot be taken back. two-way: can be reverted freely."
-	},
-	{
-		id: `${note.id}.blastRadius`,
-		primitive: "choice",
-		instructions: `How far does the change in note "${note.id}" reach?`,
-		criteria: "local: one function or file. module: a whole module or several files. contract: a public interface other code or users depend on."
-	},
-	{
-		id: `${note.id}.newConcept`,
-		primitive: "noul",
-		instructions: `Does the change in note "${note.id}" introduce a concept new to this codebase — a new abstraction, entity or term? Judge from the evidence, never a glossary; reusing or extending an existing concept is not new.`,
-		criteria: "yes: a genuinely new concept. no: reuses or extends an existing one."
-	}
-];
-/**
-* One judge rest: a verdict per unforced note (a forced note is asked
-* nothing) plus four severity answers. Dismissing a note is the risky
-* direction, so only a confident non-`edit` verdict on uncut evidence counts;
-* a cut, unanswered or below-floor note is an `edit`. Severity answers on a
-* non-`edit` note are ignored; on an `edit` they order the collecting turn.
-*/
-const triage$1 = (severities) => async (notes) => {
-	const asked = notes.filter((n) => !n.forced);
-	const judgment = asked.length === 0 ? {
-		answers: {},
-		truncated: []
-	} : await judge("review.triage", {
-		questions: asked.flatMap((n) => [verdictQuestion(n), ...severityQuestions(n)]),
-		evidence: Object.fromEntries(asked.map((n) => [n.id, `Anchor: ${n.anchor}\nReviewer's text: ${n.before}\nHuman's text: ${n.text}`])),
-		message: buildReviewTriageMessage(),
-		label: "Judging each note"
-	});
-	const { answers, truncated } = judgment;
-	const minP = numeric(vars.reviewNoteActionable, Infinity);
-	const severityMinP = numeric(vars.reviewSeverityMinP, Infinity);
-	severities.clear();
-	return new Map(notes.map((n) => {
-		const verdict = n.forced ? void 0 : VERDICTS.find((v) => v !== "edit" && answered(answers[n.id], v, minP));
-		if (verdict !== void 0 && !truncated.includes(n.id)) return [n.id, verdict];
-		severities.set(n.id, severityOf(n, judgment, severityMinP));
-		return [n.id, "edit"];
-	}));
-};
-const isCode$1 = (path) => path !== ".gtd" && !path.startsWith(".gtd/");
-/**
-* gtd writes `.gtd/REVIEW.md` from the quality lap's `report` — no reviewer
-* turn — and removes what the fixer left in `.gtd/QUALITY.md`. A re-review
-* after fixed nits restores the doc as committed at `carry`, answers kept;
-* a fresh one leaves out the notes the human already answered.
-*/
-const composing = (base, report, carry, nitFix, answered = /* @__PURE__ */ new Set()) => run("review.composing", carry === void 0 ? writeScript(REVIEW, composedReview(base, {
-	...report,
-	weakened: removedAssertions(changesSince(base)),
-	nitFix,
-	answered
-}), [QUALITY]) : showScript(carry, REVIEW, REVIEW), {
-	label: "Composing the review",
-	file: REVIEW,
-	base
-});
-/**
-* The quality lap's notes reach a human over everything since `base`, who
-* answers each one — fix as suggested, won't fix, or their own answer — and
-* may comment. A fix joins the nit batch, a won't-fix is dropped, and an own
-* answer or comment is judged: edits go to another planning lap, questions
-* are answered in place, nits fixed in one batch, praise dropped.
-*/
-const review = (base, escalations = { rounds: 0 }, options = {}) => {
-	const { guard, guardRests, fixAccess, rules } = options;
-	const feedback = options.feedback ?? {
-		file: ".gtd/REQUIREMENTS.md",
-		collecting,
-		unmatched: "gtd land: no declared pattern matches the pending changes — write .gtd/REQUIREMENTS.md from the feedback, or change nothing when it asks for nothing"
-	};
-	const severities = /* @__PURE__ */ new Map();
-	let nitFix;
-	const answered = /* @__PURE__ */ new Set();
-	return review$1(base, {
-		file: REVIEW,
-		feedback: feedback.file,
-		isCode: isCode$1,
-		reviewing: (b, carry) => {
-			const fixedAt = nitFix;
-			nitFix = void 0;
-			return composing(b, options.report ?? NO_FINDINGS, carry, fixedAt, answered);
-		},
-		fixRisks: guarded((notes) => fixRisks(notes, fixAccess, rules), guard),
-		keepGreen: () => healthy(() => fixCheck(rules), {
-			escalations,
-			guard,
-			guardRests,
-			rules
-		}),
-		awaitReview: (b) => awaitReview(b),
-		reviewMissing,
-		collecting: feedback.collecting,
-		triage: triage$1(severities),
-		decided: (decisions) => decisions.forEach((d) => answered.add(d.anchor)),
-		answerQuestions: answerReviewQuestions,
-		fixNits: async (notes) => {
-			await guarded((n) => fixNits(n, fixAccess, rules), guard)(notes);
-			nitFix = head();
-		},
-		close: closeReview,
-		captures: {
-			edits: reviewEditsCapture,
-			notes: reviewNotesCapture,
-			editNotes: (round, edits, answeredAt) => reviewEditNotesCapture(round, edits.map((n, i) => ({
-				n,
-				i,
-				s: severities.get(n.id),
-				key: captureKey(severities.get(n.id))
-			})).sort((x, y) => x.key - y.key || x.i - y.i).map(({ n, s }) => ({
-				id: n.id,
-				anchor: n.anchor,
-				text: n.forced ? n.text.replace(/^!\s*/, "") : n.text,
-				...s === void 0 ? {} : { label: s.reason }
-			})), answeredAt)
-		},
-		refusals: {
-			deleted: "gtd land: review-doc: .gtd/REVIEW.md was deleted — restore it, or leave a note (or edit code) to request changes.",
-			unmatched: feedback.unmatched,
-			...feedback.dropped === void 0 ? {} : { dropped: feedback.dropped }
-		}
-	});
-};
-function buildTail(first, second, ...rest) {
-	const options = callForm(first, second, rest);
-	if (options === void 0) return Promise.reject(/* @__PURE__ */ new Error("buildTail takes buildTail(base, options?) or the deprecated buildTail(fixFirst, base, green?, options?); this call fits neither"));
-	const [base, form] = options;
-	return tail((escalations, report) => review(base, escalations, {
-		...form,
-		report
-	}), {
-		...form,
-		triage: true
-	});
-}
-const isOptionalBoolean = (value) => value == null || typeof value === "boolean";
-const legacyForm = (fixFirst, base, green, options) => isOptionalBoolean(fixFirst) && isOptionalBoolean(green) && isOptionalObject(options) ? [base, {
-	...options,
-	fixFirst: fixFirst ?? void 0,
-	green: green ?? void 0
-}] : void 0;
-const currentForm = (base, options, third, fourth) => isOptionalObject(options) && third == null && fourth == null ? [base, options ?? {}] : void 0;
-const callForm = (first, second, [third, fourth, ...extra]) => {
-	if (extra.some((value) => value != null)) return void 0;
-	if (typeof second === "string") return legacyForm(first, second, third, fourth);
-	if (typeof first === "string") return currentForm(first, second, third, fourth);
-};
-/**
-* Undo the human's review-round code edits. A path changed since the human
-* left it is not overwritten; requireRevert names it instead.
-*/
-const reUnwind = async (feedback) => {
-	const { base, restoreFrom, edited } = feedback;
-	await run("re-unwind", restoreScript(base, {
-		restore: edited.filter((c) => c.status !== "added").map((c) => c.path),
-		remove: edited.filter((c) => c.status === "added").map((c) => c.path)
-	}, restoreFrom), {
-		label: "Re-unwinding your review edit",
-		file: REVIEW,
-		base
-	});
-	requireRevert(edited, base);
-};
-//#endregion
 //#region src/workflows/shared/continuation.ts
 const phase = (name, steered) => ({
 	name,
@@ -1445,7 +1173,7 @@ const settleQuality = async () => {
 	if (rested) await healthy(() => fixCheck());
 };
 /** The triaged quality lap, then the human review since `base`. */
-const reviewedTail = (base, lensBase) => tail((escalations, report) => review(base, escalations, { report }), {
+const reviewedTail = (base, lensBase) => tail((escalations, report) => humanReview(base, escalations, { report }), {
 	green: true,
 	lensBase,
 	triage: true

package/dist/workflows/fix.mjs

@@ -1,7 +1,7 @@
 import { read, refuse, removeScript, run, scope, start } from "../flows.mjs";
 import { g as reviewRisks, h as reviewNotes } from "../chunks/steering-D4LUQ-av.mjs";
-import { A as agentWithSkills, Ct as envDefaults, K as finisherSystem, S as coder, St as defaults, c as baseline, i as skills, n as summary, q as fixReviewNotesPrompt, r as access, s as shipped, t as steering, y as REVIEW } from "../chunks/reserved-COEMFEpy.mjs";
-import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-C_xn8U7U.mjs";
+import { C as coder, J as fixReviewNotesPrompt, N as agentWithSkills, Tt as envDefaults, c as baseline, i as skills, n as summary, q as finisherSystem, r as access, s as shipped, t as steering, wt as defaults, y as REVIEW } from "../chunks/reserved-DJk_6-ju.mjs";
+import { r as handOffTail, t as REVIEW_ORIG } from "../chunks/tail-5w5mxGTq.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,16 +1,36 @@
-import { start } from "../flows.mjs";
-import { Ct as envDefaults, St as defaults, ft as reviewGateBlockedMessage, i as skills, n as summary, r as access, s as shipped, t as steering, u as gate } from "../chunks/reserved-COEMFEpy.mjs";
-import { a as refusePendingHandOff, r as handOffTail } from "../chunks/tail-C_xn8U7U.mjs";
+import { read, refuse, removeScript, run, start } from "../flows.mjs";
+import { C as coder, N as agentWithSkills, Tt as envDefaults, i as skills, mt as reviewGateBlockedMessage, n as summary, pt as reviewFeedbackFixPrompt, q as finisherSystem, r as access, s as shipped, t as steering, u as gate, v as REQUIREMENTS, wt as defaults } from "../chunks/reserved-DJk_6-ju.mjs";
+import { a as refusePendingHandOff } from "../chunks/tail-5w5mxGTq.mjs";
+import { i as reUnwind, t as buildTail } from "../chunks/review-X7Jfz0dY.mjs";
 //#region src/workflows/review/review.ts
+/** Build the concerns a review round collected into `.gtd/REQUIREMENTS.md`, then remove it. */
+const fixFeedback = async () => {
+	await agentWithSkills("feedback.fixing", reviewFeedbackFixPrompt(), {
+		label: "Fixing your review feedback",
+		file: REQUIREMENTS,
+		model: coder(),
+		system: finisherSystem(),
+		allowEmpty: true
+	});
+	await run("feedback.closing", removeScript([REQUIREMENTS]), { label: "Closing the feedback" });
+};
 /**
-* Pure review of everything since `reviewBase`: a green gate, the quality
-* lap, then the human review. A note ends the process with `.gtd/REVIEW.md`
-* left for `fix`; it never re-plans.
+* The feature's review of everything since `reviewBase` — a green gate, the
+* triaged quality lap, then the human review — with no design phase: a
+* review that asks for changes is fixed in place and reviewed again, until
+* sign-off.
 */
 const reviewFlow = async () => {
 	refusePendingHandOff();
+	if (read(".gtd/REQUIREMENTS.md") !== void 0) refuse(`gtd: ${REQUIREMENTS} is left over — finish or remove it before a review.`);
 	await gate("review-gate", reviewGateBlockedMessage());
-	await handOffTail(false, start());
+	const base = start();
+	let outcome = await buildTail(base, { green: true });
+	while (outcome.verdict === "feedback") {
+		await reUnwind(outcome);
+		await fixFeedback();
+		outcome = await buildTail(base, { lensBase: outcome.base });
+	}
 };
 const review = shipped(reviewFlow, { review: {
 	args: [{

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 { Ct as envDefaults, Dt as flipProblems, S as coder, St as defaults, Tt as flagMentions, i as skills, kt as requireFlag, n as summary, o as flagShipped, p as FEEDBACK, r as access, t as steering, u as gate } from "../chunks/reserved-COEMFEpy.mjs";
+import { C as coder, Dt as flagMentions, Tt as envDefaults, i as skills, jt as requireFlag, kt as flipProblems, n as summary, o as flagShipped, p as FEEDBACK, r as access, t as steering, u as gate, wt as defaults } from "../chunks/reserved-DJk_6-ju.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

@@ -16909,7 +16909,7 @@ const reviewOnce = async (p, base, carry) => {
 * another lap, questions are answered in place, nits fixed in one batch,
 * praise dropped.
 */
-const review$2 = async (base, p) => {
+const review$1 = async (base, p) => {
 	let carry;
 	for (;;) {
 		await reviewOnce(p, base, carry);
@@ -17937,6 +17937,15 @@ ${notes.length === 0 ? "(none)\n" : notesCapture(notes)}
 The reviewer's risks are:
 
 ${risks.length === 0 ? "(none)\n" : notesCapture(risks)}`;
+const reviewFeedbackFixPrompt = () => `${stateFileRules}
+- Read \`.gtd/REQUIREMENTS.md\` — the concerns the human's review asked for,
+  one \`## \` heading each, in build order
+- Build every concern in this one turn; an answered question is context,
+  not a concern
+- Where a change is behavioural, add a test that fails without it
+- Leave \`.gtd/REQUIREMENTS.md\` untouched — the next step removes it
+- Leave everything uncommitted and finish your turn
+`;
 const buildReviewReviewMissingMessage = (commit) => `The review round committed no \`.gtd/REVIEW.md\` (at ${commit}), so there is
 nothing to sign off on.
 
@@ -18565,6 +18574,36 @@ const awaitReview = (base, message = buildReviewAwaitReviewMessage(base)) => hum
 	base,
 	acceptClean: true
 });
+/** Answer every `question` note inline in `.gtd/REVIEW.md`. */
+const answerReviewQuestions = (notes) => agentWithSkills("review.answer-review-questions", buildReviewAnswerQuestionsPrompt(notes), {
+	label: "Answering your questions",
+	file: REVIEW,
+	mode: "review",
+	model: planner(),
+	system: reviewerSystem()
+});
+/** Fix every `nit` note in one turn. */
+const fixNits = (notes, access, rules) => {
+	const fixing = (name) => agentWithSkills(name, buildReviewFixNitsPrompt(notes, rules), {
+		label: "Fixing your nits",
+		file: REVIEW,
+		model: planner(),
+		system: reviewerSystem()
+	});
+	return access === void 0 ? fixing("review.fix.nits.fixing") : scope({
+		name: "review.fix.nits",
+		access
+	}, () => fixing("fixing"));
+};
+/** Turn the review round `capture` describes into `.gtd/REQUIREMENTS.md`, or change nothing. */
+const collecting = (capture, round) => agentWithSkills("review.collecting", buildReviewCollectingPrompt(capture, void 0, round), {
+	label: "Collecting your feedback",
+	file: REQUIREMENTS,
+	mode: "qa",
+	model: planner(),
+	system: reviewerSystem(),
+	allowEmpty: true
+});
 /** The round at commit `round` left no `.gtd/REVIEW.md`. */
 const reviewMissing = (round) => human("review.review-missing", {
 	message: buildReviewReviewMissingMessage(round),
@@ -38282,7 +38321,7 @@ const runTail = (finish, options) => scope("build", async () => {
 	return finish(escalations, NO_FINDINGS);
 });
 /**
-* The review and fix workflows' human review since `base`: a sign-off closes
+* The fix workflow's human review since `base`: a sign-off closes
 * `.gtd/REVIEW.md`; a note leaves it, with the reviewer's own version as
 * `REVIEW_ORIG`, for the next `fix` to read — never a re-plan.
 */
@@ -38302,7 +38341,7 @@ const handOffReview = (base, escalations, guard) => reviewToHandOff(base, {
 	unparsed: "gtd land: review-doc: your edit to .gtd/REVIEW.md contains no note fix can read — restore the deleted chunk, or write the note as a line under its entry.",
 	deleted: "gtd land: review-doc: .gtd/REVIEW.md was deleted — restore it, or leave a note to hand to fix."
 });
-/** The tail the review and fix workflows run: ends at the hand-off review since `base`. */
+/** The tail the fix workflow runs: ends at the hand-off review since `base`. */
 const handOffTail = (fixFirst, base, guard) => tail((escalations) => handOffReview(base, escalations, guard), {
 	fixFirst,
 	guard
@@ -38524,36 +38563,6 @@ const answerProductQuestions = () => human("gate.answer", {
 	mode: "qa",
 	acceptClean: true
 });
-/** Answer every `question` note inline in `.gtd/REVIEW.md`. */
-const answerReviewQuestions = (notes) => agentWithSkills("review.answer-review-questions", buildReviewAnswerQuestionsPrompt(notes), {
-	label: "Answering your questions",
-	file: REVIEW,
-	mode: "review",
-	model: planner(),
-	system: reviewerSystem()
-});
-/** Fix every `nit` note in one turn. */
-const fixNits = (notes, access, rules) => {
-	const fixing = (name) => agentWithSkills(name, buildReviewFixNitsPrompt(notes, rules), {
-		label: "Fixing your nits",
-		file: REVIEW,
-		model: planner(),
-		system: reviewerSystem()
-	});
-	return access === void 0 ? fixing("review.fix.nits.fixing") : scope({
-		name: "review.fix.nits",
-		access
-	}, () => fixing("fixing"));
-};
-/** Turn the review round `capture` describes into `.gtd/REQUIREMENTS.md`, or change nothing. */
-const collecting = (capture, round) => agentWithSkills("review.collecting", buildReviewCollectingPrompt(capture, void 0, round), {
-	label: "Collecting your feedback",
-	file: REQUIREMENTS,
-	mode: "qa",
-	model: planner(),
-	system: reviewerSystem(),
-	allowEmpty: true
-});
 /** Turn the refactor review round `capture` describes into `.gtd/REFACTOR.md`, or change nothing. */
 const refactorCollecting = (capture, round, strays) => agentWithSkills("review.collecting", buildReviewCollectingPrompt(capture, {
 	strays,
@@ -38591,7 +38600,7 @@ const design = (base, guard) => scope("design", async () => {
 	} while (await noteGate(REQUIREMENTS, answerProductQuestions));
 });
 //#endregion
-//#region src/workflows/feature/review.ts
+//#region src/workflows/shared/review.ts
 const VERDICTS = [
 	"edit",
 	"question",
@@ -38731,10 +38740,11 @@ const composing = (base, report, carry, nitFix, answered = /* @__PURE__ */ new S
 * The quality lap's notes reach a human over everything since `base`, who
 * answers each one — fix as suggested, won't fix, or their own answer — and
 * may comment. A fix joins the nit batch, a won't-fix is dropped, and an own
-* answer or comment is judged: edits go to another planning lap, questions
-* are answered in place, nits fixed in one batch, praise dropped.
+* answer or comment is judged: edits end the review as `feedback` for the
+* caller to build, questions are answered in place, nits fixed in one batch,
+* praise dropped.
 */
-const review$1 = (base, escalations = { rounds: 0 }, options = {}) => {
+const humanReview = (base, escalations = { rounds: 0 }, options = {}) => {
 	const { guard, guardRests, fixAccess, rules } = options;
 	const feedback = options.feedback ?? {
 		file: ".gtd/REQUIREMENTS.md",
@@ -38744,7 +38754,7 @@ const review$1 = (base, escalations = { rounds: 0 }, options = {}) => {
 	const severities = /* @__PURE__ */ new Map();
 	let nitFix;
 	const answered = /* @__PURE__ */ new Set();
-	return review$2(base, {
+	return review$1(base, {
 		file: REVIEW,
 		feedback: feedback.file,
 		isCode: isCode$1,
@@ -38797,7 +38807,7 @@ function buildTail(first, second, ...rest) {
 	const options = callForm(first, second, rest);
 	if (options === void 0) return Promise.reject(/* @__PURE__ */ new Error("buildTail takes buildTail(base, options?) or the deprecated buildTail(fixFirst, base, green?, options?); this call fits neither"));
 	const [base, form] = options;
-	return tail((escalations, report) => review$1(base, escalations, {
+	return tail((escalations, report) => humanReview(base, escalations, {
 		...form,
 		report
 	}), {
@@ -39750,7 +39760,7 @@ const settleQuality = async () => {
 	if (rested) await healthy(() => fixCheck());
 };
 /** The triaged quality lap, then the human review since `base`. */
-const reviewedTail = (base, lensBase) => tail((escalations, report) => review$1(base, escalations, { report }), {
+const reviewedTail = (base, lensBase) => tail((escalations, report) => humanReview(base, escalations, { report }), {
 	green: true,
 	lensBase,
 	triage: true
@@ -39829,6 +39839,7 @@ const skills = (vars) => {
 	return {
 		design: ["spec-driven-development", "planning-and-task-breakdown"],
 		notes: ["incremental-implementation", "code-simplification"],
+		feedback: ["test-driven-development", "incremental-implementation"],
 		...build,
 		...Object.fromEntries(Object.entries(build).map(([name, list]) => [`refactor.${name}`, list])),
 		refactor: ["ponytail"],
@@ -39862,15 +39873,34 @@ const steering = {
 };
 //#endregion
 //#region src/workflows/review/review.ts
+/** Build the concerns a review round collected into `.gtd/REQUIREMENTS.md`, then remove it. */
+const fixFeedback = async () => {
+	await agentWithSkills("feedback.fixing", reviewFeedbackFixPrompt(), {
+		label: "Fixing your review feedback",
+		file: REQUIREMENTS,
+		model: coder(),
+		system: finisherSystem(),
+		allowEmpty: true
+	});
+	await run("feedback.closing", removeScript([REQUIREMENTS]), { label: "Closing the feedback" });
+};
 /**
-* Pure review of everything since `reviewBase`: a green gate, the quality
-* lap, then the human review. A note ends the process with `.gtd/REVIEW.md`
-* left for `fix`; it never re-plans.
+* The feature's review of everything since `reviewBase` — a green gate, the
+* triaged quality lap, then the human review — with no design phase: a
+* review that asks for changes is fixed in place and reviewed again, until
+* sign-off.
 */
 const reviewFlow = async () => {
 	refusePendingHandOff();
+	if (read(".gtd/REQUIREMENTS.md") !== void 0) refuse(`gtd: ${REQUIREMENTS} is left over — finish or remove it before a review.`);
 	await gate("review-gate", reviewGateBlockedMessage());
-	await handOffTail(false, start());
+	const base = start();
+	let outcome = await buildTail(base, { green: true });
+	while (outcome.verdict === "feedback") {
+		await reUnwind(outcome);
+		await fixFeedback();
+		outcome = await buildTail(base, { lensBase: outcome.base });
+	}
 };
 const review = shipped(reviewFlow, { review: {
 	args: [{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pmelab/gtd",
-  "version": "43.0.0",
+  "version": "44.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/src/steering/FORMATS.md

@@ -24,11 +24,11 @@ read them.
   its first line starts `H:`.
 - **Review notes**: what a human added to a `review` document since the reviewer
   wrote it — changed chunk prose, pointer notes, and new one-shot footnotes,
-  never threads. **This is the hand-off from the `review` workflow to the `fix`
-  workflow**: `review` leaves the annotated file beside the reviewer's own copy
+  never threads. **This is the hand-off from a `fix` review to the next `fix`**:
+  the review leaves the annotated file beside the reviewer's own copy
   (`.gtd/REVIEW.orig.md`), and `fix` reads its work from the notes between the
-  two and from the risks, so a file `review` wrote must read the same in any
-  `fix` that consumes it.
+  two and from the risks, so a hand-off file must read the same in any `fix`
+  that consumes it.
 
 ## What may change
 

package/src/workflows/feature/coverage.ts

@@ -19,7 +19,7 @@ import {
   type CriteriaSlice,
 } from "./criteria.js"
 import { isTestFile } from "./refactor.js"
-import { isCode } from "./review.js"
+import { isCode } from "../shared/review.js"
 
 /** Below this the judge's `yes` is not trusted: a wrongly covered ID ends the feature without its test. */
 const COVERED_MIN_P = 0.7

package/src/workflows/feature/feature.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest"
 import { runsItsScript, testRepo } from "../../testkit/index.js"
 import { CONFIG_SCAFFOLD } from "../../install/index.js"
 import { reviewDoc } from "../shared/config.fixture.js"
+import type * as featureEntry from "./index.js"
 
 describe("an ordinary feature start", () => {
   it("unwinds a captured TODO, checks the baseline and starts design from it", async () => {
@@ -363,3 +364,10 @@ describe("flagMode", () => {
     expect(repo.subjects()).toEqual(["chore: initial commit"])
   })
 })
+
+// pins the public re-exports from the feature entry point
+export type _PublicBuildTailOptions = [
+  featureEntry.BuildTailOptions,
+  featureEntry.FeedbackTarget,
+  featureEntry.ReviewRange,
+]